|
|
|
@ -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<IoCollectCodeResponse> 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());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|