From ed000b6f5642e1c642d62c0cdd876cea2bea372e Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Thu, 27 Jul 2023 17:00:57 +0800
Subject: [PATCH] =?UTF-8?q?rev:=20=E6=88=90=E5=93=81=E5=87=BA=E5=BA=93?=
 =?UTF-8?q?=EF=BC=9A=E6=96=B0=E5=A2=9E=E5=87=BA=E5=BA=93=E5=8D=95=E6=97=B6?=
 =?UTF-8?q?=E5=B0=86=E5=90=8C=E4=B8=80=E8=B4=A7=E4=BD=8D=E4=B8=8A=E7=9A=84?=
 =?UTF-8?q?=E6=89=80=E6=9C=89=E7=89=A9=E6=96=99=E5=B8=A6=E5=87=BA=E3=80=81?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=BB=BB=E5=8A=A1=E6=97=B6=E5=90=8C=E4=B8=80?=
 =?UTF-8?q?=E8=B4=A7=E4=BD=8D=E7=9A=84=E4=BB=BB=E5=8A=A1=E4=B8=8D=E5=9C=A8?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E3=80=81=E5=8F=91=E8=B4=A7=E5=8D=95=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IStivtlostorivnCpOutController.java       |  9 +++++
 .../IStIvtIostorinvCpOutService.java          | 11 ++++++
 .../impl/StIvtIostorinvCpOutServiceImpl.java  | 28 +++++++++++++-
 .../impl/StIvtIostorinvCpServiceImpl.java     |  5 +++
 .../impl/StIvtIostorinvdtlCpServiceImpl.java  |  2 +-
 .../structIvt/IStIvtStructivtCpService.java   |  9 +++++
 .../dao/mapper/StIvtStructivtCpMapper.java    |  3 ++
 .../dao/mapper/StIvtStructivtCpMapper.xml     | 37 +++++++++++++++++++
 .../impl/StIvtStructivtCpServiceImpl.java     |  5 +++
 .../product/productOut/AddDialog.vue          |  2 +-
 .../product/productOut/AddIvt.vue             | 17 +++++++--
 .../product/productOut/index.vue              |  2 +-
 .../product/productOut/productout.js          | 11 +++++-
 13 files changed, 132 insertions(+), 9 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/iostorInv/IStivtlostorivnCpOutController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/iostorInv/IStivtlostorivnCpOutController.java
index ec008158..3f765ee3 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/iostorInv/IStivtlostorivnCpOutController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/iostorInv/IStivtlostorivnCpOutController.java
@@ -16,6 +16,8 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Map;
+
 @RestController
 @RequiredArgsConstructor
 @Api(tags = "成品出库")
@@ -142,6 +144,13 @@ public class IStivtlostorivnCpOutController {
         return new ResponseEntity<>(HttpStatus.OK);
     }
 
+    @PostMapping("/queryStructAll")
+    @Log("查找此货位上的所有库存")
+    //("查找此货位上的所有库存")
+    public ResponseEntity<Object> queryStructAll(@RequestBody Map whereJson) {
+        return new ResponseEntity<>(iStIvtIostorinvCpOutService.queryStructAll(whereJson),HttpStatus.OK);
+    }
+
     @GetMapping("/initAttr")
     @Log("初始化仓位")
     //("初始化仓位")
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/IStIvtIostorinvCpOutService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/IStIvtIostorinvCpOutService.java
index 7e9323aa..5a104663 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/IStIvtIostorinvCpOutService.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/IStIvtIostorinvCpOutService.java
@@ -1,5 +1,6 @@
 package org.nl.wms.storage_manage.productmanage.service.iostorInv;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.nl.common.domain.query.PageQuery;
@@ -7,6 +8,7 @@ import org.nl.wms.storage_manage.productmanage.service.iostorInv.dao.StIvtIostor
 import org.nl.wms.storage_manage.productmanage.service.iostorInv.dto.IostorInvQuery;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -185,4 +187,13 @@ public interface IStIvtIostorinvCpOutService extends IService<StIvtIostorinvCp>
         初始化仓位
      */
     void initAttr();
+
+    /**
+     * 查找此货位上的所有库存
+     * @param whereJson
+     * {
+     *     数组
+     * }
+     */
+    JSONArray queryStructAll(Map whereJson);
 }
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 b2bf60c2..2bbe7221 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
@@ -405,6 +405,16 @@ public class StIvtIostorinvCpOutServiceImpl extends ServiceImpl<StIvtIostorinvCp
 
         if (ObjectUtil.isNotEmpty(disDao.getPoint_id())) throw new BadRequestException("此明细已生成任务!");
 
+        StIvtIostorinvdisCp disIsnull = iostorinvdisCpService.getOne(
+                new QueryWrapper<StIvtIostorinvdisCp>().lambda()
+                        .eq(StIvtIostorinvdisCp::getIostorinv_id, disDao.getIostorinv_id())
+                        .eq(StIvtIostorinvdisCp::getStoragevehicle_code, disDao.getStoragevehicle_code())
+                        .ne(StIvtIostorinvdisCp::getWork_status, IOSEnum.WORK_STATUS.code("未生成"))
+                , false
+        );
+
+        if (ObjectUtil.isNotEmpty(disIsnull)) throw new BadRequestException("此货位已生成任务!");
+
         // 2.下发任务
         SchBasePoint pointDao = iSchBasePointService.getOne(
                 new QueryWrapper<SchBasePoint>().lambda()
@@ -727,6 +737,20 @@ public class StIvtIostorinvCpOutServiceImpl extends ServiceImpl<StIvtIostorinvCp
         }
     }
 
+    @Override
+    public JSONArray queryStructAll(Map whereJson) {
+        List<Map> data = (List) whereJson.get("data");
+
+        // 拼接字符串
+        List<String> struct_code = data.stream()
+                .map(row -> row.get("struct_code").toString())
+                .collect(Collectors.toList());
+
+        List<Map> result = iStIvtStructivtCpService.getStructAll(struct_code);
+
+        return JSONArray.parseArray(JSON.toJSONString(result));
+    }
+
     @NotNull
     private StIvtIostorinvCp packageMstForm(StIvtIostorinvCp stIvtIostorinvCp,JSONObject whereJson,Boolean isUpdate) {
         JSONArray rows = whereJson.getJSONArray("tableData");
@@ -797,10 +821,10 @@ public class StIvtIostorinvCpOutServiceImpl extends ServiceImpl<StIvtIostorinvCp
                         .eq(StIvtIostorinvdtlCp::getIostorinv_id, iostorinv_id)
         );
 
-        // 判断是否都为分配完
+        // 判断是否都为分配完 或者为完成
         boolean is_true = dtlDaoList
                 .stream()
-                .allMatch(row -> 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("完成")));
 
         if (is_true) {
             // 更新主表为分配完
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 8c79594c..a31f6625 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
@@ -786,6 +786,11 @@ public class StIvtIostorinvCpServiceImpl extends ServiceImpl<StIvtIostorinvCpMap
 
             if (ObjectUtil.isNotEmpty(orderDao)) {
                 orderDao.setProduct_qty(NumberUtil.add(orderDao.getProduct_qty(),dao.getAssign_qty()));
+
+                if (orderDao.getSale_qty().doubleValue() <= orderDao.getProduct_qty().doubleValue()) {
+                    orderDao.setStatus(IOSEnum.ORDER_STATUS.code("提交"));
+                }
+
                 iMpsSaleOrderService.updateById(orderDao);
             }
         }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvdtlCpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvdtlCpServiceImpl.java
index 081abf33..ee66ac53 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvdtlCpServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvdtlCpServiceImpl.java
@@ -109,7 +109,7 @@ public class StIvtIostorinvdtlCpServiceImpl extends ServiceImpl<StIvtIostorinvdt
                     if (IOSEnum.IO_TYPE.code("入库").equals(mstDao.getIo_type())){
                         // 入库： 更新销售单状态
                         if (orderDao!=null){
-                            orderDao.setStatus(IOSEnum.ORDER_STATUS.code("提交"));
+//                            orderDao.setStatus(IOSEnum.ORDER_STATUS.code("提交"));
                             iMpsSaleOrderService.updateById(orderDao);
                         }
                     } else {
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/IStIvtStructivtCpService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/IStIvtStructivtCpService.java
index ca9082d0..6779b630 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/IStIvtStructivtCpService.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/IStIvtStructivtCpService.java
@@ -68,4 +68,13 @@ public interface IStIvtStructivtCpService extends IService<StIvtStructivtCp> {
      */
     List<Map> getStructIvtMore(StructIvtYLQuery whereJson);
 
+    /**
+     * 获取此货位下所有库存
+     * @param whereJson
+     * {
+     *     struct_code： '拼接货位'
+     * }
+     */
+    List<Map> getStructAll(List<String> whereJson);
+
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtCpMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtCpMapper.java
index 4aab73a1..74f6ae00 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtCpMapper.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtCpMapper.java
@@ -30,4 +30,7 @@ public interface StIvtStructivtCpMapper extends BaseMapper<StIvtStructivtCp> {
     List<Map> getStructIvtMoreBox(JSONObject json);
 
     List<Map> packageQuery(@Param("query") CpIvtQuery query);
+
+    List<Map> getStructAll(@Param("chanList") List<String> list);
+
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtCpMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtCpMapper.xml
index bdb2c654..df77f750 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtCpMapper.xml
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtCpMapper.xml
@@ -198,4 +198,41 @@
         order by ivt.instorage_time DESC,attr.struct_code ASC
     </select>
 
+    <select id="getStructAll" resultType="java.util.Map">
+        SELECT
+        attr.stor_name,
+        attr.sect_name,
+        ivt.struct_code,
+        ivt.struct_name,
+        mater.material_id,
+        mater.material_name,
+        mater.material_code,
+        mater.material_spec,
+        attr.storagevehicle_code,
+        ivt.canuse_qty,
+        ivt.frozen_qty,
+        ivt.ivt_qty,
+        ivt.warehousing_qty,
+        unit.unit_name,
+        unit.measure_unit_id,
+        ivt.instorage_time,
+        sale.sale_code,
+        sale.seq_no,
+        sale.sale_id,
+        sale.sale_type
+        FROM
+        st_ivt_structivt_cp ivt
+        LEFT JOIN md_me_materialbase mater ON ivt.material_id = mater.material_id
+        LEFT JOIN st_ivt_structattr attr ON attr.struct_id = ivt.struct_id
+        LEFT JOIN md_pb_measureunit unit ON unit.measure_unit_id = ivt.qty_unit_id
+        LEFT JOIN mps_sale_order sale ON sale.sale_id = ivt.sale_id
+        <where>
+            attr.struct_code in
+            <foreach collection="chanList" item="item" index="index" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+
+        </where>
+    </select>
+
 </mapper>
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/impl/StIvtStructivtCpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/impl/StIvtStructivtCpServiceImpl.java
index 8074da9d..fb1461fb 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/impl/StIvtStructivtCpServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/impl/StIvtStructivtCpServiceImpl.java
@@ -144,6 +144,11 @@ public class StIvtStructivtCpServiceImpl extends ServiceImpl<StIvtStructivtCpMap
         return structIvtList;
     }
 
+    @Override
+    public List<Map> getStructAll(List<String> whereJson) {
+        return this.baseMapper.getStructAll(whereJson);
+    }
+
     /*
         加待入
      */
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 de28aaee..1dbc19ae 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
@@ -170,7 +170,7 @@
         </template>
       </el-table-column>
       <el-table-column show-overflow-tooltip prop="source_bill_type" label="源单类型" />
-      <el-table-column show-overflow-tooltip prop="source_bill_code" label="源单号" />
+      <el-table-column show-overflow-tooltip prop="source_bill_code" label="发货单号" />
 
       <el-table-column v-if="crud.status.cu > 0" align="center" label="操作" width="170" fixed="right">
         <template scope="scope">
diff --git a/mes/qd/src/views/wms/storage_manage/product/productOut/AddIvt.vue b/mes/qd/src/views/wms/storage_manage/product/productOut/AddIvt.vue
index 38d3c27e..9643e5a4 100644
--- a/mes/qd/src/views/wms/storage_manage/product/productOut/AddIvt.vue
+++ b/mes/qd/src/views/wms/storage_manage/product/productOut/AddIvt.vue
@@ -120,6 +120,7 @@ import CRUD, { crud, header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import pagination from '@crud/Pagination'
+import productOut from '@/views/wms/storage_manage/product/productOut/productout'
 
 export default {
   name: 'AddDtl',
@@ -200,14 +201,24 @@ export default {
         this.$emit('tableChanged', this.tableRadio)
         return
       }
+
       this.rows = this.$refs.multipleTable.selection
       if (this.rows.length <= 0) {
         this.$message('请先勾选物料')
         return
       }
-      this.crud.resetQuery(false)
-      this.$emit('update:dialogShow', false)
-      this.$emit('tableChanged', this.rows)
+
+      // 将此托盘上的所有物料都带出
+      const data = {
+        'data': this.rows
+      }
+      productOut.queryStructAll(data).then(res => {
+        debugger
+        this.rows = res
+        this.crud.resetQuery(false)
+        this.$emit('update:dialogShow', false)
+        this.$emit('tableChanged', this.rows)
+      })
     }
   }
 }
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 0abbf63c..65a70160 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
@@ -219,7 +219,7 @@ export default {
   name: 'ProductOut',
   components: { ViewDialog, AddDialog, crudOperation, rrOperation, udOperation, pagination, DivDialog, TaskDialog },
   cruds() {
-    return CRUD({ title: '用户', idField: 'iostorinv_id', url: 'api/productOut', crudMethod: { ...productOut },
+    return CRUD({ title: '出库单', idField: 'iostorinv_id', url: 'api/productOut', crudMethod: { ...productOut },
       optShow: {
         add: true,
         edit: false,
diff --git a/mes/qd/src/views/wms/storage_manage/product/productOut/productout.js b/mes/qd/src/views/wms/storage_manage/product/productOut/productout.js
index f1b19c92..ed244a8b 100644
--- a/mes/qd/src/views/wms/storage_manage/product/productOut/productout.js
+++ b/mes/qd/src/views/wms/storage_manage/product/productOut/productout.js
@@ -112,6 +112,14 @@ export function confirmTask(data) {
   })
 }
 
+export function queryStructAll(data) {
+  return request({
+    url: '/api/productOut/queryStructAll',
+    method: 'post',
+    data
+  })
+}
+
 export default {
   add,
   edit,
@@ -126,5 +134,6 @@ export default {
   manualDiv,
   delTask,
   sendTask,
-  confirmTask
+  confirmTask,
+  queryStructAll
 }