From 6b40ee7e016a8c254752e078214c3499d213ba73 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Sun, 4 Feb 2024 09:56:46 +0800 Subject: [PATCH 01/12] =?UTF-8?q?1.=E8=80=83=E6=A0=B8-=E8=80=83=E6=A0=B8?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=9C=AA=E5=B8=A6=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml index 5a0533953..b4c677a56 100644 --- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml @@ -16,7 +16,8 @@ si.remark remark, si.indicators_status indicatorsStatus, si.is_objection isObjection, - si.objection_remark objectionRemark + si.objection_remark objectionRemark, + si.create_time createTime from sup_indicators si left join sup_classify sc on sc.id = si.classify_id left join sup_classify psc on psc.id = sc.p_id From a6ebe5129befd4a76b2b9846fbd262e87db1f917 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Sun, 3 Mar 2024 16:39:28 +0800 Subject: [PATCH 02/12] =?UTF-8?q?1.=E6=B5=8B=E8=AF=95=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E8=BF=98=E5=8E=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springblade/common/launch/LauncherServiceImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 3d5ab632b..eb7a75c87 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 @@ -43,11 +43,11 @@ public class LauncherServiceImpl implements LauncherService { -// PropsUtil.setProperty(props, "spring.cloud.sentinel.transport.dashboard", LauncherConstant.sentinelAddr(profile)); -// PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.username","nacos"); -// PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.password","Nacos123123"); -// PropsUtil.setProperty(props, "spring.cloud.nacos.config.username","nacos"); -// PropsUtil.setProperty(props, "spring.cloud.nacos.config.password","Nacos123123"); + PropsUtil.setProperty(props, "spring.cloud.sentinel.transport.dashboard", LauncherConstant.sentinelAddr(profile)); + PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.username","nacos"); + PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.password","Nacos123123"); + PropsUtil.setProperty(props, "spring.cloud.nacos.config.username","nacos"); + PropsUtil.setProperty(props, "spring.cloud.nacos.config.password","Nacos123123"); // dubbo注册 PropsUtil.setProperty(props, "dubbo.application.name", appName); PropsUtil.setProperty(props, "dubbo.application.qos.enable", "false"); From 1412447e40b6fea77e302e92f8cdbf897665684e Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Sun, 3 Mar 2024 21:19:40 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E5=A2=9E=E5=8A=A0nacos=20=E8=AE=BF?= =?UTF-8?q?=E9=97=AE=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springblade/common/launch/LauncherServiceImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 3d5ab632b..eb7a75c87 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 @@ -43,11 +43,11 @@ public class LauncherServiceImpl implements LauncherService { -// PropsUtil.setProperty(props, "spring.cloud.sentinel.transport.dashboard", LauncherConstant.sentinelAddr(profile)); -// PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.username","nacos"); -// PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.password","Nacos123123"); -// PropsUtil.setProperty(props, "spring.cloud.nacos.config.username","nacos"); -// PropsUtil.setProperty(props, "spring.cloud.nacos.config.password","Nacos123123"); + PropsUtil.setProperty(props, "spring.cloud.sentinel.transport.dashboard", LauncherConstant.sentinelAddr(profile)); + PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.username","nacos"); + PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.password","Nacos123123"); + PropsUtil.setProperty(props, "spring.cloud.nacos.config.username","nacos"); + PropsUtil.setProperty(props, "spring.cloud.nacos.config.password","Nacos123123"); // dubbo注册 PropsUtil.setProperty(props, "dubbo.application.name", appName); PropsUtil.setProperty(props, "dubbo.application.qos.enable", "false"); From 73e949903aa0ada341a39f203901289d3872097a Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Fri, 15 Mar 2024 09:48:42 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- blade-service/logpm-report/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-service/logpm-report/Dockerfile b/blade-service/logpm-report/Dockerfile index 9abdcb752..cd4fe081b 100644 --- a/blade-service/logpm-report/Dockerfile +++ b/blade-service/logpm-report/Dockerfile @@ -11,5 +11,5 @@ EXPOSE 8900 ADD ./target/logpm-report.jar ./app.jar ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar","-Xms128m","-Xmx512m", "app.jar"] -CMD ["--spring.profiles.active=dev"] +CMD ["--spring.profiles.active=test"] From ae9b38d84b63aa4771a491ed3df30cc2698b27a7 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Tue, 2 Apr 2024 00:07:13 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E5=8F=96=E6=B6=88=E9=A2=84=E7=BA=A6BUG?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DistributionReservationServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java index dbe93f441..74fe19ed5 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java @@ -3758,8 +3758,9 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl Date: Sun, 7 Apr 2024 11:00:13 +0800 Subject: [PATCH 06/12] =?UTF-8?q?fix(all):=E4=BF=AE=E6=94=B9=E5=BF=97?= =?UTF-8?q?=E9=82=A6=E8=AE=A2=E5=8D=95=E5=8F=82=E6=95=B0=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/logpm/factorydata/zbom/controller/OrderController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/controller/OrderController.java b/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/controller/OrderController.java index f369aa854..46cbcea69 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/controller/OrderController.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/controller/OrderController.java @@ -48,7 +48,7 @@ public class OrderController { String jsonStr = JSONUtil.toJsonStr(zbReceiptDTO); log.info("接收志邦工厂数据：{} ", jsonStr); String method = request.getParameter("method"); - if (ObjectUtil.equal(ZbomConstants.Method.ENTRY_ORDER_CREATE, method)) { + if (!ObjectUtil.equal(ZbomConstants.Method.ENTRY_ORDER_CREATE, method)) { return ZbResp.fail("暂不支持该功能"); } String corpId = request.getHeader("corpId"); From 9763c45a1a7533a62ee6cbe631cd4ed2f2b0a860 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Sun, 7 Apr 2024 13:35:51 +0800 Subject: [PATCH 07/12] =?UTF-8?q?1.=E7=9B=98=E7=82=B9=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E6=9B=B4=E6=96=B0=202.=E5=BA=93=E5=86=85?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=97=A5=E5=BF=97=E9=80=BB=E8=BE=91=E5=8F=98?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springblade/common/utils/CommonUtil.java | 4 +- .../warehouse/entity/QuestDetailEntity.java | 28 + .../entity/SyncTaskErrorLogEntity.java | 21 + .../feign/IWarehouseTrayGoodsClient.java | 2 +- .../feign/IWarehouseTrayTypeClient.java | 4 +- .../feign/IWarehouseUpdownTypeClient.java | 6 +- .../com/logpm/warehouse/vo/PositionVO.java | 3 + .../logpm/warehouse/vo/QuestContrastVO.java | 6 + .../logpm/warehouse/vo/TaskPackagelistVO.java | 33 +- .../logpm/warehouse/vo/TaskallocationVO.java | 2 +- .../controller/BasicdataTrayController.java | 4 +- .../service/IBasicdataTrayService.java | 4 +- .../impl/BasicdataTrayServiceImpl.java | 11 +- .../DistributionSignforAppController.java | 4 +- .../DistributionStockupAppController.java | 4 +- .../DistributionDeliveryListController.java | 2 +- .../DistributionSignforController.java | 2 +- .../mapper/DistributionParcelListMapper.xml | 70 +- .../mapper/DistributionStockListMapper.xml | 13 +- .../impl/DistributionAsyncServiceImpl.java | 7 +- .../impl/DistributionSignforServiceImpl.java | 10 +- .../impl/DistributionStockupServiceImpl.java | 3 +- .../DistrilbutionBillLadingServiceImpl.java | 4 +- .../jobhandle/DistributionDatarepair.java | 2 +- .../patch/receiver/SyncUpdownDataHandler.java | 2 +- .../impl/SyncOrderInfoServiceImpl.java | 6 +- .../mapper/TrunklineAdvanceDetailMapper.java | 2 + .../mapper/TrunklineAdvanceDetailMapper.xml | 8 + .../mapper/TrunklineAdvanceMapper.xml | 12 +- .../ITrunklineAdvanceDetailService.java | 2 + .../service/impl/InComingServiceImpl.java | 10 + .../service/impl/OpenOrderServiceImpl.java | 1 + .../TrunklineAdvanceDetailServiceImpl.java | 5 + .../impl/TrunklineCarsLoadServiceImpl.java | 21 +- .../api/WarehouseTrayTypeApiController.java | 16 +- .../api/WarehouseUpdownTypeApiController.java | 16 +- .../controller/OldSystemPushController.java | 4 +- .../controller/TaskQuestController.java | 1 - .../WarehouseGoodsAllocationController.java | 16 +- .../feign/WarehouseTrayGoodsClient.java | 4 +- .../feign/WarehouseTrayTypeClient.java | 12 +- .../feign/WarehouseUpdownTypeClient.java | 20 +- .../mapper/SyncTaskErrorLogMapper.java | 9 + .../warehouse/mapper/TaskQuestMapper.java | 9 + .../warehouse/mapper/TaskQuestMapper.xml | 70 +- .../mapper/WarehouseTrayGoodsMapper.xml | 6 +- .../mapper/WarehouseUpdownGoodsMapper.xml | 10 +- .../warehouse/service/IAsyncDataService.java | 2 +- .../service/ISyncTaskErrorLogService.java | 7 + .../warehouse/service/ITaskQuestService.java | 5 +- .../service/IWarehouseTrayTypeService.java | 18 +- .../service/IWarehouseUpdownTypeService.java | 18 +- .../service/impl/AsyncDataServiceImpl.java | 781 +++++++++++++----- .../impl/SyncTaskErrorLogServiceImpl.java | 15 + .../service/impl/TaskQuestServiceImpl.java | 579 +++++++------ .../impl/WarehouseTrayTypeServiceImpl.java | 44 +- ...WarehouseUpdownStockupAreaServiceImpl.java | 2 +- .../impl/WarehouseUpdownTypeServiceImpl.java | 86 +- 58 files changed, 1323 insertions(+), 745 deletions(-) create mode 100644 blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/SyncTaskErrorLogEntity.java create mode 100644 blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/SyncTaskErrorLogMapper.java create mode 100644 blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/ISyncTaskErrorLogService.java create mode 100644 blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/SyncTaskErrorLogServiceImpl.java diff --git a/blade-biz-common/src/main/java/org/springblade/common/utils/CommonUtil.java b/blade-biz-common/src/main/java/org/springblade/common/utils/CommonUtil.java index bb3209388..9d349943f 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/utils/CommonUtil.java +++ b/blade-biz-common/src/main/java/org/springblade/common/utils/CommonUtil.java @@ -250,8 +250,8 @@ public class CommonUtil { public static String getHaxCodeByLong(String str,int changdu){ - - int hashValue = str.hashCode(); // 获取哈希值（32位） + long time = new Date().getTime(); + int hashValue = (str+time).hashCode(); // 获取哈希值（32位） // 将32位哈希值转换为6位长度的纯数字形式 String s = Math.abs(hashValue) + ""; String substring = s.substring(0, changdu); diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/QuestDetailEntity.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/QuestDetailEntity.java index 02ce36e2c..8505f66de 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/QuestDetailEntity.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/QuestDetailEntity.java @@ -91,6 +91,11 @@ public class QuestDetailEntity extends TenantEntity { */ @ApiModelProperty(value = "盘点方式;1. 随机 2 库位3 订单 4 托盘") private Integer questType; + /** + * 盘点方式;1. 随机 2 库位3 订单 4 托盘 + */ + @ApiModelProperty(value = "有无数据;1.有数据 0无数据") + private Integer hasData; /** * 盘点对象;1.定制品 2零担 3 库存品 */ @@ -198,6 +203,19 @@ public class QuestDetailEntity extends TenantEntity { */ @ApiModelProperty(value = "托盘id") private String trayId; + + /** + * 新托盘id + */ + @ApiModelProperty(value = "新托盘id") + private Long newTrayId; + + /** + * 新托盘编码 + */ + @ApiModelProperty(value = "新托盘编码") + private String newTrayCode; + /** * 货位id */ @@ -209,7 +227,17 @@ public class QuestDetailEntity extends TenantEntity { */ @ApiModelProperty(value = "是否是新增数据") private Integer isNew; + /** + * 是否是变更 0否 1是 + */ + @ApiModelProperty(value = "是否是变更 0否 1是") + private Integer isChange; + /** + * 是否是变更 0否 1是 + */ + @ApiModelProperty(value = "是否是变更库位托盘 0否 1是") + private Integer isChangeAt; /** * 货位 */ diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/SyncTaskErrorLogEntity.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/SyncTaskErrorLogEntity.java new file mode 100644 index 000000000..40b8833c1 --- /dev/null +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/SyncTaskErrorLogEntity.java @@ -0,0 +1,21 @@ +package com.logpm.warehouse.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.tenant.mp.TenantEntity; + +@Data +@TableName("logpm_sync_task_error_log") +@ApiModel(value = "SyncTaskErrorLog对象", description = "同步盘点错误日志") +@EqualsAndHashCode(callSuper = true) +public class SyncTaskErrorLogEntity extends TenantEntity { + + private String questNum; + + private Long questDetailId; + + private String msg; + +} diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseTrayGoodsClient.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseTrayGoodsClient.java index 71a6447da..31741a40b 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseTrayGoodsClient.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseTrayGoodsClient.java @@ -65,7 +65,7 @@ public interface IWarehouseTrayGoodsClient { * 通过主表Id删除所有关联表 */ @PostMapping(TOP+"/delByTrayByCode") - Boolean delByTrayByCode(@RequestParam String code); + Boolean delByTrayByCode(@RequestParam String code,@RequestParam String remark); /** * 通过托盘id查询托盘上面的货物 * diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseTrayTypeClient.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseTrayTypeClient.java index a180dc3bc..03a422aad 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseTrayTypeClient.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseTrayTypeClient.java @@ -68,10 +68,10 @@ public interface IWarehouseTrayTypeClient { List findAllGoodsByTrayCodeAndWarehouseId(@RequestParam String trayCode, @RequestParam Long warehouseId); @GetMapping(API_PREFIX+"/deleteZeroOrderByTrayCode") - void deleteZeroOrderByTrayCode(@RequestParam String orderCode, @RequestParam String palletCode, @RequestParam Long wid); + void deleteZeroOrderByTrayCode(@RequestParam String orderCode, @RequestParam String palletCode, @RequestParam Long wid, @RequestParam String remark); @GetMapping(API_PREFIX+"/changeTrayWarehouseInfo") void changeTrayWarehouseInfo(@RequestParam String trayCode, @RequestParam Long warehouseId); @GetMapping(API_PREFIX+"/trayToNull") - void trayToNull(@RequestParam String trayCode); + void trayToNull(@RequestParam String trayCode,@RequestParam String remark); } diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseUpdownTypeClient.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseUpdownTypeClient.java index 5761d863b..6b8b0eb22 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseUpdownTypeClient.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseUpdownTypeClient.java @@ -42,7 +42,7 @@ public interface IWarehouseUpdownTypeClient { String TOP = API_PREFIX + "/top"; @GetMapping(TOP + "/downPackage") - R downPackage(@RequestParam("orderPackageCodes") String orderPackageCodes, @RequestParam("warehouseId") Long warehouseId); + R downPackage(@RequestParam("orderPackageCodes") String orderPackageCodes, @RequestParam("warehouseId") Long warehouseId,@RequestParam("remark") String remark); @GetMapping(TOP + "/downDeliveryPackage") @@ -58,7 +58,7 @@ public interface IWarehouseUpdownTypeClient { boolean packageChangeStock(@RequestBody List orderPackageCodes); @GetMapping(TOP + "/downPackageOrDelTray") - R downPackageOrDelTray(@RequestParam("orderPackageCodes") String orderPackageCodes, @RequestParam("warehouseId") Long warehouseId); + R downPackageOrDelTray(@RequestParam("orderPackageCodes") String orderPackageCodes, @RequestParam("warehouseId") Long warehouseId,@RequestParam("remark") String remark); @GetMapping(TOP + "/downTray") R downTray(@RequestParam("trayCode") String trayCode, @RequestParam("warehouseId") Long warehouseId); @@ -67,7 +67,7 @@ public interface IWarehouseUpdownTypeClient { boolean upShelfTray(@RequestParam("trayCode") String trayCode, @RequestParam("locationId") Long locationId, @RequestParam("warehouseId") Long warehouseId); @GetMapping(TOP + "/upShelfPackage") - boolean upShelfPackage(@RequestParam String orderPackageCode, @RequestParam Long locationId, @RequestParam Long warehouseId); + boolean upShelfPackage(@RequestParam String orderPackageCode, @RequestParam Long locationId, @RequestParam Long warehouseId,@RequestParam String remark); @GetMapping(TOP + "/findUpdownTypeInforByAllocationId") R findUpdownTypeInforByAllocationId(@RequestParam Long allocationId, @RequestParam Long warehouseId); diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/PositionVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/PositionVO.java index 9e372eb83..bd50251a2 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/PositionVO.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/PositionVO.java @@ -10,9 +10,12 @@ public class PositionVO implements Serializable { private String areaName;//货区 private String shelfName;//货架 private String allocationName;//货位 + private String positionCode;//完整货位 private String warehouseName;//仓库 private String trayCode;//托盘 private String trayName;//托盘名称 private Integer num;//数量 + private Long allocationId;//库位id + private Long trayId;//托盘id } diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/QuestContrastVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/QuestContrastVO.java index 721d0d783..1e5d85713 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/QuestContrastVO.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/QuestContrastVO.java @@ -94,6 +94,12 @@ public class QuestContrastVO { * 更新的货物信息 */ private String groundingPositionCode; + + /** + * 更新的托盘信息 + */ + private String newTrayCode; + /** * 货物状态 */ diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TaskPackagelistVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TaskPackagelistVO.java index a12a193dd..e5f17bfa4 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TaskPackagelistVO.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TaskPackagelistVO.java @@ -1,7 +1,6 @@ package com.logpm.warehouse.vo; import com.logpm.warehouse.entity.QuestDetailChildEntity; -import com.logpm.warehouse.entity.QuestDetailEntity; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,6 +39,36 @@ public class TaskPackagelistVO { @ApiModelProperty(value = "库位信息") private String allocation; + /** + * 托盘id + */ + @ApiModelProperty(value = "托盘id") + private String trayId; + + /** + * 托盘码 + */ + @ApiModelProperty(value = "托盘码") + private String trayCode; + + /** + * 托盘名称 + */ + @ApiModelProperty(value = "托盘名称") + private String trayName; + + + /** + * 货位id + */ + @ApiModelProperty(value = "货位id") + private String allocationId; + + /** + * 货位 + */ + @ApiModelProperty(value = "货位") + private String positionCode; /** * 订单号 @@ -55,7 +84,7 @@ public class TaskPackagelistVO { * 数量 */ @ApiModelProperty(value = "数量") - private Integer quantity; + private Integer stockNum; /** * 盘点方式 diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TaskallocationVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TaskallocationVO.java index 235ccd881..86f30ea86 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TaskallocationVO.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TaskallocationVO.java @@ -15,7 +15,7 @@ public class TaskallocationVO { * 货位id */ @ApiModelProperty(value = "货位id") - private Long allocationId; + private String allocationId; /** diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataTrayController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataTrayController.java index 190654f06..e2fb707b0 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataTrayController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataTrayController.java @@ -154,7 +154,7 @@ public class BasicdataTrayController extends BladeController { @ApiOperationSupport(order = 5) @ApiOperation(value = "空置", notes = "传入BasicdataTray") public R vacant(@Valid @RequestBody BasicdataTrayEntity BasicdataTray) { - return R.status(trayService.vacantById(BasicdataTray)); + return R.status(trayService.vacantById(BasicdataTray,"托盘空置")); } /** @@ -164,7 +164,7 @@ public class BasicdataTrayController extends BladeController { @ApiOperationSupport(order = 5) @ApiOperation(value = "空置", notes = "传入BasicdataTray") public R vacants(@Valid @RequestBody List codes) { - return R.status(trayService.vacantBycodes(codes)); + return R.status(trayService.vacantBycodes(codes,"托盘空置")); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataTrayService.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataTrayService.java index 55f1125b8..4030a6b94 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataTrayService.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataTrayService.java @@ -99,7 +99,7 @@ public interface IBasicdataTrayService extends BaseService /** * 托盘 一键空闲 */ - Boolean vacantById(BasicdataTrayEntity basicdataTray); + Boolean vacantById(BasicdataTrayEntity basicdataTray,String remark); /** * 托盘 打印包条 */ @@ -127,5 +127,5 @@ public interface IBasicdataTrayService extends BaseService * @param codes * @return */ - Boolean vacantBycodes(List codes); + Boolean vacantBycodes(List codes,String remark); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTrayServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTrayServiceImpl.java index 026b099bb..b1df8fcb7 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTrayServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTrayServiceImpl.java @@ -38,9 +38,6 @@ import com.logpm.basicdata.vo.BasicdataStockArticleVO; import com.logpm.basicdata.vo.BasicdataTrayVO; import com.logpm.basicdata.vo.WarehouseParcelListVO; import com.logpm.basicdata.vo.WarehouseStockListVO; -import com.logpm.distribution.vo.DistributionStockArticleQRCodeVO; -import com.logpm.warehouse.entity.WarehouseTrayEntity; -import com.logpm.warehouse.entity.WarehouseTrayGoodsEntity; import com.logpm.warehouse.feign.IWarehouseTrayGoodsClient; import com.logpm.warehouse.vo.WarehouseTrayQRCode; import com.logpm.warehouse.vo.WarehouseTraybarCode; @@ -198,7 +195,7 @@ public class BasicdataTrayServiceImpl extends BaseServiceImpl>>>>>>>>>>>>>>>{}",aBoolean); // log.info("删除托盘打托方式表>>>>>>>>>>>>>>>>{}",aBoolean1); log.info("basicdataTray>>>>>>>>>>>>>>{}",basicdataTray.getPalletCode()); - Boolean aBoolean = warehouseTrayGoodsClient.delByTrayByCode(basicdataTray.getPalletCode()); + Boolean aBoolean = warehouseTrayGoodsClient.delByTrayByCode(basicdataTray.getPalletCode(),remark); //修改托盘表状态 // boolean update = this.update(new UpdateWrapper().lambda() // .eq(BasicdataTrayEntity::getId, basicdataTray.getId()) @@ -305,9 +302,9 @@ public class BasicdataTrayServiceImpl extends BaseServiceImpl codes) { + public Boolean vacantBycodes(List codes,String remark) { for (String code : codes) { - Boolean aBoolean = warehouseTrayGoodsClient.delByTrayByCode(code); + Boolean aBoolean = warehouseTrayGoodsClient.delByTrayByCode(code,remark); } return true; } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java index 09b1465e6..1099e7f8c 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java @@ -160,7 +160,7 @@ public class DistributionSignforAppController { orderPackageCodes = orderPackageCodes + "," + packageCode; } } - updownTypeClient.downPackageOrDelTray(orderPackageCodes,myCurrentWarehouse.getId()); + updownTypeClient.downPackageOrDelTray(orderPackageCodes,myCurrentWarehouse.getId(),"签收下架解托"); } }catch (Exception e){ @@ -251,7 +251,7 @@ public class DistributionSignforAppController { } } BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); - updownTypeClient.downPackageOrDelTray(orderPackageCodes,myCurrentWarehouse.getId()); + updownTypeClient.downPackageOrDelTray(orderPackageCodes,myCurrentWarehouse.getId(),"司机一键签收下架解托"); }catch (Exception e){ log.error("##############oneclick: 更新包件下架状态失败 packageCodes={}",packageCodes); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java index 0221fd894..446d1daad 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java @@ -51,7 +51,6 @@ import org.springblade.common.constant.DictBizConstant; import org.springblade.common.constant.RabbitConstant; import org.springblade.common.constant.common.IsOrNoConstant; import org.springblade.common.constant.orderpackage.OrderPackageFreezeStatusConstant; -import org.springblade.common.constant.orderpackage.OrderPackageStockupStatusConstant; import org.springblade.common.constant.pda.PdaAudioLingoStatus; import org.springblade.common.constant.reservation.ReservationLoadingStatusConstant; import org.springblade.common.constant.reservation.ReservationOrderStatusConstant; @@ -1430,6 +1429,7 @@ public class DistributionStockupAppController extends BladeController { jsonObject.put("incomingBatch", byId.getIncomingBatch()); jsonObject.put("enterNum", 1); jsonObject.put("allocationId", stockupDTO.getAllocationId()); + jsonObject.put("remark","备货无数据库存品下架"); List list = new ArrayList<>(); list.add(jsonObject); R r = warehouseUpdownTypeClient.downStock(list); @@ -1438,7 +1438,7 @@ public class DistributionStockupAppController extends BladeController { // return Resp.scanFail("下架失败，请联系管理员！！", "下架失败，请联系管理员！！"); } } else { - R r = warehouseUpdownTypeClient.downPackage(packetBarCode, byId.getWarehouseId()); + R r = warehouseUpdownTypeClient.downPackage(packetBarCode, byId.getWarehouseId(),"备货下架包件"); if (r.getCode() != 200) { log.debug("##########" + r.getMsg()); // return Resp.scanFail("下架失败，请联系管理员！！", "下架失败，请联系管理员！！"); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java index 56587ca4a..e16853dcb 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java @@ -497,7 +497,7 @@ public class DistributionDeliveryListController extends BladeController { orderPackageCodes = orderPackageCodes + "," + packageCode; } } - warehouseUpdownTypeClient.downPackageOrDelTray(orderPackageCodes,myCurrentWarehouse.getId()); + warehouseUpdownTypeClient.downPackageOrDelTray(orderPackageCodes,myCurrentWarehouse.getId(),"签收下架解托"); } }catch (Exception e){ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java index fa7df1cd7..ae24ab647 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java @@ -297,7 +297,7 @@ public class DistributionSignforController extends BladeController { orderPackageCodes = orderPackageCodes + "," +packageCode; } } - updownTypeClient.downPackageOrDelTray(orderPackageCodes,myCurrentWarehouse.getId()); + updownTypeClient.downPackageOrDelTray(orderPackageCodes,myCurrentWarehouse.getId(),"文员一键签收下架解托"); }catch (Exception e){ log.error("##############oneclick: 更新包件下架状态失败 packageCodes={}",packageCodes); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml index bfe8e7a7d..304368e29 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml @@ -38,68 +38,22 @@ select ldsa.mall_name mallName,ldpl.order_code orderCode,ldpl.id,ldpl.conditions,ldpl.order_package_code orderPackageCode,ldsa.id stockArticleId, ldsa.mall_id mallId,ldsa.genre ,ldsa.is_zero isZero,ldpl.send_warehouse_name sendWarehouseName,ldpl.second,ldpl.third_product thirdProduct, ldpl.waybill_number waybillNumber,ldpl.firsts,ldpl.quantity,ldpl.warehouse_id warehouseId,ldpl.material_name materialName,ldpl.material_code materialCode, - CASE WHEN ldpl.conditions = 1 THEN - (select GROUP_CONCAT(tray_id) - from logpm_warehouse_tray_goods - where association_id = ldpl.id ) - WHEN ldpl.conditions = 2 THEN - (select GROUP_CONCAT(tray_id) - from logpm_warehouse_tray_goods - where association_id = ldpl.material_id and incoming_batch = ldpl.order_code and market_id = ldsa.mall_id) - ELSE - ( select GROUP_CONCAT(tray_id) - from logpm_warehouse_tray_goods - where association_id = ldpl.stock_article_id) - END trayId, - CASE WHEN ldpl.conditions = 1 THEN - (select GROUP_CONCAT(tray_code) - from logpm_warehouse_tray_goods - where association_id = ldpl.id ) - WHEN ldpl.conditions = 2 THEN - (select GROUP_CONCAT(tray_code) - from logpm_warehouse_tray_goods - where association_id = ldpl.material_id and incoming_batch = ldpl.order_code and market_id = ldsa.mall_id) - ELSE - ( select GROUP_CONCAT(tray_code) - from logpm_warehouse_tray_goods - where association_id = ldpl.stock_article_id) - END trayCode, - CASE WHEN ldpl.conditions = 1 THEN - (select GROUP_CONCAT(allocation_id) - from logpm_warehouse_updown_goods - where association_id = ldpl.id ) - WHEN ldpl.conditions = 2 THEN - (select GROUP_CONCAT(allocation_id) - from logpm_warehouse_updown_goods - where association_id = ldpl.material_id and incoming_batch = ldpl.order_code and market_id = ldsa.mall_id) - ELSE - ( select GROUP_CONCAT(allocation_id) - from logpm_warehouse_updown_goods - where association_id = ldpl.stock_article_id) - END allocationId, - CASE WHEN ldpl.conditions = 1 THEN - (select GROUP_CONCAT(position_code) - from logpm_warehouse_updown_goods - where association_id = ldpl.id ) - WHEN ldpl.conditions = 2 THEN - (select GROUP_CONCAT(position_code) - from logpm_warehouse_updown_goods - where association_id = ldpl.material_id and incoming_batch = ldpl.order_code and market_id = ldsa.mall_id) - ELSE - ( select GROUP_CONCAT(position_code) - from logpm_warehouse_updown_goods - where association_id = ldpl.stock_article_id) - END positionCode, - CASE WHEN ldpl.conditions = 2 THEN - (select GROUP_CONCAT(DISTINCT id) - from logpm_distribution_stock_list - where material_id = ldpl.material_id and incoming_batch = ldpl.order_code and market_id = ldsa.mall_id) - END stockId ,ldsa.brand brandName + ldsa.brand brandName, + lwtg.tray_id trayId, + lwtg.tray_code trayCode, + lwug.allocation_id allocationId, + lwug.position_code positionCode, + CASE + WHEN ldpl.conditions = 2 THEN + ( SELECT GROUP_CONCAT( DISTINCT id ) FROM logpm_distribution_stock_list WHERE material_id = ldpl.material_id AND incoming_batch = ldpl.order_code AND market_id = ldsa.mall_id ) + END stockId from logpm_distribution_stock_article ldsa LEFT JOIN logpm_distribution_parcel_list ldpl on ldsa.id = ldpl.stock_article_id + left join logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldpl.id and lwtg.association_type = '3' + left join logpm_warehouse_updown_goods lwug on lwug.association_id = ldpl.id and lwug.association_type = '3' - ldsa.warehouse_id = #{param.warehouseId} and ldpl.order_package_status in (20,30,40) + ldsa.warehouse_id = #{param.warehouseId} and ldpl.order_package_status = '20' and ldsa.mall_id = #{param.mallId} and ldsa.genre = #{param.genre} and ldsa.is_zero = #{param.isZero} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml index 4a9b6713c..77a6c2cf5 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml @@ -95,9 +95,16 @@ + + diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceMapper.xml index 71b1fc240..2d57ab2c1 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceMapper.xml @@ -65,7 +65,7 @@ and lta.create_time <= #{param.endCreateTime} - + and Locate(#{param.htMallName},lbc.client_name) > 0 order by lta.create_time desc @@ -134,20 +134,18 @@ update logpm_trunkline_advance set incoming_warehouse_name = #{incomingWarehouseName} - and id = #{advanceId} + where id = #{advanceId} diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceDetailService.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceDetailService.java index 7e014833c..6b05d8fca 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceDetailService.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceDetailService.java @@ -55,4 +55,6 @@ public interface ITrunklineAdvanceDetailService extends BaseService findIncomingWarehouseName(Long advanceId); List findNoIncomingPackageCode(Long advanceId); + + Integer findListByAdvanceIdAndPackageStatus(Long advanceId, String packageStatus); } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java index c0652592b..7f14bd922 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java @@ -108,6 +108,16 @@ public class InComingServiceImpl implements IInComingService { @Override public R findIncomingOrderList(InComingDTO inComingDTO) { List ls = advanceService.findIncomingOrderList(inComingDTO); + for (TrunklineAdvanceVO advanceVO : ls) { + Long advanceId = advanceVO.getId(); + Integer num = advanceDetailService.findListByAdvanceIdAndPackageStatus(advanceId,"0"); + if(num > 0){ + advanceVO.setIsIncoming(1); + }else{ + advanceVO.setIsIncoming(0); + } + } + return R.data(ls); } 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 97b4bf03f..45db9235e 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 @@ -906,6 +906,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { advanceDetailModel.setOrderCode(openLabelDTO.getOrderCode()); advanceDetailModel.setBrand(openLabelDTO.getBrand()); advanceDetailModel.setSystemType("线上"); + advanceDetailModel.setOrderPackageCode(basicdataCodeClient.getCodeByType(CodeNumConstant.PACKAGE,warehouseCode,orderCode)); advanceDetailModel.setFirstPackName(firsts); String sencods = openLabelDTO.getSencods(); 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 34addee2a..f42bee842 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 @@ -245,4 +245,9 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl findNoIncomingPackageCode(Long advanceId) { return baseMapper.findNoIncomingPackageCode(advanceId); } + + @Override + public Integer findListByAdvanceIdAndPackageStatus(Long advanceId, String packageStatus) { + return baseMapper.findListByAdvanceIdAndPackageStatus(advanceId,packageStatus); + } } 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 6c2403b3a..efe564331 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 @@ -1886,7 +1886,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl ls = new ArrayList<>(); ZeroOrderVO zeroOrderVO = new ZeroOrderVO(); zeroOrderVO.setOrderCode(orderCode); zeroOrderVO.setNum(num); ls.add(zeroOrderVO); - R r = warehouseTrayTypeService.enterZeroOrderByTrayCodeSync(trayType,trayCode,ls,warehouseId); + R r = warehouseTrayTypeService.enterZeroOrderByTrayCodeSync(trayType,trayCode,ls,warehouseId,remark); if(r.getCode() == 200){ return true; @@ -91,8 +91,8 @@ public class WarehouseTrayTypeClient implements IWarehouseTrayTypeClient { } @Override - public void deleteZeroOrderByTrayCode(String orderCode, String palletCode, Long wid) { - warehouseTrayTypeService.deleteZeroOrderByTrayCode(orderCode,palletCode,wid); + public void deleteZeroOrderByTrayCode(String orderCode, String palletCode, Long wid,String remark) { + warehouseTrayTypeService.deleteZeroOrderByTrayCode(orderCode,palletCode,wid,remark); } @Override @@ -101,8 +101,8 @@ public class WarehouseTrayTypeClient implements IWarehouseTrayTypeClient { } @Override - public void trayToNull(String trayCode) { - warehouseTrayTypeService.trayToNull(trayCode); + public void trayToNull(String trayCode,String remark) { + warehouseTrayTypeService.trayToNull(trayCode,remark); } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseUpdownTypeClient.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseUpdownTypeClient.java index e1693f79b..b59d46fd9 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseUpdownTypeClient.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseUpdownTypeClient.java @@ -46,7 +46,7 @@ public class WarehouseUpdownTypeClient implements IWarehouseUpdownTypeClient { private final IWarehouseUpdownTypeService warehouseUpdownTypeService; @Override - public R downPackage(String orderPackageCodes,Long warehouseId) { + public R downPackage(String orderPackageCodes,Long warehouseId,String remark) { List upShelfPackageList = new ArrayList<>(); String[] split = orderPackageCodes.split(","); for(String orderPackageCode:split){ @@ -55,7 +55,7 @@ public class WarehouseUpdownTypeClient implements IWarehouseUpdownTypeClient { upShelfPackageList.add(dto); } if(upShelfPackageList.size() > 0){ - return warehouseUpdownTypeService.downPackage(upShelfPackageList,warehouseId); + return warehouseUpdownTypeService.downPackage(upShelfPackageList,warehouseId,remark); }else{ return R.fail(403,"处理失败"); } @@ -79,7 +79,7 @@ public class WarehouseUpdownTypeClient implements IWarehouseUpdownTypeClient { @Override - public R downPackageOrDelTray(String orderPackageCodes,Long warehouseId) { + public R downPackageOrDelTray(String orderPackageCodes,Long warehouseId,String remark) { List upShelfPackageList = new ArrayList<>(); String[] split = orderPackageCodes.split(","); for(String orderPackageCode:split){ @@ -88,7 +88,7 @@ public class WarehouseUpdownTypeClient implements IWarehouseUpdownTypeClient { upShelfPackageList.add(dto); } if(!upShelfPackageList.isEmpty()){ - return warehouseUpdownTypeService.downPackageOrDelTray(upShelfPackageList,warehouseId); + return warehouseUpdownTypeService.downPackageOrDelTray(upShelfPackageList,warehouseId,remark); }else{ return R.fail(403,"处理失败"); } @@ -112,7 +112,7 @@ public class WarehouseUpdownTypeClient implements IWarehouseUpdownTypeClient { } @Override - public boolean upShelfPackage(String orderPackageCode, Long locationId, Long warehouseId) { + public boolean upShelfPackage(String orderPackageCode, Long locationId, Long warehouseId,String remark) { String[] split = orderPackageCode.split(","); List ls = new ArrayList<>(); for (String packageCode:split){ @@ -121,7 +121,7 @@ public class WarehouseUpdownTypeClient implements IWarehouseUpdownTypeClient { ls.add(upShelfPackageDTO); } - R r = warehouseUpdownTypeService.upShelfPackage(ls,locationId,warehouseId); + R r = warehouseUpdownTypeService.upShelfPackage(ls,locationId,warehouseId,remark); int code = r.getCode(); if(code == 200){ return true; @@ -146,6 +146,7 @@ public class WarehouseUpdownTypeClient implements IWarehouseUpdownTypeClient { public R downZeroOrder(List zeroOrders) { List ls = new ArrayList<>(); Long warehouseId = null; + String remark = null; for (JSONObject jsonObject:zeroOrders){ warehouseId = jsonObject.getLong("warehouseId"); UpShelfZeroOrderDTO dto = new UpShelfZeroOrderDTO(); @@ -153,12 +154,13 @@ public class WarehouseUpdownTypeClient implements IWarehouseUpdownTypeClient { dto.setWaybillCode(jsonObject.getString("waybillCode"));//运单号 dto.setEnterNum(jsonObject.getInteger("enterNum"));//件数 dto.setAllocationId(jsonObject.getLong("allocationId"));//库位id + remark = jsonObject.getString("remark"); dto.setWarehouseId(warehouseId); ls.add(dto); } if(ls.size() > 0){ - return warehouseUpdownTypeService.downZeroOrder(ls,warehouseId); + return warehouseUpdownTypeService.downZeroOrder(ls,warehouseId,remark); }else{ return R.fail(403,"处理失败"); } @@ -168,8 +170,10 @@ public class WarehouseUpdownTypeClient implements IWarehouseUpdownTypeClient { public R downStock(List stockLists) { List ls = new ArrayList<>(); Long warehouseId = null; + String remark = null; for (JSONObject jsonObject:stockLists){ warehouseId = jsonObject.getLong("warehouseId"); + remark = jsonObject.getString("remark"); UpShelfStockDTO dto = new UpShelfStockDTO(); dto.setMarketId(jsonObject.getLong("marketId"));//商场id dto.setMaterialCode(jsonObject.getString("materialCode"));//物料编码 @@ -181,7 +185,7 @@ public class WarehouseUpdownTypeClient implements IWarehouseUpdownTypeClient { } if(ls.size() > 0){ - return warehouseUpdownTypeService.downStock(ls,warehouseId); + return warehouseUpdownTypeService.downStock(ls,warehouseId,remark); }else{ return R.fail(403,"处理失败"); } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/SyncTaskErrorLogMapper.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/SyncTaskErrorLogMapper.java new file mode 100644 index 000000000..97ea820e7 --- /dev/null +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/SyncTaskErrorLogMapper.java @@ -0,0 +1,9 @@ +package com.logpm.warehouse.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.logpm.warehouse.entity.SyncTaskErrorLogEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface SyncTaskErrorLogMapper extends BaseMapper { +} diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.java index 6b0b815ac..6ab100702 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.java @@ -17,6 +17,7 @@ package com.logpm.warehouse.mapper; import com.logpm.distribution.entity.DistributionStockListEntity; +import com.logpm.warehouse.dto.QuestDetailDTO; import com.logpm.warehouse.dto.TaskSearchDTO; import com.logpm.warehouse.entity.QuestDetailChildEntity; import com.logpm.warehouse.entity.QuestDetailEntity; @@ -189,4 +190,12 @@ public interface TaskQuestMapper extends BaseMapper { List findStockList(@Param("param") TaskSearchDTO taskSearchDTO); List selectContrastStockInfo(@Param("questNum") String questNum); + + QuestDetailEntity findEntityById(@Param("questNum") String questNum,@Param("taskID") Long taskID); + + IPage findContrastList(IPage page, @Param("param") QuestDetailDTO questDetailDTO); + + List findIsChangeData(@Param("questNum") String questNum); + + Integer findStockNum(@Param("questDetailId") Long questDetailId, @Param("tableName") String tableName); } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml index 8b1d46e38..c38c81a72 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml @@ -108,7 +108,12 @@ `tray_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '托盘id（按托盘）', `allocation_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '货位id(按库位）', `grounding_allocation_id` bigint(20) NULL DEFAULT NULL COMMENT '上架后的库位ID', - `is_new` int(20) NULL DEFAULT NULL COMMENT '是否是新增数据', + `new_tray_id` bigint(20) NULL DEFAULT NULL COMMENT '新托盘ID', + `new_tray_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '新托盘编码', + `is_new` int(20) NULL DEFAULT 0 COMMENT '是否是新增数据', + `is_change` int(4) NULL DEFAULT 0 COMMENT '是否有变更 0未变更 1有变更', + `is_change_at` int(4) NULL DEFAULT 0 COMMENT '是否有变更库位托盘 0未变更 1有变更', + `has_data` int(4) NULL DEFAULT NULL COMMENT '是否有数据 0无 1有', `grounding_position_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '上架后的完整库位', `material_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '物料编码（库存品）', `firsts` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '一级品', @@ -137,14 +142,14 @@ INSERT INTO ${questNum}(`id`, `tenant_id`, `create_user`, `create_time`, `update_user`, `update_time`, `create_dept`, `is_deleted`, `status`, `reserve1`, `reserve2`, `reserve3`, `reserve4`, `reserve5`, `order_code`, `quest_id`, `order_id`, `quest_type`, `quest_target`, `order_package_code`, `order_package_id`, `category_name`, `stock_id`, `quest_status`, `stock_num`, `warehouse_id`, `position_code`, `tray_code`, `tray_id`, - `allocation_id`, `grounding_allocation_id`, `is_new`, `grounding_position_code`, `material_code`, `market_name`, `firsts`, `second`, + `allocation_id`, `grounding_allocation_id`, `is_new`,`has_data`, `grounding_position_code`, `material_code`, `market_name`, `firsts`, `second`, `third_product`, `incoming_batch`, `material_name`, `waybill_number`,`send_warehouse_name`,`tray_name`,`brand_name`) VALUES (#{item.id}, #{item.tenantId}, #{item.createUser}, #{item.createTime}, #{item.updateUser}, #{item.updateTime}, #{item.createDept}, #{item.isDeleted} , #{item.status}, #{item.reserve1}, #{item.reserve2}, #{item.reserve3}, #{item.reserve4}, #{item.reserve5}, #{item.orderCode}, #{item.questId}, #{item.orderId} , #{item.questType}, #{item.questTarget}, #{item.orderPackageCode}, #{item.orderPackageId}, #{item.categoryName}, #{item.stockId}, #{item.questStatus}, #{item.stockNum}, #{item.warehouseId} , #{item.positionCode}, #{item.trayCode}, #{item.trayId}, #{item.allocationId}, #{item.groundingAllocationId}, - #{item.isNew}, #{item.groundingPositionCode}, #{item.materialCode}, #{item.marketName} , #{item.firsts} , #{item.second} , + #{item.isNew},#{item.hasData}, #{item.groundingPositionCode}, #{item.materialCode}, #{item.marketName} , #{item.firsts} , #{item.second} , #{item.thirdProduct} , #{item.incomingBatch}, #{item.materialName}, #{item.waybillNumber}, #{item.sendWarehouseName},#{item.trayName},#{item.brandName} ) @@ -159,8 +164,8 @@ and quest_type =#{param.questType } and quest_target =#{param.questTarget } and warehouse_id =#{param.warehouseId } - and allocation_id =#{param.allocationId } - and tray_id =#{param.trayId } + and (allocation_id =#{param.allocationId } or grounding_allocation_id = #{param.allocationId}) + and (tray_id =#{param.trayId } or new_tray_id = #{param.trayId}) and order_code =#{param.orderCode } and order_package_code =#{param.orderPackageCode } and CONCAT(order_package_code, order_code) like concat('%',#{param.code},'%') @@ -215,12 +220,12 @@ and quest_type =#{param.questType } and quest_target =#{param.questTarget } and warehouse_id =#{param.warehouseId } - and allocation_id =#{param.allocationId } - and tray_id =#{param.trayId } + and (allocation_id =#{param.allocationId } or grounding_allocation_id =#{param.allocationId }) + and (tray_id =#{param.trayId } or new_tray_id =#{param.trayId }) and order_code =#{param.orderCode } and order_package_code =#{param.orderPackageCode } - and material_name in + and market_name in #{a} @@ -287,8 +292,8 @@ and quest_type = #{param.questType } and quest_target =#{param.questTarget } and warehouse_id =#{param.warehouseId } - and allocation_id =#{param.allocationId } - and tray_id =#{param.trayId } + and (allocation_id =#{param.allocationId } or grounding_allocation_id =#{param.allocationId }) + and (tray_id =#{param.trayId } or new_tray_id =#{param.trayId }) and tray_id is not null @@ -317,6 +322,10 @@ update_time = #{item.updateTime }, inventory_user = #{item.inventoryUser }, inventory_time = #{item.inventoryTime }, + is_change = #{item.isChange }, + new_tray_id = #{item.newTrayId }, + new_tray_code = #{item.newTrayCode }, + is_change_at = #{item.isChangeAt }, - - - - - - - - WHERE `id` = #{ item.id } + set cargo_name = #{item.cargoName }, + quest_num = #{item.questNum } + where `id` = #{ item.id } @@ -672,4 +672,30 @@ from ${questNum} lqd where quest_status =0 + + + + + + + + + diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayGoodsMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayGoodsMapper.xml index a69ee4162..dd89f4edd 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayGoodsMapper.xml +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayGoodsMapper.xml @@ -283,7 +283,8 @@ - - + + + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java index cf01390c8..f3b6496df 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java @@ -76,6 +76,7 @@ import org.springblade.core.tool.utils.BeanUtil; import org.springblade.core.tool.utils.Func; import org.springblade.core.tool.utils.ObjectUtil; import org.springblade.system.cache.DictBizCache; +import org.springblade.system.entity.User; import org.springblade.system.feign.IUserClient; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.beans.BeanUtils; @@ -1024,7 +1025,7 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl planBillLadingPackage =baseMapper.selectPackagePlanBillLading(parcelListEntity.getOrderPackageCode(), myCurrentWarehouse.getId()); + if (Func.isNotEmpty(planBillLadingPackage)){ + parcelListNodeVOS.addAll(planBillLadingPackage); + } + //查询自提取消 + List cancelBillLadingPackage =baseMapper.selectPackageCancelBillLading(parcelListEntity.getOrderPackageCode(), myCurrentWarehouse.getId()); + if (Func.isNotEmpty(cancelBillLadingPackage)){ + cancelBillLadingPackage.forEach(s->{ + R userR = userClient.userInfoById(s.getNodeControlsUserId()); + s.setNodeControlsUserName(userR.getData().getName()); + }); + parcelListNodeVOS.addAll(cancelBillLadingPackage); + } + //查询自提签收扫描 + List signForBillLadingPackage =baseMapper.selectPackageSignForlBillLading(parcelListEntity.getOrderPackageCode(), myCurrentWarehouse.getId()); + if (Func.isNotEmpty(signForBillLadingPackage)){ + signForBillLadingPackage.forEach(s->{ + R userR = userClient.userInfoById(s.getNodeControlsUserId()); + s.setNodeControlsUserName(userR.getData().getName()); + }); + parcelListNodeVOS.addAll(signForBillLadingPackage); + } //查询计划取消的包件 List cancelPlanDeliveryPackage = baseMapper.selectPackageCancelPlanDelivery(parcelListEntity.getOrderPackageCode(), myCurrentWarehouse.getId()); if (Func.isNotEmpty(cancelPlanDeliveryPackage)) { diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java index d12c5fcf1..6af3dd11c 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java @@ -1019,7 +1019,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl updateWrapper = new UpdateWrapper<>(); updateWrapper.lambda() .in(DistrilbutionBillPackageEntity::getBillLadingId, ids) - .set(DistrilbutionBillPackageEntity::getPacketBarStatus, "3") + .set(DistrilbutionBillPackageEntity::getPacketBarStatus, "2") ; distrilbutionBillPackageService.update(updateWrapper); @@ -1027,7 +1027,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl orderUpdateWrapper = new UpdateWrapper<>(); orderUpdateWrapper.lambda() .in(DistrilbutionBillStockEntity::getBillLadingId, ids) - .set(DistrilbutionBillStockEntity::getOrderStatus, "3") + .set(DistrilbutionBillStockEntity::getOrderStatus, "2") ; distrilbutionBillStockService.update(orderUpdateWrapper); @@ -1047,7 +1047,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl Date: Sun, 7 Apr 2024 14:02:51 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E8=87=AA=E6=8F=90=E5=8D=95=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2=E8=BF=99=E5=B1=95=E7=A4=BA=E8=BF=90?= =?UTF-8?q?=E5=8D=95=E6=94=B6=E8=B4=A7=E4=BA=BA=E3=80=81=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E7=94=B5=E8=AF=9D=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/mapper/DistrilbutionBillLadingMapper.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml index 8838b6337..d5fabdffe 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml @@ -37,7 +37,7 @@ GROUP_CONCAT(DISTINCT dsa.service_number) serviceNumber, GROUP_CONCAT(DISTINCT dsa.waybill_number) waybillNumber, GROUP_CONCAT(DISTINCT dsa.consignee_unit) - consigneeUnit,GROUP_CONCAT(DISTINCT dsa.customer_name) customerName, + consigneeUnit,GROUP_CONCAT(DISTINCT dsa.consignee_person) customerName, GROUP_CONCAT(DISTINCT dsa.customer_telephone) customerTelephone,dsa.warehouse,dsa.warehouse_entry_time warehouseEntryTime,dsa.storage_fee storageFee, @@ -430,8 +430,8 @@ GROUP_CONCAT(DISTINCT ANY_VALUE(ldsa.waybill_number)) AS waybillNumber, GROUP_CONCAT(DISTINCT ANY_VALUE(ldsa.service_number)) AS serviceNumber, GROUP_CONCAT(DISTINCT ANY_VALUE(ldsa.consignee_unit)) AS consigneeUnit, - GROUP_CONCAT(DISTINCT ANY_VALUE(ldsa.customer_name)) AS customerName, - GROUP_CONCAT(DISTINCT ANY_VALUE(ldsa.customer_telephone)) AS customerTelephone + GROUP_CONCAT(DISTINCT ANY_VALUE(ldsa.consignee_person)) AS customerName, + GROUP_CONCAT(DISTINCT ANY_VALUE(ldsa.consignee_mobile)) AS customerTelephone FROM logpm_distrilbution_bill_lading ldbl LEFT JOIN logpm_distrilbution_bill_stock ldbs ON ldbl.id = ldbs.bill_lading_id LEFT JOIN logpm_distribution_stock_article ldsa ON ldbs.stock_article_id = ldsa.id From 90a4f7e0ee4beffade57e6f6a7c6c9202b38df2b Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Sun, 7 Apr 2024 14:03:40 +0800 Subject: [PATCH 10/12] =?UTF-8?q?=E8=87=AA=E6=8F=90=E5=8D=95=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2=E8=BF=99=E5=B1=95=E7=A4=BA=E8=BF=90?= =?UTF-8?q?=E5=8D=95=E6=94=B6=E8=B4=A7=E4=BA=BA=E3=80=81=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E7=94=B5=E8=AF=9D=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml index d5fabdffe..ae1b8dd7e 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml @@ -433,7 +433,7 @@ GROUP_CONCAT(DISTINCT ANY_VALUE(ldsa.consignee_person)) AS customerName, GROUP_CONCAT(DISTINCT ANY_VALUE(ldsa.consignee_mobile)) AS customerTelephone FROM logpm_distrilbution_bill_lading ldbl - LEFT JOIN logpm_distrilbution_bill_stock ldbs ON ldbl.id = ldbs.bill_lading_id + LEFT JOIN logpm_distrilbution_bill_stock ldbs ON ldbl.id = ldbs.bill_lading_id AND order_status != '2' LEFT JOIN logpm_distribution_stock_article ldsa ON ldbs.stock_article_id = ldsa.id WHERE ldbl.id = #{id} GROUP BY ldbl.id; From 7b476f94685d5015da8d1938402bf98788fd79cb Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Sun, 7 Apr 2024 14:04:18 +0800 Subject: [PATCH 11/12] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BF-=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trunkline/service/impl/TrunklineAdvanceServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java index 27d105d19..83d6942f9 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java @@ -142,7 +142,7 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl Date: Sun, 7 Apr 2024 14:21:17 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E8=87=AA=E6=8F=90=E5=8F=96=E6=B6=88BUG?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DistrilbutionBillLadingServiceImpl.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java index 6af3dd11c..9b8937230 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java @@ -1034,6 +1034,19 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl packageIds = distributionParcelListEntities.stream().map(DistributionParcelListEntity::getId).collect(Collectors.toList()); //将这些包件还原成可操作状态 Integer num = distributionParcelListService.restorePakcageByIds(packageIds); + log.info("######################取消自提单释放包件>>>>>:{}",num); + ids.forEach(id ->{ + //查询自提单存在的零担订单 + List reservationZeroPackageEntities = distributionZeroPackageService.list(Wrappers.query().lambda() + .eq(DistributionReservationZeroPackageEntity::getReservationId, id) + .ne(DistributionReservationZeroPackageEntity::getZeroPackageStatus, "2") + ); + if (Func.isNotEmpty(reservationZeroPackageEntities)){ + List collect = reservationZeroPackageEntities.stream().map(DistributionReservationZeroPackageEntity::getStockArticleId).distinct().collect(Collectors.toList()); + //释放零担资源 + distributionZeroPackageService.recoverZeroPackage(id,collect); + } + }); //维护订单状态 String orderCodes = distributionParcelListEntities.stream().map(DistributionParcelListEntity::getOrderCode).distinct().collect(Collectors.joining(",")); distributionStockArticleService.maintenanceOrderInfo(orderCodes, myCurrentWarehouse.getId()); @@ -1058,7 +1071,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl updateWrapper = new UpdateWrapper<>(); updateWrapper.lambda() - .set(DistributionDeliveryDetailsEntity::getInventoryStatus, 3) + .set(DistributionDeliveryDetailsEntity::getInventoryStatus, 2) .set(DistributionDeliveryDetailsEntity::getQuantity, 0) .in(DistributionDeliveryDetailsEntity::getBillLadingId, ids); distributionDeliveryDetailsService.update(updateWrapper);