|
|
@ -1035,6 +1035,9 @@ public class IoCodeTempController extends BaseController {
|
|
|
|
public BaseResponse deleteCodesTempById(@RequestParam("id") Integer id) {
|
|
|
|
public BaseResponse deleteCodesTempById(@RequestParam("id") Integer id) {
|
|
|
|
|
|
|
|
|
|
|
|
IoCodeTempEntity codeTempEntity = codeTempService.selectById(id);
|
|
|
|
IoCodeTempEntity codeTempEntity = codeTempService.selectById(id);
|
|
|
|
|
|
|
|
if (codeTempEntity == null) {
|
|
|
|
|
|
|
|
return ResultVOUtils.error(506, "UDI码异常,未录入!");
|
|
|
|
|
|
|
|
}
|
|
|
|
IoOrderEntity orderEntity = orderService.findByBillNo(codeTempEntity.getOrderId());
|
|
|
|
IoOrderEntity orderEntity = orderService.findByBillNo(codeTempEntity.getOrderId());
|
|
|
|
if (codeTempEntity.getMyCount() > 1) {
|
|
|
|
if (codeTempEntity.getMyCount() > 1) {
|
|
|
|
codeTempEntity.setCount(codeTempEntity.getMyCount() - 1);
|
|
|
|
codeTempEntity.setCount(codeTempEntity.getMyCount() - 1);
|
|
|
@ -1060,8 +1063,8 @@ public class IoCodeTempController extends BaseController {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
boolean r1 = orderDetailBizService.isExit(orderDetailCodeEntity.getOrderIdFk());
|
|
|
|
boolean r1 = orderDetailBizService.isExit(orderEntity.getBillNo());
|
|
|
|
boolean r2 = ioOrderDetailCodeService.isExit(orderDetailCodeEntity.getOrderIdFk());
|
|
|
|
boolean r2 = ioOrderDetailCodeService.isExit(orderEntity.getBillNo());
|
|
|
|
if (!r1 && !r2) {
|
|
|
|
if (!r1 && !r2) {
|
|
|
|
orderService.deleteByBillNo(orderDetailCodeEntity.getOrderIdFk());
|
|
|
|
orderService.deleteByBillNo(orderDetailCodeEntity.getOrderIdFk());
|
|
|
|
}
|
|
|
|
}
|
|
|
|