diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/IncomingTypeEnum.java b/blade-biz-common/src/main/java/org/springblade/common/constant/IncomingTypeEnum.java index b2b9dcde5..8472919ec 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/IncomingTypeEnum.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/IncomingTypeEnum.java @@ -16,13 +16,12 @@ public enum IncomingTypeEnum { UNLOAD_TRAY_ONE(9, "卸分一体"), OPEN_TO_IN(10, "开单及入库"), FACTORY_TO_INCOMING(11, "工厂推送数据入库"), - SUPPLE_INCOMING(12, "数据补录入库"); - + SUPPLE_INCOMING(12, "数据补录入库"), + ABNORMAL_INCOMING(13, "异常列表入库"); private Integer code; private String value; - IncomingTypeEnum(Integer code, String value) { this.code = code; this.value = value; diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/LauncherConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/LauncherConstant.java index cfce22cc1..149f15f06 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/LauncherConstant.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/LauncherConstant.java @@ -105,6 +105,23 @@ public interface LauncherConstant { String APPLICATION_PROD_LOGIN_ADDR = "172.16.128.147:8888"; + /** + * elk dev 地址 + */ + + String ELK_DEV_ADDR = "192.168.2.46:9000"; + + /** + * elk prod 地址 + */ + String ELK_PROD_ADDR = "172.30.0.72:9000"; + + /** + * elk test 地址 + */ + String ELK_TEST_ADDR = "192.168.2.110:9002"; + + /** * dbuuo提供者 */ @@ -246,4 +263,21 @@ public interface LauncherConstant { } } + /** + * 动态获取elk地址 + * + * @param profile 环境变量 + * @return addr + */ + static String elkAddr(String profile) { + switch (profile) { + case (AppConstant.PROD_CODE): + return ELK_PROD_ADDR; + case (AppConstant.TEST_CODE): + return ELK_TEST_ADDR; + default: + return ELK_DEV_ADDR; + } + } + } diff --git a/blade-biz-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java b/blade-biz-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java index eb7a75c87..485bc9ce4 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java +++ b/blade-biz-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java @@ -40,6 +40,8 @@ public class LauncherServiceImpl implements LauncherService { PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.server-addr", LauncherConstant.nacosAddr(profile)); PropsUtil.setProperty(props, "spring.cloud.nacos.config.server-addr", LauncherConstant.nacosAddr(profile)); + // 开启elk日志 + PropsUtil.setProperty(props, "blade.log.elk.destination", LauncherConstant.elkAddr(profile)); diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/feign/ITrunklineCarsLoadScanClient.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/feign/ITrunklineCarsLoadScanClient.java index d8fea7ffb..f02a97991 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/feign/ITrunklineCarsLoadScanClient.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/feign/ITrunklineCarsLoadScanClient.java @@ -19,6 +19,9 @@ public interface ITrunklineCarsLoadScanClient { @GetMapping(API_PREFIX+"/incomingPackage") R incomingPackage(@RequestParam Long carsLoadScanId); + @GetMapping(API_PREFIX+"/adnormalHasStock") + R adnormalHasStock(@RequestParam Long carsLoadScanId, @RequestParam Long warehouseId); + // @PostMapping(API_PREFIX+"/addAdvanceReturnId") // Long addAdvanceReturnId(@RequestBody TrunklineAdvanceEntity trunklineAdvanceEntity); diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineCarsLoadVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineCarsLoadVO.java index 1c7c9a678..5fa063a23 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineCarsLoadVO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineCarsLoadVO.java @@ -50,5 +50,6 @@ public class TrunklineCarsLoadVO extends TrunklineCarsLoadEntity { private Integer lastStartCarStatus; private Integer planUnloadNum; private Integer totalLoadingNum; + private String loadCarsNo; } diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalRecordServiceImpl.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalRecordServiceImpl.java index a6b333ad5..2b490a35a 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalRecordServiceImpl.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalRecordServiceImpl.java @@ -106,6 +106,13 @@ public class AftersalesAbnormalRecordServiceImpl extends BaseServiceImpl{ sendDataCarNum(t, unloadCarDTO.getCompleteDate()); }); - } catch (Exception e) { log.error("##################unloadCarComDataHandler 解析数据出错：{}", e.getMessage()); + + } diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportBillLoadingMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportBillLoadingMapper.xml index 6cf265598..a6d28ac2f 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportBillLoadingMapper.xml +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportBillLoadingMapper.xml @@ -75,7 +75,7 @@ dsa.warehouse, dsa.warehouse_id, dsa.consignee_unit, - dpl.waybill_number, + '' waybill_number, dsa.order_code, '' packet_bar_code, dsa.train_number, diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapper.xml index d64746642..63144e956 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapper.xml +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapper.xml @@ -400,9 +400,9 @@ '' start_war_out_time, ifnull(dpl.warehouse_entry_time_end, dpl.create_time) warehouse_entry_time_end, CASE - WHEN lds.driver_signing = 1 THEN + WHEN ldl.signfor_state = 1 THEN '未签收' - WHEN lds.driver_signing = 2 THEN + WHEN ldl.signfor_state = 2 THEN '已签收' END driver_signing, ldl.scan_time unload_time, @@ -568,9 +568,9 @@ '' start_war_out_time, ifnull(dpl.warehouse_entry_time_end, dpl.create_time) warehouse_entry_time_end, CASE - WHEN lds.driver_signing = 1 THEN + WHEN ldl.signfor_state = 1 THEN '未签收' - WHEN lds.driver_signing = 2 THEN + WHEN ldl.signfor_state = 2 THEN '已签收' END driver_signing, ldl.scan_time unload_time, diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/query/DevilerDetailsQuery.java b/blade-service/logpm-report/src/main/java/com/logpm/report/query/DevilerDetailsQuery.java index bf5d57826..1986a27b4 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/query/DevilerDetailsQuery.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/query/DevilerDetailsQuery.java @@ -44,4 +44,10 @@ public class DevilerDetailsQuery extends Query { @ApiModelProperty(value = "运单收货人", position = 17) private String consigneeNameRange; + @ApiModelProperty(value = "签收时间开始（范围）", position = 18) + private Date startSjsigningTime; + + @ApiModelProperty(value = "签收时间结束（范围）", position = 19) + private Date endSjsigningTime; + } diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java index ccf941343..ddd7b4c4a 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java @@ -214,6 +214,10 @@ public class ReportDeliverServiceImpl implements ReportDeliverService { QueryUtil.timeGe("task_time", query.getStartTaskTime(), queryWrapper); // 配送时间结束 QueryUtil.timeLe("task_time", query.getEndTaskTime(), queryWrapper); + // 签收时间开始 + QueryUtil.timeGe("sjsigning_time", query.getStartSjsigningTime(), queryWrapper); + // 签收时间结束 + QueryUtil.timeLe("sjsigning_time", query.getEndSjsigningTime(), queryWrapper); // 仓库 QueryUtil.splitEqQuery("warehouse_name", query.getWarehouseNameRange(), queryWrapper); // 配送类型 diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/feign/TrunklineCarsLoadScanClient.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/feign/TrunklineCarsLoadScanClient.java index d3b973efa..ab684949b 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/feign/TrunklineCarsLoadScanClient.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/feign/TrunklineCarsLoadScanClient.java @@ -25,4 +25,9 @@ public class TrunklineCarsLoadScanClient implements ITrunklineCarsLoadScanClient public R incomingPackage(Long carsLoadScanId) { return trunklineCarsLoadService.syncIncomingPackage(carsLoadScanId); } + + @Override + public R adnormalHasStock(Long carsLoadScanId, Long warehouseId) { + return trunklineCarsLoadService.adnormalHasStock(carsLoadScanId,warehouseId); + } } 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 461cdbeae..ceada808a 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 @@ -114,6 +114,9 @@ and ltcl.end_warehouse_ids like concat('%',#{param.warehouseId},'%') + + and Locate(#{param.loadCarsNo},ltcl.cars_no) > 0 + group by ltcl.id,ltcl.cars_no, ltcl.plan_loading_number, ltcl.real_loading_number, @@ -395,7 +398,7 @@ and ltcl.create_time <= #{param.endTime} - and ltcl.cars_no <= #{param.loadCarsNo} + and Locate(#{param.loadCarsNo},ltcl.cars_no) > 0 group by ltcl.id order by ltcl.create_time desc diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsOrderMapper.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsOrderMapper.java index 2e8ce7108..3b98d3905 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsOrderMapper.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsOrderMapper.java @@ -58,4 +58,6 @@ public interface TrunklineCarsOrderMapper extends BaseMapper findLoadingList(@Param("loadId") Long loadId, @Param("nodeId") Long nodeId); + + Integer findLoadingNumBySignOrderId(@Param("signOrderId") Long signOrderId); } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsOrderMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsOrderMapper.xml index ff0e2167f..42fe51de2 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsOrderMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsOrderMapper.xml @@ -316,4 +316,11 @@ and real_num > 0 + + + diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineLoadSignOrderMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineLoadSignOrderMapper.xml index 60d4082d1..3ccab8873 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineLoadSignOrderMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineLoadSignOrderMapper.xml @@ -23,6 +23,12 @@ ltlso.plan_num planNum, ltlso.load_sign_code loadSignCode, ltlso.sign_num signNum, + ltlso.mall_name mallName, + ltlso.mall_person mallPerson, + ltlso.mall_mobile mallMobile, + ltlso.mall_address mallAddress, + ltlso.belong_to_warehouse_name belongToWarehouseName, + ltlso.sign_status signStatus, ltcl.driver_name driverName, ltcl.driver_mobile driverMobile, ltcl.car_number carNumber, diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadService.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadService.java index 87885c21e..75d6eca9a 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadService.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadService.java @@ -217,4 +217,6 @@ public interface ITrunklineCarsLoadService extends BaseService findLoadingList(Long loadId, Long nodeId); + + Integer findLoadingNumBySignOrderId(Long signOrderId); } 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 3e28306d2..692066c2c 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 @@ -2185,13 +2185,13 @@ public class OpenOrderServiceImpl implements IOpenOrderService { }); parcelListEntityList.forEach(parcelListEntity -> { - + Long nowWarehouseId = parcelListEntity.getWarehouseId(); parcelListEntity.setSendWarehouseId(departureWarehouseId); parcelListEntity.setSendWarehouseName(departureWarehouseName); parcelListEntity.setAcceptWarehouseId(destinationWarehouseId); parcelListEntity.setAcceptWarehouseName(destinationWarehouseName); - if(departureWarehouseId.equals(destinationWarehouseId)){ + if(nowWarehouseId.equals(destinationWarehouseId)){ parcelListEntity.setIsTransfer(0); }else{ parcelListEntity.setIsTransfer(1); 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 49326b45c..e29ffd208 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 @@ -4563,11 +4563,22 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl parcelList = parcelListMap.get(scanCode); @@ -5791,6 +5814,55 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl loadScanQueryWrapper = new QueryWrapper<>(); -// loadScanQueryWrapper.eq("load_id", loadId) -// .eq("scan_code", orderPackageCode); -// carsLoadScanEntity = trunklineCarsLoadScanService.getOne(loadScanQueryWrapper); //不在计划中，则查询在哪个仓库中 DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByOrderPackageCodeAndStatus(orderPackageCode); @@ -6353,6 +6420,148 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl