rev: xml路径修改

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/IOSEnum.java

@@ -20,7 +20,7 @@ public enum IOSEnum {
     //单据类型
     BILL_TYPE(MapOf.of("生产入库","1","手工入库","2")),
     //单据状态
-   BILL_STATUS(MapOf.of("生成","10","分配中","20","分配完","30","完成","99")),
+   BILL_STATUS(MapOf.of("生成","1","分配中","2","分配完","3","完成","9")),
     //单据状态
    WORK_STATUS(MapOf.of("创建","1","生成","2")),
     ;

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvdisCpMapper.xml

@@ -68,18 +68,26 @@
     <select id="queryInvDisByInvdtl" resultType="java.util.Map">
         SELECT
             dis.*,
+            (
+                CASE
+                WHEN IFNULL(disdtl.real_qty,'') = '' THEN dis.real_qty
+                WHEN IFNULL(disdtl.real_qty,'') != '' THEN disdtl.real_qty
+                END
+            ) AS qty,
+            disdtl.bucketunique,
             mater.material_code,
             mater.material_name,
             mater.material_spec
         FROM
             st_ivt_iostorinvdis_cp dis
+            LEFT JOIN ST_IVT_IOStorInvDisDtl_CP disdtl ON disdtl.iostorinvdis_id = dis.iostorinvdis_id
             LEFT JOIN md_me_materialbase mater ON mater.material_id = dis.material_id
         WHERE 1=1
         <if test="iostorinvdtl_id != null and iostorinvdtl_id != ''">
-          and dis.iostorinvdtl_id = #{iostorinvdtl_id}
+            and dis.iostorinvdtl_id = #{iostorinvdtl_id}
         </if>
         <if test="iostorinv_id != null and iostorinv_id != ''">
-          and dis.iostorinv_id = #{iostorinv_id}
+            and dis.iostorinv_id = #{iostorinv_id}
         </if>
         order by dis.seq_no ASC
     </select>

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpServiceImpl.java

@@ -120,23 +120,8 @@ public class StIvtIostorinvCpServiceImpl extends ServiceImpl<StIvtIostorinvCpMap
 
         // 查询分配表
         List<Map> maps = iostorinvdisCpService.queryInvDisByInvdtl(whereJson);
+        return maps;
 
-        // 返回数据
-        List<JSONObject> resultList = new ArrayList<>();
-
-        // 考虑有箱号情况
-        if (true) {
-            maps.forEach(item -> {
-                String storagevehicle_code = (String) item.get("storagevehicle_code");
-                String iostorinvdis_id = (String) item.get("iostorinvdis_id");
-
-                // 根据托盘查找分配明细
-                resultList.addAll(iStIvtIostorinvdisdtlCpService.queryInvDisByInvdtl(MapOf.of("storagevehicle_code", storagevehicle_code, "iostorinvdis_id", iostorinvdis_id)));
-            });
-        } else {
-            // 考虑无箱号情况
-        }
-        return resultList;
     }
 
     @Override

mes/qd/src/views/wms/storage_manage/product/productIn/DivDialog.vue

@@ -203,7 +203,7 @@
         <el-table-column show-overflow-tooltip prop="material_name" 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="real_qty" :formatter="crud.formatNum3" label="数量" align="center" />
+        <el-table-column show-overflow-tooltip prop="qty" :formatter="crud.formatNum3" label="数量" align="center" />
         <el-table-column show-overflow-tooltip prop="struct_code" label="货位" align="center" />
         <el-table-column show-overflow-tooltip prop="point_code" label="入库点" align="center" />
         <el-table-column show-overflow-tooltip prop="task_code" label="任务号" align="center" />

mes/qd/src/views/wms/storage_manage/product/productIn/index.vue

@@ -310,12 +310,12 @@ export default {
     buttonChange(currentRow) {
       if (currentRow !== null) {
         this.currentRow = currentRow
-        if (currentRow.bill_status === '10' || currentRow.bill_status === '20' || currentRow.bill_status === '30') {
+        if (currentRow.bill_status === '1' || currentRow.bill_status === '2' || currentRow.bill_status === '3') {
           this.dis_flag = false
         } else {
           this.dis_flag = true
         }
-        if (currentRow.bill_status === '30') {
+        if (currentRow.bill_status === '3') {
           this.confirm_flag = false
         } else {
           this.confirm_flag = true