|
|
@ -129,6 +129,7 @@ public class IoCodeTempController extends BaseController {
|
|
|
|
@Resource
|
|
|
|
@Resource
|
|
|
|
IoCollectOrderBackupService ioCollectOrderBackupService;
|
|
|
|
IoCollectOrderBackupService ioCollectOrderBackupService;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* PDA-----单据上传
|
|
|
|
* PDA-----单据上传
|
|
|
|
*/
|
|
|
|
*/
|
|
|
@ -2836,14 +2837,27 @@ public class IoCodeTempController extends BaseController {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
});
|
|
|
|
});
|
|
|
|
addOrderCodeRequest.setCodeList(codeList);
|
|
|
|
List<String> codeOnelist = new ArrayList();
|
|
|
|
|
|
|
|
// 检查该码的所有一级码并且加入进去
|
|
|
|
|
|
|
|
for (String code : codeList) {
|
|
|
|
|
|
|
|
List<RelCodeDetail> list = relCodeDetailService.getAllNextOne(code);
|
|
|
|
|
|
|
|
if(list!=null && list.size() >0){
|
|
|
|
|
|
|
|
for (RelCodeDetail relCodeDetail : list) {
|
|
|
|
|
|
|
|
codeOnelist.add(relCodeDetail.getCurCode());
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}else {
|
|
|
|
|
|
|
|
codeOnelist.add(code);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
addOrderCodeRequest.setCodeList(codeOnelist);
|
|
|
|
addOrderCodeRequest.setCorpOrderId(orderFinishBillNo);
|
|
|
|
addOrderCodeRequest.setCorpOrderId(orderFinishBillNo);
|
|
|
|
|
|
|
|
|
|
|
|
AddCodeResult addCodeResult = new AddCodeResult();
|
|
|
|
AddCodeResult addCodeResult = new AddCodeResult();
|
|
|
|
if (CollUtil.isEmpty(codeList))
|
|
|
|
if (CollUtil.isEmpty(codeOnelist))
|
|
|
|
return ResultVOUtils.error(500, "追溯码不能为空");
|
|
|
|
return ResultVOUtils.error(500, "追溯码不能为空");
|
|
|
|
List<VailCodeResultResponse> vailCodeResultResponses = new ArrayList<>();
|
|
|
|
List<VailCodeResultResponse> vailCodeResultResponses = new ArrayList<>();
|
|
|
|
for (String code : codeList) {
|
|
|
|
for (String code : codeOnelist) {
|
|
|
|
VailCodeResultResponse vailCodeResultResponse = new VailCodeResultResponse();
|
|
|
|
VailCodeResultResponse vailCodeResultResponse = new VailCodeResultResponse();
|
|
|
|
AddOrderRequest addOrderRequest = new AddOrderRequest();
|
|
|
|
AddOrderRequest addOrderRequest = new AddOrderRequest();
|
|
|
|
BeanUtils.copyProperties(addOrderCodeRequest, addOrderRequest);
|
|
|
|
BeanUtils.copyProperties(addOrderCodeRequest, addOrderRequest);
|
|
|
|