From 177c600112a36c71caa0ce77dc995cc986439d57 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Fri, 21 Jul 2023 10:18:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=A4=87=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/inout/IoCodeTempController.java | 12 ++++++++++-- .../controller/inout/IoOrderDetailBizController.java | 10 +++++----- .../api/controller/purchase/PurOrderController.java | 12 +++++++----- .../glxp/api/service/inout/IoCheckInoutService.java | 1 + src/main/resources/schemas/schema_v2.1.sql | 2 +- 5 files changed, 24 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index 97daeea92..cc237bb62 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -388,7 +388,6 @@ public class IoCodeTempController extends BaseController { //三期校验 if (bussinessTypeEntity.isCodeFillCheck()) { - BaseResponse checkOriginCodeRes = checkOriginCode(udiEntity); if (checkOriginCodeRes != null) { IoCodeLostEntity codeLostEntity = codeLostService.findByCode(code); @@ -406,7 +405,6 @@ public class IoCodeTempController extends BaseController { udiEntity.setExpireDate(codeLostEntity.getExpireDate()); udiEntity.setProduceDate(codeLostEntity.getProduceDate()); } - if (StrUtil.isNotEmpty(orderId)) { List ioCodeEnttities = codeTempService.findByOrderId(orderId); IoCodeTempEntity ioCodeEnttity = isExitLocal(code, ioCodeEnttities); @@ -416,6 +414,16 @@ public class IoCodeTempController extends BaseController { } else return checkOriginCodeRes; } + } else { + BaseResponse checkOriginCodeRes = checkOriginCode(udiEntity); + if (checkOriginCodeRes != null) { + IoCodeLostEntity codeLostEntity = codeLostService.findByCode(code); + if (codeLostEntity != null) { + udiEntity.setBatchNo(codeLostEntity.getBatchNo()); + udiEntity.setExpireDate(codeLostEntity.getExpireDate()); + udiEntity.setProduceDate(codeLostEntity.getProduceDate()); + } + } } diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java index 553fd279b..d2d1563f5 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java @@ -253,7 +253,7 @@ public class IoOrderDetailBizController extends BaseController { orderEntity.setUpdateTime(new Date()); orderEntity.setCustomerId(authAdmin.getCustomerId() + ""); long random = Calendar.getInstance().getTimeInMillis(); - orderEntity.setCorpOrderId(random+""); + orderEntity.setCorpOrderId(random + ""); orderEntity.setAction(bussinessTypeEntity.getAction()); orderEntity.setMainAction(bussinessTypeEntity.getMainAction()); orderEntity.setFromThrBillNo(thrOrderEntity.getBillNo()); @@ -275,7 +275,7 @@ public class IoOrderDetailBizController extends BaseController { InvWarehouseEntity invWarehouseEntity = invWarehouseService.selectByThrCode(thrOrderEntity.getCorpId(), thrOrderEntity.getThirdSysFk()); orderEntity.setFromDeptCode(invWarehouseEntity.getParentId()); orderEntity.setFromInvCode(invWarehouseEntity.getCode()); - } else { //往来信息 + } else { //往来信息 BasicCorpEntity basicCorpEntity = basicCorpService.selectByThirdId(thrOrderEntity.getCorpId(), thrOrderEntity.getThirdSysFk()); if (basicCorpEntity == null) { return ResultVOUtils.error(500, "往来单位信息未关联！"); @@ -547,13 +547,13 @@ public class IoOrderDetailBizController extends BaseController { IoOrderDetailBizEntity orderDetailBizEntity = orderDetailBizService.selectById(bizBindUpdateRequest.getId()); - FilterUdiRelRequest filterUdiRelRequest=new FilterUdiRelRequest(); + FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest(); filterUdiRelRequest.setId(bizBindUpdateRequest.getBindRlFk()); - UdiRelevanceResponse udiRelevanceResponse=udiRelevanceService.selectOneUdi(filterUdiRelRequest); + UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectOneUdi(filterUdiRelRequest); if (bizBindUpdateRequest.getBindRlFk() != null) orderDetailBizEntity.setBindRlFk(bizBindUpdateRequest.getBindRlFk()); - if(udiRelevanceResponse!=null){ + if (udiRelevanceResponse != null) { orderDetailBizEntity.setNameCode(udiRelevanceResponse.getNameCode()); orderDetailBizEntity.setUuidFk(udiRelevanceResponse.getUuid()); } diff --git a/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java b/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java index 58bf3446e..49dc003fa 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java @@ -79,8 +79,8 @@ public class PurOrderController { @PostMapping("/purchase/order/postOrder") public BaseResponse postOrder(@RequestBody PostPurOrderRequest postPurOrderRequest) { - if(postPurOrderRequest.getPurOrderEntity().getArrivalTime().compareTo(postPurOrderRequest.getPurOrderEntity().getCreateTime())==-1){ - return ResultVOUtils.error(999,"到货时间不能小于创建时间!"); + if (postPurOrderRequest.getPurOrderEntity().getArrivalTime().compareTo(postPurOrderRequest.getPurOrderEntity().getCreateTime()) == -1) { + return ResultVOUtils.error(999, "到货时间不能小于创建时间!"); } Long userId = customerService.getUserId(); PurOrderEntity purOrderEntity = postPurOrderRequest.getPurOrderEntity(); @@ -163,10 +163,10 @@ public class PurOrderController { purOrderEntity.setAuditUser(userId + ""); purOrderEntity.setAuditTime(new Date()); purOrderEntity.setStatus(postPurOrderRequest.getEditStatus()); - if(postPurOrderRequest.getEditStatus()==4){ + if (postPurOrderRequest.getEditStatus() == 4) { purOrderService.update(purOrderEntity); - }else if(postPurOrderRequest.getEditStatus()==3){ - Long id=purOrderEntity.getId(); + } else if (postPurOrderRequest.getEditStatus() == 3) { + Long id = purOrderEntity.getId(); List purOrderDetailEntityList = purOrderDetailService.findByOrderId(purOrderEntity.getId() + ""); //判断是不是存在同一个供应商产品 Map> purOrderDetailMap = purOrderDetailEntityList.stream().collect(Collectors.groupingBy(PurOrderDetailEntity::getSupId)); @@ -187,6 +187,8 @@ public class PurOrderController { } purOrderService.deleteById(id); purOrderDetailService.deleteByOrderId(id + ""); + } else { + purOrderService.update(purOrderEntity); } } purChangeService.purOrderChange(purOrderEntity); diff --git a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java index c3051da9e..60ffdfd72 100644 --- a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java @@ -747,6 +747,7 @@ public class IoCheckInoutService { bizEntity.setCheckSuccess(true); codeResponse.setCheckSuccess(true); codeResponse.setOrderCount(bizEntity.getCount()); + codeResponse.setPrice(bizEntity.getPrice()); } else { codeResponse.setCheckSuccess(false); codeResponse.setOrderCount(bizEntity.getCount()); diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql index b1d1c2c58..2d346012e 100644 --- a/src/main/resources/schemas/schema_v2.1.sql +++ b/src/main/resources/schemas/schema_v2.1.sql @@ -598,7 +598,7 @@ CREATE TABLE if not exists `io_destiny_process_detail` CALL Pro_Temp_ColumnWork('io_order', 'outSickInfo', 'varchar(255)', 1); - +CALL Pro_Temp_ColumnWork('inv_inner_order_detail', 'nameCode', 'varchar(255)', 1); CALL Pro_Temp_ColumnWork('inv_inner_order_detail', 'nameCode', 'varchar(255) ', 1);