fix:修改发货单选择批次号没有修改systemBatchNo字段的问题

package.json

@@ -28,6 +28,7 @@
     "bpmn-js-properties-panel": "0.46.0",
     "bpmn-js-token-simulation": "0.10.0",
     "bytemd": "^1.17.2",
+    "codemirror": "^5.65.21",
     "core-js": "^3.25.0",
     "countup.js": "^2.3.2",
     "cropperjs": "^1.5.12",
@@ -47,8 +48,11 @@
     "jspdf": "^2.5.2",
     "lodash": "^4.17.21",
     "mathjs": "^12.4.1",
+    "normalize.css": "^8.0.1",
     "nprogress": "^0.2.0",
+    "qiniu-js": "^2.5.1",
     "tinymce": "^5.10.5",
+    "viewerjs": "^1.11.8",
     "vue": "^2.7.10",
     "vue-clipboard2": "^0.3.3",
     "vue-countup-v2": "^4.0.0",

src/BIZComponents/inventoryTable.vue

@@ -943,6 +943,13 @@
             slot: 'batchNo',
             align: 'center'
           },
+          {
+            minWidth: 180,
+            prop: 'systemBatchNo',
+            label: '系统内部批次号',
+            align: 'center',
+            formatter: (row) => row.systemBatchNo || '-'
+          },
           {
             width: 120,
             prop: 'availableCountBase',

src/BIZComponents/inventoryTableDetails.vue

@@ -610,6 +610,14 @@
             isNone: this.quoteType === 2,
             align: 'center'
           },
+          {
+            minWidth: 180,
+            prop: 'systemBatchNo',
+            label: '系统内部批次号',
+            isNone: this.quoteType === 2,
+            align: 'center',
+            formatter: (row) => row.systemBatchNo || '-'
+          },
           {
             width: 160,
             prop: 'productBrand',

src/views/bpm/handleTask/components/saleOrder/invoice/detailDialog.vue

@@ -298,6 +298,13 @@
             slot: 'batchNo',
             align: 'center'
           },
+          {
+            minWidth: 180,
+            prop: 'systemBatchNo',
+            label: '系统内部批次号',
+            align: 'center',
+            formatter: (row) => row.systemBatchNo || '-'
+          },
           {
             width: 160,
             prop: 'productBrand',

src/views/bpm/outgoingManagement/components/AssetsDialog.vue

@@ -60,6 +60,16 @@
             ></el-input>
           </el-form-item>
         </el-col>
+        <el-col :span="6" v-if="dimension != 1">
+          <el-form-item label="系统批次:">
+            <el-input
+              clearable
+              type="text"
+              placeholder="请输入完整系统内部批次号"
+              v-model.trim="searchForm.systemBatchNo"
+            ></el-input>
+          </el-form-item>
+        </el-col>
         <el-col :span="6">
           <el-form-item label="刻码">
             <el-input
@@ -259,6 +269,13 @@
             label="批次号"
             min-width="80"
           ></el-table-column>
+          <el-table-column
+            v-if="dimension != 1"
+            prop="systemBatchNo"
+            label="系统内部批次号"
+            min-width="180"
+            :formatter="formatSystemBatchNo"
+          ></el-table-column>
           <el-table-column prop="level" label="级别"></el-table-column>
           <el-table-column
             v-if="dimension != 1"
@@ -428,6 +445,7 @@
           categoryCode: '',
           categoryName: '',
           batchNo: '',
+          systemBatchNo: '',
           brandNum: '',
           engrave: '',
           barcodes: '',
@@ -459,6 +477,9 @@
     },
     methods: {
       //获取工厂列表
+      formatSystemBatchNo(row) {
+        return row.systemBatchNo || '-';
+      },
       async getFactoryList() {
         const res = await warehouseDefinition.getFactoryarea({
           pageNum: 1,
@@ -645,6 +666,9 @@
             builders: this.selectionList.map((item) => {
               return {
                 categoryId: item.categoryId,
+                batchNo: item.batchNo,
+                // 历史数据保持空值，由后端按外部批次号兼容匹配
+                systemBatchNo: item.systemBatchNo || '',
                 num: item.outboundNum,
                 id: item.id
               };
@@ -687,6 +711,7 @@
           categoryCode: '',
           categoryName: '',
           batchNo: '',
+          systemBatchNo: '',
           brandNum: '',
           engrave: '',
           barcodes: '',

src/views/bpm/outgoingManagement/outbound.vue

@@ -1190,7 +1190,8 @@
                   item.categoryId || item.instanceId || item.productId,
                 num: item.demandQuantity || item.measurementCount,
                 warehouseId: this.bizType == 11 ? item.warehouseId : '',
-                batchNo: item.batchNo || ''
+                batchNo: item.batchNo || '',
+                systemBatchNo: item.systemBatchNo || ''
               };
             })
           };
@@ -1256,6 +1257,7 @@
                 warehouseId: this.bizType == 3 ? item.warehouseId : '',
                 colorKey: item.colorKey || '',
                 batchNo: item.batchNo || '',
+                systemBatchNo: item.systemBatchNo || '',
                 categoryModel: item.modelType || '',
                 deliveryDetailId: item.id || ''
               };
@@ -1299,6 +1301,7 @@
                 unitPrice: item.singlePrice,
                 weight: item.singleWeight * item.totalCount || 0,
                 batchNo: item.batchNo || '',
+                systemBatchNo: item.systemBatchNo || '',
                 taskId: item.taskId || '',
                 deliveryDetailId: item.id || ''
               };

src/views/bpm/outgoingManagement/outboundXTBG.vue

@@ -1076,7 +1076,9 @@
                 categoryId:
                   item.instanceId || item.categoryId || item.productId,
                 num: item.demandQuantity || item.measurementCount,
-                warehouseId: this.bizType == 11 ? item.warehouseId : ''
+                warehouseId: this.bizType == 11 ? item.warehouseId : '',
+                batchNo: item.batchNo || '',
+                systemBatchNo: item.systemBatchNo || ''
               };
             })
           };
@@ -1131,7 +1133,8 @@
               return {
                 categoryId: item.productId || item.categoryId,
                 num: item.totalCount,
-                batchNo: item.batchNo || ''
+                batchNo: item.batchNo || '',
+                systemBatchNo: item.systemBatchNo || ''
                 // warehouseId: this.bizType == 3 ? item.warehouseId : ''
                 // batchNo: item.batchNo || '',
               };
@@ -1170,6 +1173,7 @@
                 unitPrice: item.singlePrice,
                 weight: item.singleWeight * item.totalCount || 0,
                 batchNo: item.batchNo || '',
+                systemBatchNo: item.systemBatchNo || '',
                 taskId: item.taskId || ''
               };
             })

vue.config.js

@@ -38,7 +38,7 @@ module.exports = {
         // target: 'http://124.71.68.31:50001', // 测试环境
         // target: 'http://124.71.68.31:50001',
         // target: 'http://192.168.1.105:18086',
-        target: 'http://192.168.1.125:18086',
+        target: 'http://localhost:18086', //开发
         // target: 'http://192.168.1.116:18086',
         // target: 'http://192.168.1.3:18086',
         // target: 'http://192.168.1.251:18186',