From a2854553a1bc412bfda61450134834174ebd6f23 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Wed, 16 Oct 2024 20:11:44 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E5=B9=B2?= =?UTF-8?q?=E7=BA=BF=E6=B5=8B=E8=AF=95=E9=81=87=E5=88=B0=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logpm/trunkline/vo/UnloadPackageVO.java | 2 ++ .../controller/CarsLoadController.java | 24 +++++++++++-------- .../mapper/TrunklineCarsLoadMapper.xml | 9 ------- .../mapper/TrunklineCarsLoadScanMapper.xml | 2 ++ .../TrunklineAdvanceDetailServiceImpl.java | 2 +- .../impl/TrunklineCarsLoadServiceImpl.java | 21 ++++++++++++---- 6 files changed, 35 insertions(+), 25 deletions(-) diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/UnloadPackageVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/UnloadPackageVO.java index 52e15fb7c..d640d8839 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/UnloadPackageVO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/UnloadPackageVO.java @@ -15,6 +15,8 @@ public class UnloadPackageVO implements Serializable { private Integer unloadNum; private String trayName; private String trayCode; + private String unloadTrayName; + private String unloadTrayCode; private String scanStatus; private String unloadNodeName; private String orderCode; diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java index 8655b7178..f201e98a2 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java @@ -88,17 +88,21 @@ public class CarsLoadController { //当前登录人选择的仓库 BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); - List warehouseIds = new ArrayList<>(); - if(!Objects.isNull(myCurrentWarehouse)){ - Long warehouseId = myCurrentWarehouse.getId(); - warehouseIds.add(warehouseId); - }else{ - List myWatchWarehouse = warehouseClient.getMyWatchWarehouse(); - myWatchWarehouse.forEach(warehouseEntity -> { - warehouseIds.add(warehouseEntity.getId()); - }); + if(Objects.isNull(myCurrentWarehouse)){ + log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse); + return R.fail(400,"多仓权限无法操作，请选择仓库"); } - loadCarsDTO.setWarehouseIds(warehouseIds); +// List warehouseIds = new ArrayList<>(); +// if(!Objects.isNull(myCurrentWarehouse)){ +// Long warehouseId = myCurrentWarehouse.getId(); +// warehouseIds.add(warehouseId); +// }else{ +// List myWatchWarehouse = warehouseClient.getMyWatchWarehouse(); +// myWatchWarehouse.forEach(warehouseEntity -> { +// warehouseIds.add(warehouseEntity.getId()); +// }); +// } + loadCarsDTO.setWarehouseId(myCurrentWarehouse.getId()); IPage pages = carsLoadService.arriveCarsPageList(loadCarsDTO); return R.data(pages); diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml index 2e6db992c..047a58c1c 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml @@ -141,18 +141,9 @@ where ltcl.is_deleted = 0 and ltcl.load_status != '100' and ltcl.load_type != '4' - - and ltcl.start_warehouse_id in - - #{item} - - and ltcl.end_warehouse_ids like concat('%',#{param.warehouseId},'%') - - and Locate(#{param.endWarehouseId},ltcl.end_warehouse_ids) > 0 - and (Locate(#{param.warehouseName},ltcl.start_warehouse_name) > 0 or Locate(#{param.warehouseName},ltcl.end_warehouse_names) > 0) diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml index 3723792f0..fbc939a8e 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml @@ -940,6 +940,8 @@ unload_num unloadNum, tray_code trayCode, tray_name trayName, + unload_tray_code unloadTrayCode, + unload_tray_name unloadTrayName, scan_status scanStatus, unload_node_name unloadNodeName, order_code orderCode, diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java index 2d667f043..2c6bf4a54 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java @@ -216,7 +216,7 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl Date: Wed, 16 Oct 2024 20:38:06 +0800 Subject: [PATCH 2/5] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BFbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/logpm/trunkline/dto/LoadCarsDTO.java | 2 ++ .../entity/TrunklineCarsLoadEntity.java | 3 +++ .../mapper/TrunklineCarsLoadMapper.xml | 2 ++ .../mapper/TrunklineCarsLoadScanMapper.java | 2 ++ .../mapper/TrunklineCarsLoadScanMapper.xml | 13 +++++++++++ .../ITrunklineCarsLoadScanService.java | 2 ++ .../TrunklineCarsLoadScanServiceImpl.java | 5 +++++ .../impl/TrunklineCarsLoadServiceImpl.java | 22 +++++++++++-------- 8 files changed, 42 insertions(+), 9 deletions(-) diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java index 0bf40421e..76dda93a3 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java @@ -71,6 +71,8 @@ public class LoadCarsDTO implements Serializable { private String trayCode; private String trayName; + private String unloadTrayName; + private String unloadTrayCode; private String trayType; private Integer isZero; private String scanCode; diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsLoadEntity.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsLoadEntity.java index a3ac3b560..e0eac6929 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsLoadEntity.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsLoadEntity.java @@ -130,6 +130,9 @@ public class TrunklineCarsLoadEntity extends TenantEntity { /** 卸车件数 */ @ApiModelProperty(name = "卸车件数",notes = "") private Integer unloadNumber ; + /** 卸车件数 */ + @ApiModelProperty(name = "在车件数",notes = "") + private Integer stockNumber ; /** 异常件数 */ @ApiModelProperty(name = "异常件数",notes = "") private Integer abnormalNum ; diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml index 047a58c1c..ce9c6e976 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml @@ -8,6 +8,7 @@ ltcl.cars_line_name carsLineName, ltcl.plan_loading_number planLoadingNumber, ltcl.real_loading_number realLoadingNumber, + ltcl.stock_number stockCarsNum, ltcl.unload_number unloadNumber, ltcl.loading_type loadingType, ltcl.full_load_rate fullLoadRate, @@ -107,6 +108,7 @@ ltcl.cars_no carsNo, ltcl.plan_loading_number planLoadingNumber, ltcl.real_loading_number realLoadingNumber, + ltcl.stock_number stockCarsNum, ltcl.unload_number unloadNumber, ltcl.full_load_rate fullLoadRate, ltcl.is_customer isCustomer, diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.java index dda64ed39..1c837c4a4 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.java @@ -185,4 +185,6 @@ public interface TrunklineCarsLoadScanMapper extends BaseMapper findAllIdListByLoadIdAndScanStatus(@Param("loadId") Long loadId, @Param("scanStatus") String scanStatus); CustmoerUnloadNumVO findCarsLoadCustomeNumByLoadIdAndUnloadWarehouseId(@Param("loadId") Long loadId, @Param("warehouseId") Long warehouseId); + + Integer findStockNumByLoadId(@Param("loadId") Long loadId); } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml index fbc939a8e..897cd4113 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml @@ -115,6 +115,12 @@ and Locate(#{param.trayCode},cls.tray_code) > 0 + + and Locate(#{param.unloadTrayName},cls.unload_tray_name) > 0 + + + and Locate(#{param.unloadTrayCode},cls.unload_tray_code) > 0 + and Locate(#{param.unloadNodeName},cls.unload_node_name) > 0 @@ -995,5 +1001,12 @@ and sign_order_id is not null + + diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadScanService.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadScanService.java index bd2a2600d..4cf654b4a 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadScanService.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadScanService.java @@ -181,4 +181,6 @@ public interface ITrunklineCarsLoadScanService extends BaseService findAllIdListByLoadIdAndScanStatus(Long loadId, String scanStatus); CustmoerUnloadNumVO findCarsLoadCustomeNumByLoadIdAndUnloadWarehouseId(Long loadId, Long warehouseId); + + Integer findStockNumByLoadId(Long loadId); } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadScanServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadScanServiceImpl.java index 3607d9f0c..4c242ea94 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadScanServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadScanServiceImpl.java @@ -464,4 +464,9 @@ public class TrunklineCarsLoadScanServiceImpl extends BaseServiceImpl Date: Thu, 17 Oct 2024 10:41:30 +0800 Subject: [PATCH 3/5] =?UTF-8?q?feat(all):=20=E5=A2=9E=E5=8A=A0=E6=AC=A7?= =?UTF-8?q?=E6=B4=BE=E7=9A=AE=E9=98=BF=E8=AF=BA=E5=8F=91=E9=80=81=E6=B6=88?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1增加欧派和皮阿诺作业时发送消息到工厂 --- .../java/com/logpm/factorydata/util/FactoryDataUtil.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/blade-service-api/logpm-factory-data-api/src/main/java/com/logpm/factorydata/util/FactoryDataUtil.java b/blade-service-api/logpm-factory-data-api/src/main/java/com/logpm/factorydata/util/FactoryDataUtil.java index 30a338e54..cff09564f 100644 --- a/blade-service-api/logpm-factory-data-api/src/main/java/com/logpm/factorydata/util/FactoryDataUtil.java +++ b/blade-service-api/logpm-factory-data-api/src/main/java/com/logpm/factorydata/util/FactoryDataUtil.java @@ -27,6 +27,12 @@ public class FactoryDataUtil { factorys.put(BrandEnums.OLO.getValue(), FactoryDataConstants.Mq.RoutingKeys.OLO_NODE_DATA_PUSH); factorys.put(BrandEnums.SFY.getValue(), FactoryDataConstants.Mq.RoutingKeys.SFY_NODE_DATA_PUSH); factorys.put(BrandEnums.MTMM.getValue(), FactoryDataConstants.Mq.RoutingKeys.MENGTIAN_NODE_DATA_PUSH); + factorys.put(BrandEnums.MHJ.getValue(), FactoryDataConstants.Mq.RoutingKeys.MWH_NODE_DATA_PUSH); + // 皮阿诺 + // 欧派 + factorys.put(BrandEnums.OP.getValue(), FactoryDataConstants.Mq.RoutingKeys.OPPEIN_NODE_DATA_PUSH); + // 金牌 + factorys.put(BrandEnums.JP.getValue(), FactoryDataConstants.Mq.RoutingKeys.JP_NODE_DATA_PUSH); } From 206309d4e9e9cbe8d9b39b84b64bdd4349d8c7c2 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Thu, 17 Oct 2024 10:55:53 +0800 Subject: [PATCH 4/5] =?UTF-8?q?feat(all):=20=E5=A2=9E=E5=8A=A0=E6=AC=A7?= =?UTF-8?q?=E6=B4=BE=E7=9A=AE=E9=98=BF=E8=AF=BA=E5=8F=91=E9=80=81=E6=B6=88?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1增加欧派和皮阿诺作业时发送消息到工厂 --- .../common/constant/factorydata/FactoryDataConstants.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/factorydata/FactoryDataConstants.java b/blade-biz-common/src/main/java/org/springblade/common/constant/factorydata/FactoryDataConstants.java index 69078511f..107f16589 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/factorydata/FactoryDataConstants.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/factorydata/FactoryDataConstants.java @@ -83,6 +83,7 @@ public abstract class FactoryDataConstants { /** * 曼好家工厂订单 */ + String MWH_NODE_DATA_PUSH = "factory.data.queue.mwh.nodeDataPush" + DEVAUTH; String MWH_FACTORY_ORDER = "factory.data.queue.mwh.factoryOrder" + DEVAUTH; /** * 金牌工厂订单 @@ -134,6 +135,7 @@ public abstract class FactoryDataConstants { /** * 曼好家工厂订单 */ + String MWH_NODE_DATA_PUSH = "mwh.nodeDataPush" + DEVAUTH; String MWH_FACTORY_ORDER = "mwh.factoryOrder" + DEVAUTH; /** * 金牌工厂订单 From 470177c4f8a14e517e3714ca908995a84d810b28 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Thu, 17 Oct 2024 16:49:08 +0800 Subject: [PATCH 5/5] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/BasicdataWarehouseServiceImpl.java | 2 +- .../service/impl/OpenOrderServiceImpl.java | 84 ++++++++++--------- .../impl/TrunklineCarsLoadServiceImpl.java | 2 +- 3 files changed, 45 insertions(+), 43 deletions(-) diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java index a9f62399d..486bf922d 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java @@ -133,7 +133,7 @@ public class BasicdataWarehouseServiceImpl extends BaseServiceImpl getWarehouseList() { List myWatchWarehouse = getMyWatchWarehouse(); - if (myWatchWarehouse.size() > 0) { + if (!myWatchWarehouse.isEmpty()) { return myWatchWarehouse; } List basicdataGoodsShelfVOList = warehouseMapper.getWarehouseList(); 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 b45421f0b..dd00ce783 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 @@ -262,55 +262,57 @@ public class OpenOrderServiceImpl implements IOpenOrderService { //收货单位-----根据三方商场找到对应的clientId Long clientId = basicdataTripartiteMallClient.getClientIdByNameAndBrandAndCode(dealerName,StringUtil.isBlank(dealerCode)?"":dealerCode, brand); - BasicdataClientVO basicdataClientEntity = basicdataClientClient.findEntityVoById(clientId); - if (!Objects.isNull(basicdataClientEntity)) { - openOrderVO.setConsigneeClientId(clientId); - openOrderVO.setConsignee(basicdataClientEntity.getClientName()); - openOrderVO.setConsigneeName(basicdataClientEntity.getLinkman()); - openOrderVO.setConsigneeMobile(basicdataClientEntity.getPhone()); - openOrderVO.setConsigneeAddress(basicdataClientEntity.getDetailedly()); + if(!Objects.isNull(clientId)){ + BasicdataClientVO basicdataClientEntity = basicdataClientClient.findEntityVoById(clientId); + if (!Objects.isNull(basicdataClientEntity)) { + openOrderVO.setConsigneeClientId(clientId); + openOrderVO.setConsignee(basicdataClientEntity.getClientName()); + openOrderVO.setConsigneeName(basicdataClientEntity.getLinkman()); + openOrderVO.setConsigneeMobile(basicdataClientEntity.getPhone()); + openOrderVO.setConsigneeAddress(basicdataClientEntity.getDetailedly()); - List destinationArray = new ArrayList<>(); - String badeRegionAreaId = basicdataClientEntity.getBladeRegionAreaId(); - String bladeRegionProvinceId = basicdataClientEntity.getBladeRegionProvinceId(); - String bladeRegionCityId = basicdataClientEntity.getBladeRegionCityId(); - destinationArray.add(bladeRegionProvinceId); - destinationArray.add(bladeRegionCityId); - String name = regionFeign.getName(bladeRegionCityId); - String areaId = bladeRegionCityId; - if (!StringUtil.isBlank(badeRegionAreaId)) { - destinationArray.add(badeRegionAreaId); - name = regionFeign.getName(badeRegionAreaId); - areaId = badeRegionAreaId; - } + List destinationArray = new ArrayList<>(); + String badeRegionAreaId = basicdataClientEntity.getBladeRegionAreaId(); + String bladeRegionProvinceId = basicdataClientEntity.getBladeRegionProvinceId(); + String bladeRegionCityId = basicdataClientEntity.getBladeRegionCityId(); + destinationArray.add(bladeRegionProvinceId); + destinationArray.add(bladeRegionCityId); + String name = regionFeign.getName(bladeRegionCityId); + String areaId = bladeRegionCityId; + if (!StringUtil.isBlank(badeRegionAreaId)) { + destinationArray.add(badeRegionAreaId); + name = regionFeign.getName(badeRegionAreaId); + areaId = badeRegionAreaId; + } - openOrderVO.setDefaultDeliveryWay("2"); - String typeService = "1"; - BasicdataStoreBusinessEntity storeBusinessEntity = basicdataStoreBusinessClient.findByClientIdAndTypeService(clientId, 3); - if(!Objects.isNull(storeBusinessEntity)){ - typeService = storeBusinessEntity.getMold(); - } - if ("1".equals(typeService)){ openOrderVO.setDefaultDeliveryWay("2"); - }else if("2".equals(typeService)){ - openOrderVO.setDefaultDeliveryWay("3"); - }else if("3".equals(typeService)){ - openOrderVO.setDefaultDeliveryWay("1"); - } + String typeService = "1"; + BasicdataStoreBusinessEntity storeBusinessEntity = basicdataStoreBusinessClient.findByClientIdAndTypeService(clientId, 3); + if(!Objects.isNull(storeBusinessEntity)){ + typeService = storeBusinessEntity.getMold(); + } + if ("1".equals(typeService)){ + openOrderVO.setDefaultDeliveryWay("2"); + }else if("2".equals(typeService)){ + openOrderVO.setDefaultDeliveryWay("3"); + }else if("3".equals(typeService)){ + openOrderVO.setDefaultDeliveryWay("1"); + } - openOrderVO.setDestination(name); - openOrderVO.setDestinationCode(areaId); - openOrderVO.setDestinationArray(destinationArray); + openOrderVO.setDestination(name); + openOrderVO.setDestinationCode(areaId); + openOrderVO.setDestinationArray(destinationArray); - openOrderVO.setDefaultPayWay(basicdataClientEntity.getDefaultPaymentMethods()); + openOrderVO.setDefaultPayWay(basicdataClientEntity.getDefaultPaymentMethods()); - //查询目的仓数据 - BasicdataStorageServicesEntity basicdataStorageServicesEntity = basicdataStorageServicesClient.findEntityBySendWarehouseIdAndClientId(warehouseId, clientId); - if (!Objects.isNull(basicdataStorageServicesEntity)) { - openOrderVO.setDestinationWarehouseId(basicdataStorageServicesEntity.getServeWarehouseId()); - openOrderVO.setDestinationWarehouseName(basicdataStorageServicesEntity.getServeWarehouseName()); + //查询目的仓数据 + BasicdataStorageServicesEntity basicdataStorageServicesEntity = basicdataStorageServicesClient.findEntityBySendWarehouseIdAndClientId(warehouseId, clientId); + if (!Objects.isNull(basicdataStorageServicesEntity)) { + openOrderVO.setDestinationWarehouseId(basicdataStorageServicesEntity.getServeWarehouseId()); + openOrderVO.setDestinationWarehouseName(basicdataStorageServicesEntity.getServeWarehouseName()); + } } } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java index 789e2e199..9be5baed2 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java @@ -480,7 +480,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl