From d6ec5ea2da54bbf76685bd697bc39a7170d6d814 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Fri, 8 Nov 2024 10:12:11 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat(all):=20=E5=BF=97=E9=82=A6=E5=B7=A5?= =?UTF-8?q?=E5=8E=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1 增加自提签收和复核的回传 --- .../java/com/logpm/factorydata/zbom/enums/NodeNeedEnums.java | 5 ++++- .../logpm/factorydata/zbom/enums/ZbomNodeMappingEnums.java | 4 ++++ .../logpm/factorydata/zbom/mq/ZbomNodeDataPushListener.java | 3 ++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/enums/NodeNeedEnums.java b/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/enums/NodeNeedEnums.java index 68f8b74c6..4837560a3 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/enums/NodeNeedEnums.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/enums/NodeNeedEnums.java @@ -17,9 +17,12 @@ public enum NodeNeedEnums implements Serializable { UNLOAD_INCOMING_WAREHOUSE(105010,"卸车入库"), // TRANSFER_WAREHOUSE_UNLOADING(105020, "中转仓卸车确认"), TRANSFER_WAREHOUSE_DEPART(103080, "中转仓发车"), - SIGN_DIRECT_SHIPPER(105030,"直发商家签收"), END_WAREHOUSE_UNLOADING(105040, "末端仓卸车确认"), + + SIGN_DIRECT_SHIPPER(105030,"直发商家签收"), DISTRIBUTION_SIGN_FOR(302060, "配送签收"), + SIGN_BILLOFLADING(301080, "自提签收"), + SIGN_BILLOFLADING_REVIEW(301090, "自提复核"), SIGN_TRIPARTITE_TRANSFER_DEPART(104040, "三方中转签收"), CLERK_REVIEW(303010, "文员复核"); diff --git a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/enums/ZbomNodeMappingEnums.java b/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/enums/ZbomNodeMappingEnums.java index d8ef82f11..3d811473b 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/enums/ZbomNodeMappingEnums.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/enums/ZbomNodeMappingEnums.java @@ -50,9 +50,13 @@ public enum ZbomNodeMappingEnums { DISTRIBUTION_SIGN_FOR(ZbomNodeEnums.SIGN_FOR, WorkNodeEnums.DISTRIBUTION_SIGN_FOR, 1), SIGN_FOR_DIRECT_SHIPPER(ZbomNodeEnums.SIGN_FOR, WorkNodeEnums.SIGN_DIRECT_SHIPPER, 1), SIGN_FOR_TRIPARTITE_TRANSFER_DEPART(ZbomNodeEnums.SIGN_FOR, WorkNodeEnums.SIGN_TRIPARTITE_TRANSFER_DEPART, 1), + SIGN_BILLOFLADING(ZbomNodeEnums.SIGN_FOR, WorkNodeEnums.SIGN_BILLOFLADING, 1), + SIGN_BILLOFLADING_REVIEW(ZbomNodeEnums.SIGN_FOR, WorkNodeEnums.SIGN_BILLOFLADING_REVIEW, 1), /** * 部分签收 -- 文员复核 */ + PARTIAL_SIGN_BILLOFLADING(ZbomNodeEnums.SIGN_FOR, WorkNodeEnums.SIGN_BILLOFLADING, 2), + PARTIAL_SIGN_BILLOFLADING_REVIEW(ZbomNodeEnums.SIGN_FOR, WorkNodeEnums.SIGN_BILLOFLADING_REVIEW, 2), PARTIAL_RECEIPT(ZbomNodeEnums.PARTIAL_RECEIPT, WorkNodeEnums.CLERK_REVIEW, 2), PARTIAL_DISTRIBUTION_SIGN_FOR(ZbomNodeEnums.PARTIAL_RECEIPT, WorkNodeEnums.DISTRIBUTION_SIGN_FOR, 2), PARTIAL_RECEIPT_DIRECT_SHIPPER(ZbomNodeEnums.PARTIAL_RECEIPT, WorkNodeEnums.SIGN_DIRECT_SHIPPER, 2), diff --git a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/mq/ZbomNodeDataPushListener.java b/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/mq/ZbomNodeDataPushListener.java index ed671f71f..b3d17eb06 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/mq/ZbomNodeDataPushListener.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/mq/ZbomNodeDataPushListener.java @@ -144,7 +144,8 @@ public class ZbomNodeDataPushListener { } // 签收节点获取组装未签收数据 Map noSignNumberMap = null; - if (EnumUtil.equals(WorkNodeEnums.CLERK_REVIEW, node)) { + ZbomNodeEnums zbNode = ZbomNodeMappingEnums.getZbomByNodeAndStatus(workNodeEnums); + if (StrUtil.equals(ZbomNodeEnums.SIGN_FOR.getCode(), zbNode.getCode())) { noSignNumberMap = getNoSignNumber(content); } // 获取历史发送的节点数据 From 70d2f2632f6ef829f036d35e38cfb8b91ecd6501 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Fri, 8 Nov 2024 11:24:50 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat(all):=20=E7=B4=A2=E8=8F=B2=E4=BA=9A?= =?UTF-8?q?=E5=B7=A5=E5=8E=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1 修改索菲亚工厂客户名称处理逻辑 --- .../suofeiya/service/impl/DeliveryNoteServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/service/impl/DeliveryNoteServiceImpl.java b/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/service/impl/DeliveryNoteServiceImpl.java index 8d8e5fa12..47dac7dec 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/service/impl/DeliveryNoteServiceImpl.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/service/impl/DeliveryNoteServiceImpl.java @@ -165,7 +165,7 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl Date: Fri, 8 Nov 2024 15:09:12 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E8=BF=90=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trunkline/dto/CheckWaybillListDTO.java | 38 + .../com/logpm/trunkline/dto/OpenOrderDTO.java | 2 + .../mapper/StatisticsOrderInfoMapper.xml | 4 +- .../impl/StatisticsOrderInfoServiceImpl.java | 5 +- .../controller/OpenOrderController.java | 1574 +++++++++-------- .../trunkline/service/IOpenOrderService.java | 8 + .../service/impl/OpenOrderServiceImpl.java | 928 +++++----- 7 files changed, 1321 insertions(+), 1238 deletions(-) create mode 100644 blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/CheckWaybillListDTO.java diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/CheckWaybillListDTO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/CheckWaybillListDTO.java new file mode 100644 index 000000000..02b450df4 --- /dev/null +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/CheckWaybillListDTO.java @@ -0,0 +1,38 @@ +package com.logpm.trunkline.dto; + +import lombok.Data; + +import java.util.List; + +@Data +public class CheckWaybillListDTO { + + + /** + * 运单ID集合 + */ + private List waybillIds; + + + /** + * 审核原因 + */ + private String checkReson; + + /** + * 审核备注 + */ + private String checkRemark; + + + /** + * 仓库ID + */ + private Long warehouseId; + + /** + * 仓库名称 + */ + private String warehouseName; + +} diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/OpenOrderDTO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/OpenOrderDTO.java index d2fd4cf4d..000e1edb0 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/OpenOrderDTO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/OpenOrderDTO.java @@ -17,6 +17,8 @@ public class OpenOrderDTO implements Serializable { private Long waybillId; + + private Long brandId;//品牌id private String brand;//品牌 private String trainNumber;//客户车次号 diff --git a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsOrderInfoMapper.xml b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsOrderInfoMapper.xml index 579226383..4e26bd7b3 100644 --- a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsOrderInfoMapper.xml +++ b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsOrderInfoMapper.xml @@ -81,10 +81,10 @@ and lsoi.type_service = #{param.typeService} - and lww.create_time >= #{param.openTimeStart} + and lww.document_making_time >= #{param.openTimeStart} - and lww.create_time <= #{param.openTimeEnd} + and lww.document_making_time <= #{param.openTimeEnd} and lsoi.sign_date >= #{param.signTimeStart} diff --git a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsOrderInfoServiceImpl.java b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsOrderInfoServiceImpl.java index eb8e2f6bf..0be5973f5 100644 --- a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsOrderInfoServiceImpl.java +++ b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsOrderInfoServiceImpl.java @@ -143,10 +143,7 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl> collect = advanceDetailDTOList.stream().collect(Collectors.groupingBy(AdvanceDetailDTO::getIncomeCategoryName)); - - - + Map> collect = advanceDetailDTOList.stream().filter(advanceDetailDTO -> !Objects.isNull(advanceDetailDTO.getIncomeCategoryName())).collect(Collectors.groupingBy(AdvanceDetailDTO::getIncomeCategoryName)); Long orderInfoId = statisticsOrderInfoVO.getOrderInfoId(); diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/OpenOrderController.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/OpenOrderController.java index 281850a0a..878f8b0af 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/OpenOrderController.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/OpenOrderController.java @@ -5,10 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.logpm.basicdata.entity.BasicdataWarehouseEntity; import com.logpm.basicdata.feign.IBasicdataWarehouseClient; -import com.logpm.trunkline.dto.AdvanceDTO; -import com.logpm.trunkline.dto.OpenLabelDTO; -import com.logpm.trunkline.dto.OpenOrderDTO; -import com.logpm.trunkline.dto.WaybillDetailDTO; +import com.logpm.trunkline.dto.*; import com.logpm.trunkline.service.ICarsLoadAsyncService; import com.logpm.trunkline.service.IOpenOrderService; import com.logpm.trunkline.service.ITrunklineCarsLoadService; @@ -45,19 +42,19 @@ public class OpenOrderController { @ApiOperation(value = "暂存单分页列表", notes = "传入waybillDTO") public R advancePageList(@RequestBody AdvanceDTO advanceDTO) { String method = "############advancePageList: "; - log.info(method+"请求参数{}",advanceDTO); + log.info(method + "请求参数{}", advanceDTO); Integer pageNum = advanceDTO.getPageNum(); Integer pageSize = advanceDTO.getPageSize(); String freezeStatus = advanceDTO.getFreezeStatus(); Integer hasPackage = advanceDTO.getHasPackage(); - try{ + try { //当前登录人选择的仓库 List warehouseIds = new ArrayList<>(); BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); - if(!Objects.isNull(myCurrentWarehouse)){ + if (!Objects.isNull(myCurrentWarehouse)) { warehouseIds.add(myCurrentWarehouse.getId()); - }else{ + } else { List myWatchWarehouse = warehouseClient.getMyWatchWarehouse(); myWatchWarehouse.forEach(warehouse -> { warehouseIds.add(warehouse.getId()); @@ -65,31 +62,31 @@ public class OpenOrderController { } advanceDTO.setWarehouseIds(warehouseIds); - if(Objects.isNull(pageNum)){ + if (Objects.isNull(pageNum)) { advanceDTO.setPageNum(1); } - if(Objects.isNull(pageSize)){ + if (Objects.isNull(pageSize)) { advanceDTO.setPageNum(30); } - if(StringUtil.isBlank(freezeStatus)){ - log.warn(method+"冻结状态不能为空 freezeStatus={}",freezeStatus); - return R.fail(400,"冻结状态不能为空"); + if (StringUtil.isBlank(freezeStatus)) { + log.warn(method + "冻结状态不能为空 freezeStatus={}", freezeStatus); + return R.fail(400, "冻结状态不能为空"); } - if(Objects.isNull(hasPackage)){ - log.warn(method+"有无包件数据不能为空 hasPackage={}",hasPackage); - return R.fail(400,"有无包件数据不能为空"); + if (Objects.isNull(hasPackage)) { + log.warn(method + "有无包件数据不能为空 hasPackage={}", hasPackage); + return R.fail(400, "有无包件数据不能为空"); } IPage pages = openOrderService.advancePageList(advanceDTO); return R.data(pages); - }catch (CustomerException e){ - log.error(e.message,e); - return R.fail(e.code,e.message); - }catch (Exception e){ - log.error(method+"系统异常",e); - return R.fail(500,"系统异常"); + } catch (CustomerException e) { + log.error(e.message, e); + return R.fail(e.code, e.message); + } catch (Exception e) { + log.error(method + "系统异常", e); + return R.fail(500, "系统异常"); } } @@ -100,19 +97,19 @@ public class OpenOrderController { @ApiOperation(value = "商家端暂存单分页列表", notes = "传入waybillDTO") public R advancePageListByBussiness(@RequestBody AdvanceDTO advanceDTO) { String method = "############advancePageList: "; - log.info(method+"请求参数{}",advanceDTO); + log.info(method + "请求参数{}", advanceDTO); Integer pageNum = advanceDTO.getPageNum(); Integer pageSize = advanceDTO.getPageSize(); String freezeStatus = advanceDTO.getFreezeStatus(); Integer hasPackage = advanceDTO.getHasPackage(); - try{ + try { //当前登录人选择的仓库 List warehouseIds = new ArrayList<>(); BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); - if(!Objects.isNull(myCurrentWarehouse)){ + if (!Objects.isNull(myCurrentWarehouse)) { warehouseIds.add(myCurrentWarehouse.getId()); - }else{ + } else { List myWatchWarehouse = warehouseClient.getMyWatchWarehouse(); myWatchWarehouse.forEach(warehouse -> { warehouseIds.add(warehouse.getId()); @@ -120,31 +117,31 @@ public class OpenOrderController { } advanceDTO.setWarehouseIds(warehouseIds); - if(Objects.isNull(pageNum)){ + if (Objects.isNull(pageNum)) { advanceDTO.setPageNum(1); } - if(Objects.isNull(pageSize)){ + if (Objects.isNull(pageSize)) { advanceDTO.setPageNum(30); } - if(StringUtil.isBlank(freezeStatus)){ - log.warn(method+"冻结状态不能为空 freezeStatus={}",freezeStatus); - return R.fail(400,"冻结状态不能为空"); + if (StringUtil.isBlank(freezeStatus)) { + log.warn(method + "冻结状态不能为空 freezeStatus={}", freezeStatus); + return R.fail(400, "冻结状态不能为空"); } - if(Objects.isNull(hasPackage)){ - log.warn(method+"有无包件数据不能为空 hasPackage={}",hasPackage); - return R.fail(400,"有无包件数据不能为空"); + if (Objects.isNull(hasPackage)) { + log.warn(method + "有无包件数据不能为空 hasPackage={}", hasPackage); + return R.fail(400, "有无包件数据不能为空"); } IPage pages = openOrderService.advancePageListByBussiness(advanceDTO); return R.data(pages); - }catch (CustomerException e){ - log.error(e.message,e); - return R.fail(e.code,e.message); - }catch (Exception e){ - log.error(method+"系统异常",e); - return R.fail(500,"系统异常"); + } catch (CustomerException e) { + log.error(e.message, e); + return R.fail(e.code, e.message); + } catch (Exception e) { + log.error(method + "系统异常", e); + return R.fail(500, "系统异常"); } } @@ -155,30 +152,30 @@ public class OpenOrderController { @ApiOperation(value = "修改客户信息", notes = "传入waybillDTO") public R findCustomerInfoList(@RequestBody AdvanceDTO advanceDTO) { String method = "############findCustomerInfoList: "; - log.info(method+"请求参数{}",advanceDTO); + log.info(method + "请求参数{}", advanceDTO); List advanceIds = advanceDTO.getAdvanceIds(); - try{ + try { //当前登录人选择的仓库 BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); - if(Objects.isNull(myCurrentWarehouse)){ - log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse); - return R.fail(405,"多仓权限无法操作，请选择仓库"); + if (Objects.isNull(myCurrentWarehouse)) { + log.warn(method + "仓库信息为空 myCurrentWarehouse={}", myCurrentWarehouse); + return R.fail(405, "多仓权限无法操作，请选择仓库"); } advanceDTO.setWarehouseId(myCurrentWarehouse.getId()); - if(advanceIds.isEmpty()){ - log.warn(method+"请选择暂存单 advanceIds={}",advanceIds); - return R.fail(405,"请选择暂存单"); + if (advanceIds.isEmpty()) { + log.warn(method + "请选择暂存单 advanceIds={}", advanceIds); + return R.fail(405, "请选择暂存单"); } return openOrderService.findCustomerInfoList(advanceIds); - }catch (CustomerException e){ - log.error(e.message,e); - return R.fail(e.code,e.message); - }catch (Exception e){ - log.error(method+"系统异常",e); - return R.fail(500,"系统异常"); + } catch (CustomerException e) { + log.error(e.message, e); + return R.fail(e.code, e.message); + } catch (Exception e) { + log.error(method + "系统异常", e); + return R.fail(500, "系统异常"); } } @@ -189,37 +186,37 @@ public class OpenOrderController { @ApiOperation(value = "修改客户信息", notes = "传入waybillDTO") public R updateCustomerInfo(@RequestBody AdvanceDTO advanceDTO) { String method = "############updateCustomerInfo: "; - log.info(method+"请求参数{}",advanceDTO); + log.info(method + "请求参数{}", advanceDTO); List advanceIds = advanceDTO.getAdvanceIds(); String customerName = advanceDTO.getCustomerName(); - try{ + try { //当前登录人选择的仓库 BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); - if(Objects.isNull(myCurrentWarehouse)){ - log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse); - return R.fail(405,"多仓权限无法操作，请选择仓库"); + if (Objects.isNull(myCurrentWarehouse)) { + log.warn(method + "仓库信息为空 myCurrentWarehouse={}", myCurrentWarehouse); + return R.fail(405, "多仓权限无法操作，请选择仓库"); } advanceDTO.setWarehouseId(myCurrentWarehouse.getId()); - if(advanceIds.isEmpty()){ - log.warn(method+"请选择暂存单 advanceIds={}",advanceIds); - return R.fail(405,"请选择暂存单"); + if (advanceIds.isEmpty()) { + log.warn(method + "请选择暂存单 advanceIds={}", advanceIds); + return R.fail(405, "请选择暂存单"); } - if(StringUtil.isBlank(customerName)){ - log.warn(method+"客户名称不能为空 customerName={}",customerName); - return R.fail(405,"客户名称不能为空"); + if (StringUtil.isBlank(customerName)) { + log.warn(method + "客户名称不能为空 customerName={}", customerName); + return R.fail(405, "客户名称不能为空"); } openOrderService.updateCustomerInfo(advanceDTO); return R.success("修改成功"); - }catch (CustomerException e){ - log.error(e.message,e); - return R.fail(e.code,e.message); - }catch (Exception e){ - log.error(method+"系统异常",e); - return R.fail(500,"系统异常"); + } catch (CustomerException e) { + log.error(e.message, e); + return R.fail(e.code, e.message); + } catch (Exception e) { + log.error(method + "系统异常", e); + return R.fail(500, "系统异常"); } } @@ -230,37 +227,37 @@ public class OpenOrderController { @ApiOperation(value = "通过暂存单id冻结", notes = "传入waybillDTO") public R freezeByAdvanceIds(@RequestBody AdvanceDTO advanceDTO) { String method = "############freezeByAdvanceIds: "; - log.info(method+"请求参数{}",advanceDTO); + log.info(method + "请求参数{}", advanceDTO); List advanceIds = advanceDTO.getAdvanceIds(); String freezeStatus = advanceDTO.getFreezeStatus(); - try{ + try { //当前登录人选择的仓库 BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); - if(Objects.isNull(myCurrentWarehouse)){ - log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse); - return R.fail(405,"多仓权限无法操作，请选择仓库"); + if (Objects.isNull(myCurrentWarehouse)) { + log.warn(method + "仓库信息为空 myCurrentWarehouse={}", myCurrentWarehouse); + return R.fail(405, "多仓权限无法操作，请选择仓库"); } advanceDTO.setWarehouseId(myCurrentWarehouse.getId()); - if(advanceIds.isEmpty()){ - log.warn(method+"请选择暂存单 advanceIds={}",advanceIds); - return R.fail(405,"请选择暂存单"); + if (advanceIds.isEmpty()) { + log.warn(method + "请选择暂存单 advanceIds={}", advanceIds); + return R.fail(405, "请选择暂存单"); } - if (StringUtil.isBlank(freezeStatus)){ - log.warn(method+"冻结状态不能为空 freezeStatus={}",freezeStatus); - return R.fail(405,"冻结状态不能为空"); + if (StringUtil.isBlank(freezeStatus)) { + log.warn(method + "冻结状态不能为空 freezeStatus={}", freezeStatus); + return R.fail(405, "冻结状态不能为空"); } openOrderService.freezeByAdvanceIds(advanceDTO); return R.success("修改成功"); - }catch (CustomerException e){ - log.error(e.message,e); - return R.fail(e.code,e.message); - }catch (Exception e){ - log.error(method+"系统异常",e); - return R.fail(500,"系统异常"); + } catch (CustomerException e) { + log.error(e.message, e); + return R.fail(e.code, e.message); + } catch (Exception e) { + log.error(method + "系统异常", e); + return R.fail(500, "系统异常"); } } @@ -271,69 +268,67 @@ public class OpenOrderController { @ApiOperation(value = "删除暂存单", notes = "传入waybillDTO") public R deletedAdvance(@RequestBody AdvanceDTO advanceDTO) { String method = "############deletedAdvance: "; - log.info(method+"请求参数{}",advanceDTO); + log.info(method + "请求参数{}", advanceDTO); List advanceIds = advanceDTO.getAdvanceIds(); - try{ + try { //当前登录人选择的仓库 BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); - if(Objects.isNull(myCurrentWarehouse)){ - log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse); - return R.fail(405,"多仓权限无法操作，请选择仓库"); + if (Objects.isNull(myCurrentWarehouse)) { + log.warn(method + "仓库信息为空 myCurrentWarehouse={}", myCurrentWarehouse); + return R.fail(405, "多仓权限无法操作，请选择仓库"); } advanceDTO.setWarehouseId(myCurrentWarehouse.getId()); - if(advanceIds.isEmpty()){ - log.warn(method+"请选择暂存单 advanceIds={}",advanceIds); - return R.fail(405,"请选择暂存单"); + if (advanceIds.isEmpty()) { + log.warn(method + "请选择暂存单 advanceIds={}", advanceIds); + return R.fail(405, "请选择暂存单"); } openOrderService.deletedAdvance(advanceDTO); return R.success("修改成功"); - }catch (CustomerException e){ - log.error(e.message,e); - return R.fail(e.code,e.message); - }catch (Exception e){ - log.error(method+"系统异常",e); - return R.fail(500,"系统异常"); + } catch (CustomerException e) { + log.error(e.message, e); + return R.fail(e.code, e.message); + } catch (Exception e) { + log.error(method + "系统异常", e); + return R.fail(500, "系统异常"); } } - - @ResponseBody @PostMapping("/findAdvanceDetailList") @ApiOperationSupport(order = 1) @ApiOperation(value = "暂存单包件列表", notes = "传入waybillDTO") public R findAdvanceDetailList(@RequestBody AdvanceDTO advanceDTO) { String method = "############findAdvanceDetailList: "; - log.info(method+"请求参数{}",advanceDTO); + log.info(method + "请求参数{}", advanceDTO); Long advanceId = advanceDTO.getAdvanceId(); - try{ + try { //当前登录人选择的仓库 BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); - if(Objects.isNull(myCurrentWarehouse)){ - log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse); - return R.fail(403,"多仓权限无法操作，请选择仓库"); + if (Objects.isNull(myCurrentWarehouse)) { + log.warn(method + "仓库信息为空 myCurrentWarehouse={}", myCurrentWarehouse); + return R.fail(403, "多仓权限无法操作，请选择仓库"); } advanceDTO.setWarehouseId(myCurrentWarehouse.getId()); - if(Objects.isNull(advanceId)){ - log.warn(method+"暂存单id为空 advanceId={}",advanceId); - return R.fail(403,"暂存单id为空"); + if (Objects.isNull(advanceId)) { + log.warn(method + "暂存单id为空 advanceId={}", advanceId); + return R.fail(403, "暂存单id为空"); } List ls = openOrderService.findAdvanceDetailList(advanceId); return R.data(ls); - }catch (CustomerException e){ - log.error(e.message,e); - return R.fail(e.code,e.message); - }catch (Exception e){ - log.error(method+"系统异常",e); - return R.fail(500,"系统异常"); + } catch (CustomerException e) { + log.error(e.message, e); + return R.fail(e.code, e.message); + } catch (Exception e) { + log.error(method + "系统异常", e); + return R.fail(500, "系统异常"); } } @@ -345,27 +340,27 @@ public class OpenOrderController { String method = "############advanceToWaybillBefore: "; log.info(method + "请求参数{}", advanceDTO); List advanceIds = advanceDTO.getAdvanceIds(); - try{ + try { //当前登录人选择的仓库 BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); - if(Objects.isNull(myCurrentWarehouse)){ - log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse); - return R.fail(403,"多仓权限无法操作，请选择仓库"); + if (Objects.isNull(myCurrentWarehouse)) { + log.warn(method + "仓库信息为空 myCurrentWarehouse={}", myCurrentWarehouse); + return R.fail(403, "多仓权限无法操作，请选择仓库"); } - if(advanceIds.isEmpty()){ - log.warn(method+"未选择暂存单 advanceIds={}",advanceIds); - return R.fail(403,"未选择暂存单"); + if (advanceIds.isEmpty()) { + log.warn(method + "未选择暂存单 advanceIds={}", advanceIds); + return R.fail(403, "未选择暂存单"); } - return openOrderService.advanceToWaybillBefore(advanceIds,myCurrentWarehouse.getId()); - }catch (CustomerException e){ - log.error(e.message,e); - return R.fail(e.code,e.message); - }catch (Exception e){ - log.error(method+"系统异常",e); - return R.fail(500,"系统异常"); + return openOrderService.advanceToWaybillBefore(advanceIds, myCurrentWarehouse.getId()); + } catch (CustomerException e) { + log.error(e.message, e); + return R.fail(e.code, e.message); + } catch (Exception e) { + log.error(method + "系统异常", e); + return R.fail(500, "系统异常"); } @@ -380,27 +375,27 @@ public class OpenOrderController { String method = "############advanceToWaybillInfo: "; log.info(method + "请求参数{}", advanceDTO); List advanceIds = advanceDTO.getAdvanceIds(); - try{ + try { //当前登录人选择的仓库 BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); - if(Objects.isNull(myCurrentWarehouse)){ - log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse); - return R.fail(403,"多仓权限无法操作，请选择仓库"); + if (Objects.isNull(myCurrentWarehouse)) { + log.warn(method + "仓库信息为空 myCurrentWarehouse={}", myCurrentWarehouse); + return R.fail(403, "多仓权限无法操作，请选择仓库"); } - if(advanceIds.isEmpty()){ - log.warn(method+"未选择暂存单 advanceIds={}",advanceIds); - return R.fail(403,"未选择暂存单"); + if (advanceIds.isEmpty()) { + log.warn(method + "未选择暂存单 advanceIds={}", advanceIds); + return R.fail(403, "未选择暂存单"); } - return openOrderService.advanceToWaybillInfo(advanceIds,myCurrentWarehouse.getId()); - }catch (CustomerException e){ - log.error(e.message,e); - return R.fail(e.code,e.message); - }catch (Exception e){ - log.error(method+"系统异常",e); - return R.fail(500,"系统异常"); + return openOrderService.advanceToWaybillInfo(advanceIds, myCurrentWarehouse.getId()); + } catch (CustomerException e) { + log.error(e.message, e); + return R.fail(e.code, e.message); + } catch (Exception e) { + log.error(method + "系统异常", e); + return R.fail(500, "系统异常"); } } @@ -412,20 +407,20 @@ public class OpenOrderController { String method = "############findAdvanceDetailListByAdvanceIds: "; log.info(method + "请求参数{}", advanceDTO); List advanceIds = advanceDTO.getAdvanceIds(); - try{ + try { - if(CollUtil.isEmpty(advanceIds)){ - log.warn(method+"未选择暂存单 advanceIds={}",advanceIds); - return R.fail(403,"未选择暂存单"); + if (CollUtil.isEmpty(advanceIds)) { + log.warn(method + "未选择暂存单 advanceIds={}", advanceIds); + return R.fail(403, "未选择暂存单"); } return openOrderService.findAdvanceDetailListByAdvanceIds(advanceDTO); - }catch (CustomerException e){ - log.error(e.message,e); - return R.fail(e.code,e.message); - }catch (Exception e){ - log.error(method+"系统异常",e); - return R.fail(500,"系统异常"); + } catch (CustomerException e) { + log.error(e.message, e); + return R.fail(e.code, e.message); + } catch (Exception e) { + log.error(method + "系统异常", e); + return R.fail(500, "系统异常"); } } @@ -438,26 +433,24 @@ public class OpenOrderController { String method = "############findAdvanceDetailListByWaybillId: "; log.info(method + "请求参数{}", advanceDTO); Long waybillId = advanceDTO.getWaybillId(); - try{ + try { - if(Objects.isNull(waybillId)){ - log.warn(method+"未选择运单 waybillId={}",waybillId); - return R.fail(403,"未选择运单"); + if (Objects.isNull(waybillId)) { + log.warn(method + "未选择运单 waybillId={}", waybillId); + return R.fail(403, "未选择运单"); } return openOrderService.findAdvanceDetailListByWaybillId(advanceDTO); - }catch (CustomerException e){ - log.error(e.message,e); - return R.fail(e.code,e.message); - }catch (Exception e){ - log.error(method+"系统异常",e); - return R.fail(500,"系统异常"); + } catch (CustomerException e) { + log.error(e.message, e); + return R.fail(e.code, e.message); + } catch (Exception e) { + log.error(method + "系统异常", e); + return R.fail(500, "系统异常"); } } - - @ResponseBody @PostMapping("/advanceNoPackageToWaybillInfo") @ApiOperationSupport(order = 1) @@ -466,27 +459,27 @@ public class OpenOrderController { String method = "############advanceNoPackageToWaybillInfo: "; log.info(method + "请求参数{}", advanceDTO); List advanceIds = advanceDTO.getAdvanceIds(); - try{ + try { //当前登录人选择的仓库 BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); - if(Objects.isNull(myCurrentWarehouse)){ - log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse); - return R.fail(403,"多仓权限无法操作，请选择仓库"); + if (Objects.isNull(myCurrentWarehouse)) { + log.warn(method + "仓库信息为空 myCurrentWarehouse={}", myCurrentWarehouse); + return R.fail(403, "多仓权限无法操作，请选择仓库"); } - if(advanceIds.isEmpty()){ - log.warn(method+"未选择暂存单 advanceIds={}",advanceIds); - return R.fail(403,"未选择暂存单"); + if (advanceIds.isEmpty()) { + log.warn(method + "未选择暂存单 advanceIds={}", advanceIds); + return R.fail(403, "未选择暂存单"); } - return openOrderService.advanceNoPackageToWaybillInfo(advanceIds,myCurrentWarehouse.getId()); - }catch (CustomerException e){ - log.error(e.message,e); - return R.fail(e.code,e.message); - }catch (Exception e){ - log.error(method+"系统异常",e); - return R.fail(500,"系统异常"); + return openOrderService.advanceNoPackageToWaybillInfo(advanceIds, myCurrentWarehouse.getId()); + } catch (CustomerException e) { + log.error(e.message, e); + return R.fail(e.code, e.message); + } catch (Exception e) { + log.error(method + "系统异常", e); + return R.fail(500, "系统异常"); } } @@ -499,13 +492,13 @@ public class OpenOrderController { String method = "############openWaybill: "; log.info(method + "请求参数{}", openOrderDTO); List advanceIds = openOrderDTO.getAdvanceIds(); - try{ + try { //当前登录人选择的仓库 BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); - if(Objects.isNull(myCurrentWarehouse)){ - log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse); - return R.fail(403,"多仓权限无法操作，请选择仓库"); + if (Objects.isNull(myCurrentWarehouse)) { + log.warn(method + "仓库信息为空 myCurrentWarehouse={}", myCurrentWarehouse); + return R.fail(403, "多仓权限无法操作，请选择仓库"); } openOrderDTO.setWarehouseId(myCurrentWarehouse.getId()); @@ -515,26 +508,25 @@ public class OpenOrderController { R r = openOrderService.openWaybill(openOrderDTO); int code = r.getCode(); - if(code != 200){ + if (code != 200) { return r; } Long waybillId = (Long) r.getData(); - openOrderService.dealOpenIncoming(waybillId,advanceIds); - + openOrderService.dealOpenIncoming(waybillId, advanceIds); Map map = new HashMap(); - map.put("waybillId",waybillId); + map.put("waybillId", waybillId); return R.data(map); - }catch (CustomerException e){ - log.error(e.message,e); - return R.fail(e.code,e.message); - }catch (Exception e){ - log.error(method+"系统异常",e); - return R.fail(500,"系统异常"); + } catch (CustomerException e) { + log.error(e.message, e); + return R.fail(e.code, e.message); + } catch (Exception e) { + log.error(method + "系统异常", e); + return R.fail(500, "系统异常"); } } @@ -545,22 +537,22 @@ public class OpenOrderController { @ApiOperation(value = "录单数据查询", notes = "传入waybillDTO") public R openZeroWaybillInfo() { String method = "############openZeroWaybillInfo: "; - try{ + try { //当前登录人选择的仓库 BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); - if(Objects.isNull(myCurrentWarehouse)){ - log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse); - return R.fail(403,"多仓权限无法操作，请选择仓库"); + if (Objects.isNull(myCurrentWarehouse)) { + log.warn(method + "仓库信息为空 myCurrentWarehouse={}", myCurrentWarehouse); + return R.fail(403, "多仓权限无法操作，请选择仓库"); } return openOrderService.openZeroWaybillInfo(myCurrentWarehouse.getId()); - }catch (CustomerException e){ - log.error(e.message,e); - return R.fail(e.code,e.message); - }catch (Exception e){ - log.error(method+"系统异常",e); - return R.fail(500,"系统异常"); + } catch (CustomerException e) { + log.error(e.message, e); + return R.fail(e.code, e.message); + } catch (Exception e) { + log.error(method + "系统异常", e); + return R.fail(500, "系统异常"); } } @@ -570,24 +562,24 @@ public class OpenOrderController { @ApiOperation(value = "根据收货单位查询付款方式", notes = "传入openOrderDTO") public R findPayWayByClientId(@RequestBody OpenOrderDTO openOrderDTO) { String method = "############findPayWayByClientId: "; - log.info(method+" 请求参数：{}",openOrderDTO); - try{ + log.info(method + " 请求参数：{}", openOrderDTO); + try { Long clientId = openOrderDTO.getClientId(); //当前登录人选择的仓库 BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); - if(Objects.isNull(myCurrentWarehouse)){ - log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse); - return R.fail(403,"多仓权限无法操作，请选择仓库"); + if (Objects.isNull(myCurrentWarehouse)) { + log.warn(method + "仓库信息为空 myCurrentWarehouse={}", myCurrentWarehouse); + return R.fail(403, "多仓权限无法操作，请选择仓库"); } return openOrderService.findPayWayByClientId(clientId); - }catch (CustomerException e){ - log.error(e.message,e); - return R.fail(e.code,e.message); - }catch (Exception e){ - log.error(method+"系统异常",e); - return R.fail(500,"系统异常"); + } catch (CustomerException e) { + log.error(e.message, e); + return R.fail(e.code, e.message); + } catch (Exception e) { + log.error(method + "系统异常", e); + return R.fail(500, "系统异常"); } } @@ -599,13 +591,13 @@ public class OpenOrderController { public R openZeroWaybill(@RequestBody OpenOrderDTO openOrderDTO) { String method = "############openZeroWaybill: "; log.info(method + "请求参数{}", openOrderDTO); - try{ + try { //当前登录人选择的仓库 BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); - if(Objects.isNull(myCurrentWarehouse)){ - log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse); - return R.fail(403,"多仓权限无法操作，请选择仓库"); + if (Objects.isNull(myCurrentWarehouse)) { + log.warn(method + "仓库信息为空 myCurrentWarehouse={}", myCurrentWarehouse); + return R.fail(403, "多仓权限无法操作，请选择仓库"); } openOrderDTO.setWarehouseId(myCurrentWarehouse.getId()); @@ -613,12 +605,12 @@ public class OpenOrderController { openZeroOrderParamVerify(openOrderDTO); return openOrderService.openZeroWaybill(openOrderDTO); - }catch (CustomerException e){ - log.error(e.message,e); - return R.fail(e.code,e.message); - }catch (Exception e){ - log.error(method+"系统异常",e); - return R.fail(500,"系统异常"); + } catch (CustomerException e) { + log.error(e.message, e); + return R.fail(e.code, e.message); + } catch (Exception e) { + log.error(method + "系统异常", e); + return R.fail(500, "系统异常"); } } @@ -633,20 +625,20 @@ public class OpenOrderController { String linkMan = openOrderDTO.getLinkMan(); String linkPhone = openOrderDTO.getLinkPhone(); - try{ + try { // if(StringUtil.isBlank(clientName)){ // log.warn(method+"客户名称为空 clientName={}",clientName); // return R.fail(400,"客户名称为空"); // } - return openOrderService.findClientInfo(clientName,linkMan,linkPhone); - }catch (CustomerException e){ - log.error(e.message,e); - return R.fail(e.code,e.message); - }catch (Exception e){ - log.error(method+"系统异常",e); - return R.fail(500,"系统异常"); + return openOrderService.findClientInfo(clientName, linkMan, linkPhone); + } catch (CustomerException e) { + log.error(e.message, e); + return R.fail(e.code, e.message); + } catch (Exception e) { + log.error(method + "系统异常", e); + return R.fail(500, "系统异常"); } } @@ -659,14 +651,14 @@ public class OpenOrderController { String method = "############findDestinationByClientId: "; log.info(method + "请求参数{}", openOrderDTO); Long clientId = openOrderDTO.getClientId(); - try{ + try { return openOrderService.findDestinationByClientId(clientId); - }catch (CustomerException e){ - log.error(e.message,e); - return R.fail(e.code,e.message); - }catch (Exception e){ - log.error(method+"系统异常",e); - return R.fail(500,"系统异常"); + } catch (CustomerException e) { + log.error(e.message, e); + return R.fail(e.code, e.message); + } catch (Exception e) { + log.error(method + "系统异常", e); + return R.fail(500, "系统异常"); } } @@ -678,14 +670,14 @@ public class OpenOrderController { String method = "############findWarehouseList: "; log.info(method + "请求参数{}", openOrderDTO); String warehouseName = openOrderDTO.getWarehouseName(); - try{ + try { return openOrderService.findWarehouseList(warehouseName); - }catch (CustomerException e){ - log.error(e.message,e); - return R.fail(e.code,e.message); - }catch (Exception e){ - log.error(method+"系统异常",e); - return R.fail(500,"系统异常"); + } catch (CustomerException e) { + log.error(e.message, e); + return R.fail(e.code, e.message); + } catch (Exception e) { + log.error(method + "系统异常", e); + return R.fail(500, "系统异常"); } } @@ -696,79 +688,79 @@ public class OpenOrderController { Long departureWarehouseId = openOrderDTO.getDepartureWarehouseId(); String departureWarehouseName = openOrderDTO.getDepartureWarehouseName(); - if(Objects.isNull(departureWarehouseId) && StringUtil.isBlank(departureWarehouseName)){ - log.warn("#################openZeroOrderParamVerify: 发站仓不能为空 departureWarehouseId={} departureWarehouseName={}",departureWarehouseId,departureWarehouseName); - throw new CustomerException(405,"发站仓不能为空"); + if (Objects.isNull(departureWarehouseId) && StringUtil.isBlank(departureWarehouseName)) { + log.warn("#################openZeroOrderParamVerify: 发站仓不能为空 departureWarehouseId={} departureWarehouseName={}", departureWarehouseId, departureWarehouseName); + throw new CustomerException(405, "发站仓不能为空"); } Long warehouseId = openOrderDTO.getWarehouseId(); - if(!departureWarehouseId.equals(warehouseId)){ - log.warn("#################openZeroOrderParamVerify: 发站仓不属于当前仓 departureWarehouseId={} warehouseId={}",departureWarehouseId,warehouseId); - throw new CustomerException(405,"发站仓不属于当前仓"); + if (!departureWarehouseId.equals(warehouseId)) { + log.warn("#################openZeroOrderParamVerify: 发站仓不属于当前仓 departureWarehouseId={} warehouseId={}", departureWarehouseId, warehouseId); + throw new CustomerException(405, "发站仓不属于当前仓"); } Long brandId = openOrderDTO.getBrandId(); String brand = openOrderDTO.getBrand(); - if(Objects.isNull(brandId) || StringUtil.isBlank(brand)){ - log.warn("#################openZeroOrderParamVerify: 品牌不能为空 brandId={} brand={}",brandId,brand); - throw new CustomerException(405,"品牌不能为空"); + if (Objects.isNull(brandId) || StringUtil.isBlank(brand)) { + log.warn("#################openZeroOrderParamVerify: 品牌不能为空 brandId={} brand={}", brandId, brand); + throw new CustomerException(405, "品牌不能为空"); } Long destinationWarehouseId = openOrderDTO.getDestinationWarehouseId(); String destinationWarehouseName = openOrderDTO.getDestinationWarehouseName(); - if(Objects.isNull(destinationWarehouseId) && StringUtil.isBlank(destinationWarehouseName)){ - log.warn("#################openZeroOrderParamVerify: 目的仓不能为空 destinationWarehouseId={} destinationWarehouseName={}",destinationWarehouseId,destinationWarehouseName); - throw new CustomerException(405,"目的仓不能为空"); + if (Objects.isNull(destinationWarehouseId) && StringUtil.isBlank(destinationWarehouseName)) { + log.warn("#################openZeroOrderParamVerify: 目的仓不能为空 destinationWarehouseId={} destinationWarehouseName={}", destinationWarehouseId, destinationWarehouseName); + throw new CustomerException(405, "目的仓不能为空"); } String destination = openOrderDTO.getDestination(); - if(StringUtil.isBlank(destination)){ - log.warn("#################openZeroOrderParamVerify: 到站不能为空 destination={} ",destination); - throw new CustomerException(405,"到站不能为空"); + if (StringUtil.isBlank(destination)) { + log.warn("#################openZeroOrderParamVerify: 到站不能为空 destination={} ", destination); + throw new CustomerException(405, "到站不能为空"); } String shipper = openOrderDTO.getShipper(); - if(StringUtil.isBlank(shipper)){ - log.warn("#################openZeroOrderParamVerify: 发货单位不能为空 shipper={} ",shipper); - throw new CustomerException(405,"发货单位不能为空"); + if (StringUtil.isBlank(shipper)) { + log.warn("#################openZeroOrderParamVerify: 发货单位不能为空 shipper={} ", shipper); + throw new CustomerException(405, "发货单位不能为空"); } String consignee = openOrderDTO.getConsignee(); - if(StringUtil.isBlank(consignee)){ - log.warn("#################openZeroOrderParamVerify: 收货单位不能为空 consignee={} ",consignee); - throw new CustomerException(405,"收货单位不能为空"); + if (StringUtil.isBlank(consignee)) { + log.warn("#################openZeroOrderParamVerify: 收货单位不能为空 consignee={} ", consignee); + throw new CustomerException(405, "收货单位不能为空"); } Integer waybillType = openOrderDTO.getWaybillType(); - if(Objects.isNull(waybillType)){ - log.warn("#################openZeroOrderParamVerify: 运单类型不能为空 waybillType={} ",waybillType); - throw new CustomerException(405,"运单类型不能为空"); + if (Objects.isNull(waybillType)) { + log.warn("#################openZeroOrderParamVerify: 运单类型不能为空 waybillType={} ", waybillType); + throw new CustomerException(405, "运单类型不能为空"); } List waybillDetailList = openOrderDTO.getWaybillDetailList(); - for(WaybillDetailDTO waybillDetailDTO:waybillDetailList){ + for (WaybillDetailDTO waybillDetailDTO : waybillDetailList) { String goodsName = waybillDetailDTO.getGoodsName(); - if(StringUtil.isBlank(goodsName)){ - log.warn("#################openZeroOrderParamVerify: 货物名称不能为空 goodsName={} ",goodsName); - throw new CustomerException(405,"货物名称不能为空"); + if (StringUtil.isBlank(goodsName)) { + log.warn("#################openZeroOrderParamVerify: 货物名称不能为空 goodsName={} ", goodsName); + throw new CustomerException(405, "货物名称不能为空"); } Integer chargeType = waybillDetailDTO.getChargeType();//1件 2方 3公斤 Integer num = waybillDetailDTO.getNum(); BigDecimal weight = waybillDetailDTO.getWeight(); BigDecimal volume = waybillDetailDTO.getVolume(); - if(1 == chargeType){ - if(num <= 0){ - log.warn("#################openZeroOrderParamVerify: 货物数量不正确 num={} ",num); - throw new CustomerException(405,"货物数量不正确"); + if (1 == chargeType) { + if (num <= 0) { + log.warn("#################openZeroOrderParamVerify: 货物数量不正确 num={} ", num); + throw new CustomerException(405, "货物数量不正确"); } - }else if(2 == chargeType){ - if(volume.compareTo(BigDecimal.ZERO) <= 0){ - log.warn("#################openZeroOrderParamVerify: 货物体积不正确 volume={} ",volume); - throw new CustomerException(405,"货物体积不正确"); + } else if (2 == chargeType) { + if (volume.compareTo(BigDecimal.ZERO) <= 0) { + log.warn("#################openZeroOrderParamVerify: 货物体积不正确 volume={} ", volume); + throw new CustomerException(405, "货物体积不正确"); } - }else if(3 == chargeType){ - if(weight.compareTo(BigDecimal.ZERO) <= 0){ - log.warn("#################openZeroOrderParamVerify: 货物重量不正确 weight={} ",weight); - throw new CustomerException(405,"货物重量不正确"); + } else if (3 == chargeType) { + if (weight.compareTo(BigDecimal.ZERO) <= 0) { + log.warn("#################openZeroOrderParamVerify: 货物重量不正确 weight={} ", weight); + throw new CustomerException(405, "货物重量不正确"); } } @@ -779,22 +771,22 @@ public class OpenOrderController { // } BigDecimal subtotalFreight = waybillDetailDTO.getSubtotalFreight(); - if(subtotalFreight.compareTo(BigDecimal.ZERO) < 0){ - log.warn("#################openZeroOrderParamVerify: 货物运费小计不正确 subtotalFreight={} ",subtotalFreight); - throw new CustomerException(405,"货物运费小计不正确"); + if (subtotalFreight.compareTo(BigDecimal.ZERO) < 0) { + log.warn("#################openZeroOrderParamVerify: 货物运费小计不正确 subtotalFreight={} ", subtotalFreight); + throw new CustomerException(405, "货物运费小计不正确"); } } BigDecimal totalFreight = openOrderDTO.getTotalFreight(); - if(totalFreight.compareTo(BigDecimal.ZERO) < 0){ - log.warn("#################openZeroOrderParamVerify: 运费不正确 totalFreight={} ",totalFreight); - throw new CustomerException(405,"运费不正确"); + if (totalFreight.compareTo(BigDecimal.ZERO) < 0) { + log.warn("#################openZeroOrderParamVerify: 运费不正确 totalFreight={} ", totalFreight); + throw new CustomerException(405, "运费不正确"); } String payWay = openOrderDTO.getPayWay(); - if(StringUtil.isBlank(payWay)){ - log.warn("#################openZeroOrderParamVerify: 付款方式不能为空 payWay={} ",payWay); - throw new CustomerException(405,"付款方式不能为空"); + if (StringUtil.isBlank(payWay)) { + log.warn("#################openZeroOrderParamVerify: 付款方式不能为空 payWay={} ", payWay); + throw new CustomerException(405, "付款方式不能为空"); } BigDecimal xPay = openOrderDTO.getXianPay(); @@ -802,25 +794,25 @@ public class OpenOrderController { BigDecimal yPay = openOrderDTO.getYuePay(); BigDecimal hPay = openOrderDTO.getHuiPay(); - if("1".equals(payWay)){ - if(xPay.compareTo(BigDecimal.ZERO) <= 0){ - log.warn("#################openZeroOrderParamVerify: 现付运费不正确 xPay={} ",xPay); - throw new CustomerException(405,"现付运费不正确"); + if ("1".equals(payWay)) { + if (xPay.compareTo(BigDecimal.ZERO) <= 0) { + log.warn("#################openZeroOrderParamVerify: 现付运费不正确 xPay={} ", xPay); + throw new CustomerException(405, "现付运费不正确"); } - }else if("2".equals(payWay)){ - if(dPay.compareTo(BigDecimal.ZERO) <= 0){ - log.warn("#################openZeroOrderParamVerify: 到付运费不正确 dPay={} ",dPay); - throw new CustomerException(405,"到付运费不正确"); + } else if ("2".equals(payWay)) { + if (dPay.compareTo(BigDecimal.ZERO) <= 0) { + log.warn("#################openZeroOrderParamVerify: 到付运费不正确 dPay={} ", dPay); + throw new CustomerException(405, "到付运费不正确"); } - }else if("3".equals(payWay)){ - if(yPay.compareTo(BigDecimal.ZERO) <= 0){ - log.warn("#################openZeroOrderParamVerify: 月结运费不正确 yPay={} ",yPay); - throw new CustomerException(405,"月结运费不正确"); + } else if ("3".equals(payWay)) { + if (yPay.compareTo(BigDecimal.ZERO) <= 0) { + log.warn("#################openZeroOrderParamVerify: 月结运费不正确 yPay={} ", yPay); + throw new CustomerException(405, "月结运费不正确"); } - }else if("4".equals(payWay)){ - if(hPay.compareTo(BigDecimal.ZERO) <= 0){ - log.warn("#################openZeroOrderParamVerify: 回付运费不正确 hPay={} ",hPay); - throw new CustomerException(405,"回付运费不正确"); + } else if ("4".equals(payWay)) { + if (hPay.compareTo(BigDecimal.ZERO) <= 0) { + log.warn("#################openZeroOrderParamVerify: 回付运费不正确 hPay={} ", hPay); + throw new CustomerException(405, "回付运费不正确"); } } } @@ -830,78 +822,78 @@ public class OpenOrderController { Long departureWarehouseId = openOrderDTO.getDepartureWarehouseId(); String departureWarehouseName = openOrderDTO.getDepartureWarehouseName(); - if(Objects.isNull(departureWarehouseId) && StringUtil.isBlank(departureWarehouseName)){ - log.warn("#################openNoPackageOrderParamVerify: 发站仓不能为空 departureWarehouseId={} departureWarehouseName={}",departureWarehouseId,departureWarehouseName); - throw new CustomerException(405,"发站仓不能为空"); + if (Objects.isNull(departureWarehouseId) && StringUtil.isBlank(departureWarehouseName)) { + log.warn("#################openNoPackageOrderParamVerify: 发站仓不能为空 departureWarehouseId={} departureWarehouseName={}", departureWarehouseId, departureWarehouseName); + throw new CustomerException(405, "发站仓不能为空"); } Long warehouseId = openOrderDTO.getWarehouseId(); - if(!departureWarehouseId.equals(warehouseId)){ - log.warn("#################openNoPackageOrderParamVerify: 发站仓不属于当前仓 departureWarehouseId={} warehouseId={}",departureWarehouseId,warehouseId); - throw new CustomerException(405,"发站仓不属于当前仓"); + if (!departureWarehouseId.equals(warehouseId)) { + log.warn("#################openNoPackageOrderParamVerify: 发站仓不属于当前仓 departureWarehouseId={} warehouseId={}", departureWarehouseId, warehouseId); + throw new CustomerException(405, "发站仓不属于当前仓"); } Long destinationWarehouseId = openOrderDTO.getDestinationWarehouseId(); String destinationWarehouseName = openOrderDTO.getDestinationWarehouseName(); - if(Objects.isNull(destinationWarehouseId) && StringUtil.isBlank(destinationWarehouseName)){ - log.warn("#################openNoPackageOrderParamVerify: 目的仓不能为空 destinationWarehouseId={} destinationWarehouseName={}",destinationWarehouseId,destinationWarehouseName); - throw new CustomerException(405,"目的仓不能为空"); + if (Objects.isNull(destinationWarehouseId) && StringUtil.isBlank(destinationWarehouseName)) { + log.warn("#################openNoPackageOrderParamVerify: 目的仓不能为空 destinationWarehouseId={} destinationWarehouseName={}", destinationWarehouseId, destinationWarehouseName); + throw new CustomerException(405, "目的仓不能为空"); } String destination = openOrderDTO.getDestination(); - if(StringUtil.isBlank(destination)){ - log.warn("#################openNoPackageOrderParamVerify: 到站不能为空 destination={} ",destination); - throw new CustomerException(405,"到站不能为空"); + if (StringUtil.isBlank(destination)) { + log.warn("#################openNoPackageOrderParamVerify: 到站不能为空 destination={} ", destination); + throw new CustomerException(405, "到站不能为空"); } List advanceIds = openOrderDTO.getAdvanceIds(); - if(advanceIds.isEmpty()){ - log.warn("#################openNoPackageOrderParamVerify: 订单号不能为空 advanceIds={} ",advanceIds); - throw new CustomerException(405,"订单号不能为空"); + if (advanceIds.isEmpty()) { + log.warn("#################openNoPackageOrderParamVerify: 订单号不能为空 advanceIds={} ", advanceIds); + throw new CustomerException(405, "订单号不能为空"); } String shipper = openOrderDTO.getShipper(); - if(StringUtil.isBlank(shipper)){ - log.warn("#################openNoPackageOrderParamVerify: 发货单位不能为空 shipper={} ",shipper); - throw new CustomerException(405,"发货单位不能为空"); + if (StringUtil.isBlank(shipper)) { + log.warn("#################openNoPackageOrderParamVerify: 发货单位不能为空 shipper={} ", shipper); + throw new CustomerException(405, "发货单位不能为空"); } String consignee = openOrderDTO.getConsignee(); - if(StringUtil.isBlank(consignee)){ - log.warn("#################openNoPackageOrderParamVerify: 收货单位不能为空 consignee={} ",consignee); - throw new CustomerException(405,"收货单位不能为空"); + if (StringUtil.isBlank(consignee)) { + log.warn("#################openNoPackageOrderParamVerify: 收货单位不能为空 consignee={} ", consignee); + throw new CustomerException(405, "收货单位不能为空"); } Integer waybillType = openOrderDTO.getWaybillType(); - if(Objects.isNull(waybillType)){ - log.warn("#################openNoPackageOrderParamVerify: 运单类型不能为空 waybillType={} ",waybillType); - throw new CustomerException(405,"运单类型不能为空"); + if (Objects.isNull(waybillType)) { + log.warn("#################openNoPackageOrderParamVerify: 运单类型不能为空 waybillType={} ", waybillType); + throw new CustomerException(405, "运单类型不能为空"); } List waybillDetailList = openOrderDTO.getWaybillDetailList(); - for(WaybillDetailDTO waybillDetailDTO:waybillDetailList){ + for (WaybillDetailDTO waybillDetailDTO : waybillDetailList) { String goodsName = waybillDetailDTO.getGoodsName(); - if(StringUtil.isBlank(goodsName)){ - log.warn("#################openNoPackageOrderParamVerify: 货物名称不能为空 goodsName={} ",goodsName); - throw new CustomerException(405,"货物名称不能为空"); + if (StringUtil.isBlank(goodsName)) { + log.warn("#################openNoPackageOrderParamVerify: 货物名称不能为空 goodsName={} ", goodsName); + throw new CustomerException(405, "货物名称不能为空"); } Integer chargeType = waybillDetailDTO.getChargeType();//1件 2方 3公斤 Integer num = waybillDetailDTO.getNum(); BigDecimal weight = waybillDetailDTO.getWeight(); BigDecimal volume = waybillDetailDTO.getVolume(); - if(1 == chargeType){ - if(num <= 0){ - log.warn("#################openNoPackageOrderParamVerify: 货物数量不正确 num={} ",num); - throw new CustomerException(405,"货物数量不正确"); + if (1 == chargeType) { + if (num <= 0) { + log.warn("#################openNoPackageOrderParamVerify: 货物数量不正确 num={} ", num); + throw new CustomerException(405, "货物数量不正确"); } - }else if(2 == chargeType){ - if(volume.compareTo(BigDecimal.ZERO) <= 0){ - log.warn("#################openNoPackageOrderParamVerify: 货物体积不正确 volume={} ",volume); - throw new CustomerException(405,"货物体积不正确"); + } else if (2 == chargeType) { + if (volume.compareTo(BigDecimal.ZERO) <= 0) { + log.warn("#################openNoPackageOrderParamVerify: 货物体积不正确 volume={} ", volume); + throw new CustomerException(405, "货物体积不正确"); } - }else if(3 == chargeType){ - if(weight.compareTo(BigDecimal.ZERO) <= 0){ - log.warn("#################openNoPackageOrderParamVerify: 货物重量不正确 weight={} ",weight); - throw new CustomerException(405,"货物重量不正确"); + } else if (3 == chargeType) { + if (weight.compareTo(BigDecimal.ZERO) <= 0) { + log.warn("#################openNoPackageOrderParamVerify: 货物重量不正确 weight={} ", weight); + throw new CustomerException(405, "货物重量不正确"); } } @@ -912,22 +904,22 @@ public class OpenOrderController { // } BigDecimal subtotalFreight = waybillDetailDTO.getSubtotalFreight(); - if(subtotalFreight.compareTo(BigDecimal.ZERO) <= 0){ - log.warn("#################openNoPackageOrderParamVerify: 货物运费小计不正确 subtotalFreight={} ",subtotalFreight); - throw new CustomerException(405,"货物运费小计不正确"); + if (subtotalFreight.compareTo(BigDecimal.ZERO) <= 0) { + log.warn("#################openNoPackageOrderParamVerify: 货物运费小计不正确 subtotalFreight={} ", subtotalFreight); + throw new CustomerException(405, "货物运费小计不正确"); } } BigDecimal totalFreight = openOrderDTO.getTotalFreight(); - if(totalFreight.compareTo(BigDecimal.ZERO) <= 0){ - log.warn("#################openNoPackageOrderParamVerify: 运费不正确 totalFreight={} ",totalFreight); - throw new CustomerException(405,"运费不正确"); + if (totalFreight.compareTo(BigDecimal.ZERO) <= 0) { + log.warn("#################openNoPackageOrderParamVerify: 运费不正确 totalFreight={} ", totalFreight); + throw new CustomerException(405, "运费不正确"); } String payWay = openOrderDTO.getPayWay(); - if(StringUtil.isBlank(payWay)){ - log.warn("#################openNoPackageOrderParamVerify: 付款方式不能为空 payWay={} ",payWay); - throw new CustomerException(405,"付款方式不能为空"); + if (StringUtil.isBlank(payWay)) { + log.warn("#################openNoPackageOrderParamVerify: 付款方式不能为空 payWay={} ", payWay); + throw new CustomerException(405, "付款方式不能为空"); } BigDecimal xPay = openOrderDTO.getXianPay(); @@ -935,117 +927,116 @@ public class OpenOrderController { BigDecimal yPay = openOrderDTO.getYuePay(); BigDecimal hPay = openOrderDTO.getHuiPay(); - if("1".equals(payWay)){ - if(xPay.compareTo(BigDecimal.ZERO) <= 0){ - log.warn("#################openNoPackageOrderParamVerify: 现付运费不正确 xPay={} ",xPay); - throw new CustomerException(405,"现付运费不正确"); + if ("1".equals(payWay)) { + if (xPay.compareTo(BigDecimal.ZERO) <= 0) { + log.warn("#################openNoPackageOrderParamVerify: 现付运费不正确 xPay={} ", xPay); + throw new CustomerException(405, "现付运费不正确"); } - }else if("2".equals(payWay)){ - if(dPay.compareTo(BigDecimal.ZERO) <= 0){ - log.warn("#################openNoPackageOrderParamVerify: 到付运费不正确 dPay={} ",dPay); - throw new CustomerException(405,"到付运费不正确"); + } else if ("2".equals(payWay)) { + if (dPay.compareTo(BigDecimal.ZERO) <= 0) { + log.warn("#################openNoPackageOrderParamVerify: 到付运费不正确 dPay={} ", dPay); + throw new CustomerException(405, "到付运费不正确"); } - }else if("3".equals(payWay)){ - if(yPay.compareTo(BigDecimal.ZERO) <= 0){ - log.warn("#################openNoPackageOrderParamVerify: 月结运费不正确 yPay={} ",yPay); - throw new CustomerException(405,"月结运费不正确"); + } else if ("3".equals(payWay)) { + if (yPay.compareTo(BigDecimal.ZERO) <= 0) { + log.warn("#################openNoPackageOrderParamVerify: 月结运费不正确 yPay={} ", yPay); + throw new CustomerException(405, "月结运费不正确"); } - }else if("4".equals(payWay)){ - if(hPay.compareTo(BigDecimal.ZERO) <= 0){ - log.warn("#################openNoPackageOrderParamVerify: 回付运费不正确 hPay={} ",hPay); - throw new CustomerException(405,"回付运费不正确"); + } else if ("4".equals(payWay)) { + if (hPay.compareTo(BigDecimal.ZERO) <= 0) { + log.warn("#################openNoPackageOrderParamVerify: 回付运费不正确 hPay={} ", hPay); + throw new CustomerException(405, "回付运费不正确"); } } } - private void openOrderParamVerify(OpenOrderDTO openOrderDTO) { log.info("#################openOrderParamVerify: 验证开单参数开始"); String brand = openOrderDTO.getBrand(); - if(StringUtil.isBlank(brand)){ - log.warn("#################openOrderParamVerify: 品牌不能为空 brand={}",brand); - throw new CustomerException(405,"品牌不能为空"); + if (StringUtil.isBlank(brand)) { + log.warn("#################openOrderParamVerify: 品牌不能为空 brand={}", brand); + throw new CustomerException(405, "品牌不能为空"); } Long departureWarehouseId = openOrderDTO.getDepartureWarehouseId(); String departureWarehouseName = openOrderDTO.getDepartureWarehouseName(); - if(Objects.isNull(departureWarehouseId) && StringUtil.isBlank(departureWarehouseName)){ - log.warn("#################openOrderParamVerify: 发站仓不能为空 departureWarehouseId={} departureWarehouseName={}",departureWarehouseId,departureWarehouseName); - throw new CustomerException(405,"发站仓不能为空"); + if (Objects.isNull(departureWarehouseId) && StringUtil.isBlank(departureWarehouseName)) { + log.warn("#################openOrderParamVerify: 发站仓不能为空 departureWarehouseId={} departureWarehouseName={}", departureWarehouseId, departureWarehouseName); + throw new CustomerException(405, "发站仓不能为空"); } Long warehouseId = openOrderDTO.getWarehouseId(); - if(!departureWarehouseId.equals(warehouseId)){ - log.warn("#################openOrderParamVerify: 发站仓不属于当前仓 departureWarehouseId={} warehouseId={}",departureWarehouseId,warehouseId); - throw new CustomerException(405,"发站仓不属于当前仓"); + if (!departureWarehouseId.equals(warehouseId)) { + log.warn("#################openOrderParamVerify: 发站仓不属于当前仓 departureWarehouseId={} warehouseId={}", departureWarehouseId, warehouseId); + throw new CustomerException(405, "发站仓不属于当前仓"); } Long destinationWarehouseId = openOrderDTO.getDestinationWarehouseId(); String destinationWarehouseName = openOrderDTO.getDestinationWarehouseName(); - if(Objects.isNull(destinationWarehouseId) && StringUtil.isBlank(destinationWarehouseName)){ - log.warn("#################openOrderParamVerify: 目的仓不能为空 destinationWarehouseId={} destinationWarehouseName={}",destinationWarehouseId,destinationWarehouseName); - throw new CustomerException(405,"目的仓不能为空"); + if (Objects.isNull(destinationWarehouseId) && StringUtil.isBlank(destinationWarehouseName)) { + log.warn("#################openOrderParamVerify: 目的仓不能为空 destinationWarehouseId={} destinationWarehouseName={}", destinationWarehouseId, destinationWarehouseName); + throw new CustomerException(405, "目的仓不能为空"); } String destination = openOrderDTO.getDestination(); - if(StringUtil.isBlank(destination)){ - log.warn("#################openOrderParamVerify: 到站不能为空 destination={} ",destination); - throw new CustomerException(405,"到站不能为空"); + if (StringUtil.isBlank(destination)) { + log.warn("#################openOrderParamVerify: 到站不能为空 destination={} ", destination); + throw new CustomerException(405, "到站不能为空"); } String orderCode = openOrderDTO.getOrderCode(); - if(StringUtil.isBlank(orderCode)){ - log.warn("#################openOrderParamVerify: 订单号不能为空 orderCode={} ",orderCode); - throw new CustomerException(405,"订单号不能为空"); + if (StringUtil.isBlank(orderCode)) { + log.warn("#################openOrderParamVerify: 订单号不能为空 orderCode={} ", orderCode); + throw new CustomerException(405, "订单号不能为空"); } List advanceIds = openOrderDTO.getAdvanceIds(); - if(CollUtil.isEmpty(advanceIds)){ - log.warn("#################openOrderParamVerify: 订单号不能为空 advanceIds={} ",advanceIds); - throw new CustomerException(405,"订单号不能为空"); + if (CollUtil.isEmpty(advanceIds)) { + log.warn("#################openOrderParamVerify: 订单号不能为空 advanceIds={} ", advanceIds); + throw new CustomerException(405, "订单号不能为空"); } String shipper = openOrderDTO.getShipper(); - if(StringUtil.isBlank(shipper)){ - log.warn("#################openOrderParamVerify: 发货单位不能为空 shipper={} ",shipper); - throw new CustomerException(405,"发货单位不能为空"); + if (StringUtil.isBlank(shipper)) { + log.warn("#################openOrderParamVerify: 发货单位不能为空 shipper={} ", shipper); + throw new CustomerException(405, "发货单位不能为空"); } String consignee = openOrderDTO.getConsignee(); - if(StringUtil.isBlank(consignee)){ - log.warn("#################openOrderParamVerify: 收货单位不能为空 consignee={} ",consignee); - throw new CustomerException(405,"收货单位不能为空"); + if (StringUtil.isBlank(consignee)) { + log.warn("#################openOrderParamVerify: 收货单位不能为空 consignee={} ", consignee); + throw new CustomerException(405, "收货单位不能为空"); } Integer waybillType = openOrderDTO.getWaybillType(); - if(Objects.isNull(waybillType)){ - log.warn("#################openOrderParamVerify: 运单类型不能为空 waybillType={} ",waybillType); - throw new CustomerException(405,"运单类型不能为空"); + if (Objects.isNull(waybillType)) { + log.warn("#################openOrderParamVerify: 运单类型不能为空 waybillType={} ", waybillType); + throw new CustomerException(405, "运单类型不能为空"); } List waybillDetailList = openOrderDTO.getWaybillDetailList(); - for(WaybillDetailDTO waybillDetailDTO:waybillDetailList){ + for (WaybillDetailDTO waybillDetailDTO : waybillDetailList) { String goodsName = waybillDetailDTO.getGoodsName(); - if(StringUtil.isBlank(goodsName)){ - log.warn("#################openOrderParamVerify: 货物名称不能为空 goodsName={} ",goodsName); - throw new CustomerException(405,"货物名称不能为空"); + if (StringUtil.isBlank(goodsName)) { + log.warn("#################openOrderParamVerify: 货物名称不能为空 goodsName={} ", goodsName); + throw new CustomerException(405, "货物名称不能为空"); } Integer chargeType = waybillDetailDTO.getChargeType();//1件 2方 3公斤 Integer num = waybillDetailDTO.getNum(); BigDecimal weight = waybillDetailDTO.getWeight(); BigDecimal volume = waybillDetailDTO.getVolume(); - if(1 == chargeType){ - if(num <= 0){ - log.warn("#################openOrderParamVerify: 货物数量不正确 num={} ",num); - throw new CustomerException(405,"货物数量不正确"); + if (1 == chargeType) { + if (num <= 0) { + log.warn("#################openOrderParamVerify: 货物数量不正确 num={} ", num); + throw new CustomerException(405, "货物数量不正确"); } - }else if(2 == chargeType){ - if(volume.compareTo(BigDecimal.ZERO) <= 0){ - log.warn("#################openOrderParamVerify: 货物体积不正确 volume={} ",volume); - throw new CustomerException(405,"货物体积不正确"); + } else if (2 == chargeType) { + if (volume.compareTo(BigDecimal.ZERO) <= 0) { + log.warn("#################openOrderParamVerify: 货物体积不正确 volume={} ", volume); + throw new CustomerException(405, "货物体积不正确"); } - }else if(3 == chargeType){ - if(weight.compareTo(BigDecimal.ZERO) <= 0){ - log.warn("#################openOrderParamVerify: 货物重量不正确 weight={} ",weight); - throw new CustomerException(405,"货物重量不正确"); + } else if (3 == chargeType) { + if (weight.compareTo(BigDecimal.ZERO) <= 0) { + log.warn("#################openOrderParamVerify: 货物重量不正确 weight={} ", weight); + throw new CustomerException(405, "货物重量不正确"); } } @@ -1056,22 +1047,22 @@ public class OpenOrderController { // } BigDecimal subtotalFreight = waybillDetailDTO.getSubtotalFreight(); - if(subtotalFreight.compareTo(BigDecimal.ZERO) < 0){ - log.warn("#################openOrderParamVerify: 货物运费小计不正确 subtotalFreight={} ",subtotalFreight); - throw new CustomerException(405,"货物运费小计不正确"); + if (subtotalFreight.compareTo(BigDecimal.ZERO) < 0) { + log.warn("#################openOrderParamVerify: 货物运费小计不正确 subtotalFreight={} ", subtotalFreight); + throw new CustomerException(405, "货物运费小计不正确"); } } BigDecimal totalFreight = openOrderDTO.getTotalFreight(); - if(totalFreight.compareTo(BigDecimal.ZERO) < 0){ - log.warn("#################openOrderParamVerify: 运费不正确 totalFreight={} ",totalFreight); - throw new CustomerException(405,"运费不正确"); + if (totalFreight.compareTo(BigDecimal.ZERO) < 0) { + log.warn("#################openOrderParamVerify: 运费不正确 totalFreight={} ", totalFreight); + throw new CustomerException(405, "运费不正确"); } String payWay = openOrderDTO.getPayWay(); - if(StringUtil.isBlank(payWay)){ - log.warn("#################openOrderParamVerify: 付款方式不能为空 payWay={} ",payWay); - throw new CustomerException(405,"付款方式不能为空"); + if (StringUtil.isBlank(payWay)) { + log.warn("#################openOrderParamVerify: 付款方式不能为空 payWay={} ", payWay); + throw new CustomerException(405, "付款方式不能为空"); } BigDecimal xPay = openOrderDTO.getXianPay(); @@ -1079,25 +1070,25 @@ public class OpenOrderController { BigDecimal yPay = openOrderDTO.getYuePay(); BigDecimal hPay = openOrderDTO.getHuiPay(); - if("1".equals(payWay)){ - if(xPay.compareTo(BigDecimal.ZERO) <= 0){ - log.warn("#################openOrderParamVerify: 现付运费不正确 xPay={} ",xPay); - throw new CustomerException(405,"现付运费不正确"); + if ("1".equals(payWay)) { + if (xPay.compareTo(BigDecimal.ZERO) <= 0) { + log.warn("#################openOrderParamVerify: 现付运费不正确 xPay={} ", xPay); + throw new CustomerException(405, "现付运费不正确"); } - }else if("2".equals(payWay)){ - if(dPay.compareTo(BigDecimal.ZERO) <= 0){ - log.warn("#################openOrderParamVerify: 到付运费不正确 dPay={} ",dPay); - throw new CustomerException(405,"到付运费不正确"); + } else if ("2".equals(payWay)) { + if (dPay.compareTo(BigDecimal.ZERO) <= 0) { + log.warn("#################openOrderParamVerify: 到付运费不正确 dPay={} ", dPay); + throw new CustomerException(405, "到付运费不正确"); } - }else if("3".equals(payWay)){ - if(yPay.compareTo(BigDecimal.ZERO) <= 0){ - log.warn("#################openOrderParamVerify: 月结运费不正确 yPay={} ",yPay); - throw new CustomerException(405,"月结运费不正确"); + } else if ("3".equals(payWay)) { + if (yPay.compareTo(BigDecimal.ZERO) <= 0) { + log.warn("#################openOrderParamVerify: 月结运费不正确 yPay={} ", yPay); + throw new CustomerException(405, "月结运费不正确"); } - }else if("4".equals(payWay)){ - if(hPay.compareTo(BigDecimal.ZERO) <= 0){ - log.warn("#################openOrderParamVerify: 回付运费不正确 hPay={} ",hPay); - throw new CustomerException(405,"回付运费不正确"); + } else if ("4".equals(payWay)) { + if (hPay.compareTo(BigDecimal.ZERO) <= 0) { + log.warn("#################openOrderParamVerify: 回付运费不正确 hPay={} ", hPay); + throw new CustomerException(405, "回付运费不正确"); } } } @@ -1111,13 +1102,13 @@ public class OpenOrderController { public R openLabel(@RequestBody OpenLabelDTO openLabelDTO) { String method = "############openLabel: "; log.info(method + "请求参数{}", openLabelDTO); - try{ + try { //当前登录人选择的仓库 BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); - if(Objects.isNull(myCurrentWarehouse)){ - log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse); - return R.fail(403,"多仓权限无法操作，请选择仓库"); + if (Objects.isNull(myCurrentWarehouse)) { + log.warn(method + "仓库信息为空 myCurrentWarehouse={}", myCurrentWarehouse); + return R.fail(403, "多仓权限无法操作，请选择仓库"); } openLabelDTO.setWarehouseId(myCurrentWarehouse.getId()); openLabelDTO.setWarehouseName(myCurrentWarehouse.getName()); @@ -1126,61 +1117,61 @@ public class OpenOrderController { openLabelParamVerify(openLabelDTO); return openOrderService.openLabel(openLabelDTO); - }catch (CustomerException e){ - log.error(e.message,e); - return R.fail(e.code,e.message); - }catch (Exception e){ - log.error(method+"系统异常",e); - return R.fail(500,"系统异常"); + } catch (CustomerException e) { + log.error(e.message, e); + return R.fail(e.code, e.message); + } catch (Exception e) { + log.error(method + "系统异常", e); + return R.fail(500, "系统异常"); } } private void openLabelParamVerify(OpenLabelDTO openLabelDTO) { String method = "#############openLabelParamVerify: "; - log.info(method+"验证开标签数据"); + log.info(method + "验证开标签数据"); String orderCode = openLabelDTO.getOrderCode(); - if(StringUtil.isBlank(orderCode)){ - log.warn(method+"订单号为空 orderCode={}",orderCode); - throw new CustomerException(405,"订单号为空"); + if (StringUtil.isBlank(orderCode)) { + log.warn(method + "订单号为空 orderCode={}", orderCode); + throw new CustomerException(405, "订单号为空"); } String brand = openLabelDTO.getBrand(); - if(StringUtil.isBlank(brand)){ - log.warn(method+"品牌为空 brand={}",brand); - throw new CustomerException(405,"品牌为空"); + if (StringUtil.isBlank(brand)) { + log.warn(method + "品牌为空 brand={}", brand); + throw new CustomerException(405, "品牌为空"); } Integer totalNumber = openLabelDTO.getTotalNumber(); - if(totalNumber == 0 && !"曼好家".equals(brand)){ - log.warn(method+"总数量不正确 totalNumber={}",totalNumber); - throw new CustomerException(405,"总数量不正确"); + if (totalNumber == 0 && !"曼好家".equals(brand)) { + log.warn(method + "总数量不正确 totalNumber={}", totalNumber); + throw new CustomerException(405, "总数量不正确"); } String firsts = openLabelDTO.getFirsts(); - if(StringUtil.isBlank(firsts)){ - log.warn(method+"一级品类为空 firsts={}",firsts); - throw new CustomerException(405,"一级品类为空"); + if (StringUtil.isBlank(firsts)) { + log.warn(method + "一级品类为空 firsts={}", firsts); + throw new CustomerException(405, "一级品类为空"); } String dealerName = openLabelDTO.getDealerName(); - if(StringUtil.isBlank(dealerName)){ - log.warn(method+"商场为空 dealerName={}",dealerName); - throw new CustomerException(405,"商场为空"); + if (StringUtil.isBlank(dealerName)) { + log.warn(method + "商场为空 dealerName={}", dealerName); + throw new CustomerException(405, "商场为空"); } String customerName = openLabelDTO.getCustomerName(); - if(StringUtil.isBlank(customerName)){ - log.warn(method+"收货人为空 customerName={}",customerName); - throw new CustomerException(405,"收货人为空"); + if (StringUtil.isBlank(customerName)) { + log.warn(method + "收货人为空 customerName={}", customerName); + throw new CustomerException(405, "收货人为空"); } String customerPhone = openLabelDTO.getCustomerPhone(); - if(StringUtil.isBlank(customerPhone)){ - log.warn(method+"收货人电话为空 customerPhone={}",customerPhone); - throw new CustomerException(405,"收货人电话为空"); + if (StringUtil.isBlank(customerPhone)) { + log.warn(method + "收货人电话为空 customerPhone={}", customerPhone); + throw new CustomerException(405, "收货人电话为空"); } String customerAddress = openLabelDTO.getCustomerAddress(); - if(StringUtil.isBlank(customerAddress)){ - log.warn(method+"收货人地址为空 customerAddress={}",customerAddress); - throw new CustomerException(405,"收货人地址为空"); + if (StringUtil.isBlank(customerAddress)) { + log.warn(method + "收货人地址为空 customerAddress={}", customerAddress); + throw new CustomerException(405, "收货人地址为空"); } } @@ -1192,22 +1183,22 @@ public class OpenOrderController { public R batchOpenLabel(@RequestParam(value = "file") MultipartFile file) { String method = "############batchOpenLabel: "; log.info(method + "请求参数{}", file); - try{ + try { //当前登录人选择的仓库 BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); - if(Objects.isNull(myCurrentWarehouse)){ - log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse); - return R.fail(403,"多仓权限无法操作，请选择仓库"); + if (Objects.isNull(myCurrentWarehouse)) { + log.warn(method + "仓库信息为空 myCurrentWarehouse={}", myCurrentWarehouse); + return R.fail(403, "多仓权限无法操作，请选择仓库"); } - return openOrderService.batchOpenLabel(myCurrentWarehouse.getId(),myCurrentWarehouse.getName(),myCurrentWarehouse.getWarehouseCode(),file); - }catch (CustomerException e){ - log.error(e.message,e); - return R.fail(e.code,e.message); - }catch (Exception e){ - log.error(method+"系统异常",e); - return R.fail(500,"系统异常"); + return openOrderService.batchOpenLabel(myCurrentWarehouse.getId(), myCurrentWarehouse.getName(), myCurrentWarehouse.getWarehouseCode(), file); + } catch (CustomerException e) { + log.error(e.message, e); + return R.fail(e.code, e.message); + } catch (Exception e) { + log.error(method + "系统异常", e); + return R.fail(500, "系统异常"); } } @@ -1219,22 +1210,22 @@ public class OpenOrderController { public R openLabelHasPacakage(@RequestParam(value = "file") MultipartFile file) { String method = "############openLabelHasPacakage: "; log.info(method + "请求参数{}", file); - try{ + try { //当前登录人选择的仓库 BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); - if(Objects.isNull(myCurrentWarehouse)){ - log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse); - return R.fail(403,"多仓权限无法操作，请选择仓库"); + if (Objects.isNull(myCurrentWarehouse)) { + log.warn(method + "仓库信息为空 myCurrentWarehouse={}", myCurrentWarehouse); + return R.fail(403, "多仓权限无法操作，请选择仓库"); } - return openOrderService.openLabelHasPacakage(myCurrentWarehouse.getId(),myCurrentWarehouse.getName(),file); - }catch (CustomerException e){ - log.error(e.message,e); - return R.fail(e.code,e.message); - }catch (Exception e){ - log.error(method+"系统异常",e); - return R.fail(500,"系统异常"); + return openOrderService.openLabelHasPacakage(myCurrentWarehouse.getId(), myCurrentWarehouse.getName(), file); + } catch (CustomerException e) { + log.error(e.message, e); + return R.fail(e.code, e.message); + } catch (Exception e) { + log.error(method + "系统异常", e); + return R.fail(500, "系统异常"); } } @@ -1245,28 +1236,26 @@ public class OpenOrderController { public R importOrderNoPackage(@RequestParam(value = "file") MultipartFile file) { String method = "############importOrderNoPackage: "; log.info(method + "请求参数{}", file); - try{ + try { //当前登录人选择的仓库 BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); - if(Objects.isNull(myCurrentWarehouse)){ - log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse); - return R.fail(403,"多仓权限无法操作，请选择仓库"); + if (Objects.isNull(myCurrentWarehouse)) { + log.warn(method + "仓库信息为空 myCurrentWarehouse={}", myCurrentWarehouse); + return R.fail(403, "多仓权限无法操作，请选择仓库"); } - return openOrderService.importOrderNoPackage(myCurrentWarehouse.getId(),myCurrentWarehouse.getName(),myCurrentWarehouse.getWarehouseCode(),file); - }catch (CustomerException e){ - log.error(e.message,e); - return R.fail(e.code,e.message); - }catch (Exception e){ - log.error(method+"系统异常",e); - return R.fail(500,"系统异常"); + return openOrderService.importOrderNoPackage(myCurrentWarehouse.getId(), myCurrentWarehouse.getName(), myCurrentWarehouse.getWarehouseCode(), file); + } catch (CustomerException e) { + log.error(e.message, e); + return R.fail(e.code, e.message); + } catch (Exception e) { + log.error(method + "系统异常", e); + return R.fail(500, "系统异常"); } } - - @ResponseBody @PostMapping("/importCustomizedOuPai") @ApiOperationSupport(order = 1) @@ -1274,22 +1263,22 @@ public class OpenOrderController { public R importCustomizedOuPai(@RequestParam(value = "file") MultipartFile file) { String method = "############importCustomizedOuPai: "; log.info(method + "请求参数{}", file); - try{ + try { //当前登录人选择的仓库 BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); - if(Objects.isNull(myCurrentWarehouse)){ - log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse); - return R.fail(403,"多仓权限无法操作，请选择仓库"); + if (Objects.isNull(myCurrentWarehouse)) { + log.warn(method + "仓库信息为空 myCurrentWarehouse={}", myCurrentWarehouse); + return R.fail(403, "多仓权限无法操作，请选择仓库"); } return openOrderService.importCustomizedOuPai(myCurrentWarehouse.getId(), myCurrentWarehouse.getName(), file); - }catch (CustomerException e){ - log.error(e.message,e); - return R.fail(e.code,e.message); - }catch (Exception e){ - log.error(method+"系统异常",e); - return R.fail(500,"系统异常"); + } catch (CustomerException e) { + log.error(e.message, e); + return R.fail(e.code, e.message); + } catch (Exception e) { + log.error(method + "系统异常", e); + return R.fail(500, "系统异常"); } } @@ -1301,22 +1290,22 @@ public class OpenOrderController { public R importStandardOuPai(@RequestParam(value = "file") MultipartFile file) { String method = "############importStandardOuPai: "; log.info(method + "请求参数{}", file); - try{ + try { //当前登录人选择的仓库 BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); - if(Objects.isNull(myCurrentWarehouse)){ - log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse); - return R.fail(403,"多仓权限无法操作，请选择仓库"); + if (Objects.isNull(myCurrentWarehouse)) { + log.warn(method + "仓库信息为空 myCurrentWarehouse={}", myCurrentWarehouse); + return R.fail(403, "多仓权限无法操作，请选择仓库"); } - return openOrderService.importStandardOuPai(myCurrentWarehouse.getId(),myCurrentWarehouse.getName(),file); - }catch (CustomerException e){ - log.error(e.message,e); - return R.fail(e.code,e.message); - }catch (Exception e){ - log.error(method+"系统异常",e); - return R.fail(500,"系统异常"); + return openOrderService.importStandardOuPai(myCurrentWarehouse.getId(), myCurrentWarehouse.getName(), file); + } catch (CustomerException e) { + log.error(e.message, e); + return R.fail(e.code, e.message); + } catch (Exception e) { + log.error(method + "系统异常", e); + return R.fail(500, "系统异常"); } } @@ -1330,7 +1319,7 @@ public class OpenOrderController { log.info(method + "请求参数{}", openOrderDTO); Long waybillId = openOrderDTO.getWaybillId(); Integer isEdit = openOrderDTO.getIsEdit(); - try{ + try { //当前登录人选择的仓库 // BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); @@ -1341,23 +1330,23 @@ public class OpenOrderController { // openOrderDTO.setWarehouseId(myCurrentWarehouse.getId()); // openOrderDTO.setWarehouseName(myCurrentWarehouse.getName()); - if (Objects.isNull(waybillId)){ - log.warn(method+"运单号id为空 waybillId={}",waybillId); - return R.fail(403,"运单号id为空"); + if (Objects.isNull(waybillId)) { + log.warn(method + "运单号id为空 waybillId={}", waybillId); + return R.fail(403, "运单号id为空"); } - if (Objects.isNull(isEdit)){ - log.warn(method+"查看类型为空 isEdit={}",isEdit); - return R.fail(403,"查看类型为空"); + if (Objects.isNull(isEdit)) { + log.warn(method + "查看类型为空 isEdit={}", isEdit); + return R.fail(403, "查看类型为空"); } return openOrderService.findWaybillDetail(openOrderDTO); - }catch (CustomerException e){ - log.error(e.message,e); - return R.fail(e.code,e.message); - }catch (Exception e){ - log.error(method+"系统异常",e); - return R.fail(500,"系统异常"); + } catch (CustomerException e) { + log.error(e.message, e); + return R.fail(e.code, e.message); + } catch (Exception e) { + log.error(method + "系统异常", e); + return R.fail(500, "系统异常"); } } @@ -1370,34 +1359,33 @@ public class OpenOrderController { log.info(method + "请求参数{}", openOrderDTO); Long waybillId = openOrderDTO.getWaybillId(); - try{ + try { //当前登录人选择的仓库 BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); - if(Objects.isNull(myCurrentWarehouse)){ - log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse); - return R.fail(403,"多仓权限无法操作，请选择仓库"); + if (Objects.isNull(myCurrentWarehouse)) { + log.warn(method + "仓库信息为空 myCurrentWarehouse={}", myCurrentWarehouse); + return R.fail(403, "多仓权限无法操作，请选择仓库"); } openOrderDTO.setWarehouseId(myCurrentWarehouse.getId()); openOrderDTO.setWarehouseName(myCurrentWarehouse.getName()); - if (Objects.isNull(waybillId)){ - log.warn(method+"运单号id为空 waybillId={}",waybillId); - return R.fail(403,"运单号id为空"); + if (Objects.isNull(waybillId)) { + log.warn(method + "运单号id为空 waybillId={}", waybillId); + return R.fail(403, "运单号id为空"); } return openOrderService.updateWaybillVerify(openOrderDTO); - }catch (CustomerException e){ - log.error(e.message,e); - return R.fail(e.code,e.message); - }catch (Exception e){ - log.error(method+"系统异常",e); - return R.fail(500,"系统异常"); + } catch (CustomerException e) { + log.error(e.message, e); + return R.fail(e.code, e.message); + } catch (Exception e) { + log.error(method + "系统异常", e); + return R.fail(500, "系统异常"); } } - @ResponseBody @PostMapping("/updateWaybill") @ApiOperationSupport(order = 1) @@ -1409,33 +1397,33 @@ public class OpenOrderController { String editResonCode = openOrderDTO.getEditResonCode(); String editReson = openOrderDTO.getEditReson(); - try{ + try { //当前登录人选择的仓库 BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); - if(Objects.isNull(myCurrentWarehouse)){ - log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse); - return R.fail(403,"多仓权限无法操作，请选择仓库"); + if (Objects.isNull(myCurrentWarehouse)) { + log.warn(method + "仓库信息为空 myCurrentWarehouse={}", myCurrentWarehouse); + return R.fail(403, "多仓权限无法操作，请选择仓库"); } openOrderDTO.setWarehouseId(myCurrentWarehouse.getId()); openOrderDTO.setWarehouseName(myCurrentWarehouse.getName()); - if (Objects.isNull(waybillId)){ - log.warn(method+"运单号id为空 waybillId={}",waybillId); - return R.fail(403,"运单号id为空"); + if (Objects.isNull(waybillId)) { + log.warn(method + "运单号id为空 waybillId={}", waybillId); + return R.fail(403, "运单号id为空"); } - if(StringUtil.isBlank(editResonCode) && StringUtil.isBlank(editReson)){ - log.warn(method+"改单原因为空 editResonCode={} editReson={}",editResonCode,editReson); - return R.fail(403,"改单原因为空"); + if (StringUtil.isBlank(editResonCode) && StringUtil.isBlank(editReson)) { + log.warn(method + "改单原因为空 editResonCode={} editReson={}", editResonCode, editReson); + return R.fail(403, "改单原因为空"); } return openOrderService.updateWaybill(openOrderDTO); - }catch (CustomerException e){ - log.error(e.message,e); - return R.fail(e.code,e.message); - }catch (Exception e){ - log.error(method+"系统异常",e); - return R.fail(500,"系统异常"); + } catch (CustomerException e) { + log.error(e.message, e); + return R.fail(e.code, e.message); + } catch (Exception e) { + log.error(method + "系统异常", e); + return R.fail(500, "系统异常"); } } @@ -1447,7 +1435,7 @@ public class OpenOrderController { String method = "############findBrandList: "; log.info(method + "请求参数{}", openOrderDTO); - try{ + try { //当前登录人选择的仓库 // BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); @@ -1459,12 +1447,12 @@ public class OpenOrderController { // openOrderDTO.setWarehouseName(myCurrentWarehouse.getName()); return openOrderService.findBrandList(openOrderDTO); - }catch (CustomerException e){ - log.error(e.message,e); - return R.fail(e.code,e.message); - }catch (Exception e){ - log.error(method+"系统异常",e); - return R.fail(500,"系统异常"); + } catch (CustomerException e) { + log.error(e.message, e); + return R.fail(e.code, e.message); + } catch (Exception e) { + log.error(method + "系统异常", e); + return R.fail(500, "系统异常"); } } @@ -1479,31 +1467,64 @@ public class OpenOrderController { Long waybillId = openOrderDTO.getWaybillId(); - try{ + try { //当前登录人选择的仓库 BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); - if(Objects.isNull(myCurrentWarehouse)){ - log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse); - return R.fail(403,"多仓权限无法操作，请选择仓库"); + if (Objects.isNull(myCurrentWarehouse)) { + log.warn(method + "仓库信息为空 myCurrentWarehouse={}", myCurrentWarehouse); + return R.fail(403, "多仓权限无法操作，请选择仓库"); } openOrderDTO.setWarehouseId(myCurrentWarehouse.getId()); openOrderDTO.setWarehouseName(myCurrentWarehouse.getName()); - if(Objects.isNull(waybillId)){ - log.warn(method+"运单id为空 waybillId={}",waybillId); - return R.fail(403,"运单id为空"); + if (Objects.isNull(waybillId)) { + log.warn(method + "运单id为空 waybillId={}", waybillId); + return R.fail(403, "运单id为空"); } return openOrderService.checkWaybill(openOrderDTO); - }catch (CustomerException e){ - log.error(e.message,e); - return R.fail(e.code,e.message); - }catch (Exception e){ - log.error(method+"系统异常",e); - return R.fail(500,"系统异常"); + } catch (CustomerException e) { + log.error(e.message, e); + return R.fail(e.code, e.message); + } catch (Exception e) { + log.error(method + "系统异常", e); + return R.fail(500, "系统异常"); } } + + @ResponseBody + @PostMapping("/checkWaybillList") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "批量上", notes = "传入openOrderDTO") + public R checkWaybillList(@RequestBody CheckWaybillListDTO openOrderDTO) { + String method = "############checkWaybillList: "; + log.info(method + "请求参数{}", openOrderDTO); + + try { + if (openOrderDTO.getWaybillIds().isEmpty()) { + return R.fail(403, "参数错误！"); + } + //当前登录人选择的仓库 + BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); + if (Objects.isNull(myCurrentWarehouse)) { + log.warn(method + "仓库信息为空 myCurrentWarehouse={}", myCurrentWarehouse); + return R.fail(403, "多仓权限无法操作，请选择仓库"); + } + openOrderDTO.setWarehouseId(myCurrentWarehouse.getId()); + openOrderDTO.setWarehouseName(myCurrentWarehouse.getName()); + + return openOrderService.checkWaybillList(openOrderDTO); + } catch (CustomerException e) { + log.error(e.message, e); + return R.fail(e.code, e.message); + } catch (Exception e) { + log.error(method + "系统异常", e); + return R.fail(500, "系统异常"); + } + } + + @ResponseBody @PostMapping("/cancleCheckWaybill") @ApiOperationSupport(order = 1) @@ -1514,33 +1535,32 @@ public class OpenOrderController { Long waybillId = openOrderDTO.getWaybillId(); - try{ + try { //当前登录人选择的仓库 BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); - if(Objects.isNull(myCurrentWarehouse)){ - log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse); - return R.fail(403,"多仓权限无法操作，请选择仓库"); + if (Objects.isNull(myCurrentWarehouse)) { + log.warn(method + "仓库信息为空 myCurrentWarehouse={}", myCurrentWarehouse); + return R.fail(403, "多仓权限无法操作，请选择仓库"); } openOrderDTO.setWarehouseId(myCurrentWarehouse.getId()); openOrderDTO.setWarehouseName(myCurrentWarehouse.getName()); - if(Objects.isNull(waybillId)){ - log.warn(method+"运单id为空 waybillId={}",waybillId); - return R.fail(403,"运单id为空"); + if (Objects.isNull(waybillId)) { + log.warn(method + "运单id为空 waybillId={}", waybillId); + return R.fail(403, "运单id为空"); } return openOrderService.cancleCheckWaybill(openOrderDTO); - }catch (CustomerException e){ - log.error(e.message,e); - return R.fail(e.code,e.message); - }catch (Exception e){ - log.error(method+"系统异常",e); - return R.fail(500,"系统异常"); + } catch (CustomerException e) { + log.error(e.message, e); + return R.fail(e.code, e.message); + } catch (Exception e) { + log.error(method + "系统异常", e); + return R.fail(500, "系统异常"); } } - @ResponseBody @PostMapping("/openNoPackageWaybill") @ApiOperationSupport(order = 1) @@ -1548,13 +1568,13 @@ public class OpenOrderController { public R openNoPackageWaybill(@RequestBody OpenOrderDTO openOrderDTO) { String method = "############openNoPackageWaybill: "; log.info(method + "请求参数{}", openOrderDTO); - try{ + try { //当前登录人选择的仓库 BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); - if(Objects.isNull(myCurrentWarehouse)){ - log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse); - return R.fail(403,"多仓权限无法操作，请选择仓库"); + if (Objects.isNull(myCurrentWarehouse)) { + log.warn(method + "仓库信息为空 myCurrentWarehouse={}", myCurrentWarehouse); + return R.fail(403, "多仓权限无法操作，请选择仓库"); } openOrderDTO.setWarehouseId(myCurrentWarehouse.getId()); @@ -1562,12 +1582,12 @@ public class OpenOrderController { openNoPackageOrderParamVerify(openOrderDTO); return openOrderService.openNoPackageWaybill(openOrderDTO); - }catch (CustomerException e){ - log.error(e.message,e); - return R.fail(e.code,e.message); - }catch (Exception e){ - log.error(method+"系统异常",e); - return R.fail(500,"系统异常"); + } catch (CustomerException e) { + log.error(e.message, e); + return R.fail(e.code, e.message); + } catch (Exception e) { + log.error(method + "系统异常", e); + return R.fail(500, "系统异常"); } } @@ -1581,7 +1601,7 @@ public class OpenOrderController { log.info(method + "请求参数{}", openOrderDTO); String goodsName = openOrderDTO.getGoodsName(); - try{ + try { // if(StringUtil.isBlank(clientName)){ // log.warn(method+"客户名称为空 clientName={}",clientName); @@ -1589,12 +1609,12 @@ public class OpenOrderController { // } return openOrderService.findCategoryInfo(goodsName); - }catch (CustomerException e){ - log.error(e.message,e); - return R.fail(e.code,e.message); - }catch (Exception e){ - log.error(method+"系统异常",e); - return R.fail(500,"系统异常"); + } catch (CustomerException e) { + log.error(e.message, e); + return R.fail(e.code, e.message); + } catch (Exception e) { + log.error(method + "系统异常", e); + return R.fail(500, "系统异常"); } } @@ -1611,37 +1631,37 @@ public class OpenOrderController { String destinationCode = openOrderDTO.getDestinationCode(); List goodsIds = openOrderDTO.getGoodsIds(); - try{ + try { - if(Objects.isNull(consigneeId)){ - log.warn(method+"收货单位id为空 consigneeId={}",consigneeId); - return R.fail(405,"收货单位id为空"); + if (Objects.isNull(consigneeId)) { + log.warn(method + "收货单位id为空 consigneeId={}", consigneeId); + return R.fail(405, "收货单位id为空"); } - if(Objects.isNull(departureWarehouseId)){ - log.warn(method+"发站仓id为空 departureWarehouseId={}",departureWarehouseId); - return R.fail(405,"发站仓id为空"); + if (Objects.isNull(departureWarehouseId)) { + log.warn(method + "发站仓id为空 departureWarehouseId={}", departureWarehouseId); + return R.fail(405, "发站仓id为空"); } - if(Objects.isNull(destinationWarehouseId)){ - log.warn(method+"目的仓id为空 destinationWarehouseId={}",destinationWarehouseId); - return R.fail(405,"目的仓id为空"); + if (Objects.isNull(destinationWarehouseId)) { + log.warn(method + "目的仓id为空 destinationWarehouseId={}", destinationWarehouseId); + return R.fail(405, "目的仓id为空"); } - if(StringUtil.isBlank(destinationCode)){ - log.warn(method+"到站编码为空 destinationCode={}",destinationCode); - return R.fail(405,"到站编码为空"); + if (StringUtil.isBlank(destinationCode)) { + log.warn(method + "到站编码为空 destinationCode={}", destinationCode); + return R.fail(405, "到站编码为空"); } - if(goodsIds.isEmpty()){ - log.warn(method+"货物id为空 goodsIds={}",goodsIds); - return R.fail(405,"货物id为空"); + if (goodsIds.isEmpty()) { + log.warn(method + "货物id为空 goodsIds={}", goodsIds); + return R.fail(405, "货物id为空"); } return openOrderService.findArrPrice(openOrderDTO); - }catch (CustomerException e){ - log.error(e.message,e); - return R.fail(e.code,e.message); - }catch (Exception e){ - log.error(method+"系统异常",e); - return R.fail(500,"系统异常"); + } catch (CustomerException e) { + log.error(e.message, e); + return R.fail(e.code, e.message); + } catch (Exception e) { + log.error(method + "系统异常", e); + return R.fail(500, "系统异常"); } } @@ -1655,24 +1675,24 @@ public class OpenOrderController { Long waybillId = openOrderDTO.getWaybillId(); Integer infoType = openOrderDTO.getInfoType(); - try{ + try { - if(Objects.isNull(waybillId)){ - log.warn(method+"运单id为空 waybillId={}",waybillId); - return R.fail(405,"运单id为空"); + if (Objects.isNull(waybillId)) { + log.warn(method + "运单id为空 waybillId={}", waybillId); + return R.fail(405, "运单id为空"); } - if(Objects.isNull(infoType)){ - log.warn(method+"明细类型不能为空 infoType={}",infoType); - return R.fail(405,"明细类型不能为空"); + if (Objects.isNull(infoType)) { + log.warn(method + "明细类型不能为空 infoType={}", infoType); + return R.fail(405, "明细类型不能为空"); } - return openOrderService.findWaybillLog(waybillId,infoType); - }catch (CustomerException e){ - log.error(e.message,e); - return R.fail(e.code,e.message); - }catch (Exception e){ - log.error(method+"系统异常",e); - return R.fail(500,"系统异常"); + return openOrderService.findWaybillLog(waybillId, infoType); + } catch (CustomerException e) { + log.error(e.message, e); + return R.fail(e.code, e.message); + } catch (Exception e) { + log.error(method + "系统异常", e); + return R.fail(500, "系统异常"); } } @@ -1687,24 +1707,24 @@ public class OpenOrderController { Long waybillId = openOrderDTO.getWaybillId(); String url = openOrderDTO.getUrl(); - try{ + try { - if(Objects.isNull(waybillId)){ - log.warn(method+"运单id为空 waybillId={}",waybillId); - return R.fail(405,"运单id为空"); + if (Objects.isNull(waybillId)) { + log.warn(method + "运单id为空 waybillId={}", waybillId); + return R.fail(405, "运单id为空"); } - if(StringUtil.isBlank(url)){ - log.warn(method+"地址不能为空 url={}",url); - return R.fail(405,"地址不能为空"); + if (StringUtil.isBlank(url)) { + log.warn(method + "地址不能为空 url={}", url); + return R.fail(405, "地址不能为空"); } - return openOrderService.saveWaybillReturn(waybillId,url); - }catch (CustomerException e){ - log.error(e.message,e); - return R.fail(e.code,e.message); - }catch (Exception e){ - log.error(method+"系统异常",e); - return R.fail(500,"系统异常"); + return openOrderService.saveWaybillReturn(waybillId, url); + } catch (CustomerException e) { + log.error(e.message, e); + return R.fail(e.code, e.message); + } catch (Exception e) { + log.error(method + "系统异常", e); + return R.fail(500, "系统异常"); } } @@ -1717,20 +1737,20 @@ public class OpenOrderController { String method = "############findWaybillReturnList: "; log.info(method + "请求参数{}", openOrderDTO); Long waybillId = openOrderDTO.getWaybillId(); - try{ + try { - if(Objects.isNull(waybillId)){ - log.warn(method+"运单id为空 waybillId={}",waybillId); - return R.fail(405,"运单id为空"); + if (Objects.isNull(waybillId)) { + log.warn(method + "运单id为空 waybillId={}", waybillId); + return R.fail(405, "运单id为空"); } return openOrderService.findWaybillReturnList(waybillId); - }catch (CustomerException e){ - log.error(e.message,e); - return R.fail(e.code,e.message); - }catch (Exception e){ - log.error(method+"系统异常",e); - return R.fail(500,"系统异常"); + } catch (CustomerException e) { + log.error(e.message, e); + return R.fail(e.code, e.message); + } catch (Exception e) { + log.error(method + "系统异常", e); + return R.fail(500, "系统异常"); } } @@ -1743,27 +1763,27 @@ public class OpenOrderController { String method = "############findUpdateWaybillList: "; log.info(method + "请求参数{}", openOrderDTO); Long waybillId = openOrderDTO.getWaybillId(); - try{ + try { List warehouseIds = new ArrayList<>(); BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); - if(Objects.isNull(myCurrentWarehouse)){ + if (Objects.isNull(myCurrentWarehouse)) { List myWatchWarehouse = warehouseClient.getMyWatchWarehouse(); //循环myWatchWarehouse，把id存入warehouseIds中 myWatchWarehouse.forEach(basicdataWarehouseEntity -> { warehouseIds.add(basicdataWarehouseEntity.getId()); }); - }else{ + } else { warehouseIds.add(myCurrentWarehouse.getId()); } openOrderDTO.setWarehouseIds(warehouseIds); return openOrderService.findUpdateWaybillList(openOrderDTO); - }catch (CustomerException e){ - log.error(e.message,e); - return R.fail(e.code,e.message); - }catch (Exception e){ - log.error(method+"系统异常",e); - return R.fail(500,"系统异常"); + } catch (CustomerException e) { + log.error(e.message, e); + return R.fail(e.code, e.message); + } catch (Exception e) { + log.error(method + "系统异常", e); + return R.fail(500, "系统异常"); } } @@ -1776,26 +1796,26 @@ public class OpenOrderController { String method = "############freezeWaybill: "; log.info(method + "请求参数{}", openOrderDTO); List waybillIds = openOrderDTO.getWaybillIds(); - try{ + try { BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); - if(Objects.isNull(myCurrentWarehouse)){ - log.warn(method+"请选择仓库 myCurrentWarehouse={}",myCurrentWarehouse); - return R.fail(405,"多仓权限无法操作，请选择仓库"); + if (Objects.isNull(myCurrentWarehouse)) { + log.warn(method + "请选择仓库 myCurrentWarehouse={}", myCurrentWarehouse); + return R.fail(405, "多仓权限无法操作，请选择仓库"); } - if(CollUtil.isEmpty(waybillIds)){ - log.warn(method+"运单ids为空 waybillIds={}",waybillIds); - return R.fail(405,"运单ids为空"); + if (CollUtil.isEmpty(waybillIds)) { + log.warn(method + "运单ids为空 waybillIds={}", waybillIds); + return R.fail(405, "运单ids为空"); } - return openOrderService.freezeWaybill(waybillIds,myCurrentWarehouse.getId(),myCurrentWarehouse.getName()); - }catch (CustomerException e){ - log.error(e.message,e); - return R.fail(e.code,e.message); - }catch (Exception e){ - log.error(method+"系统异常",e); - return R.fail(500,"系统异常"); + return openOrderService.freezeWaybill(waybillIds, myCurrentWarehouse.getId(), myCurrentWarehouse.getName()); + } catch (CustomerException e) { + log.error(e.message, e); + return R.fail(e.code, e.message); + } catch (Exception e) { + log.error(method + "系统异常", e); + return R.fail(500, "系统异常"); } } @@ -1807,26 +1827,26 @@ public class OpenOrderController { String method = "############unFreezeWaybill: "; log.info(method + "请求参数{}", openOrderDTO); List waybillIds = openOrderDTO.getWaybillIds(); - try{ + try { BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); - if(Objects.isNull(myCurrentWarehouse)){ - log.warn(method+"请选择仓库 myCurrentWarehouse={}",myCurrentWarehouse); - return R.fail(405,"多仓权限无法操作，请选择仓库"); + if (Objects.isNull(myCurrentWarehouse)) { + log.warn(method + "请选择仓库 myCurrentWarehouse={}", myCurrentWarehouse); + return R.fail(405, "多仓权限无法操作，请选择仓库"); } - if(CollUtil.isEmpty(waybillIds)){ - log.warn(method+"运单ids为空 waybillIds={}",waybillIds); - return R.fail(405,"运单ids为空"); + if (CollUtil.isEmpty(waybillIds)) { + log.warn(method + "运单ids为空 waybillIds={}", waybillIds); + return R.fail(405, "运单ids为空"); } - return openOrderService.unFreezeWaybill(waybillIds,myCurrentWarehouse.getId(),myCurrentWarehouse.getName()); - }catch (CustomerException e){ - log.error(e.message,e); - return R.fail(e.code,e.message); - }catch (Exception e){ - log.error(method+"系统异常",e); - return R.fail(500,"系统异常"); + return openOrderService.unFreezeWaybill(waybillIds, myCurrentWarehouse.getId(), myCurrentWarehouse.getName()); + } catch (CustomerException e) { + log.error(e.message, e); + return R.fail(e.code, e.message); + } catch (Exception e) { + log.error(method + "系统异常", e); + return R.fail(500, "系统异常"); } } @@ -1840,31 +1860,31 @@ public class OpenOrderController { log.info(method + "请求参数{}", openOrderDTO); List waybillIds = openOrderDTO.getWaybillIds(); String abolishReson = openOrderDTO.getAbolishReson(); - try{ + try { BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); - if(Objects.isNull(myCurrentWarehouse)){ - log.warn(method+"请选择仓库 myCurrentWarehouse={}",myCurrentWarehouse); - return R.fail(405,"多仓权限无法操作，请选择仓库"); + if (Objects.isNull(myCurrentWarehouse)) { + log.warn(method + "请选择仓库 myCurrentWarehouse={}", myCurrentWarehouse); + return R.fail(405, "多仓权限无法操作，请选择仓库"); } - if(CollUtil.isEmpty(waybillIds)){ - log.warn(method+"运单ids为空 waybillIds={}",waybillIds); - return R.fail(405,"运单ids为空"); + if (CollUtil.isEmpty(waybillIds)) { + log.warn(method + "运单ids为空 waybillIds={}", waybillIds); + return R.fail(405, "运单ids为空"); } - if(StringUtil.isBlank(abolishReson)){ - log.warn(method+"请填写作废原因 abolishReson={}",abolishReson); - return R.fail(405,"请填写作废原因"); + if (StringUtil.isBlank(abolishReson)) { + log.warn(method + "请填写作废原因 abolishReson={}", abolishReson); + return R.fail(405, "请填写作废原因"); } - return openOrderService.abolishWaybill(waybillIds,myCurrentWarehouse.getId(),myCurrentWarehouse.getName(),abolishReson); - }catch (CustomerException e){ - log.error(e.message,e); - return R.fail(e.code,e.message); - }catch (Exception e){ - log.error(method+"系统异常",e); - return R.fail(500,"系统异常"); + return openOrderService.abolishWaybill(waybillIds, myCurrentWarehouse.getId(), myCurrentWarehouse.getName(), abolishReson); + } catch (CustomerException e) { + log.error(e.message, e); + return R.fail(e.code, e.message); + } catch (Exception e) { + log.error(method + "系统异常", e); + return R.fail(500, "系统异常"); } } @@ -1880,24 +1900,24 @@ public class OpenOrderController { Long consigneeId = openOrderDTO.getConsigneeId(); - try{ + try { - if(Objects.isNull(departureWarehouseId)){ - log.warn(method+"发站仓id为空 departureWarehouseId={}",departureWarehouseId); - return R.fail(405,"发站仓id为空"); + if (Objects.isNull(departureWarehouseId)) { + log.warn(method + "发站仓id为空 departureWarehouseId={}", departureWarehouseId); + return R.fail(405, "发站仓id为空"); } - if(Objects.isNull(consigneeId)){ - log.warn(method+"收货单位id不能为空 consigneeId={}",consigneeId); - return R.fail(405,"收货单位id不能为空"); + if (Objects.isNull(consigneeId)) { + log.warn(method + "收货单位id不能为空 consigneeId={}", consigneeId); + return R.fail(405, "收货单位id不能为空"); } - return openOrderService.findWaybillDes(departureWarehouseId,consigneeId); - }catch (CustomerException e){ - log.error(e.message,e); - return R.fail(e.code,e.message); - }catch (Exception e){ - log.error(method+"系统异常",e); - return R.fail(500,"系统异常"); + return openOrderService.findWaybillDes(departureWarehouseId, consigneeId); + } catch (CustomerException e) { + log.error(e.message, e); + return R.fail(e.code, e.message); + } catch (Exception e) { + log.error(method + "系统异常", e); + return R.fail(500, "系统异常"); } } @@ -1912,28 +1932,28 @@ public class OpenOrderController { Long advanceId = advanceDTO.getAdvanceId(); - try{ + try { BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); - if(Objects.isNull(myCurrentWarehouse)){ - log.warn(method+"没有选择仓库 myCurrentWarehouse={}",myCurrentWarehouse); - return R.fail(405,"多仓权限无法操作，请选择仓库"); + if (Objects.isNull(myCurrentWarehouse)) { + log.warn(method + "没有选择仓库 myCurrentWarehouse={}", myCurrentWarehouse); + return R.fail(405, "多仓权限无法操作，请选择仓库"); } advanceDTO.setWarehouseId(myCurrentWarehouse.getId()); - if(Objects.isNull(advanceId)){ - log.warn(method+"暂存单id不能为空 advanceId={}",advanceId); - return R.fail(405,"暂存单id不能为空"); + if (Objects.isNull(advanceId)) { + log.warn(method + "暂存单id不能为空 advanceId={}", advanceId); + return R.fail(405, "暂存单id不能为空"); } return openOrderService.createOrderPackage(advanceDTO); - }catch (CustomerException e){ - log.error(e.message,e); - return R.fail(e.code,e.message); - }catch (Exception e){ - log.error(method+"系统异常",e); - return R.fail(500,"系统异常"); + } catch (CustomerException e) { + log.error(e.message, e); + return R.fail(e.code, e.message); + } catch (Exception e) { + log.error(method + "系统异常", e); + return R.fail(500, "系统异常"); } } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/IOpenOrderService.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/IOpenOrderService.java index 202387eb6..bdbeb7e6b 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/IOpenOrderService.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/IOpenOrderService.java @@ -2,6 +2,7 @@ package com.logpm.trunkline.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.trunkline.dto.AdvanceDTO; +import com.logpm.trunkline.dto.CheckWaybillListDTO; import com.logpm.trunkline.dto.OpenLabelDTO; import com.logpm.trunkline.dto.OpenOrderDTO; import com.logpm.trunkline.vo.TrunklineAdvanceDetailVO; @@ -101,5 +102,12 @@ public interface IOpenOrderService { void dealOpenIncoming(Long waybillId,List advanceIds); + /** + * 运单批量审核 + * @param openOrderDTO + * @return + */ + R checkWaybillList(CheckWaybillListDTO openOrderDTO); + // R findWaybillInfo(String waybillNo); } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java index f44d4b431..10272b218 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java @@ -37,6 +37,7 @@ import com.logpm.warehouse.feign.IWarehouseWaybillDetailClient; import com.logpm.warehouse.vo.WarehouseWaybillVO; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.jetbrains.annotations.Nullable; import org.springblade.common.annotations.RepeatSubmit; import org.springblade.common.constant.CodeNumConstant; import org.springblade.common.constant.DictBizConstant; @@ -127,6 +128,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { /** * 商家端暂存单列表 + * * @param advanceDTO * @return */ @@ -140,10 +142,10 @@ public class OpenOrderServiceImpl implements IOpenOrderService { } @Override - public void dealOpenIncoming(Long waybillId,List advanceIds) { + public void dealOpenIncoming(Long waybillId, List advanceIds) { WarehouseWaybillEntity waybillEntity = warehouseWaybillClient.findByWaybillId(waybillId); - if(!Objects.isNull(waybillEntity)){ + if (!Objects.isNull(waybillEntity)) { Long departureWarehouseId = waybillEntity.getDepartureWarehouseId(); String departureWarehouseName = waybillEntity.getDepartureWarehouseName(); Long brandId = waybillEntity.getBrandId(); @@ -167,6 +169,21 @@ public class OpenOrderServiceImpl implements IOpenOrderService { } + @Override + public R checkWaybillList(CheckWaybillListDTO openOrderDTO) { + + Long warehouseId = openOrderDTO.getWarehouseId(); + String warehouseName = openOrderDTO.getWarehouseName(); + String checkReson = openOrderDTO.getCheckReson(); + String checkRemark = openOrderDTO.getCheckRemark(); + List waybillIds = openOrderDTO.getWaybillIds(); + for (Long waybillId : waybillIds) { + WarehouseWaybillEntity warehouseWaybillEntity = warehouseWaybillClient.findByWaybillId(waybillId); + solveWaybillInfo(warehouseWaybillEntity, waybillId, checkReson, checkRemark, warehouseId, warehouseName); + } + return R.success("批量审核成功"); + } + @Override public List findAdvanceDetailList(Long advanceId) { return advanceDetailService.findList(advanceId); @@ -236,13 +253,13 @@ public class OpenOrderServiceImpl implements IOpenOrderService { openOrderVO.setShipperName(basicdataClientEntity.getLinkman()); openOrderVO.setShipperMobile(basicdataClientEntity.getPhone()); openOrderVO.setShipperAddress(basicdataClientEntity.getDetailedly()); - if(CollUtil.isNotEmpty(senderNameSet) && senderNameSet.size() == 1){ + if (CollUtil.isNotEmpty(senderNameSet) && senderNameSet.size() == 1) { openOrderVO.setShipperName(senderNameSet.iterator().next()); } - if(CollUtil.isNotEmpty(senderPhoneSet) && senderPhoneSet.size() == 1){ + if (CollUtil.isNotEmpty(senderPhoneSet) && senderPhoneSet.size() == 1) { openOrderVO.setShipperMobile(senderPhoneSet.iterator().next()); } - if(CollUtil.isNotEmpty(senderAddressSet) && senderAddressSet.size() == 1){ + if (CollUtil.isNotEmpty(senderAddressSet) && senderAddressSet.size() == 1) { openOrderVO.setShipperAddress(senderAddressSet.iterator().next()); } @@ -265,26 +282,26 @@ public class OpenOrderServiceImpl implements IOpenOrderService { openOrderVO.setDepartureArray(departureArray); } - }else{ - if(CollUtil.isNotEmpty(senderFactorySet) && senderFactorySet.size() == 1){ + } else { + if (CollUtil.isNotEmpty(senderFactorySet) && senderFactorySet.size() == 1) { openOrderVO.setShipper(senderFactorySet.iterator().next()); } - if(CollUtil.isNotEmpty(senderNameSet) && senderNameSet.size() == 1){ + if (CollUtil.isNotEmpty(senderNameSet) && senderNameSet.size() == 1) { openOrderVO.setShipperName(senderNameSet.iterator().next()); } - if(CollUtil.isNotEmpty(senderPhoneSet) && senderPhoneSet.size() == 1){ + if (CollUtil.isNotEmpty(senderPhoneSet) && senderPhoneSet.size() == 1) { openOrderVO.setShipperMobile(senderPhoneSet.iterator().next()); } - if(CollUtil.isNotEmpty(senderAddressSet) && senderAddressSet.size() == 1){ + if (CollUtil.isNotEmpty(senderAddressSet) && senderAddressSet.size() == 1) { openOrderVO.setShipperAddress(senderAddressSet.iterator().next()); } } TrunklineAdvanceEntity advanceEntity = list.get(0); - if(!Objects.isNull(advanceEntity)){ + if (!Objects.isNull(advanceEntity)) { String consigneePerson = advanceEntity.getConsigneePerson(); - if(!StringUtil.isBlank(consigneePerson)){ + if (!StringUtil.isBlank(consigneePerson)) { openOrderVO.setConsigneeName(consigneePerson); openOrderVO.setConsigneeMobile(advanceEntity.getConsigneeMobile()); openOrderVO.setConsigneeAddress(advanceEntity.getConsigneeAddress()); @@ -292,8 +309,8 @@ public class OpenOrderServiceImpl implements IOpenOrderService { } //收货单位-----根据三方商场找到对应的clientId - Long clientId = basicdataTripartiteMallClient.getClientIdByNameAndBrandAndCode(dealerName,StringUtil.isBlank(dealerCode)?"":dealerCode, brand); - if(!Objects.isNull(clientId)){ + Long clientId = basicdataTripartiteMallClient.getClientIdByNameAndBrandAndCode(dealerName, StringUtil.isBlank(dealerCode) ? "" : dealerCode, brand); + if (!Objects.isNull(clientId)) { BasicdataClientVO basicdataClientEntity = basicdataClientClient.findEntityVoById(clientId); if (!Objects.isNull(basicdataClientEntity)) { openOrderVO.setConsigneeClientId(clientId); @@ -321,14 +338,14 @@ public class OpenOrderServiceImpl implements IOpenOrderService { openOrderVO.setDefaultDeliveryWay("2"); String typeService = "1"; BasicdataStoreBusinessEntity storeBusinessEntity = basicdataStoreBusinessClient.findByClientIdAndTypeService(clientId, 3); - if(!Objects.isNull(storeBusinessEntity)){ + if (!Objects.isNull(storeBusinessEntity)) { typeService = storeBusinessEntity.getMold(); } - if ("1".equals(typeService)){ + if ("1".equals(typeService)) { openOrderVO.setDefaultDeliveryWay("2"); - }else if("2".equals(typeService)){ + } else if ("2".equals(typeService)) { openOrderVO.setDefaultDeliveryWay("3"); - }else if("3".equals(typeService)){ + } else if ("3".equals(typeService)) { openOrderVO.setDefaultDeliveryWay("1"); } @@ -357,7 +374,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { Integer hasPackage = list.get(0).getHasPackage(); - if(hasPackage == 0){ + if (hasPackage == 0) { //把list通过packName进行分组 Map> groupedByPackName = list.stream() @@ -380,7 +397,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { openOrderVO.setTotalWeight(BigDecimal.ZERO); openOrderVO.setTotalVolume(BigDecimal.ZERO); - }else{ + } else { goodsList = advanceDetailService.findGoodsListByAdvanceIds(advanceIds); } @@ -429,7 +446,6 @@ public class OpenOrderServiceImpl implements IOpenOrderService { // } - openOrderVO.setGoodsList(goodsList); //查询支付方式 @@ -507,9 +523,9 @@ public class OpenOrderServiceImpl implements IOpenOrderService { // while(!Objects.isNull(warehouseWaybillEntity)){ // waybillNo = basicdataCodeClient.getCodeByType(CodeNumConstant.WAYBILL, warehouseCode, ""); // } - }else{ + } else { WarehouseWaybillEntity warehouseWaybillEntity = warehouseWaybillClient.findByWaybillNo(waybillNo); - if(!Objects.isNull(warehouseWaybillEntity)){ + if (!Objects.isNull(warehouseWaybillEntity)) { log.warn("#############openWaybill: 运单号已存在 waybillNo={}", waybillNo); return R.fail(405, "运单号已存在"); } @@ -565,9 +581,9 @@ public class OpenOrderServiceImpl implements IOpenOrderService { waybillEntity.setConsigneeAddress(openOrderDTO.getConsigneeAddress()); BasicdataClientEntity basicdataClient = basicdataClientClient.findEntityById(consigneeId); - if(!Objects.isNull(basicdataClient)){ + if (!Objects.isNull(basicdataClient)) { waybillEntity.setServiceType(basicdataClient.getTypeService()); - }else{ + } else { waybillEntity.setServiceType(1); } @@ -745,13 +761,13 @@ public class OpenOrderServiceImpl implements IOpenOrderService { orderPackageCodes.add(detail.getOrderPackageCode()); }); - if(CollUtil.isNotEmpty(orderPackageCodes)){ + if (CollUtil.isNotEmpty(orderPackageCodes)) { //把orderPackageCodes每500条分为一组 List> orderPackageCodeList = CollUtil.split(orderPackageCodes, 500); List parcelListEntities = new ArrayList<>(); orderPackageCodeList.forEach(orderPackageCodeList1 -> { - log.info("###############openWaybill: 分组查询订单包裹信息, {}",orderPackageCodeList1); + log.info("###############openWaybill: 分组查询订单包裹信息, {}", orderPackageCodeList1); parcelListEntities.addAll(distributionParcelListClient.findListByOrderPackageCodes(orderPackageCodeList1)); }); @@ -784,20 +800,20 @@ public class OpenOrderServiceImpl implements IOpenOrderService { distributionParcelListClient.updateList(parcelListEntities); //根据订单id获取每个订单的运单拼接数据 - if(!stockArticleIds.isEmpty()){ + if (!stockArticleIds.isEmpty()) { List stockArticleEntities = distributionStockArticleClient.findWaybillNoByOrderIds(stockArticleIds); stockArticleEntities.forEach(stockArticleEntity -> { stockArticleEntity.setMallId(consigneeId1); stockArticleEntity.setMallCode(basicdataClientEntity.getClientCode()); stockArticleEntity.setMallName(basicdataClientEntity.getClientName()); - stockArticleEntity.setTypeService(basicdataClientEntity.getTypeService()+""); + stockArticleEntity.setTypeService(basicdataClientEntity.getTypeService() + ""); stockArticleEntity.setConsigneePerson(waybillEntity.getConsigneeName()); stockArticleEntity.setConsigneeMobile(waybillEntity.getConsigneeMobile()); stockArticleEntity.setConsigneeAddress(waybillEntity.getConsigneeAddress()); stockArticleEntity.setConsigneeUnit(basicdataClientEntity.getClientName()); }); - if(CollUtil.isNotEmpty(stockArticleEntities)){ + if (CollUtil.isNotEmpty(stockArticleEntities)) { distributionStockArticleClient.updateByBatchId(stockArticleEntities); } } @@ -811,7 +827,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { //计算扫码入库的包件是否需要把运单和提货单挂上 - openOrderAsyncService.dealwithBillladingInfo(advanceIds,warehouseId,warehouseName,waybillId,waybillNo); + openOrderAsyncService.dealwithBillladingInfo(advanceIds, warehouseId, warehouseName, waybillId, waybillNo); //异步存入日志 String nickName = AuthUtil.getNickName(); @@ -826,7 +842,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { //发布开单广播 // openOrderAsyncService.sendOpenWaybillFanout(waybillEntity, details, advanceIds); - advanceDetailService.sendReportAdvanceOpenData(AuthUtil.getNickName(),AuthUtil.getUserId(),warehouseId,warehouseName,updateAdvanceDetailList,waybillEntity); + advanceDetailService.sendReportAdvanceOpenData(AuthUtil.getNickName(), AuthUtil.getUserId(), warehouseId, warehouseName, updateAdvanceDetailList, waybillEntity); return R.data(waybillId); } @@ -851,9 +867,9 @@ public class OpenOrderServiceImpl implements IOpenOrderService { //如果运单号为空则自动生成运单号 if (StringUtil.isBlank(waybillNo)) { waybillNo = basicdataCodeClient.getCodeByType(CodeNumConstant.WAYBILL, warehouseCode, ""); - }else{ + } else { WarehouseWaybillEntity warehouseWaybillEntity = warehouseWaybillClient.findByWaybillNo(waybillNo); - if(!Objects.isNull(warehouseWaybillEntity)){ + if (!Objects.isNull(warehouseWaybillEntity)) { log.warn("#############openZeroWaybill: 运单号已存在 waybillNo={}", waybillNo); return R.fail(405, "运单号已存在"); } @@ -905,9 +921,9 @@ public class OpenOrderServiceImpl implements IOpenOrderService { waybillEntity.setConsigneeAddress(openOrderDTO.getConsigneeAddress()); BasicdataClientEntity basicdataClient = basicdataClientClient.findEntityById(consigneeId); - if(!Objects.isNull(basicdataClient)){ + if (!Objects.isNull(basicdataClient)) { waybillEntity.setServiceType(basicdataClient.getTypeService()); - }else{ + } else { waybillEntity.setServiceType(1); } @@ -1063,11 +1079,11 @@ public class OpenOrderServiceImpl implements IOpenOrderService { openOrderAsyncService.sendOpenWaybillFanout(waybillEntity, details, null); //发送零担开单广播 - sendOpenZeroWaybillFanout(AuthUtil.getUserId(),AuthUtil.getNickName(),warehouseId,warehouseName,waybillEntity,details); + sendOpenZeroWaybillFanout(AuthUtil.getUserId(), AuthUtil.getNickName(), warehouseId, warehouseName, waybillEntity, details); - Map map = new HashMap<>(); - map.put("waybillId",waybillId); + Map map = new HashMap<>(); + map.put("waybillId", waybillId); return R.data(map); } @@ -1111,7 +1127,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { packageData.setWaybillNumber(detailEntity.getWaybillNo()); packageDataList.add(packageData); }); - json.put("details",packageDataList); + json.put("details", packageDataList); nodeFanoutMsg.setMain(json); FanoutMsg fanoutMsg = FanoutMsg.builder().exchange(FanoutConstants.trunkline.REPORTDATA.EXCHANGE).msg(JSONObject.toJSONString(nodeFanoutMsg)).build(); @@ -1172,7 +1188,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("advance_id",advanceIds); + queryWrapper.in("advance_id", advanceIds); List detailEntityList = advanceDetailService.list(queryWrapper); //把detailEntityList所有的orderPackageCode放入一个List List orderPackageCodeList = detailEntityList.stream().map(TrunklineAdvanceDetailEntity::getOrderPackageCode).collect(Collectors.toList()); @@ -1184,7 +1200,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { R r = distributionParcelListClient.deleteListByOrderPackageCodes(findParamterDTO); int code = r.getCode(); - if(code != 200){ + if (code != 200) { log.warn("############deletedAdvance: 删除订单失败"); throw new CustomerException(405, "删除订单失败"); } @@ -1276,9 +1292,9 @@ public class OpenOrderServiceImpl implements IOpenOrderService { public R findClientInfo(String clientName, String linkMan, String linkPhone) { BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse(); - if(Objects.isNull(myCurrentWarehouse)){ - log.warn("###########findClientInfo: 仓库信息不存在 myCurrentWarehouse={}",myCurrentWarehouse); - return R.fail(405,"仓库信息不存在"); + if (Objects.isNull(myCurrentWarehouse)) { + log.warn("###########findClientInfo: 仓库信息不存在 myCurrentWarehouse={}", myCurrentWarehouse); + return R.fail(405, "仓库信息不存在"); } Long warehouseId = myCurrentWarehouse.getId(); @@ -1304,25 +1320,25 @@ public class OpenOrderServiceImpl implements IOpenOrderService { basicdataClientJson.put("cityId", bladeRegionCityId); basicdataClientJson.put("areaId", badeRegionAreaId); - basicdataClientJson.put("defaultDeliveryWay","2"); + basicdataClientJson.put("defaultDeliveryWay", "2"); String typeService = "1"; BasicdataStoreBusinessEntity storeBusinessEntity = basicdataStoreBusinessClient.findByClientIdAndTypeService(clientId, 3); - if(!Objects.isNull(storeBusinessEntity)){ + if (!Objects.isNull(storeBusinessEntity)) { typeService = storeBusinessEntity.getMold(); } - if ("1".equals(typeService)){ - basicdataClientJson.put("defaultDeliveryWay","2"); - }else if("2".equals(typeService)){ - basicdataClientJson.put("defaultDeliveryWay","3"); - }else if("3".equals(typeService)){ - basicdataClientJson.put("defaultDeliveryWay","1"); + if ("1".equals(typeService)) { + basicdataClientJson.put("defaultDeliveryWay", "2"); + } else if ("2".equals(typeService)) { + basicdataClientJson.put("defaultDeliveryWay", "3"); + } else if ("3".equals(typeService)) { + basicdataClientJson.put("defaultDeliveryWay", "1"); } //查询目的仓数据 BasicdataStorageServicesEntity basicdataStorageServicesEntity = basicdataStorageServicesClient.findEntityBySendWarehouseIdAndClientId(warehouseId, clientId); if (!Objects.isNull(basicdataStorageServicesEntity)) { - basicdataClientJson.put("destinationWarehouseId",basicdataStorageServicesEntity.getServeWarehouseId()); - basicdataClientJson.put("destinationWarehouseName",basicdataStorageServicesEntity.getServeWarehouseName()); + basicdataClientJson.put("destinationWarehouseId", basicdataStorageServicesEntity.getServeWarehouseId()); + basicdataClientJson.put("destinationWarehouseName", basicdataStorageServicesEntity.getServeWarehouseName()); } }); return R.data(ls); @@ -1441,7 +1457,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { advanceDetailService.saveBatch(detailEntities); //发送报表基础数据广播 - advanceDetailService.sendReportBasicdataFanout(AuthUtil.getNickName(),AuthUtil.getUserId(),openLabelDTO.getWarehouseId(),openLabelDTO.getWarehouseName(),new Date(),detailEntities,advanceEntity.getDealerCode(),advanceEntity.getDealerName()); + advanceDetailService.sendReportBasicdataFanout(AuthUtil.getNickName(), AuthUtil.getUserId(), openLabelDTO.getWarehouseId(), openLabelDTO.getWarehouseName(), new Date(), detailEntities, advanceEntity.getDealerCode(), advanceEntity.getDealerName()); return R.success("保存成功"); } @@ -1473,9 +1489,9 @@ public class OpenOrderServiceImpl implements IOpenOrderService { .map(Map.Entry::getKey) .collect(Collectors.toSet()); - if(!duplicateOrderPackageCodes.isEmpty()){ - log.warn("#####################openLabelHasPacakage: 包条码重复 {}",duplicateOrderPackageCodes); - return R.fail(405, "包条码重复"+duplicateOrderPackageCodes); + if (!duplicateOrderPackageCodes.isEmpty()) { + log.warn("#####################openLabelHasPacakage: 包条码重复 {}", duplicateOrderPackageCodes); + return R.fail(405, "包条码重复" + duplicateOrderPackageCodes); } List orderPackageCodeKeys = new ArrayList<>(pacakgeDetailExcelDTOSet); @@ -1501,8 +1517,8 @@ public class OpenOrderServiceImpl implements IOpenOrderService { List advanceEntityList = new ArrayList<>(); - if(pacakgeDetailExcelDTOS.isEmpty()){ - log.warn("##################openLabelHasPacakage: 没有需要处理的数据 pacakgeDetailExcelDTOS={}",pacakgeDetailExcelDTOS); + if (pacakgeDetailExcelDTOS.isEmpty()) { + log.warn("##################openLabelHasPacakage: 没有需要处理的数据 pacakgeDetailExcelDTOS={}", pacakgeDetailExcelDTOS); return R.data(advanceEntityList); } @@ -1573,7 +1589,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { String brand = pacakgeDetailExcelDTO.getBrand(); advanceEntity.setBrand(brand); BasicdataBrandEntity basicdataBrandEntity = brandMap.get(brand); - if(Objects.isNull(basicdataBrandEntity)){ + if (Objects.isNull(basicdataBrandEntity)) { advanceEntity.setBrand("其他"); } advanceEntity.setTotalNum(excelDTOS.size()); @@ -1582,12 +1598,12 @@ public class OpenOrderServiceImpl implements IOpenOrderService { advanceEntity.setDealerCode(pacakgeDetailExcelDTO.getDealerCode()); String dealerName = pacakgeDetailExcelDTO.getDealerName(); - if(StringUtil.isBlank(dealerName)){ - if(StringUtil.equals(brand,"欧派")){ + if (StringUtil.isBlank(dealerName)) { + if (StringUtil.equals(brand, "欧派")) { //获取orderCode数字第一次出现的前面字符串截取 int firstDigitIndex = findFirstDigitIndex(orderCode); - if(firstDigitIndex != -1){ - dealerName = orderCode.substring(0,firstDigitIndex); + if (firstDigitIndex != -1) { + dealerName = orderCode.substring(0, firstDigitIndex); } } } @@ -1622,7 +1638,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { advanceEntity.setTotalNum(advanceEntity.getTotalNum() + excelDTOS.size()); updateAdvanceEntityList.add(advanceEntity); advanceIds.add(advanceEntity.getId()); - advanceEntityMap.put(advanceEntity.getOrderCode()+"&"+(StringUtil.isBlank(trainNumber)?"null":trainNumber),advanceEntity); + advanceEntityMap.put(advanceEntity.getOrderCode() + "&" + (StringUtil.isBlank(trainNumber) ? "null" : trainNumber), advanceEntity); } }); @@ -1668,7 +1684,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { Map> map = advanceDetailEntityList.parallelStream().collect(Collectors.groupingBy(TrunklineAdvanceDetailEntity::getAdvanceId, Collectors.mapping(TrunklineAdvanceDetailEntity::getOrderPackageCode, Collectors.toList()))); Map materialMap = new HashMap<>(); - Map advanceMapByAdvanceId = new HashMap<>(); + Map advanceMapByAdvanceId = new HashMap<>(); listMap.keySet().forEach(str -> { List pacakgeDetailExcelList = listMap.get(str); TrunklineAdvanceEntity advanceEntity = advanceEntityMap.get(str); @@ -1688,7 +1704,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { advanceDetailModel.setOrderPackageCode(orderPackageCode); String brand = advanceEntity.getBrand(); BasicdataBrandEntity brandEntity = brandMap.get(brand); - if(Objects.isNull(brandEntity)){ + if (Objects.isNull(brandEntity)) { brandEntity = brandMap.get("其他"); advanceDetailModel.setBrand(brandEntity.getBrandName()); } @@ -1775,14 +1791,14 @@ public class OpenOrderServiceImpl implements IOpenOrderService { List comlist = new ArrayList<>(); for (int i = 0; i < advanceDetailEntitiesList.size(); i++) { List list = advanceDetailEntitiesList.get(i); - CompletableFuture fromCpFirstReq = asyncService.getResponseFromCp(list, i+1); + CompletableFuture fromCpFirstReq = asyncService.getResponseFromCp(list, i + 1); comlist.add(fromCpFirstReq); } CompletableFuture.allOf(comlist.toArray(new CompletableFuture[0])).join(); } - if(!CollUtil.isEmpty(advanceEntityList)){ + if (!CollUtil.isEmpty(advanceEntityList)) { carsLoadAsyncService.sendRabbitMessageLoadScanData(advanceEntityList); } @@ -1790,15 +1806,15 @@ public class OpenOrderServiceImpl implements IOpenOrderService { //发送报表基础数据广播 //把advanceDetailEntities通过advanceId进行分组 Map> advanceDetailEntityMap = advanceDetailEntities.stream().collect(Collectors.groupingBy(TrunklineAdvanceDetailEntity::getAdvanceId)); - advanceDetailEntityMap.keySet().forEach(advanceId ->{ + advanceDetailEntityMap.keySet().forEach(advanceId -> { TrunklineAdvanceEntity advanceEntity = advanceMapByAdvanceId.get(advanceId); List advanceDetailEntities1 = advanceDetailEntityMap.get(advanceId); - advanceDetailService.sendReportBasicdataFanout(AuthUtil.getNickName(),AuthUtil.getUserId(),warehouseId,warehouseName,new Date(),advanceDetailEntities1,advanceEntity.getDealerCode(),advanceEntity.getDealerName()); + advanceDetailService.sendReportBasicdataFanout(AuthUtil.getNickName(), AuthUtil.getUserId(), warehouseId, warehouseName, new Date(), advanceDetailEntities1, advanceEntity.getDealerCode(), advanceEntity.getDealerName()); }); int successNum = advanceDetailEntities.size(); - return R.success("成功处理包件"+successNum+"件"); + return R.success("成功处理包件" + successNum + "件"); } public int findFirstDigitIndex(String str) { @@ -1827,9 +1843,9 @@ public class OpenOrderServiceImpl implements IOpenOrderService { long countWithMaterialName = importCustomizedOuPaiDTOS.stream() .filter(dto -> StringUtil.isNotBlank(dto.getFirstsName())) .count(); - if(NumberUtil.equals(countWithMaterialName,0)){ + if (NumberUtil.equals(countWithMaterialName, 0)) { log.warn("#################: 请使用定制品模版"); - return R.fail(405,"请使用定制品模版"); + return R.fail(405, "请使用定制品模版"); } //排除pacakgeDetailExcelDTOS中的orderPackageCode为空的元素 @@ -1847,9 +1863,9 @@ public class OpenOrderServiceImpl implements IOpenOrderService { List addSourceList = new ArrayList<>();//需要加回源数据的集合 List addList = new ArrayList<>();//需要加入合包码的数据集合 - mergeDataListMap.keySet().forEach(mergeCode ->{ + mergeDataListMap.keySet().forEach(mergeCode -> { List ls = mergeDataListMap.get(mergeCode); - ls.forEach(item ->{ + ls.forEach(item -> { TrunklineAdvanceMergeEntity trunklineAdvanceMergeEntity = new TrunklineAdvanceMergeEntity(); trunklineAdvanceMergeEntity.setMergeCode(mergeCode); trunklineAdvanceMergeEntity.setOrderPackageCode(item.getOrderPackageCode()); @@ -1858,11 +1874,11 @@ public class OpenOrderServiceImpl implements IOpenOrderService { }); }); - mergeDataListMap.keySet().forEach(mergeCode ->{ + mergeDataListMap.keySet().forEach(mergeCode -> { List ls = mergeDataListMap.get(mergeCode); //取出第一条放入需要处理的集合 ImportCustomizedOuPaiDTO importCustomizedOuPaiDTO = ls.get(0); - if(!Objects.isNull(importCustomizedOuPaiDTO)){ + if (!Objects.isNull(importCustomizedOuPaiDTO)) { importCustomizedOuPaiDTO.setOrderPackageCode(mergeCode); addSourceList.add(importCustomizedOuPaiDTO); } @@ -1938,7 +1954,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { List advanceDetailEntities = new ArrayList<>(); - Map advanceEntityMap = new HashMap<>(); + Map advanceEntityMap = new HashMap<>(); List advanceIds = new ArrayList<>(); @@ -1978,10 +1994,10 @@ public class OpenOrderServiceImpl implements IOpenOrderService { advanceEntity.setPackName(importCustomizedOuPaiDTO.getFirstsName()); advanceEntity.setDealerCode(importCustomizedOuPaiDTO.getDealerCode()); String dealerName = importCustomizedOuPaiDTO.getDealerName(); - if(StringUtil.isBlank(dealerName)){ + if (StringUtil.isBlank(dealerName)) { int firstDigitIndex = findFirstDigitIndex(orderCode); - if(firstDigitIndex != -1){ - dealerName = orderCode.substring(0,firstDigitIndex); + if (firstDigitIndex != -1) { + dealerName = orderCode.substring(0, firstDigitIndex); } } advanceEntity.setDealerName(dealerName); @@ -2000,7 +2016,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { advanceEntity.setLegacyStatus("0"); advanceEntity.setIsGcp(0); String isOupai = importCustomizedOuPaiDTO.getIsOupai(); - if("是".equals(isOupai)){ + if ("是".equals(isOupai)) { advanceEntity.setIsGcp(1); } if (orderCode.contains("遗")) { @@ -2016,7 +2032,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { updateAdvanceEntityList.add(advanceEntity); advanceIds.add(advanceEntity.getId()); String trainNumber = advanceEntity.getTrainNumber(); - advanceEntityMap.put(advanceEntity.getOrderCode()+"&"+(StringUtil.isBlank(trainNumber)?"null":trainNumber),advanceEntity); + advanceEntityMap.put(advanceEntity.getOrderCode() + "&" + (StringUtil.isBlank(trainNumber) ? "null" : trainNumber), advanceEntity); } }); @@ -2026,7 +2042,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { List comlist = new ArrayList<>(); for (int i = 0; i < advanceEntitiesList.size(); i++) { List list = advanceEntitiesList.get(i); - CompletableFuture fromCpFirstReq = asyncService.saveAdvanceEntity(list, i+1); + CompletableFuture fromCpFirstReq = asyncService.saveAdvanceEntity(list, i + 1); comlist.add(fromCpFirstReq); } CompletableFuture.allOf(comlist.toArray(new CompletableFuture[0])).join(); @@ -2039,7 +2055,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { List comlist = new ArrayList<>(); for (int i = 0; i < advanceEntitiesList.size(); i++) { List list = advanceEntitiesList.get(i); - CompletableFuture fromCpFirstReq = asyncService.updateAdvanceEntity(list, i+1); + CompletableFuture fromCpFirstReq = asyncService.updateAdvanceEntity(list, i + 1); comlist.add(fromCpFirstReq); } CompletableFuture.allOf(comlist.toArray(new CompletableFuture[0])).join(); @@ -2050,30 +2066,30 @@ public class OpenOrderServiceImpl implements IOpenOrderService { advanceEntityList.forEach(advanceEntity -> { advanceIds.add(advanceEntity.getId()); String trainNumber = advanceEntity.getTrainNumber(); - advanceEntityMap.put(advanceEntity.getOrderCode()+"&"+(StringUtil.isBlank(trainNumber)?"null":trainNumber),advanceEntity); + advanceEntityMap.put(advanceEntity.getOrderCode() + "&" + (StringUtil.isBlank(trainNumber) ? "null" : trainNumber), advanceEntity); }); //通过advanceIds查询所有advanceDetail QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("advance_id",advanceIds) - .eq("is_deleted",0); + queryWrapper.in("advance_id", advanceIds) + .eq("is_deleted", 0); List advanceDetailEntityList = advanceDetailService.list(queryWrapper); //把advanceDetailEntityList通过advanceId分组并且把集合转化为orderPackageCode的集合 Map> map = advanceDetailEntityList.parallelStream().collect(Collectors.groupingBy(TrunklineAdvanceDetailEntity::getAdvanceId, Collectors.mapping(TrunklineAdvanceDetailEntity::getOrderPackageCode, Collectors.toList()))); - Map advanceMapByAdvanceId = new HashMap<>(); + Map advanceMapByAdvanceId = new HashMap<>(); listMap.keySet().forEach(str -> { List importCustomizedOuPaiDTOList = listMap.get(str); TrunklineAdvanceEntity advanceEntity = advanceEntityMap.get(str); - if(!Objects.isNull(advanceEntity)){ + if (!Objects.isNull(advanceEntity)) { Long advanceId = advanceEntity.getId(); - advanceMapByAdvanceId.put(advanceId,advanceEntity); + advanceMapByAdvanceId.put(advanceId, advanceEntity); String orderCode = advanceEntity.getOrderCode(); List orderPackageCodes = map.get(advanceId); importCustomizedOuPaiDTOList.forEach(importCustomizedOuPaiDTO -> { String orderPackageCode = importCustomizedOuPaiDTO.getOrderPackageCode(); - if(Objects.isNull(orderPackageCodes) || !orderPackageCodes.contains(orderPackageCode)){ + if (Objects.isNull(orderPackageCodes) || !orderPackageCodes.contains(orderPackageCode)) { TrunklineAdvanceDetailEntity advanceDetailModel = new TrunklineAdvanceDetailEntity(); advanceDetailModel.setWarehouseId(warehouseId); advanceDetailModel.setWarehouseName(warehouseName); @@ -2127,7 +2143,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { } - if(CollUtil.isNotEmpty(addList)){ + if (CollUtil.isNotEmpty(addList)) { advanceMergeService.saveBatch(addList); } @@ -2137,20 +2153,20 @@ public class OpenOrderServiceImpl implements IOpenOrderService { int size = advanceDetailEntities.size(); - if(!CollUtil.isEmpty(advanceEntityList)){ + if (!CollUtil.isEmpty(advanceEntityList)) { carsLoadAsyncService.sendRabbitMessageLoadScanData(advanceEntityList); } //发送报表基础数据广播 //把advanceDetailEntities通过advanceId进行分组 Map> advanceDetailEntityMap = advanceDetailEntities.stream().collect(Collectors.groupingBy(TrunklineAdvanceDetailEntity::getAdvanceId)); - advanceDetailEntityMap.keySet().forEach(advanceId ->{ + advanceDetailEntityMap.keySet().forEach(advanceId -> { TrunklineAdvanceEntity advanceEntity = advanceMapByAdvanceId.get(advanceId); List advanceDetailEntities1 = advanceDetailEntityMap.get(advanceId); - advanceDetailService.sendReportBasicdataFanout(AuthUtil.getNickName(),AuthUtil.getUserId(),warehouseId,warehouseName,new Date(),advanceDetailEntities1,advanceEntity.getDealerCode(),advanceEntity.getDealerName()); + advanceDetailService.sendReportBasicdataFanout(AuthUtil.getNickName(), AuthUtil.getUserId(), warehouseId, warehouseName, new Date(), advanceDetailEntities1, advanceEntity.getDealerCode(), advanceEntity.getDealerName()); }); - return R.success("成功导入"+size+"条"); + return R.success("成功导入" + size + "条"); } @Transactional(rollbackFor = Exception.class) @@ -2166,7 +2182,6 @@ public class OpenOrderServiceImpl implements IOpenOrderService { Map materialEntityMap = materialEntities.stream().collect(Collectors.toMap(item -> item.getProductCode() + "&&" + item.getName(), item -> item)); - InputStream inputStream = file.getInputStream(); //读取inputStream中Excel的表头数据 @@ -2175,9 +2190,9 @@ public class OpenOrderServiceImpl implements IOpenOrderService { long countWithMaterialName = importStandardOuPaiDTOS.stream() .filter(dto -> StringUtil.isNotBlank(dto.getMaterialName())) .count(); - if(NumberUtil.equals(countWithMaterialName,0)){ + if (NumberUtil.equals(countWithMaterialName, 0)) { log.warn("#################: 请使用标准品模版"); - return R.fail(405,"请使用标准品模版"); + return R.fail(405, "请使用标准品模版"); } @@ -2196,10 +2211,10 @@ public class OpenOrderServiceImpl implements IOpenOrderService { List addSourceList = new ArrayList<>();//需要加回源数据的集合 List addList = new ArrayList<>();//需要加入合包码的数据集合 - mergeDataListMap.keySet().forEach(mergeCode ->{ + mergeDataListMap.keySet().forEach(mergeCode -> { List ls = mergeDataListMap.get(mergeCode); - ls.forEach(item ->{ + ls.forEach(item -> { TrunklineAdvanceMergeEntity trunklineAdvanceMergeEntity = new TrunklineAdvanceMergeEntity(); trunklineAdvanceMergeEntity.setMergeCode(mergeCode); trunklineAdvanceMergeEntity.setOrderPackageCode(item.getOrderPackageCode()); @@ -2208,11 +2223,11 @@ public class OpenOrderServiceImpl implements IOpenOrderService { }); }); - mergeDataListMap.keySet().forEach(mergeCode ->{ + mergeDataListMap.keySet().forEach(mergeCode -> { List ls = mergeDataListMap.get(mergeCode); //取出第一条放入需要处理的集合 ImportStandardOuPaiDTO importStandardOuPaiDTO = ls.get(0); - if(!Objects.isNull(importStandardOuPaiDTO)){ + if (!Objects.isNull(importStandardOuPaiDTO)) { importStandardOuPaiDTO.setOrderPackageCode(mergeCode); addSourceList.add(importStandardOuPaiDTO); } @@ -2258,13 +2273,13 @@ public class OpenOrderServiceImpl implements IOpenOrderService { List updateMaterialList = new ArrayList<>(); - if(CollUtil.isNotEmpty(hasOrderPackageCodeList)){ + if (CollUtil.isNotEmpty(hasOrderPackageCodeList)) { //把importStandardOuPaiDTOS转化成orderPackageCode为key的Map Map importStandardOuPaiDTOMap = importStandardOuPaiDTOS.stream().collect(Collectors.toMap(ImportStandardOuPaiDTO::getOrderPackageCode, Function.identity(), (a, b) -> a)); List hasAdvanceDetailList = advanceDetailService.findListByOrderPackageCodeList(hasOrderPackageCodeList); hasAdvanceDetailList.forEach(advanceDetailEntity -> { Long waybillId = advanceDetailEntity.getWaybillId(); - if(Objects.isNull(waybillId)){ + if (Objects.isNull(waybillId)) { ImportStandardOuPaiDTO importStandardOuPaiDTO = importStandardOuPaiDTOMap.get(advanceDetailEntity.getOrderPackageCode()); TrunklineAdvanceDetailEntity updateMaterialEntity = new TrunklineAdvanceDetailEntity(); updateMaterialEntity.setId(advanceDetailEntity.getId()); @@ -2278,7 +2293,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { } }); - if(CollUtil.isNotEmpty(updateMaterialList)){ + if (CollUtil.isNotEmpty(updateMaterialList)) { advanceDetailService.updateBatchById(updateMaterialList); openOrderAsyncService.updatePackageMaterial(updateMaterialList); } @@ -2291,8 +2306,8 @@ public class OpenOrderServiceImpl implements IOpenOrderService { List advanceEntityList = new ArrayList<>(); List updateAdvanceEntityList = new ArrayList<>(); - if(importStandardOuPaiDTOS.isEmpty()){ - log.warn("##################importStandardOuPai: 没有需要处理的数据 importStandardOuPaiDTOS={}",importStandardOuPaiDTOS); + if (importStandardOuPaiDTOS.isEmpty()) { + log.warn("##################importStandardOuPai: 没有需要处理的数据 importStandardOuPaiDTOS={}", importStandardOuPaiDTOS); return R.data(advanceEntityList); } @@ -2305,7 +2320,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { List advanceDetailEntities = new ArrayList<>(); - Map advanceEntityMap = new HashMap<>(); + Map advanceEntityMap = new HashMap<>(); List advanceIds = new ArrayList<>(); @@ -2330,8 +2345,8 @@ public class OpenOrderServiceImpl implements IOpenOrderService { detailEntities.forEach(advanceEntity -> { String orderCode = advanceEntity.getOrderCode(); String trainNumber = advanceEntity.getTrainNumber(); - String key = orderCode + "&" + (StringUtil.isBlank(trainNumber)?"null":trainNumber); - advanceEntityMap.put(key,advanceEntity); + String key = orderCode + "&" + (StringUtil.isBlank(trainNumber) ? "null" : trainNumber); + advanceEntityMap.put(key, advanceEntity); }); listMap.keySet().forEach(str -> { @@ -2353,10 +2368,10 @@ public class OpenOrderServiceImpl implements IOpenOrderService { advanceEntity.setPackName(importStandardOuPaiDTO.getFirstsName()); advanceEntity.setDealerCode(importStandardOuPaiDTO.getDealerCode()); String dealerName = importStandardOuPaiDTO.getDealerName(); - if(StringUtil.isBlank(dealerName)){ + if (StringUtil.isBlank(dealerName)) { int firstDigitIndex = findFirstDigitIndex(orderCode); - if(firstDigitIndex != -1){ - dealerName = orderCode.substring(0,firstDigitIndex); + if (firstDigitIndex != -1) { + dealerName = orderCode.substring(0, firstDigitIndex); } } advanceEntity.setDealerName(dealerName); @@ -2374,7 +2389,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { advanceEntity.setLegacyStatus("0"); advanceEntity.setIsGcp(0); String isOupai = importStandardOuPaiDTO.getIsOupai(); - if("是".equals(isOupai)){ + if ("是".equals(isOupai)) { advanceEntity.setIsGcp(1); } if (orderCode.contains("遗")) { @@ -2385,12 +2400,12 @@ public class OpenOrderServiceImpl implements IOpenOrderService { advanceEntity.setHasPackage(1); advanceEntityList.add(advanceEntity); } else { - advanceEntity.setTotalNum(advanceEntity.getTotalNum()+excelDTOS.size()); + advanceEntity.setTotalNum(advanceEntity.getTotalNum() + excelDTOS.size()); updateAdvanceEntityList.add(advanceEntity); advanceIds.add(advanceEntity.getId()); String trainNumber = advanceEntity.getTrainNumber(); - advanceEntityMap.put(advanceEntity.getOrderCode()+"&"+(StringUtil.isBlank(trainNumber)?"null":trainNumber),advanceEntity); + advanceEntityMap.put(advanceEntity.getOrderCode() + "&" + (StringUtil.isBlank(trainNumber) ? "null" : trainNumber), advanceEntity); } }); if (!advanceEntityList.isEmpty()) { @@ -2399,7 +2414,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { List comlist = new ArrayList<>(); for (int i = 0; i < advanceEntitiesList.size(); i++) { List list = advanceEntitiesList.get(i); - CompletableFuture fromCpFirstReq = asyncService.saveAdvanceEntity(list, i+1); + CompletableFuture fromCpFirstReq = asyncService.saveAdvanceEntity(list, i + 1); comlist.add(fromCpFirstReq); } CompletableFuture.allOf(comlist.toArray(new CompletableFuture[0])).join(); @@ -2411,7 +2426,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { List comlist = new ArrayList<>(); for (int i = 0; i < advanceEntitiesList.size(); i++) { List list = advanceEntitiesList.get(i); - CompletableFuture fromCpFirstReq = asyncService.updateAdvanceEntity(list, i+1); + CompletableFuture fromCpFirstReq = asyncService.updateAdvanceEntity(list, i + 1); comlist.add(fromCpFirstReq); } CompletableFuture.allOf(comlist.toArray(new CompletableFuture[0])).join(); @@ -2421,32 +2436,32 @@ public class OpenOrderServiceImpl implements IOpenOrderService { advanceEntityList.forEach(advanceEntity -> { advanceIds.add(advanceEntity.getId()); String trainNumber = advanceEntity.getTrainNumber(); - advanceEntityMap.put(advanceEntity.getOrderCode()+"&"+(StringUtil.isBlank(trainNumber)?"null":trainNumber),advanceEntity); + advanceEntityMap.put(advanceEntity.getOrderCode() + "&" + (StringUtil.isBlank(trainNumber) ? "null" : trainNumber), advanceEntity); }); //通过advanceIds查询所有advanceDetail QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("advance_id",advanceIds) - .eq("is_deleted",0); + queryWrapper.in("advance_id", advanceIds) + .eq("is_deleted", 0); List advanceDetailEntityList = advanceDetailService.list(queryWrapper); //把advanceDetailEntityList通过advanceId分组并且把集合转化为orderPackageCode的集合 Map> map = advanceDetailEntityList.parallelStream().collect(Collectors.groupingBy(TrunklineAdvanceDetailEntity::getAdvanceId, Collectors.mapping(TrunklineAdvanceDetailEntity::getOrderPackageCode, Collectors.toList()))); - Map materialMap = new HashMap<>(); + Map materialMap = new HashMap<>(); - Map advanceMapByAdvanceId = new HashMap<>(); + Map advanceMapByAdvanceId = new HashMap<>(); listMap.keySet().forEach(str -> { List importStandardOuPaiDTOList = listMap.get(str); TrunklineAdvanceEntity advanceEntity = advanceEntityMap.get(str); - if(!Objects.isNull(advanceEntity)){ + if (!Objects.isNull(advanceEntity)) { Long advanceId = advanceEntity.getId(); - advanceMapByAdvanceId.put(advanceId,advanceEntity); + advanceMapByAdvanceId.put(advanceId, advanceEntity); String orderCode = advanceEntity.getOrderCode(); String brand = advanceEntity.getBrand(); List orderPackageCodes = map.get(advanceId); importStandardOuPaiDTOList.forEach(importStandardOuPaiDTO -> { String orderPackageCode = importStandardOuPaiDTO.getOrderPackageCode(); - if(Objects.isNull(orderPackageCodes) || !orderPackageCodes.contains(orderPackageCode)){ + if (Objects.isNull(orderPackageCodes) || !orderPackageCodes.contains(orderPackageCode)) { TrunklineAdvanceDetailEntity advanceDetailModel = new TrunklineAdvanceDetailEntity(); advanceDetailModel.setWarehouseId(warehouseId); advanceDetailModel.setWarehouseName(warehouseName); @@ -2460,7 +2475,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { advanceDetailModel.setSendDateStr(importStandardOuPaiDTO.getSendDateStr()); advanceDetailModel.setCarNumber(importStandardOuPaiDTO.getCarNumber()); String volume = importStandardOuPaiDTO.getVolume(); - if(StringUtil.isBlank(volume)){ + if (StringUtil.isBlank(volume)) { advanceDetailModel.setVolume(BigDecimal.ZERO); } else { advanceDetailModel.setVolume(new BigDecimal(importStandardOuPaiDTO.getVolume())); @@ -2485,14 +2500,14 @@ public class OpenOrderServiceImpl implements IOpenOrderService { advanceDetailModel.setPackageStatus("0"); String volume1 = importStandardOuPaiDTO.getVolume(); - if(StringUtil.isBlank(volume1)){ + if (StringUtil.isBlank(volume1)) { volume1 = "0"; } advanceDetailModel.setVolume(new BigDecimal(volume1)); - String materialName = StringUtil.isNotBlank(importStandardOuPaiDTO.getMaterialName())?importStandardOuPaiDTO.getMaterialName():""; - String materialCode = StringUtil.isNotBlank(importStandardOuPaiDTO.getMaterialCode())?importStandardOuPaiDTO.getMaterialCode():""; + String materialName = StringUtil.isNotBlank(importStandardOuPaiDTO.getMaterialName()) ? importStandardOuPaiDTO.getMaterialName() : ""; + String materialCode = StringUtil.isNotBlank(importStandardOuPaiDTO.getMaterialCode()) ? importStandardOuPaiDTO.getMaterialCode() : ""; advanceDetailModel.setMaterialCode(materialCode); advanceDetailModel.setMaterialName(materialName); @@ -2500,15 +2515,15 @@ public class OpenOrderServiceImpl implements IOpenOrderService { BasicMaterialEntity basicMaterialEntity = materialEntityMap.get(materialCode + "&&" + materialName); - if(!Objects.isNull(basicMaterialEntity)){ + if (!Objects.isNull(basicMaterialEntity)) { advanceDetailModel.setMaterialId(basicMaterialEntity.getId()); String weight = basicMaterialEntity.getWeight(); - if(StringUtil.isBlank(weight)){ + if (StringUtil.isBlank(weight)) { weight = "0"; } String volume2 = basicMaterialEntity.getVolume(); - if(StringUtil.isBlank(volume2)){ + if (StringUtil.isBlank(volume2)) { volume2 = "0"; } advanceDetailModel.setWeight(new BigDecimal(weight)); @@ -2567,37 +2582,37 @@ public class OpenOrderServiceImpl implements IOpenOrderService { List comlist = new ArrayList<>(); for (int i = 0; i < advanceDetailEntitiesList.size(); i++) { List list = advanceDetailEntitiesList.get(i); - CompletableFuture fromCpFirstReq = asyncService.getResponseFromCp(list, i+1); + CompletableFuture fromCpFirstReq = asyncService.getResponseFromCp(list, i + 1); comlist.add(fromCpFirstReq); } CompletableFuture.allOf(comlist.toArray(new CompletableFuture[0])).join(); } - if(CollUtil.isNotEmpty(addList)){ + if (CollUtil.isNotEmpty(addList)) { advanceMergeService.saveBatch(addList); } - if(!CollUtil.isEmpty(advanceEntityList)){ + if (!CollUtil.isEmpty(advanceEntityList)) { carsLoadAsyncService.sendRabbitMessageLoadScanData(advanceEntityList); } - if(CollUtil.isNotEmpty(updateMaterialList)){ + if (CollUtil.isNotEmpty(updateMaterialList)) { advanceDetailService.updateBatchById(updateMaterialList); } //发送报表基础数据广播 //把advanceDetailEntities通过advanceId进行分组 Map> advanceDetailEntityMap = advanceDetailEntities.stream().collect(Collectors.groupingBy(TrunklineAdvanceDetailEntity::getAdvanceId)); - advanceDetailEntityMap.keySet().forEach(advanceId ->{ + advanceDetailEntityMap.keySet().forEach(advanceId -> { TrunklineAdvanceEntity advanceEntity = advanceMapByAdvanceId.get(advanceId); List advanceDetailEntities1 = advanceDetailEntityMap.get(advanceId); - advanceDetailService.sendReportBasicdataFanout(AuthUtil.getNickName(),AuthUtil.getUserId(),warehouseId,warehouseName,new Date(),advanceDetailEntities1,advanceEntity.getDealerCode(),advanceEntity.getDealerName()); + advanceDetailService.sendReportBasicdataFanout(AuthUtil.getNickName(), AuthUtil.getUserId(), warehouseId, warehouseName, new Date(), advanceDetailEntities1, advanceEntity.getDealerCode(), advanceEntity.getDealerName()); }); int successNum = advanceDetailEntities.size(); - return R.success("成功导入"+successNum+"条"); + return R.success("成功导入" + successNum + "条"); } @Override @@ -2606,16 +2621,16 @@ public class OpenOrderServiceImpl implements IOpenOrderService { Integer isEdit = openOrderDTO.getIsEdit(); WarehouseWaybillEntity waybillEntity = warehouseWaybillClient.findByWaybillId(waybillId); - if(Objects.isNull(waybillEntity)){ - log.warn("#############findWaybillDetail: 运单信息不存在 waybillId={}",waybillId); - return R.fail(405,"运单信息不存在"); + if (Objects.isNull(waybillEntity)) { + log.warn("#############findWaybillDetail: 运单信息不存在 waybillId={}", waybillId); + return R.fail(405, "运单信息不存在"); } - if(isEdit.equals(1)){ + if (isEdit.equals(1)) { Integer abolishStatus = waybillEntity.getAbolishStatus(); - if(abolishStatus.equals(1)){ - log.warn("#############findWaybillDetail: 运单已作废 waybillId={}",waybillId); - return R.fail(405,"运单已作废"); + if (abolishStatus.equals(1)) { + log.warn("#############findWaybillDetail: 运单已作废 waybillId={}", waybillId); + return R.fail(405, "运单已作废"); } } @@ -2628,14 +2643,14 @@ public class OpenOrderServiceImpl implements IOpenOrderService { Map map = new HashMap<>(); - map.put("warehouseWaybill",warehouseWaybillVO); - map.put("payTypeList",DictBizCache.getList(DictBizConstant.OPEN_ORDER_PAY_TYPE)); - map.put("payWayList",DictBizCache.getList(DictBizConstant.OPEN_ORDER_PAY_WAY)); - map.put("deliveryWayList",DictBizCache.getList(DictBizConstant.OPEN_ORDER_DELIVERY_WAY)); - map.put("urgencyList",DictBizCache.getList(DictBizConstant.OPEN_ORDER_URGENCY)); - map.put("receiptList",DictBizCache.getList(DictBizConstant.OPEN_ORDER_RECEIPT)); - map.put("transportTypeList",DictBizCache.getList(DictBizConstant.OPEN_ORDER_TRANSPORT_TYPE)); - map.put("editWaybillReasonTypeList",DictBizCache.getList(DictBizConstant.EDIT_WAYBILL_REASON_TYPE)); + map.put("warehouseWaybill", warehouseWaybillVO); + map.put("payTypeList", DictBizCache.getList(DictBizConstant.OPEN_ORDER_PAY_TYPE)); + map.put("payWayList", DictBizCache.getList(DictBizConstant.OPEN_ORDER_PAY_WAY)); + map.put("deliveryWayList", DictBizCache.getList(DictBizConstant.OPEN_ORDER_DELIVERY_WAY)); + map.put("urgencyList", DictBizCache.getList(DictBizConstant.OPEN_ORDER_URGENCY)); + map.put("receiptList", DictBizCache.getList(DictBizConstant.OPEN_ORDER_RECEIPT)); + map.put("transportTypeList", DictBizCache.getList(DictBizConstant.OPEN_ORDER_TRANSPORT_TYPE)); + map.put("editWaybillReasonTypeList", DictBizCache.getList(DictBizConstant.EDIT_WAYBILL_REASON_TYPE)); return R.data(map); } @@ -2659,37 +2674,37 @@ public class OpenOrderServiceImpl implements IOpenOrderService { } Integer abolishStatus = waybillEntity.getAbolishStatus(); - if(abolishStatus.equals(1)){ + if (abolishStatus.equals(1)) { log.warn("#############updateWaybill: 运单已作废 waybillId={}", waybillId); return R.fail(405, "运单已作废"); } Integer checkStatus = waybillEntity.getCheckStatus(); - if(checkStatus.equals(1)){ + if (checkStatus.equals(1)) { log.warn("#############updateWaybill: 运单已审核 waybillId={}", waybillId); return R.fail(405, "运单已审核，不能改单"); } Integer waybillType = waybillEntity.getWaybillType(); - if(waybillType.equals(2)){ + if (waybillType.equals(2)) { //零担改单限制 Long departureWarehouseId = waybillEntity.getDepartureWarehouseId(); Long destinationWarehouseId = waybillEntity.getDestinationWarehouseId(); Integer totalCount = waybillEntity.getTotalCount(); DistributionStockArticleEntity endStockArticleEntity = distributionStockArticleClient.findZeroByOrderCodeAndWarehouseId(waybillNo, destinationWarehouseId); - if(Objects.isNull(endStockArticleEntity)){ + if (Objects.isNull(endStockArticleEntity)) { DistributionStockArticleEntity startStockArticleEntity = distributionStockArticleClient.findZeroByOrderCodeAndWarehouseId(waybillNo, departureWarehouseId); - if(Objects.isNull(startStockArticleEntity)){ + if (Objects.isNull(startStockArticleEntity)) { log.warn("#############updateWaybill: 订单信息不存在！ waybillId={}", waybillId); return R.fail(405, "订单信息不存在！"); } Integer handQuantity = startStockArticleEntity.getHandQuantity(); - if(!NumberUtil.equals(handQuantity,totalCount)){ + if (!NumberUtil.equals(handQuantity, totalCount)) { log.warn("#############updateWaybill: 始发仓数据已发运 waybillId={}", waybillId); return R.fail(405, "始发仓数据已发运"); } - }else{ + } else { Integer handQuantity = endStockArticleEntity.getHandQuantity(); - if(!NumberUtil.equals(handQuantity,totalCount)){ + if (!NumberUtil.equals(handQuantity, totalCount)) { log.warn("#############updateWaybill: 目的仓数据还未完全到达 waybillId={}", waybillId); return R.fail(405, "目的仓数据还未完全到达"); } @@ -2715,13 +2730,13 @@ public class OpenOrderServiceImpl implements IOpenOrderService { warehouseWaybillClient.updateEntity(waybillEntity); - if(CollUtil.isNotEmpty(updateAdvanceDetailList)){ + if (CollUtil.isNotEmpty(updateAdvanceDetailList)) { advanceDetailService.updateBatchById(updateAdvanceDetailList); } // String operationRemark = "修改运单"+waybillNo+",时间："+ CommonUtil.dateToString(waybillEntity.getCreateTime())+","+updateMsg; //异步存入日志 - openOrderAsyncService.saveUpdateLog(waybillId, waybillNo, "888", editReson, "备注："+refer+" 修改内容："+updateMsg, AuthUtil.getNickName(), AuthUtil.getUserId(), warehouseId, warehouseName,waybillEntity); + openOrderAsyncService.saveUpdateLog(waybillId, waybillNo, "888", editReson, "备注：" + refer + " 修改内容：" + updateMsg, AuthUtil.getNickName(), AuthUtil.getUserId(), warehouseId, warehouseName, waybillEntity); // List wayBillDetailList = warehouseWaybillDetailClient.findListByWaybillNo(waybillNo); @@ -2741,19 +2756,19 @@ public class OpenOrderServiceImpl implements IOpenOrderService { List advanceIds = trunklineWaybillOrderService.findAdvanceIdsByWaybillIds(waybillIds); BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findEntityById(consigneeId); - if(waybillType == 1){ + if (waybillType == 1) { List parcelListEntityList = distributionParcelListClient.findAllParcelListByAdvanceIds(advanceIds); - if(CollUtil.isNotEmpty(parcelListEntityList)){ + if (CollUtil.isNotEmpty(parcelListEntityList)) { //把parcelListEntityList包件集合中所有元素的orderCode放入一个Set集合 Set orderCodeSet = parcelListEntityList.stream().map(DistributionParcelListEntity::getOrderCode).collect(Collectors.toSet()); List stockArticleEntities = distributionStockArticleClient.findAllStockArticleListByOrderCodes(new ArrayList<>(orderCodeSet)); stockArticleEntities.forEach(stockArticleEntity -> { stockArticleEntity.setMallId(consigneeId); - if(!Objects.isNull(basicdataClientEntity)){ + if (!Objects.isNull(basicdataClientEntity)) { stockArticleEntity.setMallCode(basicdataClientEntity.getClientCode()); - }else{ + } else { stockArticleEntity.setMallCode(""); } stockArticleEntity.setMallName(consignee); @@ -2774,31 +2789,31 @@ public class OpenOrderServiceImpl implements IOpenOrderService { parcelListEntity.setAcceptWarehouseId(destinationWarehouseId); parcelListEntity.setAcceptWarehouseName(destinationWarehouseName); - if(nowWarehouseId.equals(destinationWarehouseId)){ + if (nowWarehouseId.equals(destinationWarehouseId)) { parcelListEntity.setIsTransfer(0); - if("20".equals(orderPackageStatus)){ + if ("20".equals(orderPackageStatus)) { arriveWarehousePackageCode.add(orderPackageCode); } - }else{ + } else { parcelListEntity.setIsTransfer(1); - if("20".equals(orderPackageStatus)){ + if ("20".equals(orderPackageStatus)) { noArriveWarehousePackageCode.add(orderPackageCode); } } }); - if(CollUtil.isNotEmpty(stockArticleEntities)){ + if (CollUtil.isNotEmpty(stockArticleEntities)) { distributionStockArticleClient.updateByBatchId(stockArticleEntities); } - if(CollUtil.isNotEmpty(parcelListEntityList)){ + if (CollUtil.isNotEmpty(parcelListEntityList)) { distributionParcelListClient.updateList(parcelListEntityList); } - if(CollUtil.isNotEmpty(arriveWarehousePackageCode)){ + if (CollUtil.isNotEmpty(arriveWarehousePackageCode)) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("order_package_code",arriveWarehousePackageCode) - .eq("is_deleted",0); + queryWrapper.in("order_package_code", arriveWarehousePackageCode) + .eq("is_deleted", 0); List trunklineWaybillPackageEntities = trunklineWaybillPackageService.list(queryWrapper); - if(!trunklineWaybillPackageEntities.isEmpty()){ + if (!trunklineWaybillPackageEntities.isEmpty()) { for (TrunklineWaybillPackageEntity trunklineWaybillPackageEntity : trunklineWaybillPackageEntities) { trunklineWaybillPackageEntity.setPackageStatus(30); } @@ -2806,15 +2821,15 @@ public class OpenOrderServiceImpl implements IOpenOrderService { } } - if(CollUtil.isNotEmpty(noArriveWarehousePackageCode)){ + if (CollUtil.isNotEmpty(noArriveWarehousePackageCode)) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("order_package_code",noArriveWarehousePackageCode) - .eq("is_deleted",0); + queryWrapper.in("order_package_code", noArriveWarehousePackageCode) + .eq("is_deleted", 0); List trunklineWaybillPackageEntities = trunklineWaybillPackageService.list(queryWrapper); - if(!trunklineWaybillPackageEntities.isEmpty()){ + if (!trunklineWaybillPackageEntities.isEmpty()) { for (TrunklineWaybillPackageEntity trunklineWaybillPackageEntity : trunklineWaybillPackageEntities) { Integer packageStatus = trunklineWaybillPackageEntity.getPackageStatus(); - if(packageStatus == 30){ + if (packageStatus == 30) { trunklineWaybillPackageEntity.setPackageStatus(20); } } @@ -2822,7 +2837,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { } } } - }else if(waybillType == 2){ + } else if (waybillType == 2) { List addList = openOrderDTO.getAddList(); //把addList中updateType=1的放入一个新的List @@ -2834,13 +2849,13 @@ public class OpenOrderServiceImpl implements IOpenOrderService { stockArticleEntity.setDescriptionGoods(waybillEntity.getGoodsName()); stockArticleEntity.setTotalNumber(totalCount); Integer handQuantity = stockArticleEntity.getHandQuantity(); - if(handQuantity != 0){ + if (handQuantity != 0) { stockArticleEntity.setHandQuantity(totalCount); } - if(!Objects.isNull(basicdataClientEntity)){ + if (!Objects.isNull(basicdataClientEntity)) { stockArticleEntity.setMallCode(basicdataClientEntity.getClientCode()); - }else{ + } else { stockArticleEntity.setMallCode(""); } stockArticleEntity.setMallName(consignee); @@ -2853,7 +2868,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { stockArticleEntity.setAcceptWarehouseId(destinationWarehouseId); stockArticleEntity.setAcceptWarehouseName(destinationWarehouseName); String orderCode = stockArticleEntity.getOrderCode(); - if(orderCode.equals(waybillNo)){ + if (orderCode.equals(waybillNo)) { stockArticleEntity.setCustomerName(consigneeName); stockArticleEntity.setCustomerTelephone(consigneeMobile); stockArticleEntity.setCustomerAddress(consigneeAddress); @@ -2871,10 +2886,9 @@ public class OpenOrderServiceImpl implements IOpenOrderService { Map updateMap = updateList.stream().collect(Collectors.toMap(WaybillDetailDTO::getId, Function.identity())); - List deleteParcelListIds = new ArrayList<>(); List removeIds = new ArrayList<>(); - if(CollUtil.isNotEmpty(removeList)){ + if (CollUtil.isNotEmpty(removeList)) { //把removeList中所有id放入一个List List list = removeList.stream().map(WaybillDetailDTO::getId).collect(Collectors.toList()); removeIds.addAll(list); @@ -2885,14 +2899,14 @@ public class OpenOrderServiceImpl implements IOpenOrderService { Long nowWarehouseId = parcelListEntity.getWarehouseId(); Long advanceId = parcelListEntity.getAdvanceId(); Long id = parcelListEntity.getId(); - if(removeIds.contains(advanceId)){ + if (removeIds.contains(advanceId)) { deleteParcelListIds.add(id); - }else{ + } else { WaybillDetailDTO waybillDetailDTO = updateMap.get(advanceId); - if(!Objects.isNull(waybillDetailDTO)){ + if (!Objects.isNull(waybillDetailDTO)) { parcelListEntity.setFirsts(waybillDetailDTO.getGoodsName()); Integer quantity = parcelListEntity.getQuantity(); - if(quantity != 0){ + if (quantity != 0) { parcelListEntity.setQuantity(waybillDetailDTO.getNum()); } updateNumberIds.add(id); @@ -2902,18 +2916,18 @@ public class OpenOrderServiceImpl implements IOpenOrderService { parcelListEntity.setAcceptWarehouseId(destinationWarehouseId); parcelListEntity.setAcceptWarehouseName(destinationWarehouseName); - if(nowWarehouseId.equals(destinationWarehouseId)){ + if (nowWarehouseId.equals(destinationWarehouseId)) { parcelListEntity.setIsTransfer(0); - }else{ + } else { parcelListEntity.setIsTransfer(1); } } }); - if(CollUtil.isNotEmpty(orderList)){ + if (CollUtil.isNotEmpty(orderList)) { distributionStockArticleClient.updateByBatchId(orderList); } - if(CollUtil.isNotEmpty(parcelListEntityList)){ + if (CollUtil.isNotEmpty(parcelListEntityList)) { distributionParcelListClient.updateList(parcelListEntityList); } @@ -2924,7 +2938,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { Integer handQuantity = stockArticleEntity.getHandQuantity(); - addNewList.forEach(waybillDetailDTO->{ + addNewList.forEach(waybillDetailDTO -> { DistributionParcelListEntity entity = new DistributionParcelListEntity(); entity.setBrandName(stockArticleEntity.getBrand()); entity.setDealerName(stockArticleEntity.getConsigneeUnit()); @@ -2932,9 +2946,9 @@ public class OpenOrderServiceImpl implements IOpenOrderService { Long warehouseId1 = stockArticleEntity.getWarehouseId(); entity.setWarehouseId(warehouseId1); entity.setWarehouse(stockArticleEntity.getWarehouse()); - if(handQuantity != 0){ + if (handQuantity != 0) { entity.setQuantity(waybillDetailDTO.getNum()); - }else{ + } else { entity.setQuantity(0); } entity.setConditions(3); @@ -2979,41 +2993,41 @@ public class OpenOrderServiceImpl implements IOpenOrderService { }); - if(CollUtil.isNotEmpty(addNewNumberList)){ + if (CollUtil.isNotEmpty(addNewNumberList)) { distributionParcelNumberClient.addBatch(addNewNumberList); } - if(CollUtil.isNotEmpty(deleteParcelListIds)){ + if (CollUtil.isNotEmpty(deleteParcelListIds)) { distributionParcelListClient.deleteListByParcelListIds(deleteParcelListIds); } - if(CollUtil.isNotEmpty(updateNumberIds)){ + if (CollUtil.isNotEmpty(updateNumberIds)) { distributionParcelNumberClient.updateListByPracelListIds(updateNumberIds); } - trunklineWaybillOrderService.updateTotalNumByWaybillId(waybillId,totalCount); + trunklineWaybillOrderService.updateTotalNumByWaybillId(waybillId, totalCount); } trunklineWaybillPackageService.updateWaybillStatus(waybillEntity); - sendUpdateWaybillFanout(AuthUtil.getNickName(),AuthUtil.getUserId(),warehouseId,warehouseName,waybillEntity); + sendUpdateWaybillFanout(AuthUtil.getNickName(), AuthUtil.getUserId(), warehouseId, warehouseName, waybillEntity); // openOrderAsyncService.sendUpdateWaybillFanout(waybillEntity,wayBillDetailList,advanceIds,oldConsignee); return R.success("改单成功"); } private void sendUpdateWaybillFanout(String nickName, Long userId, Long warehouseId, String warehouseName, WarehouseWaybillEntity waybillEntity) { - String key = AuthUtil.getTenantId()+":brandList"; + String key = AuthUtil.getTenantId() + ":brandList"; Map brandMap = bladeRedis.hGetAll(key); - if(CollUtil.isEmpty(brandMap)){ + if (CollUtil.isEmpty(brandMap)) { List allList = basicdataBrandClient.findAllList(); Map brandIdMap = new HashMap<>(); allList.forEach(jsonObject -> { - brandIdMap.put(jsonObject.getString("brandName"),jsonObject.getLong("brandId")); + brandIdMap.put(jsonObject.getString("brandName"), jsonObject.getLong("brandId")); }); brandMap.putAll(brandIdMap); } @@ -3043,14 +3057,14 @@ public class OpenOrderServiceImpl implements IOpenOrderService { return R.fail(405, "运单信息不存在"); } Integer abolishStatus = waybillEntity.getAbolishStatus(); - if(abolishStatus.equals(1)){ + if (abolishStatus.equals(1)) { log.warn("#############updateWaybill: 运单已作废 waybillId={}", waybillId); return R.fail(405, "运单已作废"); } // String updateMsg = verifyData(openOrderDTO,waybillEntity); - List list = verifyData(openOrderDTO,waybillEntity); + List list = verifyData(openOrderDTO, waybillEntity); return R.data(list); } @@ -3093,16 +3107,16 @@ public class OpenOrderServiceImpl implements IOpenOrderService { Map orderCodeCounts = importOrderNoPackageExcelDTOS.stream() - .collect(Collectors.groupingBy(a->(a.getOrderCode()+"&"+a.getMaterialName()), Collectors.counting())); + .collect(Collectors.groupingBy(a -> (a.getOrderCode() + "&" + a.getMaterialName()), Collectors.counting())); Set duplicateOrderCodes = orderCodeCounts.entrySet().stream() .filter(entry -> entry.getValue() > 1) .map(Map.Entry::getKey) .collect(Collectors.toSet()); - if(!duplicateOrderCodes.isEmpty()){ - log.warn("#################importCustomizedOuPai: 订单号物料重复 {}",duplicateOrderCodes); - return R.fail(405, "订单号物料重复"+duplicateOrderCodes); + if (!duplicateOrderCodes.isEmpty()) { + log.warn("#################importCustomizedOuPai: 订单号物料重复 {}", duplicateOrderCodes); + return R.fail(405, "订单号物料重复" + duplicateOrderCodes); } @@ -3143,7 +3157,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { List list = new ArrayList<>(); importOrderNoPackageExcelDTOMap.keySet().forEach(key -> { ImportOrderNoPackageExcelDTO importOrderNoPackageExcelDTO = importOrderNoPackageExcelDTOMap.get(key); - if(!Objects.isNull(importOrderNoPackageExcelDTO)){ + if (!Objects.isNull(importOrderNoPackageExcelDTO)) { String orderCode = importOrderNoPackageExcelDTO.getOrderCode(); TrunklineAdvanceEntity advanceEntity = new TrunklineAdvanceVO(); advanceEntity.setWarehouseId(warehouseId); @@ -3154,7 +3168,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { String brand = importOrderNoPackageExcelDTO.getBrand(); advanceEntity.setBrand(brand); BasicdataBrandEntity basicdataBrandEntity = brandMap.get(brand); - if(Objects.isNull(basicdataBrandEntity)){ + if (Objects.isNull(basicdataBrandEntity)) { advanceEntity.setBrand("其他"); } advanceEntity.setTotalNum(Integer.parseInt(importOrderNoPackageExcelDTO.getCount())); @@ -3192,7 +3206,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { String orderCode = advanceEntity.getOrderCode(); String packName = advanceEntity.getReserve1(); ImportOrderNoPackageExcelDTO importOrderNoPackageExcelDTO = importOrderNoPackageExcelDTOMap.get(orderCode + "&" + (StringUtil.isBlank(packName) ? "null" : packName)); - if(!Objects.isNull(importOrderNoPackageExcelDTO)){ + if (!Objects.isNull(importOrderNoPackageExcelDTO)) { String firsts = importOrderNoPackageExcelDTO.getFirsts(); Integer totalNum = advanceEntity.getTotalNum(); TrunklineAdvanceDetailEntity advanceDetailModel = new TrunklineAdvanceDetailEntity(); @@ -3221,25 +3235,25 @@ public class OpenOrderServiceImpl implements IOpenOrderService { advanceDetailModel.setMaterialCode(importOrderNoPackageExcelDTO.getMaterialCode()); advanceDetailModel.setMaterialName(importOrderNoPackageExcelDTO.getMaterialName()); String volume = importOrderNoPackageExcelDTO.getVolume(); - if (StringUtil.isBlank(volume)){ + if (StringUtil.isBlank(volume)) { advanceDetailModel.setVolume(BigDecimal.ZERO); - }else{ + } else { advanceDetailModel.setVolume(new BigDecimal(volume)); } String weight = importOrderNoPackageExcelDTO.getWeight(); - if (StringUtil.isBlank(weight)){ + if (StringUtil.isBlank(weight)) { advanceDetailModel.setWeight(BigDecimal.ZERO); - }else{ + } else { advanceDetailModel.setWeight(new BigDecimal(weight)); } advanceDetailModel.setPackageStatus("0"); - String materialName = StringUtil.isNotBlank(importOrderNoPackageExcelDTO.getMaterialName())?importOrderNoPackageExcelDTO.getMaterialName():""; - String materialCode = StringUtil.isNotBlank(importOrderNoPackageExcelDTO.getMaterialCode())?importOrderNoPackageExcelDTO.getMaterialCode():""; + String materialName = StringUtil.isNotBlank(importOrderNoPackageExcelDTO.getMaterialName()) ? importOrderNoPackageExcelDTO.getMaterialName() : ""; + String materialCode = StringUtil.isNotBlank(importOrderNoPackageExcelDTO.getMaterialCode()) ? importOrderNoPackageExcelDTO.getMaterialCode() : ""; BasicMaterialEntity basicMaterialEntity = materialEntityMap.get(materialCode + "&&" + materialName); - if(!Objects.isNull(basicMaterialEntity)){ + if (!Objects.isNull(basicMaterialEntity)) { advanceDetailModel.setMaterialId(basicMaterialEntity.getId()); advanceDetailModel.setMaterialCode(materialCode); advanceDetailModel.setMaterialName(materialName); @@ -3263,7 +3277,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { List comlist = new ArrayList<>(); for (int i = 0; i < advanceDetailEntitiesList.size(); i++) { List ls = advanceDetailEntitiesList.get(i); - CompletableFuture fromCpFirstReq = asyncService.getResponseFromCp(ls, i+1); + CompletableFuture fromCpFirstReq = asyncService.getResponseFromCp(ls, i + 1); comlist.add(fromCpFirstReq); } CompletableFuture.allOf(comlist.toArray(new CompletableFuture[0])).join(); @@ -3272,16 +3286,16 @@ public class OpenOrderServiceImpl implements IOpenOrderService { //发送报表基础数据广播 //把advanceDetailEntities通过advanceId进行分组 - try{ + try { Map> advanceDetailEntityMap = advanceDetailEntities.stream().collect(Collectors.groupingBy(TrunklineAdvanceDetailEntity::getAdvanceId)); list.forEach(advanceEntity -> { Long advanceId = advanceEntity.getId(); String dealerCode = advanceEntity.getDealerCode(); String dealerName = advanceEntity.getDealerName(); List advanceDetailEntities1 = advanceDetailEntityMap.get(advanceId); - advanceDetailService.sendReportBasicdataFanout(AuthUtil.getNickName(),AuthUtil.getUserId(),warehouseId,warehouseName,new Date(),advanceDetailEntities1,dealerCode,dealerName); + advanceDetailService.sendReportBasicdataFanout(AuthUtil.getNickName(), AuthUtil.getUserId(), warehouseId, warehouseName, new Date(), advanceDetailEntities1, dealerCode, dealerName); }); - }catch (Exception e){ + } catch (Exception e) { log.error("############importCustomizedOuPai：发送广播异常"); } @@ -3441,15 +3455,14 @@ public class OpenOrderServiceImpl implements IOpenOrderService { String brand = importOrderNoPackageExcelDTO.getBrand(); advanceEntity.setBrand(brand); - if(StringUtil.isNotBlank(brand)){ + if (StringUtil.isNotBlank(brand)) { BasicdataBrandEntity basicdataBrandEntity = brandEntityMap.get(brand); - if(Objects.isNull(basicdataBrandEntity)){ + if (Objects.isNull(basicdataBrandEntity)) { advanceEntity.setBrand("其他"); } } - advanceEntity.setTotalNum(Integer.parseInt(importOrderNoPackageExcelDTO.getCount())); advanceEntity.setPackName(importOrderNoPackageExcelDTO.getFirsts()); advanceEntity.setDealerCode(importOrderNoPackageExcelDTO.getDealerCode()); @@ -3481,7 +3494,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { int successNum = list.size(); - return R.success("成功导入"+successNum+"条"); + return R.success("成功导入" + successNum + "条"); } @Override @@ -3494,23 +3507,31 @@ public class OpenOrderServiceImpl implements IOpenOrderService { String checkRemark = openOrderDTO.getCheckRemark(); WarehouseWaybillEntity warehouseWaybillEntity = warehouseWaybillClient.findByWaybillId(waybillId); + + solveWaybillInfo(warehouseWaybillEntity, waybillId, checkReson, checkRemark, warehouseId, warehouseName); + + return R.success("审核成功"); + } + + @Nullable + private void solveWaybillInfo(WarehouseWaybillEntity warehouseWaybillEntity, Long waybillId, String checkReson, String checkRemark, Long warehouseId, String warehouseName) { if (Objects.isNull(warehouseWaybillEntity)) { log.warn("##############checkWaybill: 运单信息不存在"); - return R.fail(405, "运单信息不存在"); + throw new CustomerException(405, "运单信息不存在"); } Integer abolishStatus = warehouseWaybillEntity.getAbolishStatus(); - if(abolishStatus.equals(1)){ - log.warn("#############checkWaybill: 运单已作废 waybillId={}",waybillId); - return R.fail(405,"运单已作废"); + if (abolishStatus.equals(1)) { + log.warn("#############checkWaybill: 运单已作废 waybillId={}", waybillId); + throw new CustomerException(405, warehouseWaybillEntity.getWaybillNo() + "运单已作废"); } Integer checkStatus = warehouseWaybillEntity.getCheckStatus(); - if(Objects.isNull(checkStatus)){ + if (Objects.isNull(checkStatus)) { checkStatus = 0; } - if(checkStatus.equals(1)){ - log.warn("##############checkWaybill: 运单已经审核 waybillId={}",waybillId); - return R.fail(405, "运单已经审核"); + if (checkStatus.equals(1)) { + log.warn("##############checkWaybill: 运单已经审核 waybillId={}", waybillId); + throw new CustomerException(405, warehouseWaybillEntity.getWaybillNo() + "运单已经审核"); } Date now = new Date(); @@ -3535,12 +3556,10 @@ public class OpenOrderServiceImpl implements IOpenOrderService { //发送运单审核的广播 JSONObject jsonObject = new JSONObject(); - jsonObject.put("waybillId",waybillId); + jsonObject.put("waybillId", waybillId); FanoutMsg fanoutMsg = FanoutMsg.builder().exchange(FanoutConstants.trunkline.CHECKWAYBILL.EXCHANGE) .msg(jsonObject.toJSONString()).build(); sendFanoutService.sendFanoutMsg(fanoutMsg); - - return R.success("审核成功"); } @Override @@ -3823,7 +3842,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { //绑定订单和运单的关系 List advanceEntityList = advanceService.findListByIds(advanceIds); List waybillOrderEntities = new ArrayList<>(); - for (TrunklineAdvanceEntity advanceEntity:advanceEntityList){ + for (TrunklineAdvanceEntity advanceEntity : advanceEntityList) { Long advanceId = advanceEntity.getId(); String waybillStatus = advanceEntity.getWaybillStatus(); if ("1".equals(waybillStatus)) { @@ -3986,9 +4005,9 @@ public class OpenOrderServiceImpl implements IOpenOrderService { @Override public R saveWaybillReturn(Long waybillId, String url) { WarehouseWaybillEntity waybillEntity = warehouseWaybillClient.findByWaybillId(waybillId); - if(Objects.isNull(waybillEntity)){ + if (Objects.isNull(waybillEntity)) { log.info("#################openWaybill: 运单信息不存在 waybillId={}", waybillId); - return R.fail(405,"运单信息不存在"); + return R.fail(405, "运单信息不存在"); } TrunklineWaybillReturnEntity trunklineWaybillReturnEntity = new TrunklineWaybillReturnEntity(); @@ -4000,7 +4019,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { Integer receiptNum = waybillEntity.getReceiptNum(); WarehouseWaybillEntity updateWaybillEntity = new WarehouseWaybillEntity(); updateWaybillEntity.setId(waybillId); - updateWaybillEntity.setReceiptNum(receiptNum+1); + updateWaybillEntity.setReceiptNum(receiptNum + 1); updateWaybillEntity.setReturnStatus(1); warehouseWaybillClient.updateEntity(updateWaybillEntity); @@ -4036,7 +4055,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { openOrderDTO.setCheckTimeStart(CommonUtil.getStartByDateStr(openOrderDTO.getCheckTimeStartStr())); openOrderDTO.setCheckTimeEnd(CommonUtil.getEndByDateStr(openOrderDTO.getCheckTimeEndStr())); - IPage pageList = trunklineWaybillTrackService.findUpdateWaybillList(page,openOrderDTO); + IPage pageList = trunklineWaybillTrackService.findUpdateWaybillList(page, openOrderDTO); return R.data(pageList); } @@ -4048,14 +4067,14 @@ public class OpenOrderServiceImpl implements IOpenOrderService { String waybillNo = waybillEntity.getWaybillNo(); Integer abolishStatus = waybillEntity.getAbolishStatus(); Integer freezeStatus = waybillEntity.getFreezeStatus(); - if(abolishStatus.equals(1)){ - log.warn("##############freezeWaybill: {}运单已经作废",waybillNo); - throw new CustomerException(405,waybillNo+"运单已经作废,不能冻结"); + if (abolishStatus.equals(1)) { + log.warn("##############freezeWaybill: {}运单已经作废", waybillNo); + throw new CustomerException(405, waybillNo + "运单已经作废,不能冻结"); } - if(freezeStatus.equals(1)){ - log.warn("##############freezeWaybill: {}运单已冻结",waybillNo); - throw new CustomerException(405,waybillNo+"运单已冻结,不能冻结"); + if (freezeStatus.equals(1)) { + log.warn("##############freezeWaybill: {}运单已冻结", waybillNo); + throw new CustomerException(405, waybillNo + "运单已冻结,不能冻结"); } waybillEntity.setFreezeStatus(1); @@ -4083,13 +4102,13 @@ public class OpenOrderServiceImpl implements IOpenOrderService { String waybillNo = waybillEntity.getWaybillNo(); Integer abolishStatus = waybillEntity.getAbolishStatus(); Integer freezeStatus = waybillEntity.getFreezeStatus(); - if(abolishStatus.equals(1)){ - log.warn("##############unFreezeWaybill: {}运单已经作废",waybillNo); - throw new CustomerException(405,waybillNo+"运单已经作废,不能解冻"); + if (abolishStatus.equals(1)) { + log.warn("##############unFreezeWaybill: {}运单已经作废", waybillNo); + throw new CustomerException(405, waybillNo + "运单已经作废,不能解冻"); } - if(freezeStatus.equals(0)){ - log.warn("##############unFreezeWaybill: {}运单未冻结",waybillNo); - throw new CustomerException(405,waybillNo+"运单未冻结,不能解冻"); + if (freezeStatus.equals(0)) { + log.warn("##############unFreezeWaybill: {}运单未冻结", waybillNo); + throw new CustomerException(405, waybillNo + "运单未冻结,不能解冻"); } waybillEntity.setFreezeStatus(0); @@ -4121,37 +4140,37 @@ public class OpenOrderServiceImpl implements IOpenOrderService { Long waybillId = waybillEntity.getId(); String waybillNo = waybillEntity.getWaybillNo(); String waybillStatus = waybillEntity.getWaybillStatus(); - if(StringUtil.isBlank(waybillStatus)){ - log.warn("##############abolishWaybill: {}运单为旧数据不能作废",waybillNo); - throw new CustomerException(405,waybillNo+"运单为旧数据不能作废"); + if (StringUtil.isBlank(waybillStatus)) { + log.warn("##############abolishWaybill: {}运单为旧数据不能作废", waybillNo); + throw new CustomerException(405, waybillNo + "运单为旧数据不能作废"); } Integer waybillStatusNum = Integer.parseInt(waybillStatus); - if(waybillStatusNum >= 30){ - log.warn("##############abolishWaybill: {}运单已经进入配载不能进行作废",waybillNo); - throw new CustomerException(405,waybillNo+"运单已经进入配载不能进行作废"); + if (waybillStatusNum >= 30) { + log.warn("##############abolishWaybill: {}运单已经进入配载不能进行作废", waybillNo); + throw new CustomerException(405, waybillNo + "运单已经进入配载不能进行作废"); } Integer abolishStatus = waybillEntity.getAbolishStatus(); - if(abolishStatus.equals(1)){ - log.warn("##############abolishWaybill: {}运单已经作废",waybillNo); - throw new CustomerException(405,waybillNo+"运单已经作废,不能重复作废"); + if (abolishStatus.equals(1)) { + log.warn("##############abolishWaybill: {}运单已经作废", waybillNo); + throw new CustomerException(405, waybillNo + "运单已经作废,不能重复作废"); } //判断是否做了配送 List orderCodes = distributionParcelListClient.findOrderCodeByWaybillId(waybillId); - if(CollUtil.isNotEmpty(orderCodes)){ + if (CollUtil.isNotEmpty(orderCodes)) { List reservationIds = reservationStockarticleClient.findReservationIdsByOrderCodes(orderCodes); - if(CollUtil.isNotEmpty(reservationIds)){ - log.warn("##############abolishWaybill: {}运单已经做了配送计划",waybillNo); - throw new CustomerException(405,waybillNo+"运单已经做了配送计划"); + if (CollUtil.isNotEmpty(reservationIds)) { + log.warn("##############abolishWaybill: {}运单已经做了配送计划", waybillNo); + throw new CustomerException(405, waybillNo + "运单已经做了配送计划"); } } //TODO 还需要加上生成了预存单的无法进行作废 Integer status = orderInfoClient.findCreateRencilitionOrderStatus(waybillId); - if(status == 1){ - log.warn("##########abolishWaybill: 运单已有预存单确认 waybillId={}",waybillId); - throw new CustomerException(405,"运单已有预存单确认"); + if (status == 1) { + log.warn("##########abolishWaybill: 运单已有预存单确认 waybillId={}", waybillId); + throw new CustomerException(405, "运单已有预存单确认"); } waybillEntity.setAbolishStatus(1); @@ -4159,7 +4178,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { waybillEntity.setAbolishTime(new Date()); Integer waybillType = waybillEntity.getWaybillType(); - if(waybillType.equals(1)){ + if (waybillType.equals(1)) { //订制品 advanceService.clearWaybillInfoByWaybillNo(waybillNo); advanceDetailService.clearWaybillInfoByWaybillId(waybillId); @@ -4172,7 +4191,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { clearWaybillInfoParceListIds.add(parcelListEntity.getId()); }); - }else if(waybillType.equals(2)){ + } else if (waybillType.equals(2)) { //零担 trunklineWaybillOrderService.deleteByWaybillNo(waybillNo); deleteZeroWaybillNoList.add(waybillNo); @@ -4184,20 +4203,20 @@ public class OpenOrderServiceImpl implements IOpenOrderService { //把装了车的包件取消装车 List carsLoadScanIds = trunklineCarsLoadScanService.findCarsLoadScanIdsByWaybillIds(waybillIds); - if(!CollUtil.isEmpty(carsLoadScanIds)){ - carsLoadService.removeCarsLoadScan(carsLoadScanIds,warehouseId); + if (!CollUtil.isEmpty(carsLoadScanIds)) { + carsLoadService.removeCarsLoadScan(carsLoadScanIds, warehouseId); } waybillList.forEach(waybillEntity -> { String createOperationRemark = "作废运单" + waybillEntity.getWaybillNo() + ",时间：" + CommonUtil.dateToStringGeneral(new Date()); - openOrderAsyncService.saveLog(waybillEntity.getId(), waybillEntity.getWaybillNo(), "1000", "作废运单", createOperationRemark+" 原因："+abolishReson, AuthUtil.getNickName(), AuthUtil.getUserId(), warehouseId, warehouseName); + openOrderAsyncService.saveLog(waybillEntity.getId(), waybillEntity.getWaybillNo(), "1000", "作废运单", createOperationRemark + " 原因：" + abolishReson, AuthUtil.getNickName(), AuthUtil.getUserId(), warehouseId, warehouseName); }); warehouseWaybillClient.deleteByWaybillIds(waybillIds); - if(CollUtil.isNotEmpty(clearWaybillInfoParceListIds)){ + if (CollUtil.isNotEmpty(clearWaybillInfoParceListIds)) { distributionParcelListClient.clearWaybillInfoByParceListIds(clearWaybillInfoParceListIds); } - if(CollUtil.isNotEmpty(deleteZeroWaybillNoList)){ + if (CollUtil.isNotEmpty(deleteZeroWaybillNoList)) { distributionStockArticleClient.deleteZeroOrderByWaybillNoList(deleteZeroWaybillNoList); } @@ -4207,14 +4226,14 @@ public class OpenOrderServiceImpl implements IOpenOrderService { @Override public R findWaybillDes(Long departureWarehouseId, Long consigneeId) { - Map map = new HashMap<>(); - map.put("destinationWarehouseId",null); - map.put("destinationWarehouseName",null); + Map map = new HashMap<>(); + map.put("destinationWarehouseId", null); + map.put("destinationWarehouseName", null); BasicdataStorageServicesEntity basicdataStorageServicesEntity = basicdataStorageServicesClient.findEntityBySendWarehouseIdAndClientId(departureWarehouseId, consigneeId); if (!Objects.isNull(basicdataStorageServicesEntity)) { - map.put("destinationWarehouseId",basicdataStorageServicesEntity.getServeWarehouseId()); - map.put("destinationWarehouseName",basicdataStorageServicesEntity.getServeWarehouseName()); + map.put("destinationWarehouseId", basicdataStorageServicesEntity.getServeWarehouseId()); + map.put("destinationWarehouseName", basicdataStorageServicesEntity.getServeWarehouseName()); } return R.data(map); } @@ -4226,9 +4245,9 @@ public class OpenOrderServiceImpl implements IOpenOrderService { Integer enterNum = advanceDTO.getEnterNum(); BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(warehouseId); - if(Objects.isNull(warehouseEntity)){ - log.warn("##########createOrderPackage: 仓库信息不存在 warehouseId={}",warehouseId); - return R.fail(405,"仓库信息不存在"); + if (Objects.isNull(warehouseEntity)) { + log.warn("##########createOrderPackage: 仓库信息不存在 warehouseId={}", warehouseId); + return R.fail(405, "仓库信息不存在"); } String warehouseName = warehouseEntity.getName(); String warehouseCode = warehouseEntity.getWarehouseCode(); @@ -4238,14 +4257,14 @@ public class OpenOrderServiceImpl implements IOpenOrderService { List advanceDetailList = advanceDetailService.findList(advanceId); - if(totalNum > 0 || CollUtil.isNotEmpty(advanceDetailList)){ - log.warn("##########createOrderPackage: 订单已有包件数据 advanceId={}",advanceId); - return R.fail(405,"订单已有包件数据"); + if (totalNum > 0 || CollUtil.isNotEmpty(advanceDetailList)) { + log.warn("##########createOrderPackage: 订单已有包件数据 advanceId={}", advanceId); + return R.fail(405, "订单已有包件数据"); } - if(enterNum == null || enterNum <= 0){ - log.warn("##########createOrderPackage: 输入的数量不正确 enterNum={}",enterNum); - return R.fail(405,"输入的数量不正确"); + if (enterNum == null || enterNum <= 0) { + log.warn("##########createOrderPackage: 输入的数量不正确 enterNum={}", enterNum); + return R.fail(405, "输入的数量不正确"); } TrunklineAdvanceDetailEntity advanceDetailModel = new TrunklineAdvanceDetailEntity(); @@ -4328,37 +4347,36 @@ public class OpenOrderServiceImpl implements IOpenOrderService { String warehouseName = openOrderDTO.getWarehouseName(); WarehouseWaybillEntity waybillEntity = warehouseWaybillClient.findByWaybillId(waybillId); - if(Objects.isNull(waybillEntity)){ - log.warn("##########cancleCheckWaybill: 运单信息不存在 waybillId={}",waybillId); - return R.fail(405,"运单信息不存在"); + if (Objects.isNull(waybillEntity)) { + log.warn("##########cancleCheckWaybill: 运单信息不存在 waybillId={}", waybillId); + return R.fail(405, "运单信息不存在"); } String payWay = waybillEntity.getPayWay(); Integer checkStatus = waybillEntity.getCheckStatus(); - if(checkStatus.equals(0)){ - log.warn("##########cancleCheckWaybill: 运单还未审核 waybillId={} checkStatus={}",waybillId,checkStatus); - return R.fail(405,"运单还未审核"); + if (checkStatus.equals(0)) { + log.warn("##########cancleCheckWaybill: 运单还未审核 waybillId={} checkStatus={}", waybillId, checkStatus); + return R.fail(405, "运单还未审核"); } - if("1".equals(payWay)||"2".equals(payWay)){ + if ("1".equals(payWay) || "2".equals(payWay)) { List orderCodes = distributionParcelListClient.findOrderCodeByWaybillId(waybillId); List reservationIds = reservationStockarticleClient.findReservationIdsByOrderCodes(orderCodes); - if(CollUtil.isNotEmpty(reservationIds)){ - log.warn("##########cancleCheckWaybill: 运单已有配送计划 waybillId={}",waybillId); - return R.fail(405,"运单已有配送计划"); + if (CollUtil.isNotEmpty(reservationIds)) { + log.warn("##########cancleCheckWaybill: 运单已有配送计划 waybillId={}", waybillId); + return R.fail(405, "运单已有配送计划"); } } - //判断结算单是否有生成 // Integer status = orderInfoClient.findCreateRencilitionOrderStatus(waybillId); //判断是否有生成结算单或者是否有结算金额 Integer status = orderInfoClient.findBalanceOrderStatus(waybillId); - if(status == 1){ - log.warn("##########cancleCheckWaybill: 运单已有结算金额 waybillId={}",waybillId); - return R.fail(405,"运单已有结算金额"); + if (status == 1) { + log.warn("##########cancleCheckWaybill: 运单已有结算金额 waybillId={}", waybillId); + return R.fail(405, "运单已有结算金额"); } orderInfoClient.deleteWaybillData(waybillId); @@ -4400,7 +4418,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { Long newBrandId = openOrderDTO.getBrandId(); String brand = waybillEntity.getBrand(); Long brandId = waybillEntity.getBrandId(); - if(!ObjectUtil.equals(newBrandId,brandId)){ + if (!ObjectUtil.equals(newBrandId, brandId)) { EditOrderMsgVO editOrderMsgVO = new EditOrderMsgVO(); editOrderMsgVO.setItemName("品牌"); editOrderMsgVO.setOldValue(brand); @@ -4410,7 +4428,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { String newDeparture = openOrderDTO.getDeparture(); String departure = waybillEntity.getDeparture(); - if(!ObjectUtil.equals(newDeparture,departure)){ + if (!ObjectUtil.equals(newDeparture, departure)) { // stringBuilder.append("到站：").append(destination).append("-->").append(newDestination).append(";"); EditOrderMsgVO editOrderMsgVO = new EditOrderMsgVO(); editOrderMsgVO.setItemName("发站"); @@ -4432,52 +4450,52 @@ public class OpenOrderServiceImpl implements IOpenOrderService { Integer newPickupCompleteOrNot = openOrderDTO.getPickupCompleteOrNot(); Integer pickupCompleteOrNot = waybillEntity.getPickupCompleteOrNot(); - if(!ObjectUtil.equals(newPickupCompleteOrNot,pickupCompleteOrNot)){ + if (!ObjectUtil.equals(newPickupCompleteOrNot, pickupCompleteOrNot)) { // stringBuilder.append("到站：").append(destination).append("-->").append(newDestination).append(";"); EditOrderMsgVO editOrderMsgVO = new EditOrderMsgVO(); editOrderMsgVO.setItemName("提货是否整车"); - editOrderMsgVO.setOldValue(pickupCompleteOrNot==1?"是":"否"); - editOrderMsgVO.setNewValue(newPickupCompleteOrNot==1?"是":"否"); + editOrderMsgVO.setOldValue(pickupCompleteOrNot == 1 ? "是" : "否"); + editOrderMsgVO.setNewValue(newPickupCompleteOrNot == 1 ? "是" : "否"); msgList.add(editOrderMsgVO); } Integer newTrunklineCompleteOrNot = openOrderDTO.getTrunklineCompleteOrNot(); Integer trunklineCompleteOrNot = waybillEntity.getTrunklineCompleteOrNot(); - if(!ObjectUtil.equals(newTrunklineCompleteOrNot,trunklineCompleteOrNot)){ + if (!ObjectUtil.equals(newTrunklineCompleteOrNot, trunklineCompleteOrNot)) { // stringBuilder.append("到站：").append(destination).append("-->").append(newDestination).append(";"); EditOrderMsgVO editOrderMsgVO = new EditOrderMsgVO(); editOrderMsgVO.setItemName("干线是否整车"); - editOrderMsgVO.setOldValue(trunklineCompleteOrNot==1?"是":"否"); - editOrderMsgVO.setNewValue(newTrunklineCompleteOrNot==1?"是":"否"); + editOrderMsgVO.setOldValue(trunklineCompleteOrNot == 1 ? "是" : "否"); + editOrderMsgVO.setNewValue(newTrunklineCompleteOrNot == 1 ? "是" : "否"); msgList.add(editOrderMsgVO); } String newTrunklineVehicleType = openOrderDTO.getTrunklineVehicleType(); String trunklineVehicleType = waybillEntity.getTrunklineVehicleType(); - if(!ObjectUtil.equals(newTrunklineVehicleType,trunklineVehicleType)){ + if (!ObjectUtil.equals(newTrunklineVehicleType, trunklineVehicleType)) { // stringBuilder.append("到站：").append(destination).append("-->").append(newDestination).append(";"); EditOrderMsgVO editOrderMsgVO = new EditOrderMsgVO(); editOrderMsgVO.setItemName("干线车型"); - editOrderMsgVO.setOldValue(DictBizCache.getValue("price_vehicle_type",trunklineVehicleType)); - editOrderMsgVO.setNewValue(DictBizCache.getValue("price_vehicle_type",newTrunklineVehicleType)); + editOrderMsgVO.setOldValue(DictBizCache.getValue("price_vehicle_type", trunklineVehicleType)); + editOrderMsgVO.setNewValue(DictBizCache.getValue("price_vehicle_type", newTrunklineVehicleType)); msgList.add(editOrderMsgVO); } String newPickupVehicleType = openOrderDTO.getPickupVehicleType(); String pickupVehicleType = waybillEntity.getPickupVehicleType(); - if(!ObjectUtil.equals(newPickupVehicleType,pickupVehicleType)){ + if (!ObjectUtil.equals(newPickupVehicleType, pickupVehicleType)) { // stringBuilder.append("到站：").append(destination).append("-->").append(newDestination).append(";"); EditOrderMsgVO editOrderMsgVO = new EditOrderMsgVO(); editOrderMsgVO.setItemName("提货车型"); - editOrderMsgVO.setOldValue(DictBizCache.getValue("price_vehicle_type",pickupVehicleType)); - editOrderMsgVO.setNewValue(DictBizCache.getValue("price_vehicle_type",newPickupVehicleType)); + editOrderMsgVO.setOldValue(DictBizCache.getValue("price_vehicle_type", pickupVehicleType)); + editOrderMsgVO.setNewValue(DictBizCache.getValue("price_vehicle_type", newPickupVehicleType)); msgList.add(editOrderMsgVO); } String newDestination = openOrderDTO.getDestination(); String destination = waybillEntity.getDestination(); - if(!ObjectUtil.equals(newDestination,destination)){ + if (!ObjectUtil.equals(newDestination, destination)) { // stringBuilder.append("到站：").append(destination).append("-->").append(newDestination).append(";"); EditOrderMsgVO editOrderMsgVO = new EditOrderMsgVO(); editOrderMsgVO.setItemName("到站"); @@ -4489,7 +4507,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { String newDestinationWarehouseName = openOrderDTO.getDestinationWarehouseName(); Long destinationWarehouseId = waybillEntity.getDestinationWarehouseId(); String destinationWarehouseName = waybillEntity.getDestinationWarehouseName(); - if(!ObjectUtil.equals(destinationWarehouseId,newDestinationWarehouseId)){ + if (!ObjectUtil.equals(destinationWarehouseId, newDestinationWarehouseId)) { // stringBuilder.append("目的仓：").append(departureWarehouseName).append("-->").append(newDestinationWarehouseName).append(";"); EditOrderMsgVO editOrderMsgVO = new EditOrderMsgVO(); editOrderMsgVO.setItemName("目的仓"); @@ -4501,7 +4519,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { String newShipper = openOrderDTO.getShipper(); Long shipperId = waybillEntity.getShipperId(); String shipper = waybillEntity.getShipper(); - if(!ObjectUtil.equals(shipperId,newShipperId)){ + if (!ObjectUtil.equals(shipperId, newShipperId)) { // stringBuilder.append("发货单位：").append(shipper).append("-->").append(newShipper).append(";"); EditOrderMsgVO editOrderMsgVO = new EditOrderMsgVO(); editOrderMsgVO.setItemName("发货单位"); @@ -4512,7 +4530,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { String newShipperName = openOrderDTO.getShipperName(); String shipperName = waybillEntity.getShipperName(); - if(!ObjectUtil.equals(shipperName,newShipperName)){ + if (!ObjectUtil.equals(shipperName, newShipperName)) { // stringBuilder.append("发货人：").append(shipperName).append("-->").append(newShipperName).append(";"); EditOrderMsgVO editOrderMsgVO = new EditOrderMsgVO(); editOrderMsgVO.setItemName("发货人"); @@ -4523,7 +4541,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { String newShipperMobile = openOrderDTO.getShipperMobile(); String shipperMobile = waybillEntity.getShipperMobile(); - if(!ObjectUtil.equals(shipperMobile,newShipperMobile)){ + if (!ObjectUtil.equals(shipperMobile, newShipperMobile)) { // stringBuilder.append("发货人电话：").append(shipperMobile).append("-->").append(newShipperMobile).append(";"); EditOrderMsgVO editOrderMsgVO = new EditOrderMsgVO(); editOrderMsgVO.setItemName("发货人电话"); @@ -4534,7 +4552,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { String newShipperAddress = openOrderDTO.getShipperAddress(); String shipperAddress = waybillEntity.getShipperAddress(); - if(!ObjectUtil.equals(shipperAddress,newShipperAddress)){ + if (!ObjectUtil.equals(shipperAddress, newShipperAddress)) { // stringBuilder.append("发货人地址：").append(shipperAddress).append("-->").append(newShipperAddress).append(";"); EditOrderMsgVO editOrderMsgVO = new EditOrderMsgVO(); editOrderMsgVO.setItemName("发货人地址"); @@ -4547,7 +4565,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { String newConsignee = openOrderDTO.getConsignee(); Long consigneeId = waybillEntity.getConsigneeId(); String consignee = waybillEntity.getConsignee(); - if(!ObjectUtil.equals(consigneeId,newConsigneeId)){ + if (!ObjectUtil.equals(consigneeId, newConsigneeId)) { // stringBuilder.append("收货单位：").append(consignee).append("-->").append(newConsignee).append(";"); EditOrderMsgVO editOrderMsgVO = new EditOrderMsgVO(); editOrderMsgVO.setItemName("收货单位"); @@ -4558,7 +4576,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { String newConsigneeName = openOrderDTO.getConsigneeName(); String consigneeName = waybillEntity.getConsigneeName(); - if(!ObjectUtil.equals(consigneeName,newConsigneeName)){ + if (!ObjectUtil.equals(consigneeName, newConsigneeName)) { // stringBuilder.append("收货人：").append(consigneeName).append("-->").append(newConsigneeName).append(";"); EditOrderMsgVO editOrderMsgVO = new EditOrderMsgVO(); editOrderMsgVO.setItemName("收货人"); @@ -4569,7 +4587,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { String newConsigneeMobile = openOrderDTO.getConsigneeMobile(); String consigneeMobile = waybillEntity.getConsigneeMobile(); - if(!ObjectUtil.equals(consigneeMobile,newConsigneeMobile)){ + if (!ObjectUtil.equals(consigneeMobile, newConsigneeMobile)) { // stringBuilder.append("收货人电话：").append(consigneeMobile).append("-->").append(newConsigneeMobile).append(";"); EditOrderMsgVO editOrderMsgVO = new EditOrderMsgVO(); editOrderMsgVO.setItemName("收货人电话"); @@ -4580,7 +4598,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { String newConsigneeAddress = openOrderDTO.getConsigneeAddress(); String consigneeAddress = waybillEntity.getConsigneeAddress(); - if(!ObjectUtil.equals(consigneeAddress,newConsigneeAddress)){ + if (!ObjectUtil.equals(consigneeAddress, newConsigneeAddress)) { // stringBuilder.append("收货人地址：").append(consigneeAddress).append("-->").append(newConsigneeAddress).append(";"); EditOrderMsgVO editOrderMsgVO = new EditOrderMsgVO(); editOrderMsgVO.setItemName("收货人地址"); @@ -4596,19 +4614,19 @@ public class OpenOrderServiceImpl implements IOpenOrderService { Long waybillDetailId = waybillDetailDTO.getId(); WarehouseWayBillDetail warehouseWayBillDetail = warehouseWaybillDetailClient.findEntityByWaybillDetailId(waybillDetailId); - if(Objects.isNull(warehouseWayBillDetail)){ + if (Objects.isNull(warehouseWayBillDetail)) { log.warn("#################verifyUpdateData: 明细不存在"); continue; } - if(StringUtil.isBlank(removeMsg)){ - removeMsg = warehouseWayBillDetail.getProductName()+"("+warehouseWayBillDetail.getNum()+")"; - }else{ - removeMsg = removeMsg + "," + warehouseWayBillDetail.getProductName()+"("+warehouseWayBillDetail.getNum()+")"; + if (StringUtil.isBlank(removeMsg)) { + removeMsg = warehouseWayBillDetail.getProductName() + "(" + warehouseWayBillDetail.getNum() + ")"; + } else { + removeMsg = removeMsg + "," + warehouseWayBillDetail.getProductName() + "(" + warehouseWayBillDetail.getNum() + ")"; } } - if(StringUtil.isNotBlank(removeMsg)){ + if (StringUtil.isNotBlank(removeMsg)) { // stringBuilder.append("明细移除：").append(removeMsg).append(";"); EditOrderMsgVO editOrderMsgVO = new EditOrderMsgVO(); editOrderMsgVO.setItemName("明细移除"); @@ -4621,30 +4639,30 @@ public class OpenOrderServiceImpl implements IOpenOrderService { Integer updateType = waybillDetailDTO.getUpdateType(); - if(1 == updateType){ + if (1 == updateType) { //新增 // stringBuilder.append("明细新增：").append(waybillDetailDTO.getGoodsName()).append(" 数量 ").append(waybillDetailDTO.getNum()).append(" 单价 ").append(waybillDetailDTO.getPrice()).append(";"); EditOrderMsgVO editOrderMsgVO = new EditOrderMsgVO(); - editOrderMsgVO.setItemName("明细新增 "+waybillDetailDTO.getGoodsName()); - editOrderMsgVO.setNewValue(" 数量 "+waybillDetailDTO.getNum()+" 单价 "+waybillDetailDTO.getPrice()); + editOrderMsgVO.setItemName("明细新增 " + waybillDetailDTO.getGoodsName()); + editOrderMsgVO.setNewValue(" 数量 " + waybillDetailDTO.getNum() + " 单价 " + waybillDetailDTO.getPrice()); msgList.add(editOrderMsgVO); - }else if(2 == updateType){ + } else if (2 == updateType) { //更新 Long waybillDetailId = waybillDetailDTO.getId(); WarehouseWayBillDetail warehouseWayBillDetail = warehouseWaybillDetailClient.findEntityByWaybillDetailId(waybillDetailId); - if(Objects.isNull(warehouseWayBillDetail)){ + if (Objects.isNull(warehouseWayBillDetail)) { log.warn("#################verifyUpdateData: 明细不存在"); continue; } String newGoodsName = waybillDetailDTO.getGoodsName(); String goodsName = warehouseWayBillDetail.getProductName(); - if(!Objects.equals(newGoodsName,goodsName)){ + if (!Objects.equals(newGoodsName, goodsName)) { // stringBuilder.append("明细更新：").append(warehouseWayBillDetail.getProductName()).append(" 数量修改").append(num).append("-->").append(newNum).append(";"); EditOrderMsgVO editOrderMsgVO = new EditOrderMsgVO(); - editOrderMsgVO.setItemName("明细更新 "+warehouseWayBillDetail.getProductName() +" 品类修改 "); + editOrderMsgVO.setItemName("明细更新 " + warehouseWayBillDetail.getProductName() + " 品类修改 "); editOrderMsgVO.setOldValue(goodsName); editOrderMsgVO.setNewValue(newGoodsName); msgList.add(editOrderMsgVO); @@ -4653,21 +4671,21 @@ public class OpenOrderServiceImpl implements IOpenOrderService { Integer newNum = waybillDetailDTO.getNum(); Integer num = warehouseWayBillDetail.getNum(); - if(!num.equals(newNum)){ + if (!num.equals(newNum)) { // stringBuilder.append("明细更新：").append(warehouseWayBillDetail.getProductName()).append(" 数量修改").append(num).append("-->").append(newNum).append(";"); EditOrderMsgVO editOrderMsgVO = new EditOrderMsgVO(); - editOrderMsgVO.setItemName("明细更新 "+warehouseWayBillDetail.getProductName() +" 数量修改 "); - editOrderMsgVO.setOldValue(num+""); - editOrderMsgVO.setNewValue(newNum+""); + editOrderMsgVO.setItemName("明细更新 " + warehouseWayBillDetail.getProductName() + " 数量修改 "); + editOrderMsgVO.setOldValue(num + ""); + editOrderMsgVO.setNewValue(newNum + ""); msgList.add(editOrderMsgVO); } BigDecimal newVolume = waybillDetailDTO.getVolume(); BigDecimal volume = warehouseWayBillDetail.getVolume(); - if(!ObjectUtil.equals(volume,newVolume)){ + if (!ObjectUtil.equals(volume, newVolume)) { // stringBuilder.append("明细更新：").append(warehouseWayBillDetail.getProductName()).append(" 单价修改").append(price).append("-->").append(newPrice).append(";"); EditOrderMsgVO editOrderMsgVO = new EditOrderMsgVO(); - editOrderMsgVO.setItemName("明细更新 "+warehouseWayBillDetail.getProductName() +" 体积修改 "); + editOrderMsgVO.setItemName("明细更新 " + warehouseWayBillDetail.getProductName() + " 体积修改 "); editOrderMsgVO.setOldValue(volume.toPlainString()); editOrderMsgVO.setNewValue(newVolume.toPlainString()); msgList.add(editOrderMsgVO); @@ -4676,10 +4694,10 @@ public class OpenOrderServiceImpl implements IOpenOrderService { BigDecimal newWeight = waybillDetailDTO.getWeight(); BigDecimal weight = warehouseWayBillDetail.getWeight(); - if(!ObjectUtil.equals(weight,newWeight)){ + if (!ObjectUtil.equals(weight, newWeight)) { // stringBuilder.append("明细更新：").append(warehouseWayBillDetail.getProductName()).append(" 单价修改").append(price).append("-->").append(newPrice).append(";"); EditOrderMsgVO editOrderMsgVO = new EditOrderMsgVO(); - editOrderMsgVO.setItemName("明细更新 "+warehouseWayBillDetail.getProductName() +" 重量修改 "); + editOrderMsgVO.setItemName("明细更新 " + warehouseWayBillDetail.getProductName() + " 重量修改 "); editOrderMsgVO.setOldValue(weight.toPlainString()); editOrderMsgVO.setNewValue(newWeight.toPlainString()); msgList.add(editOrderMsgVO); @@ -4688,10 +4706,10 @@ public class OpenOrderServiceImpl implements IOpenOrderService { BigDecimal newPrice = waybillDetailDTO.getPrice(); BigDecimal price = warehouseWayBillDetail.getPrice(); - if(price.compareTo(newPrice) != 0){ + if (price.compareTo(newPrice) != 0) { // stringBuilder.append("明细更新：").append(warehouseWayBillDetail.getProductName()).append(" 单价修改").append(price).append("-->").append(newPrice).append(";"); EditOrderMsgVO editOrderMsgVO = new EditOrderMsgVO(); - editOrderMsgVO.setItemName("明细更新 "+warehouseWayBillDetail.getProductName() +" 单价修改 "); + editOrderMsgVO.setItemName("明细更新 " + warehouseWayBillDetail.getProductName() + " 单价修改 "); editOrderMsgVO.setOldValue(price.toPlainString()); editOrderMsgVO.setNewValue(newPrice.toPlainString()); msgList.add(editOrderMsgVO); @@ -4700,21 +4718,21 @@ public class OpenOrderServiceImpl implements IOpenOrderService { Integer newChargeType = waybillDetailDTO.getChargeType(); Integer chargeType = warehouseWayBillDetail.getChargeType(); - if(!ObjectUtil.equals(chargeType,newChargeType)){ + if (!ObjectUtil.equals(chargeType, newChargeType)) { // stringBuilder.append("明细更新：").append(warehouseWayBillDetail.getProductName()).append(" 计价方式修改").append(chargeType).append("-->").append(newChargeType).append(";"); EditOrderMsgVO editOrderMsgVO = new EditOrderMsgVO(); - editOrderMsgVO.setItemName("明细更新 "+warehouseWayBillDetail.getProductName() +" 计价方式修改 "); - editOrderMsgVO.setOldValue(DictBizCache.getValue(DictBizConstant.OPEN_ORDER_CHARGE_TYPE,chargeType+"")); - editOrderMsgVO.setNewValue(DictBizCache.getValue(DictBizConstant.OPEN_ORDER_CHARGE_TYPE,newChargeType+"")); + editOrderMsgVO.setItemName("明细更新 " + warehouseWayBillDetail.getProductName() + " 计价方式修改 "); + editOrderMsgVO.setOldValue(DictBizCache.getValue(DictBizConstant.OPEN_ORDER_CHARGE_TYPE, chargeType + "")); + editOrderMsgVO.setNewValue(DictBizCache.getValue(DictBizConstant.OPEN_ORDER_CHARGE_TYPE, newChargeType + "")); msgList.add(editOrderMsgVO); } BigDecimal newSubtotalFreight = waybillDetailDTO.getSubtotalFreight(); BigDecimal subtotalFreight = warehouseWayBillDetail.getSubtotalFreight(); - if(subtotalFreight.compareTo(newSubtotalFreight) != 0){ + if (subtotalFreight.compareTo(newSubtotalFreight) != 0) { // stringBuilder.append("明细更新：").append(warehouseWayBillDetail.getProductName()).append(" 单价修改").append(price).append("-->").append(newPrice).append(";"); EditOrderMsgVO editOrderMsgVO = new EditOrderMsgVO(); - editOrderMsgVO.setItemName("明细更新 "+warehouseWayBillDetail.getProductName() +" 运费小计修改 "); + editOrderMsgVO.setItemName("明细更新 " + warehouseWayBillDetail.getProductName() + " 运费小计修改 "); editOrderMsgVO.setOldValue(subtotalFreight.toPlainString()); editOrderMsgVO.setNewValue(newSubtotalFreight.toPlainString()); msgList.add(editOrderMsgVO); @@ -4725,29 +4743,29 @@ public class OpenOrderServiceImpl implements IOpenOrderService { Integer newTotalCount = openOrderDTO.getTotalCount(); Integer totalCount = waybillEntity.getTotalCount(); - if(!ObjectUtil.equals(totalCount,newTotalCount)){ + if (!ObjectUtil.equals(totalCount, newTotalCount)) { // stringBuilder.append("货物总数：").append(totalCount).append("-->").append(newTotalCount).append(";"); EditOrderMsgVO editOrderMsgVO = new EditOrderMsgVO(); editOrderMsgVO.setItemName("货物总数"); - editOrderMsgVO.setOldValue(totalCount+""); - editOrderMsgVO.setNewValue(newTotalCount+""); + editOrderMsgVO.setOldValue(totalCount + ""); + editOrderMsgVO.setNewValue(newTotalCount + ""); msgList.add(editOrderMsgVO); } BigDecimal newTotalFreight = openOrderDTO.getTotalFreight(); BigDecimal totalFreight = waybillEntity.getTotalFreight(); - if(totalFreight.compareTo(newTotalFreight) != 0){ + if (totalFreight.compareTo(newTotalFreight) != 0) { // stringBuilder.append("运费：").append(totalFreight).append("-->").append(newTotalFreight).append(";"); EditOrderMsgVO editOrderMsgVO = new EditOrderMsgVO(); editOrderMsgVO.setItemName("运费"); - editOrderMsgVO.setOldValue(totalFreight+""); - editOrderMsgVO.setNewValue(newTotalFreight+""); + editOrderMsgVO.setOldValue(totalFreight + ""); + editOrderMsgVO.setNewValue(newTotalFreight + ""); msgList.add(editOrderMsgVO); } BigDecimal newDeliveryFee = openOrderDTO.getDeliveryFee(); BigDecimal deliveryFee = waybillEntity.getDeliveryFee(); - if(deliveryFee.compareTo(newDeliveryFee) != 0){ + if (deliveryFee.compareTo(newDeliveryFee) != 0) { // stringBuilder.append("送货费：").append(deliveryFee).append("-->").append(newDeliveryFee).append(";"); EditOrderMsgVO editOrderMsgVO = new EditOrderMsgVO(); editOrderMsgVO.setItemName("送货费"); @@ -4758,7 +4776,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { BigDecimal newPickupFee = openOrderDTO.getPickupFee(); BigDecimal pickupFee = waybillEntity.getPickupFee(); - if(pickupFee.compareTo(newPickupFee) != 0){ + if (pickupFee.compareTo(newPickupFee) != 0) { // stringBuilder.append("提货费：").append(pickupFee).append("-->").append(newPickupFee).append(";"); EditOrderMsgVO editOrderMsgVO = new EditOrderMsgVO(); editOrderMsgVO.setItemName("提货费"); @@ -4769,7 +4787,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { BigDecimal newWarehouseManagementFee = openOrderDTO.getWarehouseManagementFee(); BigDecimal warehouseManagementFee = waybillEntity.getWarehouseManagementFee(); - if(warehouseManagementFee.compareTo(newWarehouseManagementFee) != 0){ + if (warehouseManagementFee.compareTo(newWarehouseManagementFee) != 0) { // stringBuilder.append("仓库管理费：").append(warehouseManagementFee).append("-->").append(newWarehouseManagementFee).append(";"); EditOrderMsgVO editOrderMsgVO = new EditOrderMsgVO(); editOrderMsgVO.setItemName("仓库管理费"); @@ -4780,7 +4798,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { BigDecimal newStorageFee = openOrderDTO.getStorageFee(); BigDecimal storageFee = waybillEntity.getStorageFee(); - if(storageFee.compareTo(newStorageFee) != 0){ + if (storageFee.compareTo(newStorageFee) != 0) { // stringBuilder.append("仓储费：").append(storageFee).append("-->").append(newStorageFee).append(";"); EditOrderMsgVO editOrderMsgVO = new EditOrderMsgVO(); editOrderMsgVO.setItemName("仓储费"); @@ -4791,7 +4809,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { BigDecimal newSortingFee = openOrderDTO.getSortingFee(); BigDecimal sortingFee = waybillEntity.getSortingFee(); - if(sortingFee.compareTo(newSortingFee) != 0){ + if (sortingFee.compareTo(newSortingFee) != 0) { // stringBuilder.append("装卸费：").append(handlingFee).append("-->").append(newHandlingFee).append(";"); EditOrderMsgVO editOrderMsgVO = new EditOrderMsgVO(); editOrderMsgVO.setItemName("仓储操作费费"); @@ -4803,7 +4821,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { BigDecimal newHandlingFee = openOrderDTO.getHandlingFee(); BigDecimal handlingFee = waybillEntity.getHandlingFee(); - if(handlingFee.compareTo(newHandlingFee) != 0){ + if (handlingFee.compareTo(newHandlingFee) != 0) { // stringBuilder.append("装卸费：").append(handlingFee).append("-->").append(newHandlingFee).append(";"); EditOrderMsgVO editOrderMsgVO = new EditOrderMsgVO(); editOrderMsgVO.setItemName("仓储操作费费"); @@ -4814,7 +4832,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { BigDecimal newInstallFee = openOrderDTO.getInstallFee(); BigDecimal installFee = waybillEntity.getInstallFee(); - if(installFee.compareTo(newInstallFee) != 0){ + if (installFee.compareTo(newInstallFee) != 0) { // stringBuilder.append("安装费：").append(installFee).append("-->").append(newInstallFee).append(";"); EditOrderMsgVO editOrderMsgVO = new EditOrderMsgVO(); editOrderMsgVO.setItemName("安装费"); @@ -4825,7 +4843,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { BigDecimal newOtherFee = openOrderDTO.getOtherFee(); BigDecimal otherFee = waybillEntity.getOtherFee(); - if(otherFee.compareTo(newOtherFee) != 0){ + if (otherFee.compareTo(newOtherFee) != 0) { // stringBuilder.append("其他费：").append(otherFee).append("-->").append(newOtherFee).append(";"); EditOrderMsgVO editOrderMsgVO = new EditOrderMsgVO(); editOrderMsgVO.setItemName("其他费"); @@ -4836,7 +4854,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { BigDecimal newInsuranceFee = openOrderDTO.getInsuranceFee(); BigDecimal insuranceFee = waybillEntity.getInsuranceFee(); - if(insuranceFee.compareTo(newInsuranceFee) != 0){ + if (insuranceFee.compareTo(newInsuranceFee) != 0) { // stringBuilder.append("保价费：").append(insuranceFee).append("-->").append(newInsuranceFee).append(";"); EditOrderMsgVO editOrderMsgVO = new EditOrderMsgVO(); editOrderMsgVO.setItemName("保价费"); @@ -4847,7 +4865,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { BigDecimal newClaimingValue = openOrderDTO.getClaimingValue(); BigDecimal claimingValue = waybillEntity.getClaimingValue(); - if(claimingValue.compareTo(newClaimingValue) != 0){ + if (claimingValue.compareTo(newClaimingValue) != 0) { // stringBuilder.append("申明价值：").append(claimingValue).append("-->").append(newClaimingValue).append(";"); EditOrderMsgVO editOrderMsgVO = new EditOrderMsgVO(); editOrderMsgVO.setItemName("申明价值"); @@ -4858,29 +4876,29 @@ public class OpenOrderServiceImpl implements IOpenOrderService { String newPayType = openOrderDTO.getPayType(); String payType = waybillEntity.getPayType(); - if(!ObjectUtil.equals(payType,newPayType)){ + if (!ObjectUtil.equals(payType, newPayType)) { // stringBuilder.append("支付方式：").append(payType).append("-->").append(newPayType).append(";"); EditOrderMsgVO editOrderMsgVO = new EditOrderMsgVO(); editOrderMsgVO.setItemName("支付方式"); - editOrderMsgVO.setOldValue(DictBizCache.getValue(DictBizConstant.OPEN_ORDER_PAY_TYPE,payType)); - editOrderMsgVO.setNewValue(DictBizCache.getValue(DictBizConstant.OPEN_ORDER_PAY_TYPE,newPayType)); + editOrderMsgVO.setOldValue(DictBizCache.getValue(DictBizConstant.OPEN_ORDER_PAY_TYPE, payType)); + editOrderMsgVO.setNewValue(DictBizCache.getValue(DictBizConstant.OPEN_ORDER_PAY_TYPE, newPayType)); msgList.add(editOrderMsgVO); } String newPayWay = openOrderDTO.getPayWay(); String payWay = waybillEntity.getPayWay(); - if(!ObjectUtil.equals(payWay,newPayWay)){ + if (!ObjectUtil.equals(payWay, newPayWay)) { // stringBuilder.append("付款方式：").append(payWay).append("-->").append(newPayWay).append(";"); EditOrderMsgVO editOrderMsgVO = new EditOrderMsgVO(); editOrderMsgVO.setItemName("付款方式"); - editOrderMsgVO.setOldValue(DictBizCache.getValue(DictBizConstant.OPEN_ORDER_PAY_WAY,payWay)); - editOrderMsgVO.setNewValue(DictBizCache.getValue(DictBizConstant.OPEN_ORDER_PAY_WAY,newPayWay)); + editOrderMsgVO.setOldValue(DictBizCache.getValue(DictBizConstant.OPEN_ORDER_PAY_WAY, payWay)); + editOrderMsgVO.setNewValue(DictBizCache.getValue(DictBizConstant.OPEN_ORDER_PAY_WAY, newPayWay)); msgList.add(editOrderMsgVO); } BigDecimal xianPay = openOrderDTO.getXianPay(); BigDecimal xPay = waybillEntity.getXPay(); - if(xPay.compareTo(xianPay) != 0){ + if (xPay.compareTo(xianPay) != 0) { // stringBuilder.append("现付：").append(xPay).append("-->").append(xianPay).append(";"); EditOrderMsgVO editOrderMsgVO = new EditOrderMsgVO(); editOrderMsgVO.setItemName("现付"); @@ -4891,7 +4909,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { BigDecimal daoPay = openOrderDTO.getDaoPay(); BigDecimal dPay = waybillEntity.getDPay(); - if(dPay.compareTo(daoPay) != 0){ + if (dPay.compareTo(daoPay) != 0) { // stringBuilder.append("到付：").append(dPay).append("-->").append(daoPay).append(";"); EditOrderMsgVO editOrderMsgVO = new EditOrderMsgVO(); editOrderMsgVO.setItemName("到付"); @@ -4902,7 +4920,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { BigDecimal yuePay = openOrderDTO.getYuePay(); BigDecimal yPay = waybillEntity.getYPay(); - if(yPay.compareTo(yuePay) != 0){ + if (yPay.compareTo(yuePay) != 0) { // stringBuilder.append("月结：").append(yPay).append("-->").append(yuePay).append(";"); EditOrderMsgVO editOrderMsgVO = new EditOrderMsgVO(); editOrderMsgVO.setItemName("月结"); @@ -4913,7 +4931,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { BigDecimal huiPay = openOrderDTO.getHuiPay(); BigDecimal hPay = waybillEntity.getHPay(); - if(hPay.compareTo(huiPay) != 0){ + if (hPay.compareTo(huiPay) != 0) { // stringBuilder.append("回付：").append(hPay).append("-->").append(huiPay).append(";"); EditOrderMsgVO editOrderMsgVO = new EditOrderMsgVO(); editOrderMsgVO.setItemName("回付"); @@ -4924,7 +4942,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { BigDecimal newthirdOperationFee = openOrderDTO.getThirdOperationFee(); BigDecimal thirdOperationFee = waybillEntity.getThirdOperationFee(); - if(thirdOperationFee.compareTo(newthirdOperationFee) != 0){ + if (thirdOperationFee.compareTo(newthirdOperationFee) != 0) { // stringBuilder.append("三方操作费：").append(thirdOperationFee).append("-->").append(newthirdOperationFee).append(";"); EditOrderMsgVO editOrderMsgVO = new EditOrderMsgVO(); editOrderMsgVO.setItemName("三方操作费"); @@ -4935,75 +4953,75 @@ public class OpenOrderServiceImpl implements IOpenOrderService { String newdeliveryWay = openOrderDTO.getDeliveryWay(); String deliveryWay = waybillEntity.getDeliveryWay(); - if(!ObjectUtil.equals(deliveryWay,newdeliveryWay)){ + if (!ObjectUtil.equals(deliveryWay, newdeliveryWay)) { // stringBuilder.append("送货方式：").append(deliveryWay).append("-->").append(newdeliveryWay).append(";"); EditOrderMsgVO editOrderMsgVO = new EditOrderMsgVO(); editOrderMsgVO.setItemName("送货方式"); - editOrderMsgVO.setOldValue(DictBizCache.getValue(DictBizConstant.OPEN_ORDER_DELIVERY_WAY,deliveryWay)); - editOrderMsgVO.setNewValue(DictBizCache.getValue(DictBizConstant.OPEN_ORDER_DELIVERY_WAY,newdeliveryWay)); + editOrderMsgVO.setOldValue(DictBizCache.getValue(DictBizConstant.OPEN_ORDER_DELIVERY_WAY, deliveryWay)); + editOrderMsgVO.setNewValue(DictBizCache.getValue(DictBizConstant.OPEN_ORDER_DELIVERY_WAY, newdeliveryWay)); msgList.add(editOrderMsgVO); } String newurgency = openOrderDTO.getUrgency(); String urgency = waybillEntity.getUrgency(); - if(!ObjectUtil.equals(urgency,newurgency)){ + if (!ObjectUtil.equals(urgency, newurgency)) { // stringBuilder.append("紧急度：").append(urgency).append("-->").append(newurgency).append(";"); EditOrderMsgVO editOrderMsgVO = new EditOrderMsgVO(); editOrderMsgVO.setItemName("紧急度"); - editOrderMsgVO.setOldValue(DictBizCache.getValue(DictBizConstant.OPEN_ORDER_URGENCY,urgency)); - editOrderMsgVO.setNewValue(DictBizCache.getValue(DictBizConstant.OPEN_ORDER_URGENCY,newurgency)); + editOrderMsgVO.setOldValue(DictBizCache.getValue(DictBizConstant.OPEN_ORDER_URGENCY, urgency)); + editOrderMsgVO.setNewValue(DictBizCache.getValue(DictBizConstant.OPEN_ORDER_URGENCY, newurgency)); msgList.add(editOrderMsgVO); } String newreceipt = openOrderDTO.getReceipt(); String receipt = waybillEntity.getReceipt(); - if(!ObjectUtil.equals(receipt,newreceipt)){ + if (!ObjectUtil.equals(receipt, newreceipt)) { // stringBuilder.append("回单方式：").append(receipt).append("-->").append(newreceipt).append(";"); EditOrderMsgVO editOrderMsgVO = new EditOrderMsgVO(); editOrderMsgVO.setItemName("回单方式"); - editOrderMsgVO.setOldValue(DictBizCache.getValue(DictBizConstant.OPEN_ORDER_RECEIPT,receipt)); - editOrderMsgVO.setNewValue(DictBizCache.getValue(DictBizConstant.OPEN_ORDER_RECEIPT,newreceipt)); + editOrderMsgVO.setOldValue(DictBizCache.getValue(DictBizConstant.OPEN_ORDER_RECEIPT, receipt)); + editOrderMsgVO.setNewValue(DictBizCache.getValue(DictBizConstant.OPEN_ORDER_RECEIPT, newreceipt)); msgList.add(editOrderMsgVO); } String newtransportType = openOrderDTO.getTransportType(); String transportType = waybillEntity.getTransportType(); - if(!ObjectUtil.equals(transportType,newtransportType)){ + if (!ObjectUtil.equals(transportType, newtransportType)) { // stringBuilder.append("运输方式：").append(transportType).append("-->").append(newtransportType).append(";"); EditOrderMsgVO editOrderMsgVO = new EditOrderMsgVO(); editOrderMsgVO.setItemName("运输方式"); - editOrderMsgVO.setOldValue(DictBizCache.getValue(DictBizConstant.OPEN_ORDER_TRANSPORT_TYPE,transportType)); - editOrderMsgVO.setNewValue(DictBizCache.getValue(DictBizConstant.OPEN_ORDER_TRANSPORT_TYPE,newtransportType)); + editOrderMsgVO.setOldValue(DictBizCache.getValue(DictBizConstant.OPEN_ORDER_TRANSPORT_TYPE, transportType)); + editOrderMsgVO.setNewValue(DictBizCache.getValue(DictBizConstant.OPEN_ORDER_TRANSPORT_TYPE, newtransportType)); msgList.add(editOrderMsgVO); } Integer newreceiptNum = openOrderDTO.getReceiptNum(); Integer receiptNum = waybillEntity.getReceiptNum(); - if(!ObjectUtil.equals(receiptNum,newreceiptNum)){ + if (!ObjectUtil.equals(receiptNum, newreceiptNum)) { // stringBuilder.append("回单数量：").append(receiptNum).append("-->").append(newreceiptNum).append(";"); EditOrderMsgVO editOrderMsgVO = new EditOrderMsgVO(); editOrderMsgVO.setItemName("回单数量"); - editOrderMsgVO.setOldValue(receiptNum+""); - editOrderMsgVO.setNewValue(newreceiptNum+""); + editOrderMsgVO.setOldValue(receiptNum + ""); + editOrderMsgVO.setNewValue(newreceiptNum + ""); msgList.add(editOrderMsgVO); } BigDecimal newrebate = openOrderDTO.getRebate(); BigDecimal rebate = waybillEntity.getRebate(); - if(!Objects.isNull(rebate)){ - if(rebate.compareTo(newrebate) != 0){ + if (!Objects.isNull(rebate)) { + if (rebate.compareTo(newrebate) != 0) { // stringBuilder.append("回扣：").append(rebate).append("-->").append(newrebate).append(";"); EditOrderMsgVO editOrderMsgVO = new EditOrderMsgVO(); editOrderMsgVO.setItemName("回扣"); - editOrderMsgVO.setOldValue(rebate+""); - editOrderMsgVO.setNewValue(newrebate+""); + editOrderMsgVO.setOldValue(rebate + ""); + editOrderMsgVO.setNewValue(newrebate + ""); msgList.add(editOrderMsgVO); } } String newRemark = openOrderDTO.getRemark(); String remark = waybillEntity.getRemark(); - if(!ObjectUtil.equals(remark,newRemark)){ + if (!ObjectUtil.equals(remark, newRemark)) { // stringBuilder.append("备注：").append(remark).append("-->").append(newRemark).append(";"); EditOrderMsgVO editOrderMsgVO = new EditOrderMsgVO(); editOrderMsgVO.setItemName("备注"); @@ -5037,7 +5055,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { String newBrand = openOrderDTO.getBrand(); Long brandId = waybillEntity.getBrandId(); String brand = waybillEntity.getBrand(); - if(!ObjectUtil.equals(newBrandId,brandId)){ + if (!ObjectUtil.equals(newBrandId, brandId)) { stringBuilder.append("品牌：").append(brand).append("-->").append(newBrand).append(";"); waybillEntity.setBrandId(newBrandId); waybillEntity.setBrand(newBrand); @@ -5045,7 +5063,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { String newDeparture = openOrderDTO.getDeparture(); String departure = waybillEntity.getDeparture(); - if(!ObjectUtil.equals(newDeparture,departure)){ + if (!ObjectUtil.equals(newDeparture, departure)) { stringBuilder.append("发站：").append(departure).append("-->").append(newDeparture).append(";"); waybillEntity.setDeparture(newDeparture); waybillEntity.setDepartureCode(openOrderDTO.getDepartureCode()); @@ -5053,36 +5071,36 @@ public class OpenOrderServiceImpl implements IOpenOrderService { Integer newPickupCompleteOrNot = openOrderDTO.getPickupCompleteOrNot(); Integer pickupCompleteOrNot = waybillEntity.getPickupCompleteOrNot(); - if(!ObjectUtil.equals(newPickupCompleteOrNot,pickupCompleteOrNot)){ - stringBuilder.append("提货是否整车：").append(pickupCompleteOrNot==1?"是":"否").append("-->").append(newPickupCompleteOrNot==1?"是":"否").append(";"); + if (!ObjectUtil.equals(newPickupCompleteOrNot, pickupCompleteOrNot)) { + stringBuilder.append("提货是否整车：").append(pickupCompleteOrNot == 1 ? "是" : "否").append("-->").append(newPickupCompleteOrNot == 1 ? "是" : "否").append(";"); waybillEntity.setPickupCompleteOrNot(newPickupCompleteOrNot); } Integer newTrunklineCompleteOrNot = openOrderDTO.getTrunklineCompleteOrNot(); Integer trunklineCompleteOrNot = waybillEntity.getTrunklineCompleteOrNot(); - if(!ObjectUtil.equals(newTrunklineCompleteOrNot,trunklineCompleteOrNot)){ - stringBuilder.append("干线是否整车：").append(trunklineCompleteOrNot==1?"是":"否").append("-->").append(newTrunklineCompleteOrNot==1?"是":"否").append(";"); + if (!ObjectUtil.equals(newTrunklineCompleteOrNot, trunklineCompleteOrNot)) { + stringBuilder.append("干线是否整车：").append(trunklineCompleteOrNot == 1 ? "是" : "否").append("-->").append(newTrunklineCompleteOrNot == 1 ? "是" : "否").append(";"); waybillEntity.setTrunklineCompleteOrNot(newTrunklineCompleteOrNot); } String newTrunklineVehicleType = openOrderDTO.getTrunklineVehicleType(); String trunklineVehicleType = waybillEntity.getTrunklineVehicleType(); - if(!ObjectUtil.equals(newTrunklineVehicleType,trunklineVehicleType)){ - stringBuilder.append("干线车型：").append(DictBizCache.getValue("price_vehicle_type",trunklineVehicleType)).append("-->").append(DictBizCache.getValue("price_vehicle_type",newTrunklineVehicleType)).append(";"); + if (!ObjectUtil.equals(newTrunklineVehicleType, trunklineVehicleType)) { + stringBuilder.append("干线车型：").append(DictBizCache.getValue("price_vehicle_type", trunklineVehicleType)).append("-->").append(DictBizCache.getValue("price_vehicle_type", newTrunklineVehicleType)).append(";"); waybillEntity.setTrunklineVehicleType(newTrunklineVehicleType); } String newPickupVehicleType = openOrderDTO.getPickupVehicleType(); String pickupVehicleType = waybillEntity.getPickupVehicleType(); - if(!ObjectUtil.equals(newPickupVehicleType,pickupVehicleType)){ - stringBuilder.append("提货车型：").append(DictBizCache.getValue("price_vehicle_type",pickupVehicleType)).append("-->").append(DictBizCache.getValue("price_vehicle_type",newPickupVehicleType)).append(";"); + if (!ObjectUtil.equals(newPickupVehicleType, pickupVehicleType)) { + stringBuilder.append("提货车型：").append(DictBizCache.getValue("price_vehicle_type", pickupVehicleType)).append("-->").append(DictBizCache.getValue("price_vehicle_type", newPickupVehicleType)).append(";"); waybillEntity.setPickupVehicleType(newPickupVehicleType); } String newDestination = openOrderDTO.getDestination(); String destination = waybillEntity.getDestination(); - if (!ObjectUtil.equals(destination,newDestination)) { + if (!ObjectUtil.equals(destination, newDestination)) { stringBuilder.append("到站：").append(destination).append("-->").append(newDestination).append(";"); waybillEntity.setDestination(newDestination); waybillEntity.setDestinationCode(openOrderDTO.getDestinationCode()); @@ -5091,7 +5109,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { String newDestinationWarehouseName = openOrderDTO.getDestinationWarehouseName(); Long destinationWarehouseId = waybillEntity.getDestinationWarehouseId(); String departureWarehouseName = waybillEntity.getDepartureWarehouseName(); - if (!ObjectUtil.equals(destinationWarehouseId,newDestinationWarehouseId)) { + if (!ObjectUtil.equals(destinationWarehouseId, newDestinationWarehouseId)) { stringBuilder.append("目的仓：").append(departureWarehouseName).append("-->").append(newDestinationWarehouseName).append(";"); waybillEntity.setDestinationWarehouseId(newDestinationWarehouseId); waybillEntity.setDestinationWarehouseName(newDestinationWarehouseName); @@ -5101,9 +5119,9 @@ public class OpenOrderServiceImpl implements IOpenOrderService { Long warehouseId = parcelListEntity.getWarehouseId(); parcelListEntity.setAcceptWarehouseId(newDestinationWarehouseId); parcelListEntity.setAcceptWarehouseName(newDestinationWarehouseName); - if(warehouseId.equals(newDestinationWarehouseId)){ + if (warehouseId.equals(newDestinationWarehouseId)) { parcelListEntity.setIsTransfer(0); - }else{ + } else { parcelListEntity.setIsTransfer(1); } }); @@ -5113,28 +5131,28 @@ public class OpenOrderServiceImpl implements IOpenOrderService { String newShipper = openOrderDTO.getShipper(); Long shipperId = waybillEntity.getShipperId(); String shipper = waybillEntity.getShipper(); - if (!ObjectUtil.equals(shipperId,newShipperId)) { + if (!ObjectUtil.equals(shipperId, newShipperId)) { stringBuilder.append("发货单位：").append(shipper).append("-->").append(newShipper).append(";"); waybillEntity.setShipper(newShipper); waybillEntity.setShipperId(newShipperId); } String newShipperName = openOrderDTO.getShipperName(); String shipperName = waybillEntity.getShipperName(); - if (!ObjectUtil.equals(shipperName,newShipperName)) { + if (!ObjectUtil.equals(shipperName, newShipperName)) { stringBuilder.append("发货人：").append(shipperName).append("-->").append(newShipperName).append(";"); waybillEntity.setShipperName(newShipperName); } String newShipperMobile = openOrderDTO.getShipperMobile(); String shipperMobile = waybillEntity.getShipperMobile(); - if (!ObjectUtil.equals(shipperMobile,newShipperMobile)) { + if (!ObjectUtil.equals(shipperMobile, newShipperMobile)) { stringBuilder.append("发货人电话：").append(shipperMobile).append("-->").append(newShipperMobile).append(";"); waybillEntity.setShipperMobile(newShipperMobile); } String newShipperAddress = openOrderDTO.getShipperAddress(); String shipperAddress = waybillEntity.getShipperAddress(); - if (!ObjectUtil.equals(shipperAddress,newShipperAddress)) { + if (!ObjectUtil.equals(shipperAddress, newShipperAddress)) { stringBuilder.append("发货人地址：").append(shipperAddress).append("-->").append(newShipperAddress).append(";"); waybillEntity.setShipperAddress(newShipperAddress); } @@ -5143,7 +5161,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { String newConsignee = openOrderDTO.getConsignee(); Long consigneeId = waybillEntity.getConsigneeId(); String consignee = waybillEntity.getConsignee(); - if (!ObjectUtil.equals(consigneeId,newConsigneeId)) { + if (!ObjectUtil.equals(consigneeId, newConsigneeId)) { stringBuilder.append("收货单位：").append(consignee).append("-->").append(newConsignee).append(";"); waybillEntity.setConsignee(newConsignee); waybillEntity.setConsigneeId(newConsigneeId); @@ -5151,21 +5169,21 @@ public class OpenOrderServiceImpl implements IOpenOrderService { String newConsigneeName = openOrderDTO.getConsigneeName(); String consigneeName = waybillEntity.getConsigneeName(); - if (!ObjectUtil.equals(consigneeName,newConsigneeName)) { + if (!ObjectUtil.equals(consigneeName, newConsigneeName)) { stringBuilder.append("收货人：").append(consigneeName).append("-->").append(newConsigneeName).append(";"); waybillEntity.setConsigneeName(newConsigneeName); } String newConsigneeMobile = openOrderDTO.getConsigneeMobile(); String consigneeMobile = waybillEntity.getConsigneeMobile(); - if (!ObjectUtil.equals(consigneeMobile,newConsigneeMobile)) { + if (!ObjectUtil.equals(consigneeMobile, newConsigneeMobile)) { stringBuilder.append("收货人电话：").append(consigneeMobile).append("-->").append(newConsigneeMobile).append(";"); waybillEntity.setConsigneeMobile(newConsigneeMobile); } String newConsigneeAddress = openOrderDTO.getConsigneeAddress(); String consigneeAddress = waybillEntity.getConsigneeAddress(); - if (!ObjectUtil.equals(consigneeAddress,newConsigneeAddress)) { + if (!ObjectUtil.equals(consigneeAddress, newConsigneeAddress)) { stringBuilder.append("收货人地址：").append(consigneeAddress).append("-->").append(newConsigneeAddress).append(";"); waybillEntity.setConsigneeAddress(newConsigneeAddress); } @@ -5239,7 +5257,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { String newGoodsName = waybillDetailDTO.getGoodsName(); Long goodsId = waybillDetailDTO.getGoodsId(); String productName = warehouseWayBillDetail.getProductName(); - if (!ObjectUtil.equals(productName,newGoodsName)) { + if (!ObjectUtil.equals(productName, newGoodsName)) { stringBuilder.append("明细更新：").append(warehouseWayBillDetail.getProductName()).append(" 品类修改").append(productName).append("-->").append(newGoodsName).append(";"); warehouseWayBillDetail.setProductId(goodsId); warehouseWayBillDetail.setProductName(newGoodsName); @@ -5248,14 +5266,14 @@ public class OpenOrderServiceImpl implements IOpenOrderService { Integer newNum = waybillDetailDTO.getNum(); Integer num = warehouseWayBillDetail.getNum(); - if (!ObjectUtil.equals(num,newNum)) { + if (!ObjectUtil.equals(num, newNum)) { stringBuilder.append("明细更新：").append(warehouseWayBillDetail.getProductName()).append(" 数量修改").append(num).append("-->").append(newNum).append(";"); warehouseWayBillDetail.setNum(newNum); } BigDecimal newVolume = waybillDetailDTO.getVolume(); BigDecimal volume = warehouseWayBillDetail.getVolume(); - if(!ObjectUtil.equals(volume,newVolume)){ + if (!ObjectUtil.equals(volume, newVolume)) { stringBuilder.append("明细更新：").append(warehouseWayBillDetail.getProductName()).append(" 体积修改").append(volume).append("-->").append(newVolume).append(";"); warehouseWayBillDetail.setVolume(newVolume); } @@ -5263,7 +5281,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { BigDecimal newWeight = waybillDetailDTO.getWeight(); BigDecimal weight = warehouseWayBillDetail.getWeight(); - if(!ObjectUtil.equals(weight,newWeight)){ + if (!ObjectUtil.equals(weight, newWeight)) { stringBuilder.append("明细更新：").append(warehouseWayBillDetail.getProductName()).append(" 重量修改").append(weight).append("-->").append(newWeight).append(";"); warehouseWayBillDetail.setWeight(newWeight); } @@ -5277,14 +5295,14 @@ public class OpenOrderServiceImpl implements IOpenOrderService { Integer newChargeType = waybillDetailDTO.getChargeType(); Integer chargeType = warehouseWayBillDetail.getChargeType(); - if (!ObjectUtil.equals(chargeType,newChargeType)) { + if (!ObjectUtil.equals(chargeType, newChargeType)) { stringBuilder.append("明细更新：").append(warehouseWayBillDetail.getProductName()).append(" 计价方式修改").append(chargeType).append("-->").append(newChargeType).append(";"); warehouseWayBillDetail.setChargeType(newChargeType); } BigDecimal newSubtotalFreight = waybillDetailDTO.getSubtotalFreight(); BigDecimal subtotalFreight = warehouseWayBillDetail.getSubtotalFreight(); - if(subtotalFreight.compareTo(newSubtotalFreight) != 0){ + if (subtotalFreight.compareTo(newSubtotalFreight) != 0) { stringBuilder.append("明细更新：").append(warehouseWayBillDetail.getProductName()).append(" 运费小计修改").append(subtotalFreight).append("-->").append(newSubtotalFreight).append(";"); warehouseWayBillDetail.setSubtotalFreight(newSubtotalFreight); } @@ -5301,11 +5319,11 @@ public class OpenOrderServiceImpl implements IOpenOrderService { warehouseWaybillDetailClient.updateEntityById(warehouseWayBillDetail); } } - waybillEntity.setGoodsName(String.join(",",goodsList)); + waybillEntity.setGoodsName(String.join(",", goodsList)); Integer newTotalCount = openOrderDTO.getTotalCount(); Integer totalCount = waybillEntity.getTotalCount(); - if (!ObjectUtil.equals(totalCount,totalNum)) { + if (!ObjectUtil.equals(totalCount, totalNum)) { stringBuilder.append("货物总数：").append(totalCount).append("-->").append(totalNum).append(";"); waybillEntity.setTotalCount(totalNum); waybillEntity.setStockCount(totalNum); @@ -5390,14 +5408,14 @@ public class OpenOrderServiceImpl implements IOpenOrderService { String newPayType = openOrderDTO.getPayType(); String payType = waybillEntity.getPayType(); - if (!ObjectUtil.equals(payType,newPayType)) { + if (!ObjectUtil.equals(payType, newPayType)) { stringBuilder.append("支付方式：").append(payType).append("-->").append(newPayType).append(";"); waybillEntity.setPayType(newPayType); } String newPayWay = openOrderDTO.getPayWay(); String payWay = waybillEntity.getPayWay(); - if (!ObjectUtil.equals(payWay,newPayWay)) { + if (!ObjectUtil.equals(payWay, newPayWay)) { stringBuilder.append("付款方式：").append(payWay).append("-->").append(newPayWay).append(";"); waybillEntity.setPayWay(newPayWay); } @@ -5439,14 +5457,14 @@ public class OpenOrderServiceImpl implements IOpenOrderService { String newdeliveryWay = openOrderDTO.getDeliveryWay(); String deliveryWay = waybillEntity.getDeliveryWay(); - if (!ObjectUtil.equals(deliveryWay,newdeliveryWay)) { + if (!ObjectUtil.equals(deliveryWay, newdeliveryWay)) { stringBuilder.append("送货方式：").append(deliveryWay).append("-->").append(newdeliveryWay).append(";"); waybillEntity.setDeliveryWay(newdeliveryWay); } String newurgency = openOrderDTO.getUrgency(); String urgency = waybillEntity.getUrgency(); - if (!ObjectUtil.equals(urgency,newurgency)) { + if (!ObjectUtil.equals(urgency, newurgency)) { stringBuilder.append("紧急度：").append(urgency).append("-->").append(newurgency).append(";"); waybillEntity.setUrgency(newurgency); } @@ -5482,7 +5500,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { } String newRemark = openOrderDTO.getRemark(); String remark = waybillEntity.getRemark(); - if(!ObjectUtil.equals(remark,newRemark)){ + if (!ObjectUtil.equals(remark, newRemark)) { stringBuilder.append("备注：").append(remark).append("-->").append(newRemark).append(";"); waybillEntity.setRemark(newRemark); } @@ -5622,7 +5640,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { private Long saveNewClient(String unit, String linkman, String linkPhone, String linkAddress, String type) { Long clientId = null; BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findByName(unit); - if(Objects.isNull(basicdataClientEntity)){ + if (Objects.isNull(basicdataClientEntity)) { basicdataClientEntity = new BasicdataClientEntity(); basicdataClientEntity.setClientName(unit); basicdataClientEntity.setTypeService(1); @@ -5641,7 +5659,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { basicdataClientEntity.setTypeServiceList(slips); clientId = basicdataClientClient.saveEntity(basicdataClientEntity); - }else{ + } else { clientId = basicdataClientEntity.getId(); }