入库调整记录修改;

mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/persistence/MaterialInventoryImpl.java

@@ -634,7 +634,7 @@ public class MaterialInventoryImpl extends ServiceImpl<MaterialInventoryMapper,
             inventoryAdjustmentRecord.setAdjustedVolume(materialInventory.getVolume());
             inventoryAdjustmentRecord.setAdjustedArea(materialInventory.getArea());
         } else if ("入库".equals(adjustAction)){
-            if (materialInventory == null) {
+            if ("1".equals(materialInventoryParamDO.getIsNew())) {
                 inventoryAdjustmentRecord.setAllocationBeforeQuantity(BigDecimal.ZERO);
                 inventoryAdjustmentRecord.setAllocationAfterQuantity(materialInventoryParamDO.getQuantity());
                 inventoryAdjustmentRecord.setFreezeBeforeQuantity(BigDecimal.ZERO);

mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/todo/MaterialInventoryParamDO.java

@@ -100,4 +100,6 @@ public class MaterialInventoryParamDO extends MaterialBaseDO {
 
     private String batchNumber;
 
+    private String isNew;
+
 }

mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java

@@ -1062,6 +1062,7 @@ public class StockShelfOrderDomainService {
 //                materialInventoryMapper.insert(materialInventory);
 
                 inventoryParamDO.setType("1");
+                inventoryParamDO.setIsNew("1");
 
                 //库存调整记录
                 materialInventoryService.xgkc(inventoryParamDO);
@@ -1119,9 +1120,10 @@ public class StockShelfOrderDomainService {
                 inventoryParamDO.setQuantity(shelfMaterialDetail.getShelvesQuantity());
                 inventoryParamDO.setType("1");
                 inventoryParamDO.setUpdateTime(new Date());
-                materialInventoryService.xgkc(inventoryParamDO);
+
                 //库存调整记录
                 materialInventoryService.kctzjl(inventoryParamDO, "入库", loginUser);
+                materialInventoryService.xgkc(inventoryParamDO);
                 //抄码商品对照数据插入
                 copyCodeProductComparison(materialBaseInfo,shelfMaterialDetail,inventoryParamDO);
             }