袋装拆袋

src/views/modules/board/VulcanizationDispatchOrder.vue

@@ -5,7 +5,7 @@ export default {
   name: 'vulcanizationDispatchOrder',
   data(){
     return{
-      setTimeoutDelay: 30*1000,
+      setTimeoutDelay: 60*1000*60,
       refreshTool: null,
       dataList:[],
       queryParams:{

src/views/modules/production/generateReport.vue

@@ -947,14 +947,34 @@
               this.setUp.reviewFlag = false
               // this.search()
               let inList=[];
+              // 入库通知单
               if(data.transData!=null){
+                // 生成袋装标签
+                let params = {
+                  site:this.saveHeaderData.site,
+                  seqNo:this.saveHeaderData.seqNo,
+                  previousSeqNo:this.saveHeaderData.seqNo,
+                  orderNo:this.saveHeaderData.orderNo,
+                  number:this.saveHeaderData.qtyApprove,
+                }
+                // if (data.transData.partNo.substring(0, 2) === 'SP'){
+                //
+                // }
+                getPackagePrintDataList(params).then(({data}) => {
+                  if (data && data.code === 0) {
+                    printPackageLabelNoPreview(data.rows);
+                  }
+                })
                 //他们要打印2张
-                inList.push(data.transData)
+                // 2025-04-08加上打印袋装标签后，只需要一张入库通知单标签
+                // inList.push(data.transData)
                 inList.push(data.transData)
               }
+              // 不良数据
               if(data.badData!=null){
                 inList.push(data.badData)
               }
+              // 报工数据
               if(data.reportData!=null&&data.transData==null){
                 inList.push(data.reportData)
               }
@@ -965,19 +985,6 @@
               }
               if(inList.length>0){
                 printTransNoLabel(inList);
-                // 生成袋装标签
-                let params = {
-                  site:this.saveHeaderData.site,
-                  seqNo:this.saveHeaderData.seqNo,
-                  previousSeqNo:this.saveHeaderData.seqNo,
-                  orderNo:this.saveHeaderData.orderNo,
-                  number:this.saveHeaderData.qtyApprove,
-                }
-                getPackagePrintDataList(params).then(({data}) => {
-                  if (data && data.code === 0) {
-                    printPackageLabelNoPreview(data.rows);
-                  }
-                })
               }
 
               this.$nextTick(() => {