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

单据校验修改

Browse Source
workplace
anthonywj 11 months ago
parent dce16042f0
commit 0d2db0eb60
3 changed files with 82 additions and 33 deletions
Show Stats Download Patch File Download Diff File

112
src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java
Unescape Escape View File

@ -159,22 +159,47 @@ public class IoCollectOrderCodeManController extends BaseController {
collectOrderBiz = vailByBatchNo(udiRelevanceResponses, collectOrderBizs, udiEntity); collectOrderBiz = vailByBatchNo(udiRelevanceResponses, collectOrderBizs, udiEntity);
if (IntUtil.value(workPlace.getCheckInsert()) == 1) {
//信息提醒
if (collectOrderBiz == null) {
collectOrderBiz = scanGenOrder(udiRelevanceResponses, collectOrderBizs, udiEntity);
collectOrderBiz.setOrderIdFk(collectOrder.getBillNo());
} else {
collectOrderBiz.setScanCount(IntUtil.value(collectOrderBiz.getScanCount()) + 1);
}
} else { switch (workPlace.getCheckInsert()) {
//禁止录入 case 1: //插入
if (collectOrderBiz == null) if (collectOrderBiz == null) {
return ResultVOUtils.error(500, "非此单据追溯码！"); collectOrderBiz = scanGenOrder(udiRelevanceResponses, collectOrderBizs, udiEntity);
else { collectOrderBiz.setOrderIdFk(collectOrder.getBillNo());
collectOrderBiz.setScanCount(IntUtil.value(collectOrderBiz.getScanCount()) + 1); } else {
} collectOrderBiz.setScanCount(collectOrderBiz.getScanCount() + 1);
}
break;
case 2: //不插入
if (collectOrderBiz == null)
return ResultVOUtils.error(500, "非此单据追溯码！");
int count = collectOrderBiz.getScanCount() + 1;
if (count > collectOrderBiz.getCount()) {
return ResultVOUtils.error(500, "扫码数量超出！");
}
collectOrderBiz.setScanCount(count);
break;
case 3: //提醒是否插入
if (!IntUtil.value(addTagCodeReqeust.getInsert())) {
if (collectOrderBiz == null)
return ResultVOUtils.error(502, "非此单据追溯码！");
int count1 = collectOrderBiz.getScanCount() + 1;
if (count1 > collectOrderBiz.getCount()) {
return ResultVOUtils.error(502, "扫码数量超出！");
}
} else {
if (collectOrderBiz == null) {
collectOrderBiz = scanGenOrder(udiRelevanceResponses, collectOrderBizs, udiEntity);
collectOrderBiz.setOrderIdFk(collectOrder.getBillNo());
} else {
collectOrderBiz.setScanCount(collectOrderBiz.getScanCount() + 1);
}
}
break;
default:
break;
} }
@ -190,23 +215,46 @@ public class IoCollectOrderCodeManController extends BaseController {
//按单不校验三期 //按单不校验三期
collectOrderBiz = vailNoBatchNo(udiRelevanceResponses, collectOrderBizs); collectOrderBiz = vailNoBatchNo(udiRelevanceResponses, collectOrderBizs);
//先不管 switch (workPlace.getCheckInsert()) {
if (IntUtil.value(workPlace.getCheckInsert()) == 1) { case 1: //插入
//信息提醒 if (collectOrderBiz == null) {
if (collectOrderBiz == null) { collectOrderBiz = scanGenOrder(udiRelevanceResponses, collectOrderBizs, udiEntity);
collectOrderBiz = scanGenOrder(udiRelevanceResponses, collectOrderBizs, udiEntity); collectOrderBiz.setOrderIdFk(collectOrder.getBillNo());
collectOrderBiz.setOrderIdFk(collectOrder.getBillNo()); } else {
} else { collectOrderBiz.setScanCount(collectOrderBiz.getScanCount() + 1);
collectOrderBiz.setScanCount(IntUtil.value(collectOrderBiz.getScanCount()) + 1); }
} break;
case 2: //不插入
} else { if (collectOrderBiz == null)
//禁止录入 return ResultVOUtils.error(500, "非此单据追溯码！");
if (collectOrderBiz == null) int count = collectOrderBiz.getScanCount() + 1;
return ResultVOUtils.error(500, "非此单据追溯码！"); if (count > collectOrderBiz.getCount()) {
else { return ResultVOUtils.error(500, "扫码数量超出！");
collectOrderBiz.setScanCount(IntUtil.value(collectOrderBiz.getScanCount()) + 1); }
} collectOrderBiz.setScanCount(count);
break;
case 3: //提醒是否插入
if (!IntUtil.value(addTagCodeReqeust.getInsert())) {
if (collectOrderBiz == null)
return ResultVOUtils.error(502, "非此单据追溯码！");
int count1 = collectOrderBiz.getScanCount() + 1;
if (count1 > collectOrderBiz.getCount()) {
return ResultVOUtils.error(502, "扫码数量超出！");
}
} else {
if (collectOrderBiz == null) {
collectOrderBiz = scanGenOrder(udiRelevanceResponses, collectOrderBizs, udiEntity);
collectOrderBiz.setOrderIdFk(collectOrder.getBillNo());
} else {
collectOrderBiz.setScanCount(collectOrderBiz.getScanCount() + 1);
}
}
break;
default:
break;
} }
} }
collectOrderBizService.updateById(collectOrderBiz); collectOrderBizService.updateById(collectOrderBiz);

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

@ -293,7 +293,7 @@ public class IoCodeTempController extends BaseController {
return baseResponse; return baseResponse;
} }
} }
BaseResponse baseResponse = ResultVOUtils.error(502, "校验未完成"); BaseResponse baseResponse = ResultVOUtils.error(502, "校验未完成,缺少" + lostMsg.substring(1));
udiEntity.setCode(code); udiEntity.setCode(code);
baseResponse.setData(udiEntity); baseResponse.setData(udiEntity);
return baseResponse; return baseResponse;

1
src/main/java/com/glxp/api/req/inout/AddTagCodeReqeust.java
Unescape Escape View File

@ -23,6 +23,7 @@ public class AddTagCodeReqeust {
private String workPlaceCode; private String workPlaceCode;
private String fromCorp; private String fromCorp;
private String invCode; private String invCode;
private Boolean insert;
} }

Write Preview
Loading…
Cancel
Save