修改生产入库申请

src/api/bpm/task.js

@@ -114,6 +114,14 @@ export function approveTaskWithVariables(data) {
   });
 }
 
+export function approveTaskWithVariablesOther(data) {
+  return request({
+    url: '/bpm/inwarehouse/assign',
+    method: 'PUT',
+    data: data
+  });
+}
+
 export function outApproveNotPass(data) {
   return request({
     url: '/bpm/outApprove/notPass',
@@ -130,7 +138,6 @@ export function outinApproveNotPass(data) {
   });
 }
 
-
 // 我的消息分页
 export async function notifyMessagePageAPI(data) {
   const res = await request({

src/views/bpm/handleTask/components/inoutBound/detailDialog.vue

@@ -441,6 +441,15 @@
               label="计量单位"
               prop="measuringUnit"
             ></el-table-column>
+            <el-table-column label="发货条码" prop="barcodes" width="130">
+              <template slot-scope="{ row }">
+                <el-input
+                  v-show="!row.isPack"
+                  v-model="row.barcodes"
+                ></el-input>
+                <span v-show="row.isPack">{{ row.barcodes }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="物料代号" prop="materielCode" width="130">
               <template slot-scope="{ row }">
                 <el-input

src/views/bpm/handleTask/components/productionWarehousing/submit.vue

@@ -35,7 +35,7 @@
 </template>
 
 <script>
-  import { approveTaskWithVariables } from '@/api/bpm/task';
+  import { approveTaskWithVariablesOther } from '@/api/bpm/task';
   import outin from '@/api/warehouseManagement/outin';
   export default {
     name: '',
@@ -74,10 +74,11 @@
         console.log(storageData);
         try {
           this.isSaveLoading = true;
-          await outin.save(storageData);
-          approveTaskWithVariables({
+          let res = await outin.save(storageData);
+          approveTaskWithVariablesOther({
             id: this.taskId,
             reason: this.form.reason,
+            outInId: res.data[0],
             variables: {
               pass: true
             }

src/views/bpm/handleTask/components/purchaseOrder/invoice/procurementStorage.vue

@@ -541,6 +541,12 @@
               label="计量单位"
               prop="measuringUnit"
             ></el-table-column>
+            <el-table-column label="发货条码" prop="barcodes" width="130">
+              <template slot-scope="{ row }">
+                <el-input v-if="!row.isPack" v-model="row.barcodes"></el-input>
+                <span v-else>{{ row.barcodes }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="物料代号" prop="materielCode" width="130">
               <template slot-scope="{ row }">
                 <el-input
@@ -2099,6 +2105,7 @@
           materialDetails: this.materialDetails(it.onlyCode),
           packingCount: it.packingCount,
           status: it.status,
+          barcodes: it.barcodes,
           result: it.result
         };
       },

src/views/bpm/handleTask/components/purchaseOrder/invoice/procurementWarehousing.vue

@@ -686,6 +686,19 @@
               label="计量单位"
               prop="measuringUnit"
             ></el-table-column>
+            <el-table-column label="发货条码" prop="barcodes" width="130">
+              <template slot-scope="{ row, $index }">
+                <el-input
+                  v-if="!row.isPack"
+                  :ref="'barcodes' + $index"
+                  @keyup.native="
+                    moveFocus($event, $index, 'barcodes', '包装', row)
+                  "
+                  v-model="row.barcodes"
+                ></el-input>
+                <span v-else>{{ row.barcodes }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="物料代号" prop="materielCode" width="130">
               <template slot-scope="{ row, $index }">
                 <el-input
@@ -1338,9 +1351,15 @@
           case '包装':
             listLength = this.materialCodeReqList.length;
             if (row.measuringUnit != row.weightUtil) {
-              keyfield = ['materielCode', 'clientCode', 'engrave', 'weight'];
+              keyfield = [
+                'barcodes',
+                'materielCode',
+                'clientCode',
+                'engrave',
+                'weight'
+              ];
             } else {
-              keyfield = ['materielCode', 'clientCode', 'engrave'];
+              keyfield = ['barcodes', 'materielCode', 'clientCode', 'engrave'];
             }
             break;
           case '物料':