diff --git a/src/main/java/com/gaotao/modules/handlingunit/entity/HandlingUnit.java b/src/main/java/com/gaotao/modules/handlingunit/entity/HandlingUnit.java index 7eed137..b0c4949 100644 --- a/src/main/java/com/gaotao/modules/handlingunit/entity/HandlingUnit.java +++ b/src/main/java/com/gaotao/modules/handlingunit/entity/HandlingUnit.java @@ -59,32 +59,32 @@ public class HandlingUnit { private Date receiveDate; // 收货日期 private String tid; private String epc; - + // WMS预留相关字段 - rqrq @TableField("reserve_flag") private String reserveFlag; - + @TableField("reserve_order_ref1") private String reserveOrderRef1; - + @TableField("reserve_order_ref2") private String reserveOrderRef2; - + @TableField("reserve_order_ref3") private String reserveOrderRef3; - + private BigDecimal length; private BigDecimal height; private BigDecimal width; private String umId; - + /** * 工程变更级别 - 对应IFS系统的ENG_CHG_LEVEL字段 * 默认值:1 */ @TableField("eng_chg_level") - private Integer engChgLevel; + private String engChgLevel; // RFID识别需要的关键字段 @TableField(exist = false) diff --git a/src/main/java/com/gaotao/modules/other/service/impl/InventoryMoveServiceImpl.java b/src/main/java/com/gaotao/modules/other/service/impl/InventoryMoveServiceImpl.java index c35e071..7d4c390 100644 --- a/src/main/java/com/gaotao/modules/other/service/impl/InventoryMoveServiceImpl.java +++ b/src/main/java/com/gaotao/modules/other/service/impl/InventoryMoveServiceImpl.java @@ -267,7 +267,7 @@ public class InventoryMoveServiceImpl implements InventoryMoveService { newGroup.lotBatchNo = hu.getBatchNo(); newGroup.wdr = hu.getWdr(); newGroup.expiredDate = hu.getExpiredDate(); // 有效期值保留 - newGroup.engChgLevel = hu.getEngChgLevel() != null ? hu.getEngChgLevel() : 1; // 工程变更级别,默认1 + newGroup.engChgLevel = hu.getEngChgLevel() != null ? hu.getEngChgLevel() : "1"; // 工程变更级别,默认1 newGroup.totalQty = BigDecimal.ZERO; return newGroup; }); @@ -316,7 +316,7 @@ public class InventoryMoveServiceImpl implements InventoryMoveService { newGroup.lotBatchNo = hu.getBatchNo(); newGroup.wdr = hu.getWdr(); newGroup.expiredDate = hu.getExpiredDate(); // 有效期值保留 - newGroup.engChgLevel = hu.getEngChgLevel() != null ? hu.getEngChgLevel() : 1; // 工程变更级别,默认1 + newGroup.engChgLevel = hu.getEngChgLevel() != null ? hu.getEngChgLevel() : "1"; // 工程变更级别,默认1 newGroup.totalQty = BigDecimal.ZERO; return newGroup; }); @@ -761,7 +761,7 @@ public class InventoryMoveServiceImpl implements InventoryMoveService { String wdr; BigDecimal totalQty; Date expiredDate; - Integer engChgLevel; // 工程变更级别,默认1 + String engChgLevel; // 工程变更级别,默认1 } /** diff --git a/src/main/java/com/gaotao/modules/warehouse/entity/InventoryStock.java b/src/main/java/com/gaotao/modules/warehouse/entity/InventoryStock.java index 866bba2..354ba58 100644 --- a/src/main/java/com/gaotao/modules/warehouse/entity/InventoryStock.java +++ b/src/main/java/com/gaotao/modules/warehouse/entity/InventoryStock.java @@ -75,7 +75,7 @@ public class InventoryStock { * 默认值:1 */ @TableField("eng_chg_level") - private Integer engChgLevel; + private String engChgLevel; @TableField(exist = false) private BigDecimal printQty; diff --git a/src/main/java/com/gaotao/modules/warehouse/service/impl/IfsInventoryInitServiceImpl.java b/src/main/java/com/gaotao/modules/warehouse/service/impl/IfsInventoryInitServiceImpl.java index 2331193..eb8d579 100644 --- a/src/main/java/com/gaotao/modules/warehouse/service/impl/IfsInventoryInitServiceImpl.java +++ b/src/main/java/com/gaotao/modules/warehouse/service/impl/IfsInventoryInitServiceImpl.java @@ -160,7 +160,7 @@ public class IfsInventoryInitServiceImpl implements IfsInventoryInitService { handlingUnit.setManufactureDate(ifsStock.getManufactureDate()); handlingUnit.setExpiredDate(ifsStock.getExpiredDate()); handlingUnit.setUmId(request.getUmid()); - handlingUnit.setEngChgLevel(ifsStock.getEngChgLevel() != null ? ifsStock.getEngChgLevel() : 1); // 设置工程变更级别,默认1 + handlingUnit.setEngChgLevel(ifsStock.getEngChgLevel() != null ? ifsStock.getEngChgLevel() : "1"); // 设置工程变更级别,默认1 // 保存HandlingUnit boolean saveResult = handlingUnitService.save(handlingUnit); @@ -276,7 +276,7 @@ public class IfsInventoryInitServiceImpl implements IfsInventoryInitService { handlingUnit.setManufactureDate(ifsStock.getManufactureDate()); handlingUnit.setExpiredDate(ifsStock.getExpiredDate()); handlingUnit.setUmId(request.getUmid()); - handlingUnit.setEngChgLevel(ifsStock.getEngChgLevel() != null ? ifsStock.getEngChgLevel() : 1); // 设置工程变更级别,默认1 + handlingUnit.setEngChgLevel(ifsStock.getEngChgLevel() != null ? ifsStock.getEngChgLevel() : "1"); // 设置工程变更级别,默认1 // 保存余数HandlingUnit boolean saveResult = handlingUnitService.save(handlingUnit); @@ -480,7 +480,7 @@ public class IfsInventoryInitServiceImpl implements IfsInventoryInitService { } handlingUnit.setUmId(request.getUmid()); - handlingUnit.setEngChgLevel(1); // 其它入库默认工程变更级别为1 + handlingUnit.setEngChgLevel("1"); // 其它入库默认工程变更级别为1 // 设置备注 if (request.getRemark() != null && !request.getRemark().trim().isEmpty()) { @@ -647,7 +647,7 @@ public class IfsInventoryInitServiceImpl implements IfsInventoryInitService { handlingUnit.setManufactureDate(ifsStock.getManufactureDate()); handlingUnit.setExpiredDate(ifsStock.getExpiredDate()); handlingUnit.setUmId(item.getUmid()); - handlingUnit.setEngChgLevel(ifsStock.getEngChgLevel() != null ? ifsStock.getEngChgLevel() : 1); // 设置工程变更级别,默认1 + handlingUnit.setEngChgLevel(ifsStock.getEngChgLevel() != null ? ifsStock.getEngChgLevel() : "1"); // 设置工程变更级别,默认1 // 保存HandlingUnit boolean saveResult = handlingUnitService.save(handlingUnit); @@ -815,7 +815,7 @@ public class IfsInventoryInitServiceImpl implements IfsInventoryInitService { String handlingUnitFlag = getValue(data, 18); // S列: HU String isCommonlyUsed = getValue(data, 19); // T列: 密封性 String palletType = getValue(data, 20); // U列: A02型号(托盘类型) - + // 解析Excel行数据 - V列: EngChgLevel(工程变更级别) String engChgLevelStr = getValue(data, 21); // V列: EngChgLevel @@ -870,7 +870,7 @@ public class IfsInventoryInitServiceImpl implements IfsInventoryInitService { // 解析日期 Date manufactureDate = parseDate(receiptDateStr); Date expiredDate = parseDate(expirationDateStr); - + // 解析工程变更级别,默认值为1 Integer engChgLevel = 1; if (StringUtils.isNotBlank(engChgLevelStr)) {