Browse Source

增加engChgLevel字段String

master
han\hanst 2 months ago
parent
commit
66a5603b78
  1. 2
      src/main/java/com/gaotao/modules/handlingunit/entity/HandlingUnit.java
  2. 6
      src/main/java/com/gaotao/modules/other/service/impl/InventoryMoveServiceImpl.java
  3. 2
      src/main/java/com/gaotao/modules/warehouse/entity/InventoryStock.java
  4. 8
      src/main/java/com/gaotao/modules/warehouse/service/impl/IfsInventoryInitServiceImpl.java

2
src/main/java/com/gaotao/modules/handlingunit/entity/HandlingUnit.java

@ -84,7 +84,7 @@ public class HandlingUnit {
* 默认值1 * 默认值1
*/ */
@TableField("eng_chg_level") @TableField("eng_chg_level")
private Integer engChgLevel;
private String engChgLevel;
// RFID识别需要的关键字段 // RFID识别需要的关键字段
@TableField(exist = false) @TableField(exist = false)

6
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.lotBatchNo = hu.getBatchNo();
newGroup.wdr = hu.getWdr(); newGroup.wdr = hu.getWdr();
newGroup.expiredDate = hu.getExpiredDate(); // 有效期值保留 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; newGroup.totalQty = BigDecimal.ZERO;
return newGroup; return newGroup;
}); });
@ -316,7 +316,7 @@ public class InventoryMoveServiceImpl implements InventoryMoveService {
newGroup.lotBatchNo = hu.getBatchNo(); newGroup.lotBatchNo = hu.getBatchNo();
newGroup.wdr = hu.getWdr(); newGroup.wdr = hu.getWdr();
newGroup.expiredDate = hu.getExpiredDate(); // 有效期值保留 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; newGroup.totalQty = BigDecimal.ZERO;
return newGroup; return newGroup;
}); });
@ -761,7 +761,7 @@ public class InventoryMoveServiceImpl implements InventoryMoveService {
String wdr; String wdr;
BigDecimal totalQty; BigDecimal totalQty;
Date expiredDate; Date expiredDate;
Integer engChgLevel; // 工程变更级别默认1
String engChgLevel; // 工程变更级别默认1
} }
/** /**

2
src/main/java/com/gaotao/modules/warehouse/entity/InventoryStock.java

@ -75,7 +75,7 @@ public class InventoryStock {
* 默认值1 * 默认值1
*/ */
@TableField("eng_chg_level") @TableField("eng_chg_level")
private Integer engChgLevel;
private String engChgLevel;
@TableField(exist = false) @TableField(exist = false)
private BigDecimal printQty; private BigDecimal printQty;

8
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.setManufactureDate(ifsStock.getManufactureDate());
handlingUnit.setExpiredDate(ifsStock.getExpiredDate()); handlingUnit.setExpiredDate(ifsStock.getExpiredDate());
handlingUnit.setUmId(request.getUmid()); handlingUnit.setUmId(request.getUmid());
handlingUnit.setEngChgLevel(ifsStock.getEngChgLevel() != null ? ifsStock.getEngChgLevel() : 1); // 设置工程变更级别默认1
handlingUnit.setEngChgLevel(ifsStock.getEngChgLevel() != null ? ifsStock.getEngChgLevel() : "1"); // 设置工程变更级别默认1
// 保存HandlingUnit // 保存HandlingUnit
boolean saveResult = handlingUnitService.save(handlingUnit); boolean saveResult = handlingUnitService.save(handlingUnit);
@ -276,7 +276,7 @@ public class IfsInventoryInitServiceImpl implements IfsInventoryInitService {
handlingUnit.setManufactureDate(ifsStock.getManufactureDate()); handlingUnit.setManufactureDate(ifsStock.getManufactureDate());
handlingUnit.setExpiredDate(ifsStock.getExpiredDate()); handlingUnit.setExpiredDate(ifsStock.getExpiredDate());
handlingUnit.setUmId(request.getUmid()); handlingUnit.setUmId(request.getUmid());
handlingUnit.setEngChgLevel(ifsStock.getEngChgLevel() != null ? ifsStock.getEngChgLevel() : 1); // 设置工程变更级别默认1
handlingUnit.setEngChgLevel(ifsStock.getEngChgLevel() != null ? ifsStock.getEngChgLevel() : "1"); // 设置工程变更级别默认1
// 保存余数HandlingUnit // 保存余数HandlingUnit
boolean saveResult = handlingUnitService.save(handlingUnit); boolean saveResult = handlingUnitService.save(handlingUnit);
@ -480,7 +480,7 @@ public class IfsInventoryInitServiceImpl implements IfsInventoryInitService {
} }
handlingUnit.setUmId(request.getUmid()); handlingUnit.setUmId(request.getUmid());
handlingUnit.setEngChgLevel(1); // 其它入库默认工程变更级别为1
handlingUnit.setEngChgLevel("1"); // 其它入库默认工程变更级别为1
// 设置备注 // 设置备注
if (request.getRemark() != null && !request.getRemark().trim().isEmpty()) { if (request.getRemark() != null && !request.getRemark().trim().isEmpty()) {
@ -647,7 +647,7 @@ public class IfsInventoryInitServiceImpl implements IfsInventoryInitService {
handlingUnit.setManufactureDate(ifsStock.getManufactureDate()); handlingUnit.setManufactureDate(ifsStock.getManufactureDate());
handlingUnit.setExpiredDate(ifsStock.getExpiredDate()); handlingUnit.setExpiredDate(ifsStock.getExpiredDate());
handlingUnit.setUmId(item.getUmid()); handlingUnit.setUmId(item.getUmid());
handlingUnit.setEngChgLevel(ifsStock.getEngChgLevel() != null ? ifsStock.getEngChgLevel() : 1); // 设置工程变更级别默认1
handlingUnit.setEngChgLevel(ifsStock.getEngChgLevel() != null ? ifsStock.getEngChgLevel() : "1"); // 设置工程变更级别默认1
// 保存HandlingUnit // 保存HandlingUnit
boolean saveResult = handlingUnitService.save(handlingUnit); boolean saveResult = handlingUnitService.save(handlingUnit);

Loading…
Cancel
Save