From fb1a5f7f46e069da332d79f4f5e5d01e0ea3bf70 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Tue, 8 Oct 2024 09:27:16 +0800
Subject: [PATCH] =?UTF-8?q?10/8=20=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/inout/order.js                       | 14 ++++++
 src/views/collect/DealOrder.vue              |  5 +++
 src/views/collect/IoCreateOrder.vue          | 47 ++++++++++++++++++--
 src/views/collect/IoSplitFifoCodePanel.vue   | 14 +++++-
 src/views/collect/IoSplitOperateCode.vue     | 24 +++++++---
 src/views/collect/chooseDraftOrderDialog.vue | 24 +++++++---
 src/views/inout/DialogEditCode.vue           |  9 ++++
 7 files changed, 121 insertions(+), 16 deletions(-)

diff --git a/src/api/inout/order.js b/src/api/inout/order.js
index 02fa28e6..8fb9701b 100644
--- a/src/api/inout/order.js
+++ b/src/api/inout/order.js
@@ -648,4 +648,18 @@ export function batchAddCodeByOrderFinish(query) {
   });
 }
 
+export function upProcessing(query) {
+  return axios({
+    url: "/udiwms/inout/order/upProcessing",
+    method: "post",
+    data: query
+  });
+}
 
+export function getProcessingOrder(params) {
+  return axios({
+    url: "/udiwms/inout/order/getProcessingOrder",
+    method: "get",
+    params: params
+  });
+}
diff --git a/src/views/collect/DealOrder.vue b/src/views/collect/DealOrder.vue
index 55a598d7..e711f89b 100644
--- a/src/views/collect/DealOrder.vue
+++ b/src/views/collect/DealOrder.vue
@@ -372,6 +372,7 @@
 
     </el-form>
   </div>
+
 </template>
 
 <script>
@@ -537,6 +538,10 @@ export default {
             this.formData.workPlaceCode = this.workplaceId
             this.checked = false
           }
+        }else {
+          this.checked = true
+            this.formData.billNo = null
+          this.$message.error(res.message)
         }
       })
     },
diff --git a/src/views/collect/IoCreateOrder.vue b/src/views/collect/IoCreateOrder.vue
index 7584adb0..215ca6cb 100644
--- a/src/views/collect/IoCreateOrder.vue
+++ b/src/views/collect/IoCreateOrder.vue
@@ -291,6 +291,7 @@
       v-if="chooseDraftOrderVisible"
     >
       <chooseDraftOrderDialog
+        ref="chooseDraftOrder"
         :rowData="rowData"
         :closeChooseDialog="closeChooseDialog"
         :handleChoose="handleChoose"
@@ -329,8 +330,8 @@ import {
   submitOrderWeb,
   saveOrderWeb,
   enterCodeWeb, submitAllocateBiz, rollbackWaitcheck, submitCodeResult, submitCheckResult, delmitBiz,
-  batchVailCode, batchAddCode, batchAddCodeByOrderFinish
-} from "@/api/inout/order";
+  batchVailCode, batchAddCode, batchAddCodeByOrderFinish, upProcessing, getProcessingOrder
+} from '@/api/inout/order'
 import {filterSubAll, findByFrom, findInvByUser} from "@/api/system/invSubWarehouse";
 import {parseTime} from "@/utils/coTools";
 import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
@@ -1583,6 +1584,7 @@ export default {
           if (response.code === 20000) {
             this.$message.success("提交成功");
             this.successCloseData()
+            this.result = ""
             if (this.closeDialog != undefined) {
               this.closeDialog();
             }
@@ -1616,7 +1618,27 @@ export default {
     },
     handleChoose(currentRow) {
       this.orderQuery = currentRow
-      this.refreshOrder(this.orderQuery)
+      //选入单据 判断此订单是否正在处理中
+      this.upOrderStatus()
+
+    },
+    upOrderStatus(){
+      let query = {
+        billNo : this.orderQuery.billNo
+      }
+      upProcessing(query).then(res => {
+        if (res.code == 20000){
+          this.chooseDraftOrderVisible = false
+          this.refreshOrder(this.orderQuery)
+        }else if (res.code == 501){
+          this.$message.error("当前单据正在处理中，请重新选择单据")
+          this.$refs.chooseDraftOrder.getList();
+          this.chooseDraftOrderVisible = true
+          //当前订单正在处理中，刷新列表重新选择草稿订单
+        }else {
+          return this.$message.error("系统繁忙")
+        }
+      })
     },
     //获取选入的完成单
     confirmSelect(row) {
@@ -1643,6 +1665,7 @@ export default {
         if (response.code === 20000) {
           this.$message.success("保存成功")
           this.successCloseData()
+          this.result = ""
         } else {
           this.$message.error(response.message);
         }
@@ -2036,6 +2059,22 @@ export default {
       if (!isBlank(this.errResult))
         this.errVisible = true;
     },
+    getOrder(){
+      let query = {
+        workPlaceCode: this.workplaceId
+      }
+      getProcessingOrder(query).then(res => {
+        if (res.code == 20000){
+          if (res.data != null){
+            this.refreshOrder(res.data)
+          }
+        }else {
+          this.$message.error("获取错误")
+        }
+      })
+
+
+    }
   },
   filters: {},
   mounted() {
@@ -2085,6 +2124,8 @@ export default {
       this.workplaceId = this.$route.query.workplaceId
       this.orderFormData.workPlaceCode = Number(this.$route.query.workplaceId);
       this.orderFormData.splitBusType = "YPCF002"
+      //查找当前用户工位是否有正在处理的单据
+      this.getOrder()
     } else {
       if (this.orderQuery.workPlaceCode != null) {
         this.orderFormData.workPlaceCode = String(this.orderQuery.workPlaceCode);
diff --git a/src/views/collect/IoSplitFifoCodePanel.vue b/src/views/collect/IoSplitFifoCodePanel.vue
index 7bb8b458..a2a13f31 100644
--- a/src/views/collect/IoSplitFifoCodePanel.vue
+++ b/src/views/collect/IoSplitFifoCodePanel.vue
@@ -860,6 +860,9 @@ export default {
       };
       this.actDateRange = [];
       this.getList();
+      this.resultDetailList = []
+      this.apartDetailList = []
+      this.currentRow.cpmctymc = null
     },
     onSubmit(_this) {
       if (_this == null)
@@ -939,7 +942,7 @@ export default {
         })
     },
     onResultSubmit() {
-      if (isBlank(this.resultQuery.code) || isBlank(this.currentRow.relId) || isBlank(this.currentRow.batchNo)){
+      if (isBlank(this.resultQuery.code) && isBlank(this.currentRow.relId) && isBlank(this.currentRow.batchNo)){
         return this.$message.error("请选择单据")
       }
       this.resultQuery = {
@@ -953,6 +956,9 @@ export default {
       this.getResultDetailList()
     },
     onResultReset() {
+      if (isBlank(this.resultQuery.code) && isBlank(this.currentRow.relId) && isBlank(this.currentRow.batchNo)){
+        return this.$message.error("请选择单据")
+      }
       this.resultQuery = {
         relId: this.currentRow.relId,
         batchNo: this.currentRow.batchNo,
@@ -963,6 +969,9 @@ export default {
       this.getResultDetailList()
     },
     onCodeResultSubmit() {
+      if (isBlank(this.resultQuery.code) && isBlank(this.currentRow.relId) && isBlank(this.currentRow.batchNo)){
+        return this.$message.error("请选择单据")
+      }
       this.codeQuery = {
         code: this.codeQuery.code,
         relId: this.currentRow.relId,
@@ -974,6 +983,9 @@ export default {
       this.getSplitCodeDetail()
     },
     onCodeResultReset() {
+      if (isBlank(this.resultQuery.code) && isBlank(this.currentRow.relId) && isBlank(this.currentRow.batchNo)){
+        return this.$message.error("请选择单据")
+      }
       this.codeQuery = {
         relId: this.currentRow.relId,
         batchNo: this.currentRow.batchNo,
diff --git a/src/views/collect/IoSplitOperateCode.vue b/src/views/collect/IoSplitOperateCode.vue
index b6c5f995..38644c17 100644
--- a/src/views/collect/IoSplitOperateCode.vue
+++ b/src/views/collect/IoSplitOperateCode.vue
@@ -942,22 +942,37 @@ export default {
       })
     },
     onReset() {
+
       this.filterQuery = {
-        ...this.filterQuery,
+        statusType: 'draft',
+        busType: null,
         id: "",
         billNo: null,
         mainAction: null,
-        statusType: 'draft',
+        action: null,
         page: 1,
         limit: 10,
         startTime: null,
         endTime: null,
+        keyWords: null,
         workPlaceCode:null,
-        keyWords:null,
-        busType: null
+        // invCode: this.$store.getters.locInvCode,
+        vueType: null,
       };
+      this.splitType = this.$route.query.splitType;
+      if (this.splitType == "search") {
+        this.filterQuery.vueType = "splitOrder";
+        this.filterQuery.statusType = 'split_finish';
+      } else if (this.splitType == "out") {
+        this.filterQuery.action = 'SC72197936495755';
+        this.filterQuery.statusType = 'scan_code';
+      } else if (this.splitType == "return") {
+        this.filterQuery.action = 'SC72249388338364';
+        this.filterQuery.statusType = 'scan_code';
+      }
       this.actDateRange = [];
       this.getList();
+      this.currentRow.billNo = ""
       this.codeDetailList = []
       this.resultDetailList = []
     },
@@ -1207,7 +1222,6 @@ export default {
         limit: 10
       };
       this.getBizDetailList();
-
     },
     onBizSubmit() {
       if (isBlank(this.currentRow.billNo)){
diff --git a/src/views/collect/chooseDraftOrderDialog.vue b/src/views/collect/chooseDraftOrderDialog.vue
index 322c356c..09838639 100644
--- a/src/views/collect/chooseDraftOrderDialog.vue
+++ b/src/views/collect/chooseDraftOrderDialog.vue
@@ -770,7 +770,7 @@ export default {
         startTime: null,
         endTime: null,
         keyWords: null,
-        invCode: this.$store.getters.locInvCode,
+        // invCode: this.$store.getters.locInvCode,
         vueType: null,
       },
       fromOptions: [],
@@ -898,19 +898,18 @@ export default {
   methods: {
     onReset() {
       this.filterQuery = {
-        ...this.filterQuery,
         id: "",
         billNo: null,
         mainAction: null,
         action: null,
-        statusType: null,
+        statusType: "scan_code",
         page: 1,
         limit: 10,
         startTime: null,
         endTime: null,
-        invCode: this.$store.getters.locInvCode,
-        keyWords: null
-
+        keyWords: null,
+        // invCode: this.$store.getters.locInvCode,
+        vueType: null,
       };
       this.actDateRange = [];
       this.getList();
@@ -976,6 +975,17 @@ export default {
       this.loading = true;
       this.filterQuery.workPlaceCode = this.rowData.workPlaceCode
       this.filterQuery.fifoSplit = this.rowData.fifoSplit
+      this.splitType = this.$route.query.splitType;
+      if (this.splitType == "search") {
+        this.filterQuery.vueType = "splitOrder";
+        this.filterQuery.statusType = 'split_finish';
+      } else if (this.splitType == "out") {
+        this.filterQuery.action = 'SC72197936495755';
+        this.filterQuery.statusType = 'scan_code';
+      } else if (this.splitType == "return") {
+        this.filterQuery.action = 'SC72249388338364';
+        this.filterQuery.statusType = 'scan_code';
+      }
       getOrderList(this.filterQuery)
         .then((response) => {
           this.loading = false;
@@ -1201,7 +1211,7 @@ export default {
       if (this.currentRow.billNo == null) {
         return this.$message.error("请选择单据")
       }
-      this.closeChooseDialog()
+      // this.closeChooseDialog()
       this.handleChoose(this.currentRow)
     },
     //获取当前工位
diff --git a/src/views/inout/DialogEditCode.vue b/src/views/inout/DialogEditCode.vue
index 7430c853..913f5b85 100644
--- a/src/views/inout/DialogEditCode.vue
+++ b/src/views/inout/DialogEditCode.vue
@@ -53,6 +53,15 @@
                       :disabled="editData.serialNo!=null && editData.serialNo!='' "></el-input>
           </el-form-item>
         </el-col>
+        <el-col :span="11">
+          <el-form-item prop="count" label="实际数量">
+            <el-input v-model="editData.reCount" auto-complete="off"
+                      type="number"
+                      min="1"
+                      disabled
+                      :disabled="editData.reCount!=null && editData.reCount!='' "></el-input>
+          </el-form-item>
+        </el-col>
 
         <!--<el-col :span="11">-->
         <!--  <el-form-item>-->