UDI
/
udi-cpt-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug修改

Browse Source
cert
anthonywj 2 years ago
parent 05c809dc10
commit 496b4e8fc7
2 changed files with 93 additions and 92 deletions
Show Stats Download Patch File Download Diff File

184
src/main/java/com/glxp/api/controller/trace/UdiTraceController.java
Unescape Escape View File

@ -290,97 +290,97 @@ public class UdiTraceController extends BaseController {
} }
/** // /**
* 客户端根据任务上传出入库单据 // * 客户端根据任务上传出入库单据
* // *
* @param traceOrderUploadRequest // * @param traceOrderUploadRequest
* @param bindingResult // * @param bindingResult
* @return // * @return
*/ // */
@Transactional // @Transactional
@ApiOperation(value = "客户端根据任务上传出入库单据", response = BaseResponse.class) // @ApiOperation(value = "客户端根据任务上传出入库单据", response = BaseResponse.class)
@AuthRuleAnnotation("udi/trace/order/upload") // @AuthRuleAnnotation("udi/trace/order/upload")
@PostMapping("udi/trace/order/upload") // @PostMapping("udi/trace/order/upload")
public BaseResponse uploadOrder(@RequestBody TraceOrderUploadRequest traceOrderUploadRequest, BindingResult bindingResult) { // public BaseResponse uploadOrder(@RequestBody TraceOrderUploadRequest traceOrderUploadRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { // if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); // return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
} // }
//
TraceTaskNoticeEntity taskNoticeEntity = traceTaskNoticeService.getById(traceOrderUploadRequest.getTaskId()); // TraceTaskNoticeEntity taskNoticeEntity = traceTaskNoticeService.getById(traceOrderUploadRequest.getTaskId());
if (taskNoticeEntity == null) { // if (taskNoticeEntity == null) {
return ResultVOUtils.error(500, "任务已过期，或任务不存在！"); // return ResultVOUtils.error(500, "任务已过期，或任务不存在！");
} // }
//
//清空历史数据 // //清空历史数据
traceOrderService.deleteByCompanyId(taskNoticeEntity.getProdudctRecordIdFk(), taskNoticeEntity.getCompanyIdFk()); // traceOrderService.deleteByCompanyId(taskNoticeEntity.getProdudctRecordIdFk(), taskNoticeEntity.getCompanyIdFk());
//
TraceOrderEntity traceOrderEntity = new TraceOrderEntity(); // TraceOrderEntity traceOrderEntity = new TraceOrderEntity();
BeanUtils.copyProperties(traceOrderUploadRequest, traceOrderEntity); // BeanUtils.copyProperties(traceOrderUploadRequest, traceOrderEntity);
traceOrderEntity.setId(IdUtil.getSnowflakeNextId()); // traceOrderEntity.setId(IdUtil.getSnowflakeNextId());
traceOrderEntity.setUpdateTime(new Date()); // traceOrderEntity.setUpdateTime(new Date());
traceOrderService.save(traceOrderEntity); // traceOrderService.save(traceOrderEntity);
//
//设置任务已完成 // //设置任务已完成
taskNoticeEntity.setStatus(3); // taskNoticeEntity.setStatus(3);
traceTaskNoticeService.updateById(taskNoticeEntity); // traceTaskNoticeService.updateById(taskNoticeEntity);
udiTraceService.pushDelayRemoveTask(taskNoticeEntity); // udiTraceService.pushDelayRemoveTask(taskNoticeEntity);
return ResultVOUtils.success("上传成功"); // return ResultVOUtils.success("上传成功");
} // }
//
//
/** // /**
* 客户端根据任务上传生产关联关系信息 // * 客户端根据任务上传生产关联关系信息
* // *
* @param traceManuOrderUploadRequest // * @param traceManuOrderUploadRequest
* @param bindingResult // * @param bindingResult
* @return // * @return
*/ // */
@Transactional // @Transactional
@ApiOperation(value = "客户端根据任务上传生产关联关系信息", response = BaseResponse.class) // @ApiOperation(value = "客户端根据任务上传生产关联关系信息", response = BaseResponse.class)
@AuthRuleAnnotation("udi/trace/manuOrder/upload") // @AuthRuleAnnotation("udi/trace/manuOrder/upload")
@PostMapping("udi/trace/manuOrder/upload") // @PostMapping("udi/trace/manuOrder/upload")
public BaseResponse uploadManuOrder(@RequestBody TraceManuOrderUploadRequest traceManuOrderUploadRequest, BindingResult bindingResult) { // public BaseResponse uploadManuOrder(@RequestBody TraceManuOrderUploadRequest traceManuOrderUploadRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { // if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); // return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
} // }
//
//
TraceTaskNoticeEntity taskNoticeEntity = traceTaskNoticeService.getById(traceManuOrderUploadRequest.getTaskId()); // TraceTaskNoticeEntity taskNoticeEntity = traceTaskNoticeService.getById(traceManuOrderUploadRequest.getTaskId());
if (taskNoticeEntity == null) { // if (taskNoticeEntity == null) {
return ResultVOUtils.error(500, "任务已过期，或任务不存在！"); // return ResultVOUtils.error(500, "任务已过期，或任务不存在！");
} // }
//
//清除历史数据 // //清除历史数据
TraceManuOrderEntity originOrder = traceManuOrderService.findByBillNo(traceManuOrderUploadRequest.getBillNo(), taskNoticeEntity.getProdudctRecordIdFk(), taskNoticeEntity.getCompanyIdFk()); // TraceManuOrderEntity originOrder = traceManuOrderService.findByBillNo(traceManuOrderUploadRequest.getBillNo(), taskNoticeEntity.getProdudctRecordIdFk(), taskNoticeEntity.getCompanyIdFk());
if (originOrder != null) { // if (originOrder != null) {
traceManuOrderService.removeById(originOrder.getId()); // traceManuOrderService.removeById(originOrder.getId());
traceManuCodeRelService.remove(new QueryWrapper<TraceManuCodeRelEntity>().eq("manuOrderIdFk", originOrder.getId())); // traceManuCodeRelService.remove(new QueryWrapper<TraceManuCodeRelEntity>().eq("manuOrderIdFk", originOrder.getId()));
} // }
//
//新增生产订单 // //新增生产订单
TraceManuOrderEntity traceManuOrderEntity = new TraceManuOrderEntity(); // TraceManuOrderEntity traceManuOrderEntity = new TraceManuOrderEntity();
BeanUtils.copyProperties(traceManuOrderUploadRequest, traceManuOrderEntity); // BeanUtils.copyProperties(traceManuOrderUploadRequest, traceManuOrderEntity);
traceManuOrderEntity.setId(IdUtil.getSnowflakeNextId()); // traceManuOrderEntity.setId(IdUtil.getSnowflakeNextId());
traceManuOrderService.save(traceManuOrderEntity); // traceManuOrderService.save(traceManuOrderEntity);
//
//新增订单关联明细 // //新增订单关联明细
List<TraceManuDetailRequest> traceManuDetailRequests = traceManuOrderUploadRequest.getDetails(); // List<TraceManuDetailRequest> traceManuDetailRequests = traceManuOrderUploadRequest.getDetails();
if (CollUtil.isNotEmpty(traceManuDetailRequests)) { // if (CollUtil.isNotEmpty(traceManuDetailRequests)) {
for (TraceManuDetailRequest traceManuDetailRequest : traceManuDetailRequests) { // for (TraceManuDetailRequest traceManuDetailRequest : traceManuDetailRequests) {
TraceManuCodeRelEntity traceManuCodeRelEntity = new TraceManuCodeRelEntity(); // TraceManuCodeRelEntity traceManuCodeRelEntity = new TraceManuCodeRelEntity();
BeanUtils.copyProperties(traceManuDetailRequest, traceManuCodeRelEntity); // BeanUtils.copyProperties(traceManuDetailRequest, traceManuCodeRelEntity);
traceManuCodeRelEntity.setId(IdUtil.getSnowflakeNextId()); // traceManuCodeRelEntity.setId(IdUtil.getSnowflakeNextId());
traceManuCodeRelEntity.setManuOrderIdFk(traceManuOrderEntity.getId()); // traceManuCodeRelEntity.setManuOrderIdFk(traceManuOrderEntity.getId());
traceManuOrderService.save(traceManuOrderEntity); // traceManuOrderService.save(traceManuOrderEntity);
} // }
} // }
//
//设置任务已完成 // //设置任务已完成
taskNoticeEntity.setStatus(3); // taskNoticeEntity.setStatus(3);
traceTaskNoticeService.updateById(taskNoticeEntity); // traceTaskNoticeService.updateById(taskNoticeEntity);
udiTraceService.pushDelayRemoveTask(taskNoticeEntity); // udiTraceService.pushDelayRemoveTask(taskNoticeEntity);
//
return ResultVOUtils.success("上传成功"); // return ResultVOUtils.success("上传成功");
} // }
} }

1
src/main/resources/mybatis/mapper/trace/TraceOrderMapper.xml
Unescape Escape View File

@ -78,6 +78,7 @@
and batchNo = #{batchNo} and batchNo = #{batchNo}
</if> </if>
</where> </where>
order by trace_order.billDate
</select> </select>

Write Preview
Loading…
Cancel
Save