UDI
/
udi-wms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

单据类型初始化问题

Browse Source
dev2.0
anthonywj 2 years ago
parent 5ab0fa6296
commit dbd58892ee
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File

18
src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
Unescape Escape View File

@ -418,8 +418,8 @@ public class IoCodeTempController extends BaseController {
//过期提醒： //过期提醒：
// SystemParamConfigEntity expireParamConfigEntity = systemParamConfigService.selectByParamKey("expire_date_tip"); // SystemParamConfigEntity expireParamConfigEntity = systemParamConfigService.selectByParamKey("expire_date_tip");
//bussinessTypeEntity.getCheckVailDate() == 1 && !addOrderRequest.isIgnoreExpire() //IntUtil.value(bussinessTypeEntity.getCheckVailDate()) == 1 && !addOrderRequest.isIgnoreExpire()
if (bussinessTypeEntity.getCheckExpire() == 1 && !addOrderRequest.isIgnoreExpire()) { if (IntUtil.value(bussinessTypeEntity.getCheckExpire()) == 1 && !addOrderRequest.isIgnoreExpire()) {
if (StrUtil.isNotEmpty(udiEntity.getExpireDate())) { if (StrUtil.isNotEmpty(udiEntity.getExpireDate())) {
String expireDate = "20" + udiEntity.getExpireDate(); String expireDate = "20" + udiEntity.getExpireDate();
long expireTime = MsDateUtil.parseDateExpire(expireDate); long expireTime = MsDateUtil.parseDateExpire(expireDate);
@ -428,7 +428,7 @@ public class IoCodeTempController extends BaseController {
} }
} }
} }
if (bussinessTypeEntity.getCheckExpire() == 2) { if (IntUtil.value(bussinessTypeEntity.getCheckExpire()) == 2) {
if (StrUtil.isNotEmpty(udiEntity.getExpireDate())) { if (StrUtil.isNotEmpty(udiEntity.getExpireDate())) {
String expireDate = "20" + udiEntity.getExpireDate(); String expireDate = "20" + udiEntity.getExpireDate();
long expireTime = MsDateUtil.parseDateExpire(expireDate); long expireTime = MsDateUtil.parseDateExpire(expireDate);
@ -445,7 +445,7 @@ public class IoCodeTempController extends BaseController {
long recent = 0; long recent = 0;
if (udiRelevanceResponse.getRecentDateTime() != null) if (udiRelevanceResponse.getRecentDateTime() != null)
recent = udiRelevanceResponse.getRecentDateTime().longValue(); recent = udiRelevanceResponse.getRecentDateTime().longValue();
if (bussinessTypeEntity.getCheckVailDate() == 1 && recent > 0 && !addOrderRequest.isIgnoreRecentExpire() && udiRelevanceResponse.getIsDateBy() == 2) { if (IntUtil.value(bussinessTypeEntity.getCheckVailDate()) == 1 && recent > 0 && !addOrderRequest.isIgnoreRecentExpire() && udiRelevanceResponse.getIsDateBy() == 2) {
if (StrUtil.isNotEmpty(udiEntity.getExpireDate())) { if (StrUtil.isNotEmpty(udiEntity.getExpireDate())) {
String expireDate = "20" + udiEntity.getExpireDate(); String expireDate = "20" + udiEntity.getExpireDate();
long expireTime = MsDateUtil.parseDateExpire(expireDate); long expireTime = MsDateUtil.parseDateExpire(expireDate);
@ -462,7 +462,7 @@ public class IoCodeTempController extends BaseController {
} }
} }
if (bussinessTypeEntity.getCheckVailDate() == 1 && recent > 0 && !addOrderRequest.isIgnoreRecentExpire() && udiRelevanceResponse.getIsDateBy() == 1) { if (IntUtil.value(bussinessTypeEntity.getCheckVailDate()) == 1 && recent > 0 && !addOrderRequest.isIgnoreRecentExpire() && udiRelevanceResponse.getIsDateBy() == 1) {
if (StrUtil.isNotEmpty(udiEntity.getExpireDate())) { if (StrUtil.isNotEmpty(udiEntity.getExpireDate())) {
String expireDate = "20" + udiEntity.getExpireDate(); String expireDate = "20" + udiEntity.getExpireDate();
long expireTime = MsDateUtil.parseDateExpire(expireDate); long expireTime = MsDateUtil.parseDateExpire(expireDate);
@ -1408,7 +1408,7 @@ public class IoCodeTempController extends BaseController {
//过期提醒： //过期提醒：
if (bussinessTypeEntity.getCheckExpire() == 1 && !addOrderRequest.isIgnoreExpire()) { if (IntUtil.value(bussinessTypeEntity.getCheckExpire()) == 1 && !addOrderRequest.isIgnoreExpire()) {
if (StrUtil.isNotEmpty(udiEntity.getExpireDate())) { if (StrUtil.isNotEmpty(udiEntity.getExpireDate())) {
String expireDate = "20" + udiEntity.getExpireDate(); String expireDate = "20" + udiEntity.getExpireDate();
long expireTime = MsDateUtil.parseDateExpire(expireDate); long expireTime = MsDateUtil.parseDateExpire(expireDate);
@ -1417,7 +1417,7 @@ public class IoCodeTempController extends BaseController {
} }
} }
} }
if (bussinessTypeEntity.getCheckExpire() == 2) { if (IntUtil.value(bussinessTypeEntity.getCheckExpire()) == 2) {
if (StrUtil.isNotEmpty(udiEntity.getExpireDate())) { if (StrUtil.isNotEmpty(udiEntity.getExpireDate())) {
String expireDate = "20" + udiEntity.getExpireDate(); String expireDate = "20" + udiEntity.getExpireDate();
long expireTime = MsDateUtil.parseDateExpire(expireDate); long expireTime = MsDateUtil.parseDateExpire(expireDate);
@ -1430,7 +1430,7 @@ public class IoCodeTempController extends BaseController {
long recent = 0; long recent = 0;
if (udiRelevanceResponse.getRecentDateTime() != null) if (udiRelevanceResponse.getRecentDateTime() != null)
recent = udiRelevanceResponse.getRecentDateTime().longValue(); recent = udiRelevanceResponse.getRecentDateTime().longValue();
if (bussinessTypeEntity.getCheckVailDate() == 1 && recent > 0 && !addOrderRequest.isIgnoreRecentExpire() && udiRelevanceResponse.getIsDateBy() == 2) { if (IntUtil.value(bussinessTypeEntity.getCheckVailDate()) == 1 && recent > 0 && !addOrderRequest.isIgnoreRecentExpire() && udiRelevanceResponse.getIsDateBy() == 2) {
if (StrUtil.isNotEmpty(udiEntity.getExpireDate())) { if (StrUtil.isNotEmpty(udiEntity.getExpireDate())) {
String expireDate = "20" + udiEntity.getExpireDate(); String expireDate = "20" + udiEntity.getExpireDate();
long expireTime = MsDateUtil.parseDateExpire(expireDate); long expireTime = MsDateUtil.parseDateExpire(expireDate);
@ -1447,7 +1447,7 @@ public class IoCodeTempController extends BaseController {
} }
} }
if (bussinessTypeEntity.getCheckVailDate() == 1 && recent > 0 && !addOrderRequest.isIgnoreRecentExpire() && udiRelevanceResponse.getIsDateBy() == 1) { if (IntUtil.value(bussinessTypeEntity.getCheckVailDate()) == 1 && recent > 0 && !addOrderRequest.isIgnoreRecentExpire() && udiRelevanceResponse.getIsDateBy() == 1) {
if (StrUtil.isNotEmpty(udiEntity.getExpireDate())) { if (StrUtil.isNotEmpty(udiEntity.getExpireDate())) {
String expireDate = "20" + udiEntity.getExpireDate(); String expireDate = "20" + udiEntity.getExpireDate();
long expireTime = MsDateUtil.parseDateExpire(expireDate); long expireTime = MsDateUtil.parseDateExpire(expireDate);

2
src/main/java/com/glxp/api/controller/inv/InvPreinOrderController.java
Unescape Escape View File

@ -128,7 +128,7 @@ public class InvPreinOrderController extends BaseController {
if (count <= 0) { if (count <= 0) {
return ResultVOUtils.error(500, "预验收库存数量不足！"); return ResultVOUtils.error(500, "预验收库存数量不足！");
} else { } else {
if (StrUtil.isNotEmpty(invPreinDetailEntity.getBatchNo()) && StrUtil.isNotEmpty(codeTempEntity.getBatchNo()) if (invPreinDetailEntity != null && StrUtil.isNotEmpty(invPreinDetailEntity.getBatchNo()) && StrUtil.isNotEmpty(codeTempEntity.getBatchNo())
&& !invPreinDetailEntity.getBatchNo().equals(codeTempEntity.getBatchNo())) { && !invPreinDetailEntity.getBatchNo().equals(codeTempEntity.getBatchNo())) {
return ResultVOUtils.error(500, "当前批次号与预验收录入批次号不匹配！"); return ResultVOUtils.error(500, "当前批次号与预验收录入批次号不匹配！");
} }

2
src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java
Unescape Escape View File

@ -43,7 +43,7 @@ public class BasicBussinessTypeEntity {
* 是否启用, 0：未启用 1：可查看，2：可编辑 * 是否启用, 0：未启用 1：可查看，2：可编辑
*/ */
@TableField(value = "enable") @TableField(value = "enable")
private Integer enable; private boolean enable;
/** /**
* 备注 * 备注

Write Preview
Loading…
Cancel
Save