Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-mes into dev

src/views/produceOrder/components/report/Common.vue

@@ -90,7 +90,10 @@
                 (categoryMsg.totalWeight =
                   categoryMsg.number === ''
                     ? ''
-                    : categoryMsg.number * (infoData.productUnitWeight || 1))
+                    : multiply(
+                        categoryMsg.number,
+                        infoData.productUnitWeight || 1
+                      ))
               "
               clearable
             ></el-input>

src/views/produceOrder/components/report/Drying.vue

@@ -91,7 +91,10 @@
                 (categoryMsg.totalWeight =
                   categoryMsg.number === ''
                     ? ''
-                    : categoryMsg.number * (infoData.productUnitWeight || 1))
+                    : multiply(
+                        categoryMsg.number,
+                        infoData.productUnitWeight || 1
+                      ))
               "
               clearable
             ></el-input>
@@ -110,7 +113,7 @@
         <el-descriptions-item label="舟皿数量" :span="3"
           ><el-input
             placeholder="请输入"
-            v-model="boatMsg.extraField.boatMsg"
+            v-model="boatMsg.extraField.boatNum"
           ></el-input
         ></el-descriptions-item>
         <el-descriptions-item label="质检项" :span="2">
@@ -329,7 +332,7 @@
           rootCategoryLevelId: '',
           specification: '',
           extraField: {
-            boatMsg: ''
+            boatNum: ''
           }
         }
       };

src/views/produceOrder/components/report/Extrusion.vue

@@ -86,7 +86,7 @@
                 :key="index"
                 :label="item.batchNum"
                 :value="item.batchNum"
-                @click.native="categoryMsg.totalWeight = item.storageNum"
+                @click.native="categoryMsg.number = item.storageNum"
               ></el-option>
             </el-select>
           </el-form-item>
@@ -98,9 +98,9 @@
             required
             label-width="0"
             class="w100"
-            prop="categoryMsg.totalWeight"
+            prop="categoryMsg.number"
             ><el-input
-              v-model="categoryMsg.totalWeight"
+              v-model="categoryMsg.number"
               placeholder="请输入"
             ></el-input> </el-form-item
         ></el-descriptions-item>
@@ -324,6 +324,7 @@
       return {
         categoryMsg: {
           batchNo: '',
+          number: '',
           totalWeight: '',
           brandNum: '',
           sourceCategoryId: '',
@@ -465,7 +466,7 @@
 
           realTimeStorage({
             categoryCode: res.categoryCode,
-            factoryCode: this.infoData.werks || '14T1'
+            factoryCode: res.factoryCode || '14T1'
           }).then((res) => {
             this.batchList = res;
           });
@@ -513,8 +514,11 @@
               if (this.boatMsg.code) {
                 workReportDeviceList.push(this.boatMsg);
               }
+
+              this.categoryMsg.totalWeight = this.categoryMsg.number;
               fun({
                 checkState: 1,
+                isSapReportState: 1,
                 workReport: this.workReport,
                 workReportCategoryList: [this.categoryMsg],
                 workReportDeviceList

src/views/produceOrder/components/report/HalfAdded.vue

@@ -90,7 +90,10 @@
                 (categoryMsg.totalWeight =
                   categoryMsg.number === ''
                     ? ''
-                    : categoryMsg.number * (infoData.productUnitWeight || 1))
+                    : multiply(
+                        categoryMsg.number,
+                        infoData.productUnitWeight || 1
+                      ))
               "
               clearable
             ></el-input>
@@ -427,11 +430,15 @@
                 name: this.infoData.productName,
                 code: this.infoData.productCode
               });
+              const workReportCategoryList = [this.categoryMsg];
+              if (this.boatMsg.code) {
+                workReportCategoryList.push(this.boatMsg);
+              }
               fun({
                 checkState: 1,
                 workReport: this.workReport,
                 workReportDeviceList: [this.workReportDeviceList],
-                workReportCategoryList: [this.categoryMsg]
+                workReportCategoryList
               }).then((res) => {
                 // this.$message.success('报工成功！');
                 // this.getReportCount();

src/views/produceOrder/components/report/Heating.vue

@@ -90,7 +90,10 @@
                 (categoryMsg.totalWeight =
                   categoryMsg.number === ''
                     ? ''
-                    : categoryMsg.number * (infoData.productUnitWeight || 1))
+                    : multiply(
+                        categoryMsg.number,
+                        infoData.productUnitWeight || 1
+                      ))
               "
               clearable
             ></el-input>
@@ -105,7 +108,7 @@
         <el-descriptions-item label="舟皿数量" :span="3"
           ><el-input
             placeholder="请输入"
-            v-model="boatMsg.extraField.num"
+            v-model="boatMsg.extraField.boatNum"
           ></el-input
         ></el-descriptions-item>
         <el-descriptions-item label="质检项" :span="2">
@@ -326,7 +329,7 @@
           rootCategoryLevelId: '',
           specification: '',
           extraField: {
-            num: ''
+            boatNum: ''
           }
         }
       };
@@ -436,11 +439,16 @@
                 name: this.infoData.productName,
                 code: this.infoData.productCode
               });
+
+              const workReportCategoryList = [this.categoryMsg];
+              if (this.boatMsg.code) {
+                workReportCategoryList.push(this.boatMsg);
+              }
               fun({
                 checkState: 1,
                 workReport: this.workReport,
                 workReportDeviceList: [this.workReportDeviceList],
-                workReportCategoryList: [this.categoryMsg]
+                workReportCategoryList
               }).then((res) => {
                 // this.$message.success('报工成功！');
                 // this.getReportCount();

src/views/produceOrder/components/report/Warehousing.vue

@@ -39,7 +39,7 @@
             type="datetime"
             format="yyyy-MM-dd HH:mm:ss"
             placeholder="请选择"
-			:disabled="formData.dateType==2"
+            :disabled="formData.dateType == 2"
           ></el-date-picker
         ></el-form-item>
       </div>
@@ -129,20 +129,20 @@
         type: Object,
         default: () => ({})
       },
-		formData: {
-		  type: Object,
-		  default: () => ({})
-		},
-		firstInfo:{
-		  type: Object,
-		  default: () => ({})
-		},
-		currentInfo:{
-			type: Object,
-			default: () => ({}) 
-		}
+      formData: {
+        type: Object,
+        default: () => ({})
+      },
+      firstInfo: {
+        type: Object,
+        default: () => ({})
+      },
+      currentInfo: {
+        type: Object,
+        default: () => ({})
+      }
     },
-    data () {
+    data() {
       return {
         workReport: {
           executorId: '',
@@ -174,27 +174,31 @@
     watch: {
       taskInfo: {
         immediate: true,
-        handler () {
+        handler() {
           if (this.taskInfo.code) {
             this.getReportCount();
           }
         }
       },
-	  formData: {
-	    immediate: true,
-	    handler () {
-	  		if (this.formData.dateType==2) {
-	  			this.$set(this.workReport,'executeTime',this.formData.appointTime);
-	  		}
-	    }
-	  }
+      formData: {
+        immediate: true,
+        handler() {
+          if (this.formData.dateType == 2) {
+            this.$set(
+              this.workReport,
+              'executeTime',
+              this.formData.appointTime
+            );
+          }
+        }
+      }
     },
-    created () {
+    created() {
       this.workReport.executorId = this.$store.state.user.info?.userId;
       this.workReport.executorJobNum = this.$store.state.user.info?.jobNumber;
     },
     methods: {
-      async getReportCount () {
+      async getReportCount() {
         const res = await reportCount({
           taskCode: this.taskInfo.code,
           lastTaskCode: this.taskInfo.lastTaskCode,
@@ -203,7 +207,7 @@
 
         this.countMsg = res;
       },
-      report (fun) {
+      report(fun) {
         this.$refs.formRef.validate((value) => {
           if (value) {
             this.$confirm('是否确定要报工?', '提示').then(() => {
@@ -217,6 +221,7 @@
               this.workReport.productInfo.standardNum = this.categoryMsg.number;
               fun({
                 checkState: 3,
+                isSapReportState: 3,
                 workReport: this.workReport,
                 workReportCategoryList: [this.categoryMsg]
               }).then((res) => {

src/views/produceOrder/detail.vue

@@ -249,14 +249,14 @@
     writeOffWork
   } from '@/api/produceOrder/index.js';
   export default {
-	mixins: [dictMixins],
+    mixins: [dictMixins],
     components: {
       OrderPrint,
       otherMission,
       progressBox,
       bomList
     },
-    data () {
+    data() {
       return {
         infoData: {},
         descriptionsShow: true,
@@ -1026,9 +1026,9 @@
               prop: 'storageCode',
               minWidth: 100,
               align: 'center',
-			  formatter: (_row, _column, cellValue) => {
-			    return this.getDictValue('仓库', _row.storageCode);
-			  }
+              formatter: (_row, _column, cellValue) => {
+                return this.getDictValue('仓库', _row.storageCode);
+              }
             },
             {
               label: '操作',
@@ -1059,17 +1059,17 @@
         }
       };
     },
-    created () {
-      this.workOrderId = this.$route.query.id;
+    created() {
+      this.workOrderId = this.$route.params.id;
       this.getInfo(this.workOrderId);
-	  this.requestDict('仓库');
+      this.requestDict('仓库');
     },
     methods: {
-      handlePrint () {
+      handlePrint() {
         this.$refs.orderPrintRef.open();
       },
 
-      handleTabClick (tab) {
+      handleTabClick(tab) {
         if (this.chooseIndex != tab.index) {
           this.chooseIndex = Number(tab.index);
           const chooseItem = this.tabList[this.chooseIndex];
@@ -1084,7 +1084,7 @@
           this.setData();
         }
       },
-      setData () {
+      setData() {
         this.request.completeNum = this.tabList[this.chooseIndex].number;
         if (this.chooseIndex == this.tabList.length - 1) {
           this.request.isLast = 1;
@@ -1094,7 +1094,7 @@
             this.tabList[this.chooseIndex + 1].number;
         }
       },
-      async datasource ({ page, limit, where }) {
+      async datasource({ page, limit, where }) {
         const res = await reportPage({ ...where, pageNum: page, size: limit });
         if (typeof res.list == 'string') {
           res.list = [];
@@ -1102,12 +1102,12 @@
         return res;
       },
       /* 刷新表格 */
-      reload (where) {
+      reload(where) {
         this.$nextTick(() =>
           this.$refs.table.reload({ page: 1, limit: 10, where })
         );
       },
-      async getInfo (id) {
+      async getInfo(id) {
         const res = await getInfoById(id);
         this.infoData = res;
         if (typeof res.taskTypeProcessDiagrams == 'string') {
@@ -1124,19 +1124,19 @@
         this.getReportCount();
         this.setData();
       },
-      async getReportCount () {
+      async getReportCount() {
         const res = await reportCount({
           taskCode: this.taskCode,
           workOrderId: this.workOrderId
         });
         this.countMsg = res;
       },
-      openOther () {
+      openOther() {
         this.$refs.otherMissionRef.open();
       },
 
       // 冲销
-      writeOff (row) {
+      writeOff(row) {
         const h = this.$createElement;
         this.$confirm('', {
           message: h('div', null, [
@@ -1213,11 +1213,11 @@
           .catch(() => {});
       },
 
-      check (row) {
+      check(row) {
         this.$refs.bomListRef.open(row);
       },
 
-      async refreshData () {
+      async refreshData() {
         const res = await getInfoById(this.workOrderId);
         this.infoData = res;
         if (typeof res.taskTypeProcessDiagrams == 'string') {

src/views/produceOrder/index.vue

@@ -100,7 +100,7 @@
   import createDialog from './components/createDialog.vue';
   import unpackDialog from './components/unpackDialog.vue';
   import pickingDialog from './components/pickingDialog.vue';
-	import { positiveIntegerReg } from 'ele-admin';
+  import { positiveIntegerReg } from 'ele-admin';
   export default {
     components: {
       produceOrderSearch,
@@ -108,7 +108,7 @@
       createDialog,
       unpackDialog
     },
-    data () {
+    data() {
       return {
         activeName: 'first',
 
@@ -137,7 +137,7 @@
     },
     computed: {
       // 表格列配置
-      columns () {
+      columns() {
         const opt = {
           first: [
             // {
@@ -305,16 +305,16 @@
         ];
       }
     },
-		// created(){
-		// 	 console.log('positiveIntegerReg',positiveIntegerReg)
-		// },
+    // created(){
+    // 	 console.log('positiveIntegerReg',positiveIntegerReg)
+    // },
     methods: {
-      handlePicking () {
+      handlePicking() {
         this.$router.push({
           path: '/produceOrder/picking'
         });
       },
-      statusFormatter (status) {
+      statusFormatter(status) {
         const obj = this.statusOpt[this.activeName].find(
           (i) => i.value == status
         );
@@ -322,21 +322,21 @@
         return obj && obj.label;
       },
       /* 表格数据源 */
-      datasource ({ page, limit, where }) {
+      datasource({ page, limit, where }) {
         return getPage({
           pageNum: page,
           size: limit,
           ...where
         });
       },
-      createSuccess () {
+      createSuccess() {
         this.reload();
       },
-      handleCreate () {
+      handleCreate() {
         this.$refs.createRef.open(0);
       },
       // 发布工单
-      handleOrderPublish (type, row) {
+      handleOrderPublish(type, row) {
         this.$router.push({
           path: '/produceOrder/report',
           query: {
@@ -346,7 +346,7 @@
         });
       },
       // 完结与批量完结
-      toEnd (row) {
+      toEnd(row) {
         if (row) {
           this.$confirm(`是否要完结工单【${row.code}】？`, '提醒', {
             confirmButtonText: '确认',
@@ -396,7 +396,7 @@
       },
 
       // 取消完结
-      toCancel (row) {
+      toCancel(row) {
         cancelCompletion([row.id]).then((res) => {
           this.$message.success('成功');
           this.reload();
@@ -404,15 +404,15 @@
       },
 
       // 拆分
-      toUnpack (row) {
+      toUnpack(row) {
         this.$refs.unpackRef.open(row);
       },
-      handleTabChange () {
+      handleTabChange() {
         this.$refs.searchRef.reset();
       },
 
       /* 刷新表格 */
-      reload (where = {}) {
+      reload(where = {}) {
         this.$nextTick(() => {
           where.statusList = (
             where.status || this.statusOpt[this.activeName][0].value
@@ -421,16 +421,15 @@
         });
       },
 
-      goDetail (row) {
+      goDetail(row) {
         this.$router.push({
-          path: '/produceOrder/detail',
+          path: '/produceOrder/detail/' + row.id,
           query: {
-            id: row.id,
             produceVersionId: row.produceVersionId
           }
         });
       },
-      handleDelete ({ id }) {
+      handleDelete({ id }) {
         this.$confirm('确定删除当前数据?', '提示').then(async () => {
           await del(id);
           this.$message.success('删除成功！');

src/views/produceOrder/report.vue

@@ -123,8 +123,8 @@
         :key="activeName + isUpdate"
         :infoData="infoData"
         :formData="formData"
-		:firstInfo="tabList[0]"
-		:currentInfo="tabList[activeName]"
+        :firstInfo="tabList[0]"
+        :currentInfo="tabList[activeName]"
         :taskInfo="{
           ...tabList[activeName],
           lastTaskCode:
@@ -163,7 +163,7 @@
       Furnace,
       Warehousing
     },
-    data () {
+    data() {
       return {
         infoData: {},
         isUpdate: true,
@@ -196,7 +196,7 @@
       };
     },
     computed: {
-      componentName () {
+      componentName() {
         const { name } = this.tabList[this.activeName];
 
         if (name.includes('半加')) {
@@ -207,12 +207,12 @@
         );
       }
     },
-    created () {
+    created() {
       this.init();
       this.getInfoData();
     },
     methods: {
-      handleReport () {
+      handleReport() {
         this.$refs.reportRef.report(async (data) => {
           // data.workReportCategoryList = data.workReportCategoryList || [
           //   {
@@ -231,7 +231,7 @@
           }
 
           const params = {
-            isSapReportState: 0,
+            isSapReportState: 2, //sap报工状态(0:不调用SAP接口报工;1:投料;2:报工;3:入库)
             lastTaskCode:
               this.tabList[
                 this.activeName > 0 ? this.activeName - 1 : this.activeName
@@ -246,15 +246,15 @@
           });
         });
       },
-      async init () {
+      async init() {
         await this.getDetail();
         await this._getTaskListById();
       },
-      async getDetail () {
+      async getDetail() {
         const res = await getById(this.$route.query.id);
         this.infoData = res;
       },
-      async _getTaskListById () {
+      async _getTaskListById() {
         // 获取工序
         const res1 = await getTaskListById(this.infoData.produceVersionId);
 
@@ -262,11 +262,11 @@
         this.tabList.push({
           name: '入库',
           code: '999999',
-		  sortNum:99
+          sortNum: 99
         });
         this.activeName = '0';
       },
-      async getInfoData () {
+      async getInfoData() {
         const res = await getInfo();
         if (typeof res != 'string') {
           this.formData = res;