8/31 损耗出库修改 业务类型增加 是否独占

src/main/java/com/glxp/api/controller/basic/SysWorkplaceDocumentController.java

@@ -77,7 +77,6 @@ public class SysWorkplaceDocumentController extends BaseController {
     @PostMapping("/udiwms/sysWorkplace/updateType")
     public BaseResponse updateType(@RequestBody SysWorkplaceDocumentEntity entity) {
 
-
         boolean save = sysWorkplaceDocumentService.updateById(entity);
         if (!save) {
             return ResultVOUtils.error("更新失败");

src/main/java/com/glxp/api/entity/basic/SysWorkplaceDocumentEntity.java

@@ -141,6 +141,12 @@ public class SysWorkplaceDocumentEntity {
     @TableField(value = "autoTag")
     private Integer autoTag;
 
+    /**
+     * 是否独占库存 0:否 1:是
+     */
+    @TableField(value = "monopoly")
+    private Integer monopoly;
+
 
 }
 

src/main/java/com/glxp/api/res/basic/SysWorkplaceDocumentResponse.java

@@ -129,6 +129,13 @@ public class SysWorkplaceDocumentResponse {
     private String thrBusName;
     private Integer autoTag;
 
+    /**
+     * 是否独占库存 0:否 1:是
+     */
+    @TableField(value = "monopoly")
+    private Integer monopoly;
+
+
     public String getThrBusName() {
         if (StrUtil.isNotEmpty(innerBusName))
             return innerBusName;

src/main/java/com/glxp/api/res/collect/IoSplitDesOrderDetailResponse.java

@@ -14,7 +14,7 @@ public class IoSplitDesOrderDetailResponse {
 
     private String orderIdFk;
 
-    private Integer invId;
+    private Long invId;
 
     private Long relId;
 

src/main/java/com/glxp/api/res/inout/IoSplitInvResponse.java

@@ -131,6 +131,7 @@ public class IoSplitInvResponse {
     private Integer remindState;
     private String busName;
     private Integer availableCount;
+    private Integer monopoly;
 
 
 }

src/main/java/com/glxp/api/service/collect/IoSplitDesOrderService.java

@@ -173,10 +173,19 @@ public class IoSplitDesOrderService extends ServiceImpl<IoSplitDesOrderMapper, I
 
         //拿到 产品库存
         IoSplitFifoInv splitFifoInv = ioSplitFifoInvService.getById(addInvDesDetaiRequest.getSplitFifoInv().getId());
+        int count = splitFifoInv.getReCount() - addInvDesDetaiRequest.getOutCount();
+        if (count < 0){
+            throw new JsonException(500,"库存不足");
+        }
         //修改产品 库存 出库数量 可用数量 剩余数量
         splitFifoInv.setOutCount(splitFifoInv.getOutCount() + addInvDesDetaiRequest.getOutCount());//出库数量
         splitFifoInv.setReCount(splitFifoInv.getInCount() - splitFifoInv.getOutCount());//剩余数量
-        splitFifoInv.setAvailableCount(splitFifoInv.getInCount() - splitFifoInv.getOutCount() - splitFifoInv.getLockCount());
+        int availableCount = splitFifoInv.getInCount() - splitFifoInv.getOutCount() - splitFifoInv.getLockCount();
+        if (availableCount < 0){
+            throw new JsonException(500,"可用数量库存不足");
+        }
+        //剩余数量
+        splitFifoInv.setAvailableCount(availableCount);
         splitFifoInv.setUpdateTime(new Date());
         //更改 库存
         boolean update = ioSplitFifoInvService.updateById(splitFifoInv);
@@ -241,13 +250,21 @@ public class IoSplitDesOrderService extends ServiceImpl<IoSplitDesOrderMapper, I
         IoSplitFifoInv splitFifoInv = ioSplitFifoInvService.getOne(new LambdaQueryWrapper<IoSplitFifoInv>()
                 .eq(IoSplitFifoInv::getId,splitFifoCodeEntity.getInvIdFk()));
         if (splitFifoInv == null){
-            throw  new JsonException(5000,"未找到该产品！");
+            throw  new JsonException(500,"未找到该产品！");
         }
-        //修改产品 库存 入库数量
+        int count = splitFifoInv.getReCount() - addInvDesDetaiRequest.getOutCount();
+        if (count < 0){
+            throw new JsonException(500,"库存不足");
+        }
+        //修改产品 库存 入库数
         splitFifoInv.setInCount(splitFifoInv.getInCount() - addInvDesDetaiRequest.getOutCount());
         splitFifoInv.setOutCount(splitFifoInv.getOutCount() + addInvDesDetaiRequest.getOutCount());//出库数量
         splitFifoInv.setReCount(splitFifoInv.getInCount() - splitFifoInv.getOutCount());//剩余数量
-        splitFifoInv.setAvailableCount(splitFifoInv.getInCount() - splitFifoInv.getOutCount()-splitFifoInv.getLockCount());//实用数量
+        int availableCount = splitFifoInv.getInCount() - splitFifoInv.getOutCount() - splitFifoInv.getLockCount();
+        if (availableCount < 0){
+            throw new JsonException(500,"可用数量库存不足");
+        }
+        splitFifoInv.setAvailableCount(availableCount);//可用数量
         splitFifoInv.setUpdateTime(new Date());
         //更改 库存
         boolean update = ioSplitFifoInvService.updateById(splitFifoInv);

src/main/resources/mybatis/mapper/inout/IoSplitFifoInvMapper.xml

@@ -42,7 +42,8 @@
            bp.zxxsdycpbs,
            bc.name  supName,
            sw.workPlaceName,
-           swd.busName
+           swd.busName,
+           swd.monopoly
     from io_split_fifo_inv isfi
            LEFT JOIN basic_udirel bu ON bu.id = isfi.relId
            LEFT JOIN basic_products bp ON bu.uuid = bp.uuid