|
|
|
@ -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)) { |
|
|
|
|