From f032261e1fc2ad843feafdc6b0c299f148691f58 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Mon, 2 Sep 2024 18:30:36 +0800
Subject: [PATCH] =?UTF-8?q?8/2=20=E6=8D=9F=E8=80=97=E5=87=BA=E5=BA=93?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/entity/inout/IoSplitCodeEntity.java   |  8 ++++
 .../collect/IoSplitDesOrderService.java       | 46 +++++++++++++------
 .../mapper/inout/IoSplitCodeMapper.xml        |  3 +-
 3 files changed, 43 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/glxp/api/entity/inout/IoSplitCodeEntity.java b/src/main/java/com/glxp/api/entity/inout/IoSplitCodeEntity.java
index c8bfb273a..4d5f570d0 100644
--- a/src/main/java/com/glxp/api/entity/inout/IoSplitCodeEntity.java
+++ b/src/main/java/com/glxp/api/entity/inout/IoSplitCodeEntity.java
@@ -220,6 +220,14 @@ public class IoSplitCodeEntity implements Serializable {
     private String workplaceName;
     @TableField(exist = false)
     private String busTypeName;
+    @TableField(exist = false)
+    private String ggxh;
+    @TableField(exist = false)
+    private String measname;
+    @TableField(exist = false)
+    private String manufactory;
+    @TableField(exist = false)
+    private String ybbm;
 
 
     private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderService.java b/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderService.java
index 871dbe518..35c6769ae 100644
--- a/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderService.java
@@ -155,7 +155,7 @@ public class IoSplitDesOrderService extends ServiceImpl<IoSplitDesOrderMapper, I
         collectOrder = IoSplitDesOrder.builder()
                 .id(IdUtil.getSnowflakeNextId())
                 .billNo(gennerOrderUtils.createWdOrderNo(new OrderNoTypeBean(Constant.SPLIT_DES_ORDER, "yyyyMMdd")))
-                .busType("1")
+                .busType(addInvDesDetaiRequest.getSplitFifoInv().getBusType())
                 .orderType(1)
                 .workPlaceCode(addInvDesDetaiRequest.getSplitFifoInv().getWorkPlaceCode())
                 .createTime(new Date())
@@ -178,20 +178,35 @@ public class IoSplitDesOrderService extends ServiceImpl<IoSplitDesOrderMapper, I
             throw new JsonException(500,"库存不足");
         }
         //修改产品 库存 出库数量 可用数量 剩余数量
+        //入库数量是否需要更改？
         splitFifoInv.setOutCount(splitFifoInv.getOutCount() + addInvDesDetaiRequest.getOutCount());//出库数量
-        splitFifoInv.setReCount(splitFifoInv.getInCount() - splitFifoInv.getOutCount());//剩余数量
-        int availableCount = splitFifoInv.getInCount() - splitFifoInv.getOutCount() - splitFifoInv.getLockCount();
-        if (availableCount < 0){
+        splitFifoInv.setReCount(splitFifoInv.getInCount() - addInvDesDetaiRequest.getOutCount());//剩余数量
+        int availableCount = splitFifoInv.getInCount() - addInvDesDetaiRequest.getOutCount() - splitFifoInv.getLockCount();
+        if (availableCount <= -1){
             throw new JsonException(500,"可用数量库存不足");
         }
-        //剩余数量
+        //可用数量
         splitFifoInv.setAvailableCount(availableCount);
+        splitFifoInv.setInCount(splitFifoInv.getInCount() - addInvDesDetaiRequest.getOutCount());//入库数量
         splitFifoInv.setUpdateTime(new Date());
         //更改 库存
         boolean update = ioSplitFifoInvService.updateById(splitFifoInv);
         if (!update) {
             return false;
         }
+        //todo 码明细删减库存
+        IoSplitFifoCodeEntity splitFifoCodeEntity = splitFifoCodeService.getOne(new LambdaQueryWrapper<IoSplitFifoCodeEntity>()
+                .eq(IoSplitFifoCodeEntity::getWorkPlaceCode,splitFifoInv.getWorkPlaceCode())
+                .eq(IoSplitFifoCodeEntity::getBatchNo,splitFifoInv.getBatchNo())
+                .eq(IoSplitFifoCodeEntity::getRelId,splitFifoInv.getRelId()));
+        if (splitFifoCodeEntity == null) {
+            throw new JsonException("该工位不存在，请检查后重试！");
+        }
+        splitFifoCodeEntity.setTotalCount(splitFifoCodeEntity.getTotalCount() - addInvDesDetaiRequest.getOutCount());
+        boolean b = splitFifoCodeService.updateById(splitFifoCodeEntity);
+        if (!b){
+            throw  new JsonException(500,"追溯码库存删减失败");
+        }
 //        IoSplitFifoInv splitFifoInv = addInvDesDetaiRequest.getSplitFifoInv();
         IoSplitDesOrderDetail splitDesOrderDetail = IoSplitDesOrderDetail.builder()
                 .id(IdUtil.getSnowflakeNextId())
@@ -215,6 +230,7 @@ public class IoSplitDesOrderService extends ServiceImpl<IoSplitDesOrderMapper, I
         return true;
     }
 
+    @Transactional(rollbackFor = Exception.class)
     public Boolean destroyOutByCode(AddInvDesDetaiRequest addInvDesDetaiRequest) {
         IoSplitFifoCodeEntity splitFifoCodeEntity = splitFifoCodeService.findByCode(addInvDesDetaiRequest.getCode(), addInvDesDetaiRequest.getSplitFifoInv().getWorkPlaceCode());
         if (splitFifoCodeEntity == null) {
@@ -224,7 +240,7 @@ public class IoSplitDesOrderService extends ServiceImpl<IoSplitDesOrderMapper, I
         collectOrder = IoSplitDesOrder.builder()
                 .id(IdUtil.getSnowflakeNextId())
                 .billNo(gennerOrderUtils.createWdOrderNo(new OrderNoTypeBean(Constant.SPLIT_DES_ORDER, "yyyyMMdd")))
-                .busType("1")
+                .busType(addInvDesDetaiRequest.getSplitFifoInv().getBusType())
                 .orderType(1)
                 .workPlaceCode(addInvDesDetaiRequest.getSplitFifoInv().getWorkPlaceCode())
                 .createTime(new Date())
@@ -257,14 +273,16 @@ public class IoSplitDesOrderService extends ServiceImpl<IoSplitDesOrderMapper, I
             throw new JsonException(500,"库存不足");
         }
         //修改产品 库存 入库数
-        splitFifoInv.setInCount(splitFifoInv.getInCount() - addInvDesDetaiRequest.getOutCount());
+
         splitFifoInv.setOutCount(splitFifoInv.getOutCount() + addInvDesDetaiRequest.getOutCount());//出库数量
-        splitFifoInv.setReCount(splitFifoInv.getInCount() - splitFifoInv.getOutCount());//剩余数量
-        int availableCount = splitFifoInv.getInCount() - splitFifoInv.getOutCount() - splitFifoInv.getLockCount();
-        if (availableCount < 0){
+        splitFifoInv.setReCount(splitFifoInv.getInCount() - addInvDesDetaiRequest.getOutCount());//剩余数量
+        int availableCount = splitFifoInv.getInCount() - addInvDesDetaiRequest.getOutCount() - splitFifoInv.getLockCount();
+        if (availableCount <= -1){
             throw new JsonException(500,"可用数量库存不足");
         }
+//        int newAvailableCount  = splitFifoInv.getAvailableCount() - availableCount;
         splitFifoInv.setAvailableCount(availableCount);//可用数量
+        splitFifoInv.setInCount(splitFifoInv.getInCount() - addInvDesDetaiRequest.getOutCount());
         splitFifoInv.setUpdateTime(new Date());
         //更改 库存
         boolean update = ioSplitFifoInvService.updateById(splitFifoInv);
@@ -294,25 +312,27 @@ public class IoSplitDesOrderService extends ServiceImpl<IoSplitDesOrderMapper, I
     }
 
 
+    @Transactional(rollbackFor = Exception.class)
     public void splitDesOrder(AddInvDesDetaiRequest addInvDesDetaiRequest) {
 
         IoSplitDesOrder collectOrder;
         collectOrder = IoSplitDesOrder.builder()
+                .id(IdUtil.getSnowflakeNextId())
                 .billNo(gennerOrderUtils.createWdOrderNo(new OrderNoTypeBean(Constant.SPLIT_DES_ORDER, "yyyyMMdd")))
                 .busType("1")
                 .workPlaceCode(addInvDesDetaiRequest.getWorkPlaceCode())
                 .createTime(new Date())
                 .billTime(new Date())
                 .remark(addInvDesDetaiRequest.getRemark())
-                .status(1)
+                .status(2)
                 .createUser(addInvDesDetaiRequest.getCreateUser())
                 .updateTime(new Date())
                 .updateUser(addInvDesDetaiRequest.getUpdateUser())
                 .build();
         save(collectOrder);
-        IoSplitCodeEntity splitCodeEntity = splitCodeService.findByCode(addInvDesDetaiRequest.getCode(), addInvDesDetaiRequest.getWorkPlaceCode(), null);
+        IoSplitCodeEntity splitCodeEntity = splitCodeService.findByCode(addInvDesDetaiRequest.getCode(), addInvDesDetaiRequest.getSplitFifoInv().getWorkPlaceCode(), null);
         if (splitCodeEntity == null) {
-            throw new RuntimeException("该追溯码不存在！");
+            throw new JsonException(500,"该追溯码不存在！");
         }
         int count = IntUtil.value(splitCodeEntity.getRemainCount()) - IntUtil.value(addInvDesDetaiRequest.getOutCount());
         if (count < 0) {
diff --git a/src/main/resources/mybatis/mapper/inout/IoSplitCodeMapper.xml b/src/main/resources/mybatis/mapper/inout/IoSplitCodeMapper.xml
index 94346d260..fe814c71f 100644
--- a/src/main/resources/mybatis/mapper/inout/IoSplitCodeMapper.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoSplitCodeMapper.xml
@@ -3,7 +3,8 @@
 <mapper namespace="com.glxp.api.dao.inout.IoSplitCodeMapper">
     <select id="filterList" parameterType="com.glxp.api.req.inout.IoSplitCodeRequest"
             resultType="com.glxp.api.entity.inout.IoSplitCodeEntity">
-        SELECT isc.*,bp.cpmctymc productName,sw.workplaceName,COALESCE(thr_bustype_origin.name, basic_bussiness_type.name) as busTypeName
+        SELECT isc.*,bp.cpmctymc productName,sw.workplaceName,COALESCE(thr_bustype_origin.name, basic_bussiness_type.name) as busTypeName,COALESCE(bp.bzgg, bp.ggxh) as ggxh,bp.measname,
+        COALESCE(bp.ylqxzcrbarmc, bp.manufactory) as manufactory,bp.ybbm
         FROM io_split_code isc
         left join basic_products bp on bp.nameCode = isc.nameCode
         left join sys_workplace sw on sw.workplaceId = isc.workPlaceCode