|
|
|
@ -45,13 +45,13 @@ public class IoCollectCodeBackupController extends BaseController {
|
|
|
|
|
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
|
|
|
|
}
|
|
|
|
|
List<IoCollectCodeResponse> collectOrderCodeManResponses = ioCollectCodeBackService.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());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
@ -65,14 +65,15 @@ public class IoCollectCodeBackupController extends BaseController {
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 根据id删除追溯码表
|
|
|
|
|
*
|
|
|
|
|
* @param IoCollectCodeBackup
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
@PostMapping("/udiwms/basic/collect/ioCollectCodeBackup/deleteCollectCode")
|
|
|
|
|
public BaseResponse deleteCollectCode(@RequestBody IoCollectCodeBackup IoCollectCodeBackup) {
|
|
|
|
|
boolean b = ioCollectCodeBackService.removeById(IoCollectCodeBackup);
|
|
|
|
|
if (!b){
|
|
|
|
|
return ResultVOUtils.error(500,"删除失败");
|
|
|
|
|
if (!b) {
|
|
|
|
|
return ResultVOUtils.error(500, "删除失败");
|
|
|
|
|
}
|
|
|
|
|
return ResultVOUtils.success("删除成功");
|
|
|
|
|
}
|
|
|
|
@ -80,6 +81,7 @@ public class IoCollectCodeBackupController extends BaseController {
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 根据id删除追溯码表
|
|
|
|
|
*
|
|
|
|
|
* @param IoCollectCodeBackup
|
|
|
|
|
* @param bindingResult
|
|
|
|
|
* @return
|
|
|
|
@ -91,8 +93,8 @@ public class IoCollectCodeBackupController extends BaseController {
|
|
|
|
|
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
|
|
|
|
}
|
|
|
|
|
boolean b = ioCollectCodeBackService.updateById(IoCollectCodeBackup);
|
|
|
|
|
if (!b){
|
|
|
|
|
return ResultVOUtils.error(500,"更新失败");
|
|
|
|
|
if (!b) {
|
|
|
|
|
return ResultVOUtils.error(500, "更新失败");
|
|
|
|
|
}
|
|
|
|
|
return ResultVOUtils.success("更新成功");
|
|
|
|
|
}
|
|
|
|
|