出入库+库存

src/main/java/com/dk/mdm/model/vo/ivt/InOutRecordVO.java

@@ -179,7 +179,7 @@ public class InOutRecordVO  {
 
     @TableField(typeHandler = UuidTypeHandler.class)
     @ApiModelProperty(value = "明细id(出库，入库，调整单）")
-    private String ItemId;
+    private String itemId;
 
     @ApiModelProperty(value = "仓库ID")
     @TableField(typeHandler = UuidTypeHandler.class)

src/main/java/com/dk/mdm/service/ivt/inbound/InboundOtherService.java

@@ -200,13 +200,14 @@ public class InboundOtherService extends BaseService<Inbound> {
             //实体转换
             InboundItem inboundItem = inboundItemConvert.convertToPo(inboundItemVO);
             inboundItemMapper.insert(inboundItem);
+            inboundItemVO.setItemId(inboundItem.getItemId());
         }
         //endregion
 
         //region 库存
         if (Constant.IntoStatus.YIRUKU.getName().equals(inboundVO.getIntoStatus())) {
             Map<String, Object> invMap = new HashMap<>();
-            map.put("intoDetail", inboundVO.getItemList());
+            invMap.put("intoDetail", inboundVO.getItemList());
             inventoryService.operatingInventoryInformation(invMap);
         }
         //endregion
@@ -304,6 +305,7 @@ public class InboundOtherService extends BaseService<Inbound> {
                         //实体转换
                         InboundItem inboundItem = inboundItemConvert.convertToPo(inboundItemVO);
                         inboundItemMapper.insert(inboundItem);
+                        inboundItemVO.setItemId(inboundItem.getItemId());
                         //region 将库存需要的参数赋值
                         inboundItemVO.setInventoryType(Constant.InventoryType.INBOUND.getName());
                         inboundItemVO.setInventoryDocCode(Constant.InventoryDocCode.OTHER_INBOUND.getValue());
@@ -395,6 +397,7 @@ public class InboundOtherService extends BaseService<Inbound> {
                         //实体转换
                         InboundItem inboundItem = inboundItemConvert.convertToPo(inboundItemVO);
                         inboundItemMapper.insert(inboundItem);
+                        inboundItemVO.setItemId(inboundItem.getItemId());
                     }
                     //endregion
                 }
@@ -616,6 +619,7 @@ public class InboundOtherService extends BaseService<Inbound> {
                 InboundItem inboundItem = inboundItemConvert.convertToPo(inboundItemVO);
                 //新建
                 inboundItemMapper.insert(inboundItem);
+                inboundItemVO.setItemId(inboundItem.getItemId());
 
                 //region 将库存需要的参数赋值
                 inboundItemVO.setInventoryType(Constant.InventoryType.INBOUND.getName());

src/main/java/com/dk/mdm/service/ivt/inbound/InboundPurchaseReturnService.java

@@ -209,6 +209,7 @@ public class InboundPurchaseReturnService extends BaseService<Inbound> {
             //实体转换
             InboundItem inboundItem = inboundItemConvert.convertToPo(inboundItemVO);
             inboundItemMapper.insert(inboundItem);
+            inboundItemVO.setItemId(inboundItem.getItemId());
             //endregion
 
         }
@@ -336,6 +337,7 @@ public class InboundPurchaseReturnService extends BaseService<Inbound> {
                         //实体转换
                         InboundItem inboundItem = inboundItemConvert.convertToPo(inboundItemVO);
                         inboundItemMapper.insert(inboundItem);
+                        inboundItemVO.setItemId(inboundItem.getItemId());
 
                         //region 将库存需要的参数赋值
                         inboundItemVO.setInventoryType(Constant.InventoryType.INBOUND.getName());
@@ -440,6 +442,7 @@ public class InboundPurchaseReturnService extends BaseService<Inbound> {
                         //实体转换
                         InboundItem inboundItem = inboundItemConvert.convertToPo(inboundItemVO);
                         inboundItemMapper.insert(inboundItem);
+                        inboundItemVO.setItemId(inboundItem.getItemId());
                     }
                     //endregion
 
@@ -680,6 +683,7 @@ public class InboundPurchaseReturnService extends BaseService<Inbound> {
                 InboundItem inboundItem = inboundItemConvert.convertToPo(inboundItemVO);
                 //新建
                 inboundItemMapper.insert(inboundItem);
+                inboundItemVO.setItemId(inboundItem.getItemId());
                 //region 将库存需要的参数赋值
                 inboundItemVO.setInventoryType(Constant.InventoryType.INBOUND.getName());
                 inboundItemVO.setInventoryDocCode(Constant.InventoryDocCode.PURCHASE_RETURN.getValue());

src/main/java/com/dk/mdm/service/ivt/inbound/InboundPurchaseService.java

@@ -242,6 +242,7 @@ public class InboundPurchaseService extends BaseService<Inbound> {
             //实体转换
             InboundItem inboundItem = inboundItemConvert.convertToPo(inboundItemVO);
             inboundItemMapper.insert(inboundItem);
+            inboundItemVO.setItemId(inboundItem.getItemId());
             //endregion
 
             //region 采购明细
@@ -289,7 +290,7 @@ public class InboundPurchaseService extends BaseService<Inbound> {
         if (Constant.IntoStatus.YIRUKU.getName().equals(inboundVO.getIntoStatus())) {
             Map<String, Object> invMap = new HashMap<>();
             invMap.put("intoDetail", inboundVO.getItemList());
-            inventoryService.operatingInventoryInformation(map);
+            inventoryService.operatingInventoryInformation(invMap);
         }
         //endregion
 
@@ -401,7 +402,7 @@ public class InboundPurchaseService extends BaseService<Inbound> {
                         //实体转换
                         InboundItem inboundItem = inboundItemConvert.convertToPo(inboundItemVO);
                         inboundItemMapper.insert(inboundItem);
-
+                        inboundItemVO.setItemId(inboundItem.getItemId());
                         //region 将库存需要的参数赋值
                         inboundItemVO.setInventoryType(Constant.InventoryType.INBOUND.getName());
                         inboundItemVO.setInventoryDocCode(Constant.InventoryDocCode.PURCHASE_ORDER.getValue());
@@ -581,6 +582,7 @@ public class InboundPurchaseService extends BaseService<Inbound> {
                         //实体转换
                         InboundItem inboundItem = inboundItemConvert.convertToPo(inboundItemVO);
                         inboundItemMapper.insert(inboundItem);
+                        inboundItemVO.setItemId(inboundItem.getItemId());
                     }
                     //endregion
 
@@ -978,6 +980,7 @@ public class InboundPurchaseService extends BaseService<Inbound> {
                 InboundItem inboundItem = inboundItemConvert.convertToPo(inboundItemVO);
                 //新建
                 inboundItemMapper.insert(inboundItem);
+                inboundItemVO.setItemId(inboundItem.getItemId());
 
                 //region 将库存需要的参数赋值
                 inboundItemVO.setInventoryType(Constant.InventoryType.INBOUND.getName());

src/main/java/com/dk/mdm/service/ivt/inventory/InventoryService.java

@@ -116,7 +116,7 @@ public class InventoryService extends BaseService<Inventory> {
             //入库价
             inOutRecordVO.setPriceInto(inOutRecordVO.getPriceInto());
             //入库日期
-            inOutRecordVO.setAccDate(inOutRecordVO.getIntoDate());
+            inOutRecordVO.setAccDate(LocalDate.now());
         }
         //region 校验是否传库存需要的数据
         this.checkInventory(inOutRecordVOList);
@@ -163,7 +163,7 @@ public class InventoryService extends BaseService<Inventory> {
             }
             //endregion
             //入库日期
-            inOutRecordVO.setAccDate(inOutRecordVO.getOutDate());
+            inOutRecordVO.setAccDate(LocalDate.now());
         }
         //region 校验是否传库存需要的数据
         this.checkInventory(inOutRecordVOList);
@@ -197,6 +197,10 @@ public class InventoryService extends BaseService<Inventory> {
             if (Constant.FlgAutoHandleStringType.ONE.getValue().equals(flgHandleSetting)) {
                 inventoryBatchVO.setCanNegativeFlag(true);
             }
+            //不可以
+            else{
+                inventoryBatchVO.setCanNegativeFlag(false);
+            }
             //商品ID
             if (inventoryBatchVO.getSkuId() == null || "".equals(inventoryBatchVO.getSkuId())) {
                 throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.SKU_IS_NULL.getMessage());
@@ -482,6 +486,9 @@ public class InventoryService extends BaseService<Inventory> {
      * @date : 2024/4/10 14:39
      * @author : 寇珊珊
      */
+    @Transactional(
+            rollbackFor = {Exception.class}
+    )
     public InventoryResponse checkInventoryNumber(InOutRecordVO inOutRecordVO) {
         //存在标识
         //根据sku，仓库，非标号查询
@@ -734,6 +741,9 @@ public class InventoryService extends BaseService<Inventory> {
      * @date : 2024/4/10 15:05
      * @author : 寇珊珊
      */
+    @Transactional(
+            rollbackFor = {Exception.class}
+    )
     public void updateInventoryMessageAdd(InventoryResponse inventoryResponse, InOutRecordVO inOutRecordVO) {
         //region  根据库存id查询库存批次明细 汇总金额
         List<InventoryBatchResponse> inventoryBatchResponseList = inventoryBatchMapper.selectAmountAndQuantity(new InventoryBatchQuery().setInvId(inventoryResponse.getInvId()));
@@ -1355,7 +1365,6 @@ public class InventoryService extends BaseService<Inventory> {
         }
     }
 
-
     /**
      * @desc : 操作负库存--删除（作废功能用目前）
      * @date : 2024/4/12 13:16

src/main/java/com/dk/mdm/service/ivt/outbound/OutboundOtherService.java

@@ -198,6 +198,7 @@ public class OutboundOtherService extends BaseService<Outbound> {
             //实体转换
             OutboundItem outboundItem = outboundItemConvert.convertToPo(outboundItemVO);
             outboundItemMapper.insert(outboundItem);
+            outboundItemVO.setItemId(outboundItem.getItemId());
             //endregion
 
         }
@@ -306,7 +307,8 @@ public class OutboundOtherService extends BaseService<Outbound> {
                         //实体转换
                         OutboundItem outboundItem = outboundItemConvert.convertToPo(outboundItemVO);
                         outboundItemMapper.insert(outboundItem);
-                        
+                        outboundItemVO.setItemId(outboundItem.getItemId());
+
                         //region 将库存需要的参数赋值
                         outboundItemVO.setInventoryType(Constant.InventoryType.OUTBOUND.getName());
                         outboundItemVO.setInventoryDocCode(Constant.InventoryDocCode.OTHER_OUTBOUND.getValue());
@@ -403,6 +405,7 @@ public class OutboundOtherService extends BaseService<Outbound> {
                         OutboundItem outboundItem = outboundItemConvert.convertToPo(outboundItemVO);
                         //新建
                         outboundItemMapper.insert(outboundItem);
+                        outboundItemVO.setItemId(outboundItem.getItemId());
                     }
                     //endregion
                 }
@@ -616,6 +619,7 @@ public class OutboundOtherService extends BaseService<Outbound> {
                 OutboundItem outboundItem = outboundItemConvert.convertToPo(outboundItemVO);
                 //新建
                 outboundItemMapper.insert(outboundItem);
+                outboundItemVO.setItemId(outboundItem.getItemId());
 
                 //region 将库存需要的参数赋值
                 outboundItemVO.setInventoryType(Constant.InventoryType.OUTBOUND.getName());

src/main/java/com/dk/mdm/service/ivt/outbound/OutboundSaleOrderService.java

@@ -234,6 +234,7 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
             //实体转换
             OutboundItem outboundItem = outboundItemConvert.convertToPo(outboundItemVO);
             outboundItemMapper.insert(outboundItem);
+            outboundItemVO.setItemId(outboundItem.getItemId());
             //endregion
 
             //region 销售明细
@@ -283,7 +284,7 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
         if(Constant.OutStatus.YICHUKU.getName().equals(outboundVO.getOutStatus())){
             Map<String, Object> invMap = new HashMap<>();
             invMap.put("outDetail",outboundVO.getItemList());
-            inventoryService.operatingInventoryInformation(map);
+            inventoryService.operatingInventoryInformation(invMap);
         }
         //endregion
 
@@ -396,7 +397,7 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
                         OutboundItem outboundItem = outboundItemConvert.convertToPo(outboundItemVO);
                         //新建
                         outboundItemMapper.insert(outboundItem);
-
+                        outboundItemVO.setItemId(outboundItem.getItemId());
                         //region 将库存需要的参数赋值
                         outboundItemVO.setInventoryType(Constant.InventoryType.OUTBOUND.getName());
                         outboundItemVO.setInventoryDocCode(Constant.InventoryDocCode.SALE_ORDER.getValue());
@@ -574,6 +575,7 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
                         OutboundItem outboundItem = outboundItemConvert.convertToPo(outboundItemVO);
                         //新建
                         outboundItemMapper.insert(outboundItem);
+                        outboundItemVO.setItemId(outboundItem.getItemId());
                     }
                     //endregion
 
@@ -963,6 +965,7 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
                 OutboundItem outboundItem = outboundItemConvert.convertToPo(outboundItemVO);
                 //新建
                 outboundItemMapper.insert(outboundItem);
+                outboundItemVO.setItemId(outboundItem.getItemId());
 
                 //region 将库存需要的参数赋值
                 outboundItemVO.setInventoryType(Constant.InventoryType.OUTBOUND.getName());

src/main/java/com/dk/mdm/service/ivt/outbound/OutboundSaleReturnService.java

@@ -401,6 +401,7 @@ public class OutboundSaleReturnService extends BaseService<Outbound> {
             //实体转换
             OutboundItem outboundItem = outboundItemConvert.convertToPo(outboundItemVO);
             outboundItemMapper.insert(outboundItem);
+            outboundItemVO.setItemId(outboundItem.getItemId());
             //endregion
         }
         //endregion
@@ -533,6 +534,7 @@ public class OutboundSaleReturnService extends BaseService<Outbound> {
                         OutboundItem outboundItem = outboundItemConvert.convertToPo(outboundItemVO);
                         //新建
                         outboundItemMapper.insert(outboundItem);
+                        outboundItemVO.setItemId(outboundItem.getItemId());
 
                         //region 将库存需要的参数赋值
                         outboundItemVO.setInventoryType(Constant.InventoryType.OUTBOUND.getName());
@@ -655,6 +657,7 @@ public class OutboundSaleReturnService extends BaseService<Outbound> {
                         OutboundItem outboundItem = outboundItemConvert.convertToPo(outboundItemVO);
                         //新建
                         outboundItemMapper.insert(outboundItem);
+                        outboundItemVO.setItemId(outboundItem.getItemId());
                     }
                     //endregion
 
@@ -929,6 +932,7 @@ public class OutboundSaleReturnService extends BaseService<Outbound> {
                 OutboundItem outboundItem = outboundItemConvert.convertToPo(outboundItemVO);
                 //新建
                 outboundItemMapper.insert(outboundItem);
+                outboundItemVO.setItemId(outboundItem.getItemId());
                 //region 将库存需要的参数赋值
                 outboundItemVO.setInventoryType(Constant.InventoryType.OUTBOUND.getName());
                 outboundItemVO.setInventoryDocCode(Constant.InventoryDocCode.SALE_RETURN.getValue());