From e582ed1c2bb768729dd6d6a0a7d43468761f3225 Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Tue, 20 Jun 2023 20:41:06 +0800
Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E7=95=8C=E9=9D=A2=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iostorInv/impl/StIvtIostorinvCpOutServiceImpl.java   | 5 ++++-
 .../iostorInv/impl/StIvtIostorinvCpServiceImpl.java      | 5 ++++-
 .../wms/storage_manage/product/productIn/AddDialog.vue   | 4 ++--
 .../wms/storage_manage/product/productIn/TaskDialog.vue  | 6 +++---
 .../wms/storage_manage/product/productIn/ViewDialog.vue  | 8 ++++----
 .../views/wms/storage_manage/product/productIn/index.vue | 2 +-
 .../wms/storage_manage/product/productOut/AddDialog.vue  | 4 ++--
 .../wms/storage_manage/product/productOut/DivDialog.vue  | 9 +++++----
 .../wms/storage_manage/product/productOut/StructIvt.vue  | 4 ++--
 .../wms/storage_manage/product/productOut/TaskDialog.vue | 6 +++---
 .../wms/storage_manage/product/productOut/ViewDialog.vue | 8 ++++----
 .../wms/storage_manage/product/productOut/index.vue      | 2 +-
 12 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpOutServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpOutServiceImpl.java
index eadbfacb..ee4bba7d 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpOutServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpOutServiceImpl.java
@@ -450,7 +450,10 @@ public class StIvtIostorinvCpOutServiceImpl extends ServiceImpl<StIvtIostorinvCp
         );
 
         boolean is_dis = dtlDaoList.stream()
-                .allMatch(row -> row.getBill_status().equals(IOSEnum.BILL_STATUS.code("分配完")) || row.getBill_status().equals(IOSEnum.BILL_STATUS.code("完成")));
+                .allMatch(row -> row.getBill_status().equals(IOSEnum.BILL_STATUS.code("分配完"))
+                        || row.getBill_status().equals(IOSEnum.BILL_STATUS.code("完成"))
+                        || row.getBill_status().equals(IOSEnum.BILL_STATUS.code("分配中"))
+                );
 
         if (!is_dis) throw new BadRequestException("请先分配单据!");
 
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpServiceImpl.java
index 08f4d6cf..265429fb 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpServiceImpl.java
@@ -695,7 +695,10 @@ public class StIvtIostorinvCpServiceImpl extends ServiceImpl<StIvtIostorinvCpMap
         );
 
         boolean is_dis = dtlDaoList.stream()
-                .allMatch(row -> row.getBill_status().equals(IOSEnum.BILL_STATUS.code("分配完")) || row.getBill_status().equals(IOSEnum.BILL_STATUS.code("完成")));
+                .allMatch(row -> row.getBill_status().equals(IOSEnum.BILL_STATUS.code("分配完"))
+                        || row.getBill_status().equals(IOSEnum.BILL_STATUS.code("完成"))
+                        || row.getBill_status().equals(IOSEnum.BILL_STATUS.code("分配中"))
+                );
 
         if (!is_dis) throw new BadRequestException("请先分配单据!");
 
diff --git a/mes/qd/src/views/wms/storage_manage/product/productIn/AddDialog.vue b/mes/qd/src/views/wms/storage_manage/product/productIn/AddDialog.vue
index 20970af2..d5a099ed 100644
--- a/mes/qd/src/views/wms/storage_manage/product/productIn/AddDialog.vue
+++ b/mes/qd/src/views/wms/storage_manage/product/productIn/AddDialog.vue
@@ -83,8 +83,8 @@
         <label slot="label">明&nbsp;&nbsp;细&nbsp;数:</label>
         <el-input v-model="form.detail_count" size="mini" disabled style="width: 210px" />
       </el-form-item>
-      <el-form-item label="总重量" prop="total_qty">
-        <label slot="label">总&nbsp;&nbsp;重&nbsp;量:</label>
+      <el-form-item label="总数量" prop="total_qty">
+        <label slot="label">总&nbsp;&nbsp;数&nbsp;量:</label>
         <el-input-number
           v-model="form.total_qty"
           :controls="false"
diff --git a/mes/qd/src/views/wms/storage_manage/product/productIn/TaskDialog.vue b/mes/qd/src/views/wms/storage_manage/product/productIn/TaskDialog.vue
index e0929ee4..d5c78032 100644
--- a/mes/qd/src/views/wms/storage_manage/product/productIn/TaskDialog.vue
+++ b/mes/qd/src/views/wms/storage_manage/product/productIn/TaskDialog.vue
@@ -38,10 +38,10 @@
         <el-table-column show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
         <el-table-column show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
         <el-table-column show-overflow-tooltip prop="pcsn" label="批次" align="center" />
-        <el-table-column show-overflow-tooltip prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
+        <el-table-column show-overflow-tooltip prop="plan_qty" :formatter="crud.formatNum3" label="数量" align="center" />
         <el-table-column show-overflow-tooltip prop="assign_qty" :formatter="crud.formatNum3" label="已分配数量" align="center" />
         <el-table-column show-overflow-tooltip prop="unassign_qty" :formatter="crud.formatNum3" label="未分配数量" align="center" />
-        <el-table-column show-overflow-tooltip prop="qty_unit_name" label="重量单位" align="center" />
+        <el-table-column show-overflow-tooltip prop="qty_unit_name" label="单位" align="center" />
         <el-table-column show-overflow-tooltip prop="base_bill_type" label="源单类型" :formatter="formatBaseType" align="center" />
         <el-table-column show-overflow-tooltip prop="base_bill_code" label="源单号" align="center" />
         <el-table-column show-overflow-tooltip prop="base_bill_table" label="源单行号" align="center" />
@@ -111,7 +111,7 @@
         <el-table-column show-overflow-tooltip width="150" prop="material_code" label="物料编码" align="center" />
         <el-table-column show-overflow-tooltip width="150" prop="material_name" label="物料名称" align="center" />
         <el-table-column show-overflow-tooltip width="170" prop="pcsn" label="批次" align="center" />
-        <el-table-column show-overflow-tooltip prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
+        <el-table-column show-overflow-tooltip prop="plan_qty" :formatter="crud.formatNum3" label="数量" align="center" />
         <el-table-column show-overflow-tooltip prop="storagevehicle_code" label="托盘号" align="center" />
         <el-table-column show-overflow-tooltip prop="bucketunique" label="箱号" align="center" />
         <el-table-column show-overflow-tooltip prop="point_code1" label="起始位置" align="center" />
diff --git a/mes/qd/src/views/wms/storage_manage/product/productIn/ViewDialog.vue b/mes/qd/src/views/wms/storage_manage/product/productIn/ViewDialog.vue
index f0021b52..a747989f 100644
--- a/mes/qd/src/views/wms/storage_manage/product/productIn/ViewDialog.vue
+++ b/mes/qd/src/views/wms/storage_manage/product/productIn/ViewDialog.vue
@@ -72,8 +72,8 @@
         <label slot="label">明&nbsp;&nbsp;细&nbsp;数:</label>
         <el-input v-model="form.detail_count" size="mini" disabled style="width: 210px" />
       </el-form-item>
-      <el-form-item label="总重量" prop="total_qty">
-        <label slot="label">总&nbsp;&nbsp;重&nbsp;量:</label>
+      <el-form-item label="总数量" prop="total_qty">
+        <label slot="label">总&nbsp;&nbsp;数&nbsp;量:</label>
         <el-input-number
           v-model="form.total_qty"
           :controls="false"
@@ -112,7 +112,7 @@
         <el-table-column min-width="120" show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
         <el-table-column min-width="120" show-overflow-tooltip prop="material_spec" label="物料规格" align="center" />
         <el-table-column prop="pcsn" label="批次" width="150" align="center" />
-        <el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
+        <el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="数量" align="center" />
         <el-table-column prop="qty_unit_name" label="单位" align="center" />
         <el-table-column show-overflow-tooltip prop="base_bill_type" label="源单类型" :formatter="formatBaseType" align="center" />
         <el-table-column show-overflow-tooltip prop="base_bill_code" label="源单号" align="center" />
@@ -142,7 +142,7 @@
         <el-table-column prop="pcsn" label="批次" align="center" width="150" />
         <el-table-column show-overflow-tooltip prop="storagevehicle_code" label="托盘号" align="center" />
         <el-table-column show-overflow-tooltip prop="bucketunique" label="箱号" align="center" />
-        <el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
+        <el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="数量 align="center" />
         <el-table-column prop="point_code1" label="起始位置" align="center" />
         <el-table-column prop="point_code2" label="目的位置" align="center" />
         <el-table-column prop="task_code" label="任务号" align="center" />
diff --git a/mes/qd/src/views/wms/storage_manage/product/productIn/index.vue b/mes/qd/src/views/wms/storage_manage/product/productIn/index.vue
index 6e2ac429..18c01571 100644
--- a/mes/qd/src/views/wms/storage_manage/product/productIn/index.vue
+++ b/mes/qd/src/views/wms/storage_manage/product/productIn/index.vue
@@ -323,7 +323,7 @@ export default {
         } else {
           this.dis_flag = true
         }
-        if (currentRow.bill_status === '30') {
+        if (currentRow.bill_status === '30' || currentRow.bill_status === '20') {
           this.confirm_flag = false
         } else {
           this.confirm_flag = true
diff --git a/mes/qd/src/views/wms/storage_manage/product/productOut/AddDialog.vue b/mes/qd/src/views/wms/storage_manage/product/productOut/AddDialog.vue
index 65349fe3..1e9c9b07 100644
--- a/mes/qd/src/views/wms/storage_manage/product/productOut/AddDialog.vue
+++ b/mes/qd/src/views/wms/storage_manage/product/productOut/AddDialog.vue
@@ -83,8 +83,8 @@
         <label slot="label">明&nbsp;&nbsp;细&nbsp;数:</label>
         <el-input v-model="form.detail_count" size="mini" disabled style="width: 210px" />
       </el-form-item>
-      <el-form-item label="总重量" prop="total_qty">
-        <label slot="label">总&nbsp;&nbsp;重&nbsp;量:</label>
+      <el-form-item label="总数量" prop="total_qty">
+        <label slot="label">总&nbsp;&nbsp;数&nbsp;量:</label>
         <el-input-number
           v-model="form.total_qty"
           :controls="false"
diff --git a/mes/qd/src/views/wms/storage_manage/product/productOut/DivDialog.vue b/mes/qd/src/views/wms/storage_manage/product/productOut/DivDialog.vue
index 0f4d65c6..005b94a9 100644
--- a/mes/qd/src/views/wms/storage_manage/product/productOut/DivDialog.vue
+++ b/mes/qd/src/views/wms/storage_manage/product/productOut/DivDialog.vue
@@ -108,9 +108,9 @@
         <el-table-column show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
         <el-table-column show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
         <el-table-column show-overflow-tooltip prop="material_spec" label="物料规格" align="center" />
-        <el-table-column show-overflow-tooltip prop="plan_qty" label="重量" :formatter="crud.formatNum3" align="center" />
-        <el-table-column show-overflow-tooltip prop="assign_qty" label="已分配重量" :formatter="crud.formatNum3" align="center" />
-        <el-table-column show-overflow-tooltip prop="unassign_qty" label="未分配重量" :formatter="crud.formatNum3" align="center" />
+        <el-table-column show-overflow-tooltip prop="plan_qty" label="数量" :formatter="crud.formatNum3" align="center" />
+        <el-table-column show-overflow-tooltip prop="assign_qty" label="已分配数量" :formatter="crud.formatNum3" align="center" />
+        <el-table-column show-overflow-tooltip prop="unassign_qty" label="未分配数量" :formatter="crud.formatNum3" align="center" />
         <el-table-column show-overflow-tooltip prop="qty_unit_name" label="单位" align="center" />
         <el-table-column show-overflow-tooltip prop="source_bill_type" label="源单类型" align="center" :formatter="formatSourceType"/>
         <el-table-column show-overflow-tooltip prop="source_bill_code" label="源单号" align="center" />
@@ -204,7 +204,7 @@
         <el-table-column prop="material_code" label="物料编码" width="150px" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
         <el-table-column prop="material_name" label="物料名称" width="250px" :min-width="flexWidth('material_name',crud.data,'物料名称')" />
         <el-table-column prop="material_spec" label="物料规格" width="150px" :min-width="flexWidth('material_spec',crud.data,'物料规格')" />
-        <el-table-column show-overflow-tooltip prop="plan_qty" label="出库重量" :formatter="crud.formatNum3" align="center" />
+        <el-table-column show-overflow-tooltip prop="plan_qty" label="出库数量" :formatter="crud.formatNum3" align="center" />
         <el-table-column show-overflow-tooltip prop="storagevehicle_code" width="150px" label="载具号" align="center" />
         <el-table-column show-overflow-tooltip prop="struct_code" width="150px" label="仓位编码" align="center" />
         <el-table-column show-overflow-tooltip prop="struct_name" width="150px" label="仓位名称" align="center" />
@@ -453,6 +453,7 @@ export default {
         this.crud.notify('设置成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
         this.queryTableDtl()
         this.tabledis = []
+        this.form2.point_code = ''
       }).finally(() => {
         this.loadingSetAllPoint = false
       })
diff --git a/mes/qd/src/views/wms/storage_manage/product/productOut/StructIvt.vue b/mes/qd/src/views/wms/storage_manage/product/productOut/StructIvt.vue
index 2717ab56..bb0a4d8e 100644
--- a/mes/qd/src/views/wms/storage_manage/product/productOut/StructIvt.vue
+++ b/mes/qd/src/views/wms/storage_manage/product/productOut/StructIvt.vue
@@ -82,8 +82,8 @@
       <el-table-column show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
       <el-table-column show-overflow-tooltip prop="material_spec" label="物料规格" align="center" />
       <el-table-column show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
-      <el-table-column show-overflow-tooltip prop="canuse_qty" label="可出重量" :formatter="crud.formatNum3" align="center" />
-      <el-table-column show-overflow-tooltip prop="plan_qty" label="出库重量" :formatter="crud.formatNum3" width="160" align="center">
+      <el-table-column show-overflow-tooltip prop="canuse_qty" label="可出数量" :formatter="crud.formatNum3" align="center" />
+      <el-table-column show-overflow-tooltip prop="plan_qty" label="出库数量" :formatter="crud.formatNum3" width="160" align="center">
         <template scope="scope">
           <el-input-number v-show="!scope.row.edit" v-model="scope.row.plan_qty" :precision="3" :max="100000000" />
           <span v-show="scope.row.edit">{{ scope.row.plan_qty }}</span>
diff --git a/mes/qd/src/views/wms/storage_manage/product/productOut/TaskDialog.vue b/mes/qd/src/views/wms/storage_manage/product/productOut/TaskDialog.vue
index ba50fef9..11383ca9 100644
--- a/mes/qd/src/views/wms/storage_manage/product/productOut/TaskDialog.vue
+++ b/mes/qd/src/views/wms/storage_manage/product/productOut/TaskDialog.vue
@@ -38,10 +38,10 @@
         <el-table-column show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
         <el-table-column show-overflow-tooltip width="150" prop="material_spec" label="物料规格" align="center" />
         <el-table-column show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
-        <el-table-column show-overflow-tooltip prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
+        <el-table-column show-overflow-tooltip prop="plan_qty" :formatter="crud.formatNum3" label="数量" align="center" />
         <el-table-column show-overflow-tooltip prop="assign_qty" :formatter="crud.formatNum3" label="已分配数量" align="center" />
         <el-table-column show-overflow-tooltip prop="unassign_qty" :formatter="crud.formatNum3" label="未分配数量" align="center" />
-        <el-table-column show-overflow-tooltip prop="qty_unit_name" label="重量单位" align="center" />
+        <el-table-column show-overflow-tooltip prop="qty_unit_name" label="单位" align="center" />
         <el-table-column show-overflow-tooltip prop="source_bill_type" label="源单类型" align="center" :formatter="formatSourceType"/>
         <el-table-column show-overflow-tooltip prop="source_bill_code" label="源单号" align="center" />
       </el-table>
@@ -111,7 +111,7 @@
         <el-table-column show-overflow-tooltip width="150" prop="material_spec" label="物料规格" align="center" />
         <el-table-column show-overflow-tooltip width="150" prop="material_name" label="物料名称" align="center" />
         <el-table-column show-overflow-tooltip width="170" prop="storagevehicle_code" label="载具号" align="center" />
-        <el-table-column show-overflow-tooltip prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
+        <el-table-column show-overflow-tooltip prop="plan_qty" :formatter="crud.formatNum3" label="数量" align="center" />
         <el-table-column show-overflow-tooltip prop="point_code1" label="起始位置" align="center" />
         <el-table-column show-overflow-tooltip prop="point_code2" label="目的位置" align="center" />
         <el-table-column show-overflow-tooltip prop="task_code" label="任务号" align="center" />
diff --git a/mes/qd/src/views/wms/storage_manage/product/productOut/ViewDialog.vue b/mes/qd/src/views/wms/storage_manage/product/productOut/ViewDialog.vue
index e80684ee..859369b0 100644
--- a/mes/qd/src/views/wms/storage_manage/product/productOut/ViewDialog.vue
+++ b/mes/qd/src/views/wms/storage_manage/product/productOut/ViewDialog.vue
@@ -72,8 +72,8 @@
         <label slot="label">明&nbsp;&nbsp;细&nbsp;数:</label>
         <el-input v-model="form.detail_count" size="mini" disabled style="width: 210px" />
       </el-form-item>
-      <el-form-item label="总重量" prop="total_qty">
-        <label slot="label">总&nbsp;&nbsp;重&nbsp;量:</label>
+      <el-form-item label="总数量" prop="total_qty">
+        <label slot="label">总&nbsp;&nbsp;数&nbsp;量:</label>
         <el-input-number
           v-model="form.total_qty"
           :controls="false"
@@ -112,7 +112,7 @@
         <el-table-column min-width="120" show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
         <el-table-column min-width="120" show-overflow-tooltip prop="material_spec" label="物料规格" align="center" />
         <el-table-column prop="pcsn" label="批次" width="150" align="center" />
-        <el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
+        <el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="数量" align="center" />
         <el-table-column prop="qty_unit_name" label="单位" align="center" />
         <el-table-column show-overflow-tooltip prop="source_bill_type" label="源单类型" :formatter="formatBaseType" align="center" />
         <el-table-column show-overflow-tooltip prop="source_bill_code" label="源单号" align="center" />
@@ -140,7 +140,7 @@
         <el-table-column min-width="120" show-overflow-tooltip prop="material_spec" label="物料规格" align="center" />
         <el-table-column prop="pcsn" label="批次" align="center" width="150" />
         <el-table-column show-overflow-tooltip prop="storagevehicle_code" label="托盘号" align="center" />
-        <el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
+        <el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="数量" align="center" />
         <el-table-column prop="point_code1" label="起始位置" align="center" />
         <el-table-column prop="point_code2" label="目的位置" align="center" />
         <el-table-column prop="task_code" label="任务号" align="center" />
diff --git a/mes/qd/src/views/wms/storage_manage/product/productOut/index.vue b/mes/qd/src/views/wms/storage_manage/product/productOut/index.vue
index e0db5d60..18f1852c 100644
--- a/mes/qd/src/views/wms/storage_manage/product/productOut/index.vue
+++ b/mes/qd/src/views/wms/storage_manage/product/productOut/index.vue
@@ -166,7 +166,7 @@
         <el-table-column show-overflow-tooltip prop="stor_name" label="仓库" min-width="120" />
         <el-table-column prop="product_area" label="生产车间" width="130" show-overflow-tooltip />
         <el-table-column show-overflow-tooltip min-width="120" prop="biz_date" label="业务日期" />
-        <el-table-column label="总重量" align="center" prop="total_qty">
+        <el-table-column label="总数量" align="center" prop="total_qty">
           <template slot-scope="scope">
             {{ fun(scope.row.total_qty) }}
           </template>