Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-pad into dev

common/http.api.js

@@ -161,6 +161,7 @@ const install = (Vue, vm) => {
           params
         ),
 
+
       /**
        * 工艺工序相关API
        */
@@ -277,6 +278,10 @@ const install = (Vue, vm) => {
       genCode: (ruleCode) => vm.$u.get(config.adminPath +
           '/system/autocode/get/' + ruleCode
       ),
+	  
+	   //获取最后一道工序
+	  getNextProcess: (params = {}) =>
+	  	    vm.$u.get(config.adminPath + '/mobile/pro/protask/feedBackNextProcess', params),
 
 
       //首页相关api

pages/mes/prodReport/index.vue

@@ -2529,26 +2529,33 @@ export default {
                   });
                 });
               }
-							console.log('item', item)
-              if (item.whether == '1') {
-                this.printPdfSocket({
-                  reportName: 'mysql:qrcode-50*50-2',
-                  values: {
-                    detail: [
-                      {
-                        barcode: item.printContents,
-					    showText: '单号:'+item.printContents,
-                        gp: 1
-                      },
-					  {
-						barcode: item.printContents,
-						showText: '单号:'+item.printContents,
-						gp: 1
-					  }
-                    ]
-                  }
-                });
-              }
+              let workunitName='';
+              console.log(item.taskId);
+              this.$u.api.getNextProcess({taskId:item.taskId}).then(workunit =>{
+                workunitName=workunit.data.workunitName;
+                console.log(item.arrangeCode,item.workorderCode,item.quantityQualify,workunitName);
+                let aa='编排单号:'+item.arrangeCode+'\n工单号:'+item.workorderCode+'\n数量:'+item.quantityQualify+'\n下一道工序:'+workunitName;
+                console.log(aa);
+                if (item.whether == '1') {
+                  this.printPdfSocket({
+                    reportName: 'mysql:qrcode-50*50-2',
+                    values: {
+                      detail: [
+                        {
+                          barcode: item.printContents,
+                          showText: '编排单号:'+item.arrangeCode+'\n数量:'+item.quantityQualify+'\n工单号:'+item.workorderCode+'\n下一道工序:'+workunitName,
+                          gp: 1
+                        },
+                        {
+                          barcode: item.printContents,
+                          showText: '编排单号:'+item.arrangeCode+'\n数量:'+item.quantityQualify+'\n工单号:'+item.workorderCode+'\n下一道工序:'+workunitName,
+                          gp: 1
+                        }
+                      ]
+                    }
+                  });
+                }
+              });
               if (!res.msg) {
                 this.$u.toast('上报成功');
               } else {