Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
86e6286038
|
|
@ -218,9 +218,9 @@ public class AppBackApplyController extends BaseController {
|
||||||
if (CollUtil.isEmpty(record.getBackApplyDetails())) {
|
if (CollUtil.isEmpty(record.getBackApplyDetails())) {
|
||||||
return AjaxResult.error("退料设备明细为空,请重新选择后上传!");
|
return AjaxResult.error("退料设备明细为空,请重新选择后上传!");
|
||||||
}
|
}
|
||||||
|
backApplyService.updateBackInfo(record.getParentId(),record.getCompanyId());
|
||||||
for (BackApplyInfo backApplyInfo : record.getBackApplyDetails()) {
|
for (BackApplyInfo backApplyInfo : record.getBackApplyDetails()) {
|
||||||
backApplyInfo.setParentId(record.getParentId());
|
backApplyInfo.setParentId(record.getParentId());
|
||||||
backApplyService.updateBackInfo(record.getParentId(),record.getCompanyId());
|
|
||||||
boolean re = backApplyService.upload(backApplyInfo) > 0;
|
boolean re = backApplyService.upload(backApplyInfo) > 0;
|
||||||
if (!re) {
|
if (!re) {
|
||||||
return AjaxResult.error("退料任务明细插入失败");
|
return AjaxResult.error("退料任务明细插入失败");
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue