diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectCodeController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectCodeController.java index abf01c0a8..543f6546a 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectCodeController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectCodeController.java @@ -28,7 +28,6 @@ import java.util.List; public class IoCollectCodeController extends BaseController { - @Resource IoCollectCodeService collectCodeService; @@ -37,6 +36,7 @@ public class IoCollectCodeController extends BaseController { /** * 追溯码查询 + * * @param * @param bindingResult * @return @@ -48,13 +48,13 @@ public class IoCollectCodeController extends BaseController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } List collectOrderCodeManResponses = collectCodeService.filterList(IoCollectCodeRequest); - for (IoCollectCodeResponse ioCollectCodeResponse : collectOrderCodeManResponses){ + for (IoCollectCodeResponse ioCollectCodeResponse : collectOrderCodeManResponses) { if (StrUtil.isEmpty(ioCollectCodeResponse.getManufactory())) { ioCollectCodeResponse.setManufactory(ioCollectCodeResponse.getYlqxzcrbarmc()); } IoCollectOrder byBillNo = collectOrderService.getByBillNo(ioCollectCodeResponse.getBillNo()); ioCollectCodeResponse.setBillTime(byBillNo.getBillTime()); - if (byBillNo.getRemark() != null){ + if (byBillNo.getRemark() != null) { ioCollectCodeResponse.setRemark(byBillNo.getRemark()); } } diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectCodeService.java b/src/main/java/com/glxp/api/service/collect/IoCollectCodeService.java index 656d1ac95..6b16db8d8 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectCodeService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectCodeService.java @@ -70,6 +70,7 @@ public class IoCollectCodeService extends ServiceImpl splitCodes = collectOrderCodeAutoService.listByBillNo(collectOrderBizRequest.getOrderIdFk(), 1); List unSplitCodes = collectOrderCodeAutoService.listByBillNo(collectOrderBizRequest.getOrderIdFk(), 2); List manList = collectOrderCodeManService.listByBillNo(collectOrderBizRequest.getOrderIdFk()); + //todo 码表插入采购类型 for (CollectOrderBizResponse collectOrderBiz : list) { List temp1 = manList.stream() .filter(obj -> obj.getBizIdFk().equals(collectOrderBiz.getId())) @@ -91,6 +92,8 @@ public class IoCollectCodeService extends ServiceImpl