|
|
@ -457,8 +457,8 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
|
|
|
|
switch (sysWorkplaceDocumentEntity.getCheckInsert()) {
|
|
|
|
switch (sysWorkplaceDocumentEntity.getCheckInsert()) {
|
|
|
|
case 1: //插入
|
|
|
|
case 1: //插入
|
|
|
|
if (collectOrderBiz == null) {
|
|
|
|
if (collectOrderBiz == null) {
|
|
|
|
collectOrderBiz = scanGenOrder(udiRelevanceResponses, collectOrderBizs, udiEntity, collectOrder);
|
|
|
|
if (collectOrderBiz == null)
|
|
|
|
collectOrderBiz.setOrderIdFk(collectOrder.getBillNo());
|
|
|
|
throw new JsonException(500, addTagCodeReqeust.getCode() + "非此单据追溯码,请检查!");
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
collectOrderBiz.setAddScanCount(1);
|
|
|
|
collectOrderBiz.setAddScanCount(1);
|
|
|
|
collectOrderBiz.setAddScanActCount(scanCount);
|
|
|
|
collectOrderBiz.setAddScanActCount(scanCount);
|
|
|
@ -486,7 +486,7 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
|
|
|
|
|
|
|
|
|
|
|
|
if (!IntUtil.value(addTagCodeReqeust.getInsert())) {
|
|
|
|
if (!IntUtil.value(addTagCodeReqeust.getInsert())) {
|
|
|
|
if (collectOrderBiz == null)
|
|
|
|
if (collectOrderBiz == null)
|
|
|
|
throw new JsonException(502, addTagCodeReqeust.getCode() + "非此单据追溯码,是否继续添加?");
|
|
|
|
throw new JsonException(500, addTagCodeReqeust.getCode() + "非此单据追溯码,请检查!");
|
|
|
|
int count1 = IntUtil.value(collectOrderBiz.getScanCount()) + 1;
|
|
|
|
int count1 = IntUtil.value(collectOrderBiz.getScanCount()) + 1;
|
|
|
|
int actCount1 = 0;
|
|
|
|
int actCount1 = 0;
|
|
|
|
actCount1 = IntUtil.value(collectOrderBiz.getScanActCount()) + scanCount;
|
|
|
|
actCount1 = IntUtil.value(collectOrderBiz.getScanActCount()) + scanCount;
|
|
|
@ -642,7 +642,6 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
|
|
|
|
collectOrderBiz.setAddActCount(actCount);
|
|
|
|
collectOrderBiz.setAddActCount(actCount);
|
|
|
|
collectOrderBiz.setAddScanActCount(actCount);
|
|
|
|
collectOrderBiz.setAddScanActCount(actCount);
|
|
|
|
collectOrderBiz.setScanCount(IntUtil.value(collectOrderBiz.getScanCount()) + 1);
|
|
|
|
collectOrderBiz.setScanCount(IntUtil.value(collectOrderBiz.getScanCount()) + 1);
|
|
|
|
|
|
|
|
|
|
|
|
return collectOrderBiz;
|
|
|
|
return collectOrderBiz;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|