移位增加入库单和lot编号校验库存是否合并

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

@@ -269,7 +269,9 @@ public class MaterialInventoryImpl extends ServiceImpl<MaterialInventoryMapper,
                         + materialInventoryDO.getBatchRefNo() + "_"
                         + materialInventoryDO.getBatchNumber() + "_"
                         + materialInventoryDO.getMaterialStatusCode() + "_"
-                        + materialInventoryDO.getContainerCode();
+                        + materialInventoryDO.getContainerCode() + "_"
+                        + materialInventoryDO.getLotNumber() + "_"
+                        + materialInventoryDO.getInOrderNumber();
                 
                 // 注意：如果唯一性约束包含批次号、容器ID、物料状态等字段，那么key也应该包含这些字段
                 // 但是，根据唯一性约束名称IDX_MAT_INV_LOC_MAT_ID，它应该只包含storage_location_id和material_base_info_id

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

@@ -236,4 +236,12 @@ public class MaterialInventoryDO extends MaterialBaseDO {
     @ApiModelProperty("冻结数量大于0条件")
     @Excel(name = "冻结数量大于0条件")
     private String greaterThanFreezeQuantity;
+
+    @ApiModelProperty("入库单号")
+    @Excel(name = "入库单号")
+    private String inOrderNumber;
+
+    @ApiModelProperty("LOT编号")
+    @Excel(name = "LOT编号")
+    private String LotNumber;
 }

mhd_wms/src/main/java/com/mhd/wms/domain/shiftManage/service/ShiftManageDomainService.java

@@ -870,6 +870,8 @@ public class ShiftManageDomainService {
         if (ObjectUtil.isNull(materialInventoryDb)){
             MaterialInventoryDO materialInventoryDONow = new MaterialInventoryDO();
             BatchAttributeAssignment(materialMoreDetailList, materialInventoryDONow);//批次属性赋值
+            materialInventoryDONow.setLotNumber(shiftMaterialDetailPO.getLotNumber());
+            materialInventoryDONow.setInOrderNumber(shiftMaterialDetailPO.getInOrderNumber());
             materialInventoryDONow.setMaterialBaseInfoId(shiftMaterialDetailPO.getMaterialBaseInfoId());
             materialInventoryDONow.setWarehouseId(shiftMaterialDetailPO.getNewWarehouseId());
             materialInventoryDONow.setWarehouseCode(shiftMaterialDetailPO.getNewWarehouseCode());

mhd_wms/src/main/java/com/mhd/wms/domain/shiftMaterialDetail/repository/po/ShiftMaterialDetailPO.java

@@ -275,6 +275,14 @@ public class ShiftMaterialDetailPO extends BaseVOEntity {
     @Excel(name = "总面积(SQM)")
     private BigDecimal totalArea;
 
+    @ApiModelProperty("入库单号")
+    @Excel(name = "入库单号")
+    private String inOrderNumber;
+
+    @ApiModelProperty("LOT编号")
+    @Excel(name = "LOT编号")
+    private String LotNumber;
+
     @ApiModelProperty("移位详情")
     @TableField(exist = false)
     private List<ShiftMaterialDetailPO> children;