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

Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z

Browse Source
dev_no_inv
chenhc 9 months ago
parent bfaae7675e 987fb774c0
commit 081bf3c658
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File

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

@ -810,7 +810,7 @@ public class IoCodeTempController extends BaseController {
//校验工位存量是否存在 //校验工位存量是否存在
if (bussinessTypeEntity.getAction().equals(ConstantType.SPLIT_OUT)) { if (bussinessTypeEntity.getAction().equals(ConstantType.SPLIT_OUT)) {
IoSplitFifoCodeEntity fifoCodeEntity = fifoCodeService.findByCode(code, addOrderRequest.getWorkPlaceCode()); IoSplitFifoCodeEntity fifoCodeEntity = fifoCodeService.findByCode(code, null);
if (fifoCodeEntity != null && StrUtil.isNotEmpty(fifoCodeEntity.getSerialNo())) { if (fifoCodeEntity != null && StrUtil.isNotEmpty(fifoCodeEntity.getSerialNo())) {
return ResultVOUtils.error(533, "当前追溯码已存在！"); return ResultVOUtils.error(533, "当前追溯码已存在！");
} }
@ -824,7 +824,7 @@ public class IoCodeTempController extends BaseController {
} else if (bussinessTypeEntity.getAction().equals(ConstantType.SPLIT_RETURN)) { } else if (bussinessTypeEntity.getAction().equals(ConstantType.SPLIT_RETURN)) {
IoSplitFifoCodeEntity fifoCodeEntity = fifoCodeService.findByCode(code, addOrderRequest.getWorkPlaceCode()); IoSplitFifoCodeEntity fifoCodeEntity = fifoCodeService.findByCode(code, null);
if (fifoCodeEntity == null) { if (fifoCodeEntity == null) {
return ResultVOUtils.error(500, "当前追溯码未上货！"); return ResultVOUtils.error(500, "当前追溯码未上货！");
} }
@ -1316,14 +1316,14 @@ public class IoCodeTempController extends BaseController {
//------工位上货相关-----校验工位存量是否存在---- //------工位上货相关-----校验工位存量是否存在----
if (bussinessTypeEntity.getAction().equals(ConstantType.SPLIT_OUT)) { if (bussinessTypeEntity.getAction().equals(ConstantType.SPLIT_OUT)) {
IoSplitFifoCodeEntity fifoCodeEntity = fifoCodeService.findByCode(code, addOrderRequest.getWorkPlaceCode()); IoSplitFifoCodeEntity fifoCodeEntity = fifoCodeService.findByCode(code, null);
if (fifoCodeEntity != null && StrUtil.isNotEmpty(fifoCodeEntity.getSerialNo())) { if (fifoCodeEntity != null && StrUtil.isNotEmpty(fifoCodeEntity.getSerialNo())) {
return ResultVOUtils.error(533, "当前追溯码已存在！"); return ResultVOUtils.error(533, "当前追溯码已存在！");
} }
IoSplitCodeEntity splitCodeEntity = splitCodeService.findByCode(code); IoSplitCodeEntity splitCodeEntity = splitCodeService.findByCode(code);
if (splitCodeEntity != null && StrUtil.isNotEmpty(splitCodeEntity.getSerialNo())) { if (splitCodeEntity != null) {//&& StrUtil.isNotEmpty(splitCodeEntity.getSerialNo())
return ResultVOUtils.error(533, "当前追溯码已存在！"); return ResultVOUtils.error(533, "当前追溯码已存在拆零库存！");
} }
//校验码表是否已经存在追溯码 io_code_temp //校验码表是否已经存在追溯码 io_code_temp
@ -1333,13 +1333,13 @@ public class IoCodeTempController extends BaseController {
} }
} else if (bussinessTypeEntity.getAction().equals(ConstantType.SPLIT_RETURN)) { } else if (bussinessTypeEntity.getAction().equals(ConstantType.SPLIT_RETURN)) {
IoSplitFifoCodeEntity fifoCodeEntity = fifoCodeService.findByCode(code, addOrderRequest.getWorkPlaceCode()); IoSplitFifoCodeEntity fifoCodeEntity = fifoCodeService.findByCode(code, null);
if (fifoCodeEntity == null) { if (fifoCodeEntity == null) {
return ResultVOUtils.error(500, "当前追溯码未上货！"); return ResultVOUtils.error(500, "当前追溯码未上货！");
} }
IoSplitCodeEntity splitCodeEntity = splitCodeService.findByCode(code); IoSplitCodeEntity splitCodeEntity = splitCodeService.findByCode(code);
if (splitCodeEntity != null && StrUtil.isNotEmpty(splitCodeEntity.getSerialNo())) { if (splitCodeEntity != null) {//&& StrUtil.isNotEmpty(splitCodeEntity.getSerialNo())
return ResultVOUtils.error(533, "当前追溯码已经拆零，无法退货！"); return ResultVOUtils.error(533, "当前追溯码已经拆零，无法退货！");
} }

Write Preview
Loading…
Cancel
Save