From 7ae6ed2aac44745501f2249daebc1b508fc24632 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Fri, 10 Jul 2026 10:42:38 +0800 Subject: [PATCH 01/58] =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E7=89=A9=E6=96=99=E6=95=B0=E9=87=8F;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/stockInOrder/service/StockInOrderDomainService.java | 2 +- .../stockOutOrder/service/StockOutOrderDomainService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java index 32a91bbe5..d423d3ebd 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java @@ -107,7 +107,7 @@ public class StockInOrderDomainService { // //设置物料信息 // setMaterialDetailInfo(stockInOrderDO); // //统计总物料种数 -// stockInOrderDO.setMaterialQuantity(stockInOrderDO.getMaterialDetailList().size()); + stockInOrderDO.setMaterialQuantity(stockInOrderDO.getMaterialDetailList().size()); // //统计总计划数 // BigDecimal quantity = stockInOrderDO.getMaterialDetailList().stream().map(InMaterialDetailDO::getQuantity).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add); // stockInOrderDO.setQuantity(quantity); diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java index 070410be6..36b4a1909 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java @@ -166,7 +166,7 @@ public class StockOutOrderDomainService { //设置物料信息 //setMaterialDetailInfo(stockOutOrderDO); //统计种类 - //stockOutOrderDO.setMaterialQuantity(stockOutOrderDO.getMaterialDetailList().size()); + stockOutOrderDO.setMaterialQuantity(stockOutOrderDO.getMaterialDetailList().size()); //统计总数量 BigDecimal quantity = stockOutOrderDO.getMaterialDetailList().stream().map(OutMaterialDetailDO::getOutboundQuantity).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add); stockOutOrderDO.setQuantity(quantity); From bbe8ce3523b3d11d329297150cc8e26872b85de6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Fri, 10 Jul 2026 14:15:34 +0800 Subject: [PATCH 02/58] =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8D=95pda=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/stockInOrder/entity/StockInOrder.java | 9 +++++++++ .../repository/po/StockInOrderPO.java | 8 ++++++++ .../repository/todo/StockInOrderDO.java | 16 ++++++++++++++++ .../dto/stockInOrder/StockInOrderDTO.java | 15 +++++++++++++++ .../mapper/stockInOrder/StockInOrderMapper.xml | 10 ++++++++++ 5 files changed, 58 insertions(+) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/entity/StockInOrder.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/entity/StockInOrder.java index 0da6467d4..efae4e032 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/entity/StockInOrder.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/entity/StockInOrder.java @@ -382,4 +382,13 @@ public class StockInOrder extends BaseVOEntity { @ApiModelProperty("推送人姓名") private String pushByName; + + @ApiModelProperty("作业人用户ID") + private Long workUserId; + + @ApiModelProperty("作业任务接收状态") + private String workTaskReceiveStatus; + + @ApiModelProperty("任务下发用户ID") + private String taskIssueUserId; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/po/StockInOrderPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/po/StockInOrderPO.java index 19a78ed27..ebdb794b0 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/po/StockInOrderPO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/po/StockInOrderPO.java @@ -444,4 +444,12 @@ public class StockInOrderPO extends BaseVOEntity { private String pushByName; private String khdm; + @ApiModelProperty("作业人用户ID") + private Long workUserId; + + @ApiModelProperty("作业任务接收状态") + private String workTaskReceiveStatus; + + @ApiModelProperty("任务下发用户ID") + private String taskIssueUserId; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/todo/StockInOrderDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/todo/StockInOrderDO.java index 4f131966d..ab930d976 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/todo/StockInOrderDO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/todo/StockInOrderDO.java @@ -428,4 +428,20 @@ public class StockInOrderDO extends BaseVOEntity { @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createTimeTo; + + //仓码pda查询参数 + @ApiModelProperty("pda查询用户ID") + private Long queryUserId; + @ApiModelProperty("状态列表") + private List statusList; + + + @ApiModelProperty("作业人用户ID") + private Long workUserId; + + @ApiModelProperty("作业任务接收状态") + private String workTaskReceiveStatus; + + @ApiModelProperty("任务下发用户ID") + private String taskIssueUserId; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockInOrder/StockInOrderDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockInOrder/StockInOrderDTO.java index ad6b20d0f..e30c47148 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockInOrder/StockInOrderDTO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockInOrder/StockInOrderDTO.java @@ -426,4 +426,19 @@ public class StockInOrderDTO extends StockInOrderBaseDTO { @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createTimeTo; + + //仓码pda查询参数 + @ApiModelProperty("pda查询用户ID") + private Long queryUserId; + @ApiModelProperty("状态列表") + private List statusList; + + @ApiModelProperty("作业人用户ID") + private Long workUserId; + + @ApiModelProperty("作业任务接收状态") + private String workTaskReceiveStatus; + + @ApiModelProperty("任务下发用户ID") + private String taskIssueUserId; } \ No newline at end of file diff --git a/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml b/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml index a1a04ed25..952183fd7 100644 --- a/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml +++ b/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml @@ -342,6 +342,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{item} + + + and a.status in + + #{item} + + + + and a.TASK_ISSUE_USER_ID like CONCAT(#{queryUserId}, '%') + and a."TO" like concat('%', #{to}, '%') From 1381bcee720ace51ef3d97498d61ecb793088262 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Fri, 10 Jul 2026 14:17:46 +0800 Subject: [PATCH 03/58] =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8D=95pda=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/stockInOrder/StockInOrderMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml b/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml index 952183fd7..cb5326e20 100644 --- a/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml +++ b/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml @@ -350,7 +350,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - and a.TASK_ISSUE_USER_ID like CONCAT(#{queryUserId}, '%') + and a.TASK_ISSUE_USER_ID like concat('%', #{queryUserId}, '%') From f4f2573af73f99ccffefefbaa403125eed4d94ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Fri, 10 Jul 2026 15:26:06 +0800 Subject: [PATCH 04/58] =?UTF-8?q?=E4=BB=93=E7=A0=81pda=E6=94=B9=E9=80=A0;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/api/domain/WarehouseFeignPO.java | 8 ++++++- .../domain/warehouse/entity/Warehouse.java | 7 ++++++ .../warehouse/repository/po/WarehousePO.java | 6 +++++ .../repository/todo/WarehouseDO.java | 8 +++++++ .../dto/warehouse/WarehouseDTO.java | 8 +++++++ .../basic/warehouse/WarehouseMapper.xml | 9 +++++++- .../StockInOrderApplicationService.java | 15 ++++++++++++- .../StockOutOrderApplicationService.java | 22 +++++++++++++++---- .../repository/mapper/StockInOrderMapper.java | 4 +++- .../stockOutOrder/entity/StockOutOrder.java | 9 ++++++++ .../listener/ExcelParseService.java | 7 ++++++ .../repository/po/StockOutOrderPO.java | 8 +++++++ .../repository/todo/StockOutOrderDO.java | 15 +++++++++++++ .../service/StockOutOrderDomainService.java | 6 +++++ .../dto/stockOutOrder/StockOutOrderDTO.java | 14 ++++++++++++ .../stockInOrder/StockInOrderMapper.xml | 11 +++++++++- .../stockOutOrder/StockOutOrderMapper.xml | 14 +++++++++++- 17 files changed, 161 insertions(+), 10 deletions(-) diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/WarehouseFeignPO.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/WarehouseFeignPO.java index b064dc0df..04b023713 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/WarehouseFeignPO.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/WarehouseFeignPO.java @@ -116,6 +116,12 @@ public class WarehouseFeignPO extends BaseVOEntity{ @Excel(name = "是否作废: 1-否 2-是") private Integer nullify; + @ApiModelProperty("任务模式") + @Excel(name = "任务模式") + private String taskMode; + @ApiModelProperty("作业模式") + @Excel(name = "作业模式") + private String workMode; -} +} \ No newline at end of file diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/warehouse/entity/Warehouse.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/warehouse/entity/Warehouse.java index 6aec2e620..4564aa5b9 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/warehouse/entity/Warehouse.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/warehouse/entity/Warehouse.java @@ -122,5 +122,12 @@ public class Warehouse extends BaseVOEntity{ @Excel(name = "是否启用: 1-否 2-是") private Integer isEnable; + @ApiModelProperty("任务模式") + @Excel(name = "任务模式") + private String taskMode; + + @ApiModelProperty("作业模式") + @Excel(name = "作业模式") + private String workMode; } \ No newline at end of file diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/warehouse/repository/po/WarehousePO.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/warehouse/repository/po/WarehousePO.java index c42b2f6b6..1127d377d 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/warehouse/repository/po/WarehousePO.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/warehouse/repository/po/WarehousePO.java @@ -124,5 +124,11 @@ public class WarehousePO extends BaseVOEntity{ private Integer isEnable; @ApiModelProperty("库区集合") private List storageSectionList; + @ApiModelProperty("任务模式") + @Excel(name = "任务模式") + private String taskMode; + @ApiModelProperty("作业模式") + @Excel(name = "作业模式") + private String workMode; } \ No newline at end of file diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/warehouse/repository/todo/WarehouseDO.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/warehouse/repository/todo/WarehouseDO.java index f5bd4ec85..097528ef2 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/warehouse/repository/todo/WarehouseDO.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/warehouse/repository/todo/WarehouseDO.java @@ -131,4 +131,12 @@ public class WarehouseDO extends BaseVOEntity{ private String orgIds; @ApiModelProperty("组织id 集合") private List orgIdList; + + @ApiModelProperty("任务模式") + @Excel(name = "任务模式") + private String taskMode; + + @ApiModelProperty("作业模式") + @Excel(name = "作业模式") + private String workMode; } \ No newline at end of file diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/warehouse/WarehouseDTO.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/warehouse/WarehouseDTO.java index 62bd089cf..8b1b164aa 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/warehouse/WarehouseDTO.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/warehouse/WarehouseDTO.java @@ -136,4 +136,12 @@ public class WarehouseDTO extends BaseVOEntity{ private String orgIds; @ApiModelProperty("组织id 集合") private List orgIdList; + + @ApiModelProperty("任务模式") + @Excel(name = "任务模式") + private String taskMode; + + @ApiModelProperty("作业模式") + @Excel(name = "作业模式") + private String workMode; } \ No newline at end of file diff --git a/mhd-modules/mhd-system/src/main/resources/mapper/basic/warehouse/WarehouseMapper.xml b/mhd-modules/mhd-system/src/main/resources/mapper/basic/warehouse/WarehouseMapper.xml index 04fcb50ca..ec3402469 100644 --- a/mhd-modules/mhd-system/src/main/resources/mapper/basic/warehouse/WarehouseMapper.xml +++ b/mhd-modules/mhd-system/src/main/resources/mapper/basic/warehouse/WarehouseMapper.xml @@ -37,11 +37,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + - select warehouse_id, organization_id, organization_name, top_organization_id, warehouse_code, warehouse_name, warehouse_type, warehouse_type_name, warehouse_structure, warehouse_nature, warm_layer_code, warm_layer_name, director_name, director_phone, region_code, region_name, detail_address, longitude, latitude, building_region, usage_region, remark, opening_up, nullify, create_time, create_by, create_by_name, update_time, update_by, update_by_name, del_flag, IS_ENABLE from warehouse + select warehouse_id, organization_id, organization_name, top_organization_id, warehouse_code, warehouse_name, + warehouse_type, warehouse_type_name, warehouse_structure, warehouse_nature, warm_layer_code, warm_layer_name, + director_name, director_phone, region_code, region_name, detail_address, longitude, latitude, building_region, + usage_region, remark, opening_up, nullify, create_time, create_by, create_by_name, update_time, update_by, + update_by_name, del_flag, IS_ENABLE ,WORK_MODE,TASK_MODE + from warehouse diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java index 6d9b63602..db327932a 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java @@ -45,6 +45,7 @@ import com.mhd.wms.domain.receiptOrderAccount.repository.facade.IReceiptOrderAcc import com.mhd.wms.domain.stockInOrder.entity.StockInOrder; import com.mhd.wms.domain.stockInOrder.repository.facade.IStockInOrderService; import com.mhd.wms.domain.stockInOrder.entity.StockInOrder; +import com.mhd.wms.domain.stockInOrder.repository.mapper.StockInOrderMapper; import com.mhd.wms.domain.stockInOrder.repository.po.StockInOrderPO; import com.mhd.wms.domain.stockInOrder.repository.todo.StockInOrderDO; import com.mhd.wms.domain.stockInOrder.repository.vo.GwInDetail; @@ -119,6 +120,8 @@ public class StockInOrderApplicationService { @Autowired private StockOutOrderMapper stockOutOrderMapper; @Autowired + private StockInOrderMapper stockInOrderMapper; + @Autowired private PickingMaterialDetailMapper pickingMaterialDetailMapper; private static final String PUSH_API_URL = "http://10.102.192.15/nagu-erp-api/transfer/pushData"; private static final String API_NAME = "save_order_i"; @@ -563,6 +566,9 @@ public class StockInOrderApplicationService { public void omsOrderAdd(StockInOrder stockInOrder){ + // 设置任务下发用户ID + String userId = stockInOrderMapper.queryWarehouseUserId(stockInOrder.getOrganizationId(), stockInOrder.getWarehouseId(), stockInOrder.getTopOrganizationId()); + stockInOrder.setTaskIssueUserId(userId); stockInOrderDomainService.omsOrderAdd(stockInOrder); } @@ -1795,7 +1801,10 @@ public class StockInOrderApplicationService { supplierParam(order); // 设置数据字典键值 setDataDict(order); - + + // 设置任务下发用户ID + String userId = stockInOrderMapper.queryWarehouseUserId(order.getOrganizationId(), order.getWarehouseId(), order.getTopOrganizationId()); + order.setTaskIssueUserId(userId); orderList.add(order); } @@ -1915,6 +1924,10 @@ public class StockInOrderApplicationService { if (stockInOrderDO.getWarehouseId() == null) { throw new ServiceException("仓库ID不能为空"); } + + //任务下发用户ID + String userIds = stockInOrderMapper.queryWarehouseUserId(stockInOrderDO.getOrganizationId(), stockInOrderDO.getWarehouseId(), stockInOrderDO.getTopOrganizationId()); + stockInOrderDO.setTaskIssueUserId(userIds); AjaxResult ajaxResult = systemServiceFeign.getWarehouseInfoByWarehouseId(stockInOrderDO.getWarehouseId()); if (ajaxResult == null) { throw new ServiceException("获取仓库信息失败：返回结果为空，仓库ID：" + stockInOrderDO.getWarehouseId()); diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java index da4f96954..dc276dd38 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java @@ -50,6 +50,7 @@ import com.mhd.wms.domain.pickingMaterialDetail.repository.po.PickingMaterialDet import com.mhd.wms.domain.stockInOrder.entity.StockInOrder; import com.mhd.wms.domain.receiptOrderAccount.entity.ReceiptOrderAccount; import com.mhd.wms.domain.receiptOrderAccount.repository.facade.IReceiptOrderAccountService; +import com.mhd.wms.domain.stockInOrder.repository.mapper.StockInOrderMapper; import com.mhd.wms.domain.stockOutOrder.entity.StockOutOrder; import com.mhd.wms.domain.stockOutOrder.repository.facade.IStockOutOrderService; import com.mhd.wms.domain.stockOutOrder.repository.mapper.StockOutOrderMapper; @@ -117,6 +118,8 @@ public class StockOutOrderApplicationService { @Autowired private StockOutOrderMapper stockOutOrderMapper; @Autowired + private StockInOrderMapper stockInOrderMapper; + @Autowired private PickingMaterialDetailMapper pickingMaterialDetailMapper; private static final String PUSH_API_URL = "http://10.102.192.15/nagu-erp-api/transfer/pushData"; private static final String API_NAME = "save_order_e"; @@ -294,14 +297,20 @@ public class StockOutOrderApplicationService { */ public Boolean insert(StockOutOrderDO stockOutOrderDO) { //设置仓库 - //setWarehouseInfo(stockOutOrderDO); + setWarehouseInfo(stockOutOrderDO); //设置货主信息 shipperParam(stockOutOrderDO); //设置客户信息 customerParam(stockOutOrderDO); - stockOutOrderDO.setOrderTypeCode("pu_tong_chu_ku"); - stockOutOrderDO.setBusinessType("pu_tong_chu_ku"); - stockOutOrderDO.setOrderTypeName("普通出库"); + if (stockOutOrderDO.getOrderTypeCode() == null) { + stockOutOrderDO.setOrderTypeCode("pu_tong_chu_ku"); + } + if (stockOutOrderDO.getBusinessType() == null) { + stockOutOrderDO.setBusinessType("pu_tong_chu_ku"); + } + if (stockOutOrderDO.getOrderTypeName() == null) { + stockOutOrderDO.setOrderTypeName("普通出库"); + } //设置数据字典键值 //setDataDict(stockOutOrderDO); return stockOutOrderDomainService.insert(stockOutOrderDO); @@ -311,6 +320,8 @@ public class StockOutOrderApplicationService { * 修改出库单 */ public Boolean update(StockOutOrderDO stockOutOrderDO) { + //设置仓库 + setWarehouseInfo(stockOutOrderDO); return stockOutOrderDomainService.update(stockOutOrderDO); } @@ -1354,6 +1365,9 @@ public class StockOutOrderApplicationService { if (stockOutOrderDO.getWarehouseId() == null) { throw new ServiceException("仓库ID不能为空"); } + // 获取任务下发用户ID + String userId = stockInOrderMapper.queryWarehouseUserId(stockOutOrderDO.getOrganizationId(), stockOutOrderDO.getWarehouseId(), stockOutOrderDO.getTopOrganizationId()); + stockOutOrderDO.setTaskIssueUserId(userId); AjaxResult ajaxResult = systemServiceFeign.getWarehouseInfoByWarehouseId(stockOutOrderDO.getWarehouseId()); if(!"200".equals(String.valueOf(ajaxResult.get("code")))){ throw new ServiceException("获取仓库信息失败"); diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/mapper/StockInOrderMapper.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/mapper/StockInOrderMapper.java index 7e447d800..15c9d20b5 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/mapper/StockInOrderMapper.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/mapper/StockInOrderMapper.java @@ -30,4 +30,6 @@ public interface StockInOrderMapper extends BaseMapper List queryNoticePrintDetail(StockInOrderDO stockInOrderDO); StockInOrderPO selectByInOrderNumber(@Param("inOrderNumber") String inOrderNumber); -} + + String queryWarehouseUserId(@Param("organizationId") Long organizationId, @Param("warehouseId") Long warehouseId, @Param("topOrganizationId") Long topOrganizationId); +} \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/entity/StockOutOrder.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/entity/StockOutOrder.java index 0d67f7fa2..39d464489 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/entity/StockOutOrder.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/entity/StockOutOrder.java @@ -424,4 +424,13 @@ public class StockOutOrder extends BaseVOEntity { @ApiModelProperty("推送人姓名") private String pushByName; + + @ApiModelProperty("作业人用户ID") + private Long workUserId; + + @ApiModelProperty("作业任务接收状态") + private String workTaskReceiveStatus; + + @ApiModelProperty("任务下发用户ID") + private String taskIssueUserId; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/listener/ExcelParseService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/listener/ExcelParseService.java index 8fb6472db..ede734c42 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/listener/ExcelParseService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/listener/ExcelParseService.java @@ -25,6 +25,7 @@ import com.mhd.wms.domain.materialBaseInfo.repository.mapper.MaterialBaseInfoMap import com.mhd.wms.domain.materialBaseInfo.repository.po.MaterialBaseInfoPO; import com.mhd.wms.domain.materialBaseInfo.repository.todo.MaterialBaseInfoDO; import com.mhd.wms.domain.outMaterialDetail.repository.todo.OutMaterialDetailDO; +import com.mhd.wms.domain.stockInOrder.repository.mapper.StockInOrderMapper; import com.mhd.wms.domain.stockOutOrder.entity.StockOutOrder; import com.mhd.wms.domain.stockOutOrder.repository.facade.IStockOutOrderService; import com.mhd.wms.domain.stockOutOrder.repository.mapper.StockOutOrderMapper; @@ -61,6 +62,8 @@ public class ExcelParseService { private StockOutOrderDomainService stockOutOrderDomainService; @Autowired private StockOutOrderMapper stockOutOrderMapper; + @Autowired + private StockInOrderMapper stockInOrderMapper; @Resource private UserServiceFeign userServiceFeign; /** @@ -114,6 +117,7 @@ public class ExcelParseService { stockOutOrder.setWarehouseName(warehouseName); stockOutOrder.setWarehouseCode(warehouseCode); stockOutOrder.setWarehouseId(warehouseId); + stockOutOrder.setSalesmanId(String.valueOf(loginUser.getUserPo().getUserId())); stockOutOrder.setSalesmanName(loginUser.getUserPo().getUserName()); String settlementCurrency = stockOutOrderMapper.getSettlementCurrency(shipperId); @@ -124,6 +128,9 @@ public class ExcelParseService { stockOutOrder.setOrganizationId(loginUser.getUserPo().getOrganizationId()); stockOutOrder.setOrganizationName(loginUser.getUserPo().getOrganizationName()); } + // 获取任务下发用户ID + String userId = stockInOrderMapper.queryWarehouseUserId(stockOutOrder.getOrganizationId(), stockOutOrder.getWarehouseId(), stockOutOrder.getTopOrganizationId()); + stockOutOrder.setTaskIssueUserId(userId); initParam(stockOutOrder); // 导入出库单时，如果出库单类型为空，默认设置为普通出库 if (StringUtils.isBlank(stockOutOrder.getOrderTypeCode())) { diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/po/StockOutOrderPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/po/StockOutOrderPO.java index 413f72731..f3f206de8 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/po/StockOutOrderPO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/po/StockOutOrderPO.java @@ -451,4 +451,12 @@ public class StockOutOrderPO extends BaseVOEntity { @ApiModelProperty("推送人姓名") private String pushByName; private String khdm; + @ApiModelProperty("作业人用户ID") + private Long workUserId; + + @ApiModelProperty("作业任务接收状态") + private String workTaskReceiveStatus; + + @ApiModelProperty("任务下发用户ID") + private String taskIssueUserId; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/todo/StockOutOrderDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/todo/StockOutOrderDO.java index adece8789..b1c4ccd13 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/todo/StockOutOrderDO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/todo/StockOutOrderDO.java @@ -492,4 +492,19 @@ public class StockOutOrderDO extends BaseVOEntity { @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createTimeTo; + + @ApiModelProperty("作业人用户ID") + private Long workUserId; + + @ApiModelProperty("作业任务接收状态") + private String workTaskReceiveStatus; + + @ApiModelProperty("任务下发用户ID") + private String taskIssueUserId; + + //仓码pda查询参数 + @ApiModelProperty("pda查询用户ID") + private Long queryUserId; + @ApiModelProperty("状态列表") + private List statusList; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java index 36b4a1909..6bf396e6d 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java @@ -70,6 +70,7 @@ import com.mhd.wms.domain.replenishmentNotice.repository.todo.ReplenishmentNotic import com.mhd.wms.domain.replenishmentNotice.service.ReplenishmentNoticeDomainService; import com.mhd.wms.domain.statementStatistics.po.ImmediateInventoryPO; import com.mhd.wms.domain.stockInOrder.entity.StockInOrder; +import com.mhd.wms.domain.stockInOrder.repository.mapper.StockInOrderMapper; import com.mhd.wms.domain.stockInOrder.repository.todo.StockInOrderDO; import com.mhd.wms.domain.stockInOrder.service.StockInOrderDomainService; import com.mhd.wms.domain.stockOutOrder.entity.StockOutOrder; @@ -149,6 +150,8 @@ public class StockOutOrderDomainService { private IPickingMaterialDetailService pickingMaterialDetailService; @Autowired private IPickingOrderService pickingOrderService; + @Autowired + private StockInOrderMapper stockInOrderMapper; /** * 分页查询出库单列表 */ @@ -1986,6 +1989,9 @@ public class StockOutOrderDomainService { private static final String OMS_AUTO_AUDIT_REMARK = "OMS下发自动审核"; public void omsOrderAdd(StockOutOrder stockOutOrder) { + // 任务下发用户id + String userId = stockInOrderMapper.queryWarehouseUserId(stockOutOrder.getOrganizationId(), stockOutOrder.getWarehouseId(), stockOutOrder.getTopOrganizationId()); + stockOutOrder.setTaskIssueUserId(userId); stockOutOrderService.save(stockOutOrder); } diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockOutOrder/StockOutOrderDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockOutOrder/StockOutOrderDTO.java index 4d5862483..65f5a7398 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockOutOrder/StockOutOrderDTO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockOutOrder/StockOutOrderDTO.java @@ -484,4 +484,18 @@ public class StockOutOrderDTO extends StockOutOrderBaseDTO { @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createTimeTo; + @ApiModelProperty("作业人用户ID") + private Long workUserId; + + @ApiModelProperty("作业任务接收状态") + private String workTaskReceiveStatus; + + @ApiModelProperty("任务下发用户ID") + private String taskIssueUserId; + + //仓码pda查询参数 + @ApiModelProperty("pda查询用户ID") + private Long queryUserId; + @ApiModelProperty("状态列表") + private List statusList; } \ No newline at end of file diff --git a/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml b/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml index cb5326e20..ab42bbf12 100644 --- a/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml +++ b/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml @@ -101,6 +101,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + @@ -134,7 +137,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a."TO", a.CONTACT_PERSON, a.VEHICLE_INFO, a.CONSIGNMENT_NO, a.TEL, a.DRIVER_SIGNATURE, a.FAX, a.DECLARATION_AREA, a.MANUFACTURER, a.CUSTOMS_BROKER_INFO, a.DELIVERY_ADDRESS, a.ENTRY_EXIT_CUSTOMS, a.ORIGIN_DESTINATION_COUNTRY, a.CARRIER, a.CONTAINER_NO, a.TRANSPORT_METHOD, a.SUPERVISION_METHOD, a.CUSTOMS_INSPECTION, a.NEED_CUSTOMS_DECLARATION, a.NEED_TRANSPORT, - a.WAREHOUSE_DATE, a.COMPLETION_TIME, a.ORDER_DATE,a.stock_in_order,a.business_order_no + a.WAREHOUSE_DATE, a.COMPLETION_TIME, a.ORDER_DATE,a.stock_in_order,a.business_order_no,a.WORK_USER_ID,a.WORK_TASK_RECEIVE_STATUS,a.TASK_ISSUE_USER_ID @@ -585,4 +588,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND in_order_number = #{inOrderNumber} + + \ No newline at end of file diff --git a/mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml b/mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml index 87b8b297b..5c60414ad 100644 --- a/mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml +++ b/mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml @@ -100,6 +100,9 @@ + + + @@ -120,7 +123,7 @@ a.CUSTOMS_DECLARER_INFO,a.DELIVERY_ADDR,a.ENTRY_EXIT_CUSTOMS,a.DEPARTURE_ARRIVAL_COUNTRY,a.CARRIER,a.CONTAINER_NO,a.CONTAINER_NO_NAME,a.OUTBOUND_DATE, a.COMPLETE_TIME,a.ORDER_DATE,a.TRANSPORT_MODE_CODE,a.TRANSPORT_MODE_NAME,a.SUPERVISION_MODE_CODE,a.SUPERVISION_MODE_NAME, a.CUSTOMS_INSPECTION_FLAG,a.NEED_DECLARE_FLAG,a.NEED_TRANSPORT_FLAG,a.picture_app,a.billing_json,a.SETTLEMENT_CURRENCY, - a.SALESMAN_ID,a.SALESMAN_NAME,a.business_order_no,a.RETURN_QUANTITY + a.SALESMAN_ID,a.SALESMAN_NAME,a.business_order_no,a.RETURN_QUANTITY,a.WORK_USER_ID,a.WORK_TASK_RECEIVE_STATUS,a.TASK_ISSUE_USER_ID @@ -170,6 +173,15 @@ + + and a.status in + + #{item} + + + + and a.TASK_ISSUE_USER_ID like concat('%', #{queryUserId}, '%') + and a.status > #{gtStatus} From e2bfb032a7a402b4d89ad412528867c50dfeef5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Fri, 10 Jul 2026 16:20:53 +0800 Subject: [PATCH 05/58] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mhd/wms/domain/stockInOrder/entity/StockInOrder.java | 3 ++- .../wms/domain/stockInOrder/repository/po/StockInOrderPO.java | 3 ++- .../domain/stockInOrder/repository/todo/StockInOrderDO.java | 3 ++- .../com/mhd/wms/domain/stockOutOrder/entity/StockOutOrder.java | 3 ++- .../domain/stockOutOrder/repository/po/StockOutOrderPO.java | 3 ++- .../domain/stockOutOrder/repository/todo/StockOutOrderDO.java | 3 +++ .../mhd/wms/interfaces/dto/stockInOrder/StockInOrderDTO.java | 3 ++- .../mhd/wms/interfaces/dto/stockOutOrder/StockOutOrderDTO.java | 3 ++- .../main/resources/mapper/stockInOrder/StockInOrderMapper.xml | 3 ++- .../resources/mapper/stockOutOrder/StockOutOrderMapper.xml | 3 ++- 10 files changed, 21 insertions(+), 9 deletions(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/entity/StockInOrder.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/entity/StockInOrder.java index efae4e032..79d8b2dd6 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/entity/StockInOrder.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/entity/StockInOrder.java @@ -385,7 +385,8 @@ public class StockInOrder extends BaseVOEntity { @ApiModelProperty("作业人用户ID") private Long workUserId; - + @ApiModelProperty("作业人用户") + private String workUserName; @ApiModelProperty("作业任务接收状态") private String workTaskReceiveStatus; diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/po/StockInOrderPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/po/StockInOrderPO.java index ebdb794b0..ea9facb43 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/po/StockInOrderPO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/po/StockInOrderPO.java @@ -446,7 +446,8 @@ public class StockInOrderPO extends BaseVOEntity { @ApiModelProperty("作业人用户ID") private Long workUserId; - + @ApiModelProperty("作业人用户") + private String workUserName; @ApiModelProperty("作业任务接收状态") private String workTaskReceiveStatus; diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/todo/StockInOrderDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/todo/StockInOrderDO.java index ab930d976..97417bcf4 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/todo/StockInOrderDO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/todo/StockInOrderDO.java @@ -438,7 +438,8 @@ public class StockInOrderDO extends BaseVOEntity { @ApiModelProperty("作业人用户ID") private Long workUserId; - + @ApiModelProperty("作业人用户") + private String workUserName; @ApiModelProperty("作业任务接收状态") private String workTaskReceiveStatus; diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/entity/StockOutOrder.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/entity/StockOutOrder.java index 39d464489..ca13c0772 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/entity/StockOutOrder.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/entity/StockOutOrder.java @@ -427,7 +427,8 @@ public class StockOutOrder extends BaseVOEntity { @ApiModelProperty("作业人用户ID") private Long workUserId; - + @ApiModelProperty("作业人用户") + private String workUserName; @ApiModelProperty("作业任务接收状态") private String workTaskReceiveStatus; diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/po/StockOutOrderPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/po/StockOutOrderPO.java index f3f206de8..73ce5b5bf 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/po/StockOutOrderPO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/po/StockOutOrderPO.java @@ -453,7 +453,8 @@ public class StockOutOrderPO extends BaseVOEntity { private String khdm; @ApiModelProperty("作业人用户ID") private Long workUserId; - + @ApiModelProperty("作业人用户") + private String workUserName; @ApiModelProperty("作业任务接收状态") private String workTaskReceiveStatus; diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/todo/StockOutOrderDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/todo/StockOutOrderDO.java index b1c4ccd13..875ba00fa 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/todo/StockOutOrderDO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/todo/StockOutOrderDO.java @@ -496,6 +496,9 @@ public class StockOutOrderDO extends BaseVOEntity { @ApiModelProperty("作业人用户ID") private Long workUserId; + @ApiModelProperty("作业人用户") + private String workUserName; + @ApiModelProperty("作业任务接收状态") private String workTaskReceiveStatus; diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockInOrder/StockInOrderDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockInOrder/StockInOrderDTO.java index e30c47148..c1980e4f4 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockInOrder/StockInOrderDTO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockInOrder/StockInOrderDTO.java @@ -435,7 +435,8 @@ public class StockInOrderDTO extends StockInOrderBaseDTO { @ApiModelProperty("作业人用户ID") private Long workUserId; - + @ApiModelProperty("作业人用户") + private String workUserName; @ApiModelProperty("作业任务接收状态") private String workTaskReceiveStatus; diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockOutOrder/StockOutOrderDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockOutOrder/StockOutOrderDTO.java index 65f5a7398..85e3d7c57 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockOutOrder/StockOutOrderDTO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockOutOrder/StockOutOrderDTO.java @@ -486,7 +486,8 @@ public class StockOutOrderDTO extends StockOutOrderBaseDTO { private Date createTimeTo; @ApiModelProperty("作业人用户ID") private Long workUserId; - + @ApiModelProperty("作业人用户") + private String workUserName; @ApiModelProperty("作业任务接收状态") private String workTaskReceiveStatus; diff --git a/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml b/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml index ab42bbf12..d28c83d03 100644 --- a/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml +++ b/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml @@ -102,6 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -137,7 +138,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a."TO", a.CONTACT_PERSON, a.VEHICLE_INFO, a.CONSIGNMENT_NO, a.TEL, a.DRIVER_SIGNATURE, a.FAX, a.DECLARATION_AREA, a.MANUFACTURER, a.CUSTOMS_BROKER_INFO, a.DELIVERY_ADDRESS, a.ENTRY_EXIT_CUSTOMS, a.ORIGIN_DESTINATION_COUNTRY, a.CARRIER, a.CONTAINER_NO, a.TRANSPORT_METHOD, a.SUPERVISION_METHOD, a.CUSTOMS_INSPECTION, a.NEED_CUSTOMS_DECLARATION, a.NEED_TRANSPORT, - a.WAREHOUSE_DATE, a.COMPLETION_TIME, a.ORDER_DATE,a.stock_in_order,a.business_order_no,a.WORK_USER_ID,a.WORK_TASK_RECEIVE_STATUS,a.TASK_ISSUE_USER_ID + a.WAREHOUSE_DATE, a.COMPLETION_TIME, a.ORDER_DATE,a.stock_in_order,a.business_order_no,a.WORK_USER_ID,a.WORK_TASK_RECEIVE_STATUS,a.TASK_ISSUE_USER_ID,a.WORK_USER_NAME diff --git a/mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml b/mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml index 5c60414ad..ff7954d80 100644 --- a/mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml +++ b/mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml @@ -101,6 +101,7 @@ + @@ -123,7 +124,7 @@ a.CUSTOMS_DECLARER_INFO,a.DELIVERY_ADDR,a.ENTRY_EXIT_CUSTOMS,a.DEPARTURE_ARRIVAL_COUNTRY,a.CARRIER,a.CONTAINER_NO,a.CONTAINER_NO_NAME,a.OUTBOUND_DATE, a.COMPLETE_TIME,a.ORDER_DATE,a.TRANSPORT_MODE_CODE,a.TRANSPORT_MODE_NAME,a.SUPERVISION_MODE_CODE,a.SUPERVISION_MODE_NAME, a.CUSTOMS_INSPECTION_FLAG,a.NEED_DECLARE_FLAG,a.NEED_TRANSPORT_FLAG,a.picture_app,a.billing_json,a.SETTLEMENT_CURRENCY, - a.SALESMAN_ID,a.SALESMAN_NAME,a.business_order_no,a.RETURN_QUANTITY,a.WORK_USER_ID,a.WORK_TASK_RECEIVE_STATUS,a.TASK_ISSUE_USER_ID + a.SALESMAN_ID,a.SALESMAN_NAME,a.business_order_no,a.RETURN_QUANTITY,a.WORK_USER_ID,a.WORK_TASK_RECEIVE_STATUS,a.TASK_ISSUE_USER_ID,a.WORK_USER_NAME From 4852b4496a84e68a8f7344a14ddceea78590efc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Fri, 10 Jul 2026 16:30:49 +0800 Subject: [PATCH 06/58] =?UTF-8?q?pda=E4=BB=BB=E5=8A=A1=E6=8E=A5=E6=94=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stockInOrder/StockInOrderApplicationService.java | 12 ++++++++++++ .../facadeApi/stockInOrder/StockInOrderApi.java | 9 +++++++++ .../mapper/stockInOrder/StockInOrderMapper.xml | 2 +- 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java index db327932a..d73789cfa 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java @@ -572,6 +572,18 @@ public class StockInOrderApplicationService { stockInOrderDomainService.omsOrderAdd(stockInOrder); } + public void acceptTask(StockInOrder stockInOrder){ + Long workUserId = stockInOrder.getWorkUserId(); + String workUserName = stockInOrder.getWorkUserName(); + if (workUserId == null || workUserName == null) { + throw new ServiceException("作业人员id或名称为空!"); + } + stockInOrderService.update(null, new LambdaUpdateWrapper() + .set(StockInOrder::getWorkUserId, workUserId) + .set(StockInOrder::getWorkUserName, workUserName) + .eq(StockInOrder::getInOrderId, stockInOrder.getInOrderId())); + } + public void omsOrderAddDetail(List inMaterialDetails){ stockInOrderDomainService.omsOrderAddDetail(inMaterialDetails); } diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java index 2b7de4d42..3971d66cc 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java @@ -172,6 +172,15 @@ public class StockInOrderApi extends BaseController { stockInOrderApplicationService.omsOrderAdd(stockInOrder); } + /** + * oms下发单保存 + */ + @ApiOperation("pda接收任务") + @PostMapping(value = "/acceptTask") + public void acceptTask(@RequestBody StockInOrder stockInOrder) { + stockInOrderApplicationService.acceptTask(stockInOrder); + } + /** * oms下发单明细保存 */ diff --git a/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml b/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml index d28c83d03..b981cb8d4 100644 --- a/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml +++ b/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml @@ -589,7 +589,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND in_order_number = #{inOrderNumber} - SELECT WM_CONCAT(CORRELATION_ID) AS userIds FROM ASSOCIATION_WAREHOUSE WHERE warehouse_id = #{warehouseId} AND del_flag = 1 AND organization_id = #{organizationId} AND top_organization_id = #{topOrganizationId} From 5030ca2a8ab6637d0f6643bf6f0c5fb6e8868c1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Fri, 10 Jul 2026 17:06:29 +0800 Subject: [PATCH 07/58] =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93=E7=A7=BB?= =?UTF-8?q?=E4=BA=A4=E4=BB=BB=E5=8A=A1=E5=8F=8A=E7=A7=BB=E9=99=A4=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E9=A1=B9;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StockInOrderApplicationService.java | 32 +++++++++++++ .../StockOutOrderApplicationService.java | 48 +++++++++++++++++++ .../repository/todo/StockInOrderDO.java | 3 ++ .../repository/todo/StockOutOrderDO.java | 3 ++ .../dto/stockInOrder/StockInOrderDTO.java | 3 ++ .../dto/stockOutOrder/StockOutOrderDTO.java | 3 ++ .../stockInOrder/StockInOrderApi.java | 9 ++++ .../stockOutOrder/StockOutOrderApi.java | 19 ++++++++ 8 files changed, 120 insertions(+) diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java index d73789cfa..32b3b6eb1 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java @@ -584,6 +584,38 @@ public class StockInOrderApplicationService { .eq(StockInOrder::getInOrderId, stockInOrder.getInOrderId())); } + public void removeTask(StockInOrderDO stockInOrder){ + Long inOrderId = stockInOrder.getInOrderId(); + String removeUserId = stockInOrder.getRemoveUserId(); + if (removeUserId == null) { + throw new ServiceException("移除任务用户ID为空!"); + } + if (inOrderId == null) { + throw new ServiceException("入库单不存在!"); + } + StockInOrder stock = stockInOrderService.getById(inOrderId); + if (stock == null) { + throw new ServiceException("入库单不存在!"); + } + String taskIssueUserId = stock.getTaskIssueUserId(); + if (taskIssueUserId == null) { + return; + } + String[] split = taskIssueUserId.split(","); + List taskIds = Arrays.asList(split); + // 删除匹配元素 + taskIds.removeIf(str -> removeUserId.equals(str)); + if (taskIds != null && taskIds.size() > 0) { + String newTaskIssueUserId = String.join(",", taskIds); + stock.setTaskIssueUserId(newTaskIssueUserId); + stockInOrderService.updateById(stock); + } else { + stockInOrderService.update(null ,new LambdaUpdateWrapper() + .set(StockInOrder::getTaskIssueUserId, null) + .eq(StockInOrder::getInOrderId, stockInOrder.getInOrderId())); + } + } + public void omsOrderAddDetail(List inMaterialDetails){ stockInOrderDomainService.omsOrderAddDetail(inMaterialDetails); } diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java index dc276dd38..95f6d128d 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java @@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.mhd.common.core.constant.SecurityConstants; import com.mhd.common.core.constant.SnowFlakeConstants; import com.mhd.common.core.domain.entity.R; @@ -51,6 +52,7 @@ import com.mhd.wms.domain.stockInOrder.entity.StockInOrder; import com.mhd.wms.domain.receiptOrderAccount.entity.ReceiptOrderAccount; import com.mhd.wms.domain.receiptOrderAccount.repository.facade.IReceiptOrderAccountService; import com.mhd.wms.domain.stockInOrder.repository.mapper.StockInOrderMapper; +import com.mhd.wms.domain.stockInOrder.repository.todo.StockInOrderDO; import com.mhd.wms.domain.stockOutOrder.entity.StockOutOrder; import com.mhd.wms.domain.stockOutOrder.repository.facade.IStockOutOrderService; import com.mhd.wms.domain.stockOutOrder.repository.mapper.StockOutOrderMapper; @@ -1617,6 +1619,52 @@ public class StockOutOrderApplicationService { + public void acceptTask(StockOutOrder stockOutOrder){ + Long workUserId = stockOutOrder.getWorkUserId(); + String workUserName = stockOutOrder.getWorkUserName(); + if (workUserId == null || workUserName == null) { + throw new ServiceException("作业人员id或名称为空!"); + } + stockOutOrderService.update(null, new LambdaUpdateWrapper() + .set(StockOutOrder::getWorkUserId, workUserId) + .set(StockOutOrder::getWorkUserName, workUserName) + .eq(StockOutOrder::getOutOrderId, stockOutOrder.getOutOrderId())); + } + + public void removeTask(StockOutOrderDO stockOutOrder){ + Long outOrderId = stockOutOrder.getOutOrderId(); + String removeUserId = stockOutOrder.getRemoveUserId(); + if (removeUserId == null) { + throw new ServiceException("移除任务用户ID为空!"); + } + if (outOrderId == null) { + throw new ServiceException("出库单不存在!"); + } + StockOutOrder stock = stockOutOrderService.getById(outOrderId); + if (stock == null) { + throw new ServiceException("入库单不存在!"); + } + String taskIssueUserId = stock.getTaskIssueUserId(); + if (taskIssueUserId == null) { + return; + } + String[] split = taskIssueUserId.split(","); + List taskIds = Arrays.asList(split); + // 删除匹配元素 + taskIds.removeIf(str -> removeUserId.equals(str)); + if (taskIds != null && taskIds.size() > 0) { + String newTaskIssueUserId = String.join(",", taskIds); + stock.setTaskIssueUserId(newTaskIssueUserId); + stockOutOrderService.updateById(stock); + } else { + stockOutOrderService.update(null ,new LambdaUpdateWrapper() + .set(StockOutOrder::getTaskIssueUserId, null) + .eq(StockOutOrder::getOutOrderId, stockOutOrder.getOutOrderId())); + } + } + + + public void omsOrderAdd(StockOutOrder stockOutOrder){ stockOutOrderDomainService.omsOrderAdd(stockOutOrder); } diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/todo/StockInOrderDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/todo/StockInOrderDO.java index 97417bcf4..24a41d5ce 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/todo/StockInOrderDO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/todo/StockInOrderDO.java @@ -445,4 +445,7 @@ public class StockInOrderDO extends BaseVOEntity { @ApiModelProperty("任务下发用户ID") private String taskIssueUserId; + + @ApiModelProperty("任务移除用户ID") + private String removeUserId; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/todo/StockOutOrderDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/todo/StockOutOrderDO.java index 875ba00fa..559c21fe9 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/todo/StockOutOrderDO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/todo/StockOutOrderDO.java @@ -510,4 +510,7 @@ public class StockOutOrderDO extends BaseVOEntity { private Long queryUserId; @ApiModelProperty("状态列表") private List statusList; + + @ApiModelProperty("任务移除用户ID") + private String removeUserId; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockInOrder/StockInOrderDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockInOrder/StockInOrderDTO.java index c1980e4f4..b70a0c7a7 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockInOrder/StockInOrderDTO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockInOrder/StockInOrderDTO.java @@ -442,4 +442,7 @@ public class StockInOrderDTO extends StockInOrderBaseDTO { @ApiModelProperty("任务下发用户ID") private String taskIssueUserId; + + @ApiModelProperty("任务移除用户ID") + private String removeUserId; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockOutOrder/StockOutOrderDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockOutOrder/StockOutOrderDTO.java index 85e3d7c57..39e3c8793 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockOutOrder/StockOutOrderDTO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockOutOrder/StockOutOrderDTO.java @@ -499,4 +499,7 @@ public class StockOutOrderDTO extends StockOutOrderBaseDTO { private Long queryUserId; @ApiModelProperty("状态列表") private List statusList; + + @ApiModelProperty("任务移除用户ID") + private String removeUserId; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java index 3971d66cc..6e4ba98c4 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java @@ -181,6 +181,15 @@ public class StockInOrderApi extends BaseController { stockInOrderApplicationService.acceptTask(stockInOrder); } + /** + * oms下发单保存 + */ + @ApiOperation("pda取消接收任务") + @PostMapping(value = "/removeTask") + public void removeTask(@RequestBody StockInOrderDO stockInOrderDO) { + stockInOrderApplicationService.removeTask(stockInOrderDO); + } + /** * oms下发单明细保存 */ diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockOutOrder/StockOutOrderApi.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockOutOrder/StockOutOrderApi.java index dcf644f9c..f44ea95bd 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockOutOrder/StockOutOrderApi.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockOutOrder/StockOutOrderApi.java @@ -18,6 +18,7 @@ import com.mhd.wms.domain.outMaterialDetail.entity.OutMaterialDetail; import com.mhd.wms.domain.outMaterialDetail.repository.po.OutMaterialDetailPO; import com.mhd.wms.domain.outMaterialDetail.repository.todo.OutMaterialDetailDO; import com.mhd.wms.domain.stockInOrder.entity.StockInOrder; +import com.mhd.wms.domain.stockInOrder.repository.todo.StockInOrderDO; import com.mhd.wms.domain.stockOutOrder.entity.StockOutOrder; import com.mhd.wms.domain.stockOutOrder.repository.facade.IStockOutOrderService; import com.mhd.wms.domain.stockOutOrder.repository.listener.ExcelParseService; @@ -464,6 +465,24 @@ public class StockOutOrderApi extends BaseController { stockOutOrderApplicationService.omsOrderAdd(stockOutOrder); } + /** + * oms下发单保存 + */ + @ApiOperation("pda接收任务") + @PostMapping(value = "/acceptTask") + public void acceptTask(@RequestBody StockOutOrder stockOutOrder) { + stockOutOrderApplicationService.acceptTask(stockOutOrder); + } + + /** + * oms下发单保存 + */ + @ApiOperation("pda取消接收任务") + @PostMapping(value = "/removeTask") + public void removeTask(@RequestBody StockOutOrderDO stockOutOrderDO) { + stockOutOrderApplicationService.removeTask(stockOutOrderDO); + } + /** * oms下发单明细保存 */ From 2755ed1a33bf409902564cfb358413f826a4699b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Fri, 10 Jul 2026 17:08:24 +0800 Subject: [PATCH 08/58] =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93=E7=A7=BB?= =?UTF-8?q?=E4=BA=A4=E4=BB=BB=E5=8A=A1=E5=8F=8A=E7=A7=BB=E9=99=A4=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E9=A1=B9;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/stockInOrder/StockInOrderApplicationService.java | 1 + .../service/stockOutOrder/StockOutOrderApplicationService.java | 1 + 2 files changed, 2 insertions(+) diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java index 32b3b6eb1..80cb8c795 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java @@ -581,6 +581,7 @@ public class StockInOrderApplicationService { stockInOrderService.update(null, new LambdaUpdateWrapper() .set(StockInOrder::getWorkUserId, workUserId) .set(StockInOrder::getWorkUserName, workUserName) + .set(StockInOrder::getWorkTaskReceiveStatus, "1") .eq(StockInOrder::getInOrderId, stockInOrder.getInOrderId())); } diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java index 95f6d128d..dd5583a13 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java @@ -1628,6 +1628,7 @@ public class StockOutOrderApplicationService { stockOutOrderService.update(null, new LambdaUpdateWrapper() .set(StockOutOrder::getWorkUserId, workUserId) .set(StockOutOrder::getWorkUserName, workUserName) + .set(StockOutOrder::getWorkTaskReceiveStatus, "1") .eq(StockOutOrder::getOutOrderId, stockOutOrder.getOutOrderId())); } From 1548a28c9eda27e4be148b9d59038185e298f3bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Sat, 11 Jul 2026 10:32:33 +0800 Subject: [PATCH 09/58] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=A9=BA=E6=8C=87=E9=92=88=E5=A4=84=E7=90=86?= =?UTF-8?q?;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StockInOrderApplicationService.java | 21 ++++++++++++------- .../StockOutOrderApplicationService.java | 21 ++++++++++++------- 2 files changed, 26 insertions(+), 16 deletions(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java index 80cb8c795..6a3a299db 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java @@ -604,17 +604,22 @@ public class StockInOrderApplicationService { } String[] split = taskIssueUserId.split(","); List taskIds = Arrays.asList(split); - // 删除匹配元素 - taskIds.removeIf(str -> removeUserId.equals(str)); if (taskIds != null && taskIds.size() > 0) { - String newTaskIssueUserId = String.join(",", taskIds); - stock.setTaskIssueUserId(newTaskIssueUserId); - stockInOrderService.updateById(stock); + // 删除匹配元素 + taskIds.removeIf(str -> removeUserId.equals(str)); + if (taskIds != null && taskIds.size() > 0) { + String newTaskIssueUserId = String.join(",", taskIds); + stock.setTaskIssueUserId(newTaskIssueUserId); + stockInOrderService.updateById(stock); + } else { + stockInOrderService.update(null ,new LambdaUpdateWrapper() + .set(StockInOrder::getTaskIssueUserId, null) + .eq(StockInOrder::getInOrderId, stockInOrder.getInOrderId())); + } } else { - stockInOrderService.update(null ,new LambdaUpdateWrapper() - .set(StockInOrder::getTaskIssueUserId, null) - .eq(StockInOrder::getInOrderId, stockInOrder.getInOrderId())); + throw new ServiceException("当前订单没有任务人员!"); } + } public void omsOrderAddDetail(List inMaterialDetails){ diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java index dd5583a13..a8ecf9aa8 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java @@ -1651,17 +1651,22 @@ public class StockOutOrderApplicationService { } String[] split = taskIssueUserId.split(","); List taskIds = Arrays.asList(split); - // 删除匹配元素 - taskIds.removeIf(str -> removeUserId.equals(str)); if (taskIds != null && taskIds.size() > 0) { - String newTaskIssueUserId = String.join(",", taskIds); - stock.setTaskIssueUserId(newTaskIssueUserId); - stockOutOrderService.updateById(stock); + // 删除匹配元素 + taskIds.removeIf(str -> removeUserId.equals(str)); + if (taskIds != null && taskIds.size() > 0) { + String newTaskIssueUserId = String.join(",", taskIds); + stock.setTaskIssueUserId(newTaskIssueUserId); + stockOutOrderService.updateById(stock); + } else { + stockOutOrderService.update(null ,new LambdaUpdateWrapper() + .set(StockOutOrder::getTaskIssueUserId, null) + .eq(StockOutOrder::getOutOrderId, stockOutOrder.getOutOrderId())); + } } else { - stockOutOrderService.update(null ,new LambdaUpdateWrapper() - .set(StockOutOrder::getTaskIssueUserId, null) - .eq(StockOutOrder::getOutOrderId, stockOutOrder.getOutOrderId())); + throw new ServiceException("当前订单不存在任务人员!"); } + } From 46757ed2f11930e4dcea0e245451d59fa1f945d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Sat, 11 Jul 2026 10:39:32 +0800 Subject: [PATCH 10/58] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=A9=BA=E6=8C=87=E9=92=88=E5=A4=84=E7=90=86?= =?UTF-8?q?;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/stockInOrder/StockInOrderApplicationService.java | 5 ++++- .../stockOutOrder/StockOutOrderApplicationService.java | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java index 6a3a299db..20ed4b54c 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java @@ -606,7 +606,10 @@ public class StockInOrderApplicationService { List taskIds = Arrays.asList(split); if (taskIds != null && taskIds.size() > 0) { // 删除匹配元素 - taskIds.removeIf(str -> removeUserId.equals(str)); + //taskIds.removeIf(str -> removeUserId.equals(str)); + taskIds = taskIds.stream() + .filter(str -> !Objects.equals(removeUserId, str)) + .collect(Collectors.toList()); if (taskIds != null && taskIds.size() > 0) { String newTaskIssueUserId = String.join(",", taskIds); stock.setTaskIssueUserId(newTaskIssueUserId); diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java index a8ecf9aa8..4501c2ff2 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java @@ -1653,7 +1653,10 @@ public class StockOutOrderApplicationService { List taskIds = Arrays.asList(split); if (taskIds != null && taskIds.size() > 0) { // 删除匹配元素 - taskIds.removeIf(str -> removeUserId.equals(str)); + //taskIds.removeIf(str -> removeUserId.equals(str)); + taskIds = taskIds.stream() + .filter(str -> !Objects.equals(removeUserId, str)) + .collect(Collectors.toList()); if (taskIds != null && taskIds.size() > 0) { String newTaskIssueUserId = String.join(",", taskIds); stock.setTaskIssueUserId(newTaskIssueUserId); From 444b6add0afefd90b46bb7a7de9a3600d00478a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Sat, 11 Jul 2026 10:51:14 +0800 Subject: [PATCH 11/58] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=A9=BA=E6=8C=87=E9=92=88=E5=A4=84=E7=90=86?= =?UTF-8?q?;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../interfaces/facadeApi/stockInOrder/StockInOrderApi.java | 6 ++++-- .../facadeApi/stockOutOrder/StockOutOrderApi.java | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java index 6e4ba98c4..5f8e0b48e 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java @@ -177,8 +177,9 @@ public class StockInOrderApi extends BaseController { */ @ApiOperation("pda接收任务") @PostMapping(value = "/acceptTask") - public void acceptTask(@RequestBody StockInOrder stockInOrder) { + public AjaxResult acceptTask(@RequestBody StockInOrder stockInOrder) { stockInOrderApplicationService.acceptTask(stockInOrder); + return AjaxResult.success(); } /** @@ -186,8 +187,9 @@ public class StockInOrderApi extends BaseController { */ @ApiOperation("pda取消接收任务") @PostMapping(value = "/removeTask") - public void removeTask(@RequestBody StockInOrderDO stockInOrderDO) { + public AjaxResult removeTask(@RequestBody StockInOrderDO stockInOrderDO) { stockInOrderApplicationService.removeTask(stockInOrderDO); + return AjaxResult.success(); } /** diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockOutOrder/StockOutOrderApi.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockOutOrder/StockOutOrderApi.java index f44ea95bd..d383bed5a 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockOutOrder/StockOutOrderApi.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockOutOrder/StockOutOrderApi.java @@ -470,8 +470,9 @@ public class StockOutOrderApi extends BaseController { */ @ApiOperation("pda接收任务") @PostMapping(value = "/acceptTask") - public void acceptTask(@RequestBody StockOutOrder stockOutOrder) { + public AjaxResult acceptTask(@RequestBody StockOutOrder stockOutOrder) { stockOutOrderApplicationService.acceptTask(stockOutOrder); + return AjaxResult.success(); } /** @@ -479,8 +480,9 @@ public class StockOutOrderApi extends BaseController { */ @ApiOperation("pda取消接收任务") @PostMapping(value = "/removeTask") - public void removeTask(@RequestBody StockOutOrderDO stockOutOrderDO) { + public AjaxResult removeTask(@RequestBody StockOutOrderDO stockOutOrderDO) { stockOutOrderApplicationService.removeTask(stockOutOrderDO); + return AjaxResult.success(); } /** From 35122c0fca7a57bc08a14ce2393f543889697a9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Mon, 13 Jul 2026 15:17:16 +0800 Subject: [PATCH 12/58] =?UTF-8?q?=E7=AE=80=E6=98=93=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E6=94=B6=E8=B4=A7=E5=8F=8A=E4=B8=8A=E6=9E=B6;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StockInOrderApplicationService.java | 25 +- .../entity/InMaterialDetail.java | 4 + .../repository/po/InMaterialDetailPO.java | 4 + .../repository/todo/InMaterialDetailDO.java | 4 + .../service/StockInOrderDomainService.java | 232 +++++++++++++++++- .../inMaterialDetail/InMaterialDetailDTO.java | 4 + .../stockInOrder/StockInOrderApi.java | 20 ++ 7 files changed, 276 insertions(+), 17 deletions(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java index 20ed4b54c..85c960d55 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java @@ -544,23 +544,16 @@ public class StockInOrderApplicationService { */ public Boolean auditState(StockInOrderDO stockInOrderDO){ Boolean b = stockInOrderDomainService.auditState(stockInOrderDO); -// List inOrderIds = stockInOrderDO.getInOrderIds(); -// if (inOrderIds != null && !inOrderIds.isEmpty()) { -// StockInOrder stockInOrder = stockInOrderService.getById(inOrderIds.get(0)); -// Integer needCustomsDeclaration = stockInOrder.getNeedCustomsDeclaration(); -// Integer auditStatus = stockInOrder.getAuditStatus(); -// try { -// if (needCustomsDeclaration != null && needCustomsDeclaration == 1 && auditStatus != null && auditStatus == 3) { -// Long inOrderId = stockInOrder.getInOrderId(); -// List idList = new ArrayList<>(); -// idList.add(inOrderId); -// //batchPush(idList); -// } -// } catch (Exception e) { -// throw new ServiceException("推送关务系统失败!"); -// } -// } + return b; + } + public Boolean receiptEasyMode(StockInOrderDO stockInOrderDO){ + Boolean b = stockInOrderDomainService.receiptEasyMode(stockInOrderDO); + return b; + } + + public Boolean shelfEasyMode(StockInOrderDO stockInOrderDO){ + Boolean b = stockInOrderDomainService.shelfEasyMode(stockInOrderDO); return b; } diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/entity/InMaterialDetail.java b/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/entity/InMaterialDetail.java index dbd947f6c..3d592e406 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/entity/InMaterialDetail.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/entity/InMaterialDetail.java @@ -414,4 +414,8 @@ public class InMaterialDetail extends BaseVOEntity { private BigDecimal erpPriceGw; //申报总价 private BigDecimal amountGw; + + //仓码简易模式收货上架 + private BigDecimal collectQuantity; + private String shelfJson; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/po/InMaterialDetailPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/po/InMaterialDetailPO.java index 3b4b83ccb..b53b7a071 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/po/InMaterialDetailPO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/po/InMaterialDetailPO.java @@ -439,4 +439,8 @@ public class InMaterialDetailPO extends StockInOrderBasePO { //申报总价 private BigDecimal amountGw; private String khdm; + + //仓码简易模式收货上架 + private BigDecimal collectQuantity; + private String shelfJson; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/todo/InMaterialDetailDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/todo/InMaterialDetailDO.java index 13f27b4b4..10474e43a 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/todo/InMaterialDetailDO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/todo/InMaterialDetailDO.java @@ -404,4 +404,8 @@ public class InMaterialDetailDO extends StockInOrderBaseDO { private BigDecimal erpPriceGw; //申报总价 private BigDecimal amountGw; + + //仓码简易模式收货上架 + private BigDecimal collectQuantity; + private String shelfJson; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java index d423d3ebd..bd8d9a999 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java @@ -1,14 +1,17 @@ package com.mhd.wms.domain.stockInOrder.service; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.TypeReference; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.mhd.common.core.constant.SnowFlakeConstants; import com.mhd.common.core.exception.ServiceException; import com.mhd.common.core.utils.IgnoreNullUtil; import com.mhd.common.core.utils.OrderSequence; import com.mhd.common.core.utils.StringUtils; import com.mhd.common.core.utils.bean.BeanUtils; +import com.mhd.common.core.utils.uuid.IdGenerator; import com.mhd.common.core.web.domain.AjaxResult; import com.mhd.common.security.utils.SecurityUtils; import com.mhd.system.api.SystemServiceFeign; @@ -27,9 +30,11 @@ import com.mhd.wms.domain.materialWarehouseControl.repository.facade.IMaterialWa import com.mhd.wms.domain.materialWarehouseControl.repository.po.MaterialWarehouseControlPO; import com.mhd.wms.domain.qualityInspection.repository.facade.IQualityInspectionService; import com.mhd.wms.domain.qualityInspection.repository.todo.QualityInspectionDO; +import com.mhd.wms.domain.receiptMaterialDetail.entity.ReceiptMaterialDetail; import com.mhd.wms.domain.receiptMaterialDetail.repository.facade.IReceiptMaterialDetailService; import com.mhd.wms.domain.receiptMaterialDetail.repository.po.ReceiptMaterialDetailPO; import com.mhd.wms.domain.receiptMaterialDetail.repository.todo.ReceiptMaterialDetailDO; +import com.mhd.wms.domain.shelfMaterialDetail.entity.ShelfMaterialDetail; import com.mhd.wms.domain.shelfMaterialDetail.repository.facade.IShelfMaterialDetailService; import com.mhd.wms.domain.shelfMaterialDetail.repository.po.ShelfMaterialDetailPO; import com.mhd.wms.domain.shelfMaterialDetail.repository.todo.ShelfMaterialDetailDO; @@ -37,9 +42,13 @@ import com.mhd.wms.domain.stockInOrder.entity.StockInOrder; import com.mhd.wms.domain.stockInOrder.repository.facade.IStockInOrderService; import com.mhd.wms.domain.stockInOrder.repository.po.StockInOrderPO; import com.mhd.wms.domain.stockInOrder.repository.todo.StockInOrderDO; +import com.mhd.wms.domain.stockReceiptOrder.entity.StockReceiptOrder; +import com.mhd.wms.domain.stockReceiptOrder.repository.facade.IStockReceiptOrderService; import com.mhd.wms.domain.stockReceiptOrder.repository.po.StockReceiptOrderPO; import com.mhd.wms.domain.stockReceiptOrder.repository.todo.StockReceiptOrderDO; import com.mhd.wms.domain.stockReceiptOrder.service.StockReceiptOrderDomainService; +import com.mhd.wms.domain.stockShelfOrder.entity.StockShelfOrder; +import com.mhd.wms.domain.stockShelfOrder.repository.facade.IStockShelfOrderService; import com.mhd.wms.domain.stockShelfOrder.repository.po.StockShelfOrderPO; import com.mhd.wms.domain.stockShelfOrder.repository.todo.StockShelfOrderDO; import com.mhd.wms.domain.stockShelfOrder.service.StockShelfOrderDomainService; @@ -50,6 +59,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; +import javax.annotation.Resource; import java.lang.reflect.Field; import java.math.BigDecimal; import java.util.*; @@ -81,12 +91,18 @@ public class StockInOrderDomainService { private IMaterialGoodsRuleService materialGoodsRuleService; @Autowired private IMaterialWarehouseControlService materialWarehouseControlService; - @Autowired + @Resource private SystemServiceFeign systemServiceFeign; @Autowired private IReceiptMaterialDetailService receiptMaterialDetailService; @Autowired private IShelfMaterialDetailService shelfMaterialDetailService; + @Autowired + private IStockReceiptOrderService stockReceiptOrderService; + @Autowired + private IStockShelfOrderService stockShelfOrderService; + @Autowired + private IdGenerator idGenerator; /** * 分页查询入库单列表 @@ -483,6 +499,220 @@ public class StockInOrderDomainService { .in(StockInOrder::getInOrderId, stockInOrderDO.getInOrderIds())); } + @Transactional(rollbackFor = Exception.class) + public Boolean receiptEasyMode(StockInOrderDO stockInOrderDO) { + LoginUser loginUser = SecurityUtils.getLoginUser(); + + String userRealName = loginUser.getUserPo() != null && loginUser.getUserPo().getUserName() != null + ? loginUser.getUserPo().getUserName() + : (loginUser.getRealname() != null ? loginUser.getRealname() : loginUser.getUsername()); + String inOrderNumber = stockInOrderDO.getInOrderNumber(); + List materialDetailList = stockInOrderDO.getMaterialDetailList(); + List receiptMaterialDetailList = materialDetailList.stream() + .filter(m -> m.getCollectQuantity() != null && m.getCollectQuantity().compareTo(BigDecimal.ZERO) != 0) + .collect(Collectors.toList()); + if (receiptMaterialDetailList!=null && receiptMaterialDetailList.size()>0) { + for (InMaterialDetailDO inMaterialDetailDO : receiptMaterialDetailList) { + BigDecimal collectQuantity = inMaterialDetailDO.getCollectQuantity(); + Long materialBaseInfoId = inMaterialDetailDO.getMaterialBaseInfoId(); + Long uniqueId = inMaterialDetailDO.getUniqueId(); + ReceiptMaterialDetail receiptMaterialDetail = receiptMaterialDetailService.getOne(new QueryWrapper().lambda() + .eq(ReceiptMaterialDetail::getMaterialBaseInfoId, materialBaseInfoId) + .eq(ReceiptMaterialDetail::getInUniqueId, uniqueId) + .eq(ReceiptMaterialDetail::getDelFlag, 1), false); + receiptMaterialDetail.setReceiptQuantity(collectQuantity); + BigDecimal quantity = receiptMaterialDetail.getQuantity(); + if (quantity != null && quantity.compareTo(BigDecimal.ZERO) == 0) { + receiptMaterialDetail.setReceiptStatus(3); + } + receiptMaterialDetailService.updateById(receiptMaterialDetail); + + StockReceiptOrder stockReceiptOrder = stockReceiptOrderService.getOne(new QueryWrapper().lambda() + .eq(StockReceiptOrder::getInOrderNumber, inOrderNumber) + .eq(StockReceiptOrder::getDelFlag, 1), false); + if (stockReceiptOrder != null) { + stockReceiptOrder.setStatus(2); + stockReceiptOrder.setReceiptQuantity(stockReceiptOrder.getReceiptQuantity().add(collectQuantity)); + stockReceiptOrderService.updateById(stockReceiptOrder); + } + + StockInOrder stockInOrder = stockInOrderService.getOne(new QueryWrapper().lambda() + .eq(StockInOrder::getInOrderNumber, inOrderNumber) + .eq(StockInOrder::getDelFlag, 1), false); + if (stockInOrder != null) { + stockInOrder.setStatus(3); + stockInOrderService.updateById(stockInOrder); + } + List list = stockShelfOrderService.list(new QueryWrapper().lambda() + .eq(StockShelfOrder::getInOrderNumber, inOrderNumber) + .eq(StockShelfOrder::getDelFlag, 1)); + StockShelfOrder stockShelfOrder = new StockShelfOrder(); + if (list!=null && list.size()>0) { + stockShelfOrder = list.get(0); + } else { + BeanUtils.copyProperties(stockReceiptOrder, stockShelfOrder); + stockShelfOrder.setShelfOrderNumber(OrderSequence.getOrderCode("SJ")); + stockShelfOrderService.save(stockShelfOrder); + } + log.info("生成上架单成功，上架单编号：{}", stockShelfOrder.getShelfOrderNumber()); + ShelfMaterialDetail shelfMaterialDetail = new ShelfMaterialDetail(); + ShelfMaterialDetail one = shelfMaterialDetailService.getOne(new QueryWrapper().lambda() + .eq(ShelfMaterialDetail::getMaterialBaseInfoId, materialBaseInfoId) + .eq(ShelfMaterialDetail::getInUniqueId, uniqueId) + .eq(ShelfMaterialDetail::getLevel, 1) + .eq(ShelfMaterialDetail::getDelFlag, 1), false); + if (one != null) { + one.setQuantity(collectQuantity); + shelfMaterialDetailService.updateById(one); + } else { + BeanUtils.copyProperties(inMaterialDetailDO, shelfMaterialDetail); + shelfMaterialDetail.setShelfOrderNumber(stockShelfOrder.getShelfOrderNumber()); + shelfMaterialDetail.setQuantity(collectQuantity); + shelfMaterialDetail.setInUniqueId(uniqueId); + shelfMaterialDetail.setReceiptUniqueId(receiptMaterialDetail.getUniqueId()); + shelfMaterialDetailService.save(shelfMaterialDetail); + } + + log.info("生成上架单成功，上架单编号：{}，上架单明细编号：{}", stockShelfOrder.getShelfOrderNumber(), shelfMaterialDetail.getShelfOrderNumber()); + } + } + return stockInOrderService.update(null, new UpdateWrapper().lambda() + .set(StockInOrder::getAuditStatus, stockInOrderDO.getAuditStatus()) + .in(StockInOrder::getInOrderId, stockInOrderDO.getInOrderIds())); + } + + @Transactional(rollbackFor = Exception.class) + public Boolean shelfEasyMode(StockInOrderDO stockInOrderDO) { + LoginUser loginUser = SecurityUtils.getLoginUser(); + + String userRealName = loginUser.getUserPo() != null && loginUser.getUserPo().getUserName() != null + ? loginUser.getUserPo().getUserName() + : (loginUser.getRealname() != null ? loginUser.getRealname() : loginUser.getUsername()); + String inOrderNumber = stockInOrderDO.getInOrderNumber(); + List materialDetailList = stockInOrderDO.getMaterialDetailList(); + List receiptMaterialDetailList = materialDetailList.stream() + .filter(m -> StringUtils.isNotBlank(m.getShelfJson())) + .collect(Collectors.toList()); + if (receiptMaterialDetailList!=null && receiptMaterialDetailList.size()>0) { + for (InMaterialDetailDO inMaterialDetailDO : receiptMaterialDetailList) { + Long materialDetailId1 = inMaterialDetailDO.getMaterialDetailId(); + Long materialBaseInfoId = inMaterialDetailDO.getMaterialBaseInfoId(); + Long uniqueId = inMaterialDetailDO.getUniqueId(); + String shelfJson = inMaterialDetailDO.getShelfJson(); + List> shelfList = JSON.parseObject(shelfJson, new TypeReference>>(){}); + StockInOrder stockInOrder = stockInOrderService.getOne(new QueryWrapper().lambda() + .eq(StockInOrder::getInOrderNumber, inOrderNumber) + .eq(StockInOrder::getDelFlag, 1), false); + if (stockInOrder != null) { + stockInOrder.setStatus(4); + stockInOrderService.updateById(stockInOrder); + } + int index=0; + for (Map stringObjectMap : shelfList) { + BigDecimal shelvesQuantity = (BigDecimal) stringObjectMap.get("shelvesQuantity"); + String shelfOrderNumber = (String) stringObjectMap.get("shelfOrderNumber"); + String warehouseCode = (String) stringObjectMap.get("warehouseCode"); + String warehouseName = (String) stringObjectMap.get("warehouseName"); + String storageCode = (String) stringObjectMap.get("storageCode"); + String storageName = (String) stringObjectMap.get("storageName"); + String storageLocationCode = (String) stringObjectMap.get("storageLocationCode"); + String storageLocationName = (String) stringObjectMap.get("storageLocationName"); + Long warehouseId = (Long) stringObjectMap.get("warehouseId"); + Long storageSectionId = (Long) stringObjectMap.get("storageSectionId"); + Long storageLocationId = (Long) stringObjectMap.get("storageLocationId"); +// Integer level = (Integer) stringObjectMap.get("level"); + + // 如果 materialDetailId 不为空，则更新上架单明细 + if (stringObjectMap.containsKey("materialDetailId")) { + Long materialDetailId = (Long) stringObjectMap.get("materialDetailId"); + ShelfMaterialDetail detail = shelfMaterialDetailService.getById(materialDetailId); + detail.setShelvesQuantity(shelvesQuantity); + detail.setAlreadyShelvesQuantity(shelvesQuantity); + detail.setWarehouseId(warehouseId); + detail.setStorageSectionId(storageSectionId); + detail.setStorageLocationId(storageLocationId); + detail.setWarehouseCode(warehouseCode); + detail.setWarehouseName(warehouseName); + detail.setStorageCode(storageCode); + detail.setStorageName(storageName); + detail.setStorageLocationCode(storageLocationCode); + detail.setStorageLocationName(storageLocationName); + shelfMaterialDetailService.updateById(detail); + continue; + } + + // 如果 materialDetailId 为空，则创建上架单明细 + List list = stockShelfOrderService.list(new QueryWrapper().lambda() + .eq(StockShelfOrder::getInOrderNumber, inOrderNumber) + .eq(StockShelfOrder::getDelFlag, 1)); + StockShelfOrder stockShelfOrder = new StockShelfOrder(); + if (list!=null && list.size()>0) { + stockShelfOrder = list.get(0); + stockShelfOrder.setStatus(2); + stockShelfOrderService.updateById(stockShelfOrder); + } else { + throw new RuntimeException("未找到上架单!"); + } + ShelfMaterialDetail one = shelfMaterialDetailService.getOne(new QueryWrapper().lambda() + .eq(ShelfMaterialDetail::getMaterialBaseInfoId, materialBaseInfoId) + .eq(ShelfMaterialDetail::getInUniqueId, uniqueId) + .eq(ShelfMaterialDetail::getDelFlag, 1), false); + if (one != null) { + if (index == 0) { + one.setShelvesQuantity(shelvesQuantity); + one.setAlreadyShelvesQuantity(shelvesQuantity); + one.setWarehouseId(warehouseId); + one.setStorageSectionId(storageSectionId); + one.setStorageLocationId(storageLocationId); + one.setShelfOrderNumber(shelfOrderNumber); + one.setWarehouseCode(warehouseCode); + one.setWarehouseName(warehouseName); + one.setStorageCode(storageCode); + one.setStorageName(storageName); + one.setStorageLocationCode(storageLocationCode); + one.setStorageLocationName(storageLocationName); + one.setLevel(1); + one.setParentUniqueId(0l); + one.setShelvesStatus(3); + shelfMaterialDetailService.updateById(one); + stringObjectMap.put("materialDetailId", one.getMaterialDetailId()); + stringObjectMap.put("level",1); + } else { + ShelfMaterialDetail shelfMaterialDetail = new ShelfMaterialDetail(); + BeanUtils.copyProperties(one, shelfMaterialDetail); + shelfMaterialDetail.setQuantity(BigDecimal.ZERO); + shelfMaterialDetail.setShelvesQuantity(shelvesQuantity); + shelfMaterialDetail.setAlreadyShelvesQuantity(shelvesQuantity); + shelfMaterialDetail.setShelfOrderNumber(shelfOrderNumber); + shelfMaterialDetail.setWarehouseCode(warehouseCode); + shelfMaterialDetail.setWarehouseName(warehouseName); + shelfMaterialDetail.setStorageCode(storageCode); + shelfMaterialDetail.setStorageName(storageName); + shelfMaterialDetail.setStorageLocationCode(storageLocationCode); + shelfMaterialDetail.setStorageLocationName(storageLocationName); + shelfMaterialDetail.setLevel(2); + shelfMaterialDetail.setParentUniqueId(one.getUniqueId()); + shelfMaterialDetail.setUniqueId(idGenerator.snowflakeId(SnowFlakeConstants.wmsId)); + shelfMaterialDetail.setInUniqueId(idGenerator.snowflakeId(SnowFlakeConstants.wmsId)); + shelfMaterialDetail.setReceiptUniqueId(idGenerator.snowflakeId(SnowFlakeConstants.wmsId)); + shelfMaterialDetail.setShelvesStatus(3); + shelfMaterialDetailService.save(shelfMaterialDetail); + stringObjectMap.put("materialDetailId", shelfMaterialDetail.getMaterialDetailId()); + stringObjectMap.put("level",2 ); + } + } else { + throw new RuntimeException("未找到上架单明细!"); + } + index++; + } + InMaterialDetail inMaterialDetail = materialDetailService.getById(materialDetailId1); + inMaterialDetail.setShelfJson(JSON.toJSONString(shelfList)); + materialDetailService.updateById(inMaterialDetail); + } + } + return true; + } + /** * @description 取消入库单 diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/inMaterialDetail/InMaterialDetailDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/inMaterialDetail/InMaterialDetailDTO.java index a87ebdf82..4895b9d89 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/inMaterialDetail/InMaterialDetailDTO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/inMaterialDetail/InMaterialDetailDTO.java @@ -401,4 +401,8 @@ public class InMaterialDetailDTO extends BaseVOEntity { private BigDecimal erpPriceGw; //申报总价 private BigDecimal amountGw; + + //仓码简易模式收货上架 + private BigDecimal collectQuantity; + private String shelfJson; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java index 5f8e0b48e..530189443 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java @@ -192,6 +192,26 @@ public class StockInOrderApi extends BaseController { return AjaxResult.success(); } + /** + * 审核入库单 + */ + @ApiOperation("pda简易模式收货") + @PostMapping(value = "/receiptEasyMode") + public AjaxResult receiptEasyMode(@RequestBody StockInOrderDTO stockInOrderDTO) { + StockInOrderDO stockInOrderDO = stockInOrderAssembler.toDO(stockInOrderDTO); + return AjaxResult.success(stockInOrderApplicationService.receiptEasyMode(stockInOrderDO)); + } + + /** + * 审核入库单 + */ + @ApiOperation("pda简易模式上架") + @PostMapping(value = "/shelfEasyMode") + public AjaxResult shelfEasyMode(@RequestBody StockInOrderDTO stockInOrderDTO) { + StockInOrderDO stockInOrderDO = stockInOrderAssembler.toDO(stockInOrderDTO); + return AjaxResult.success(stockInOrderApplicationService.shelfEasyMode(stockInOrderDO)); + } + /** * oms下发单明细保存 */ From 81c30d752d40f265cfac4abfee068ce467711738 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Mon, 13 Jul 2026 16:42:18 +0800 Subject: [PATCH 13/58] =?UTF-8?q?=E7=AE=80=E6=98=93=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E6=94=B6=E8=B4=A7=E5=8F=8A=E4=B8=8A=E6=9E=B6;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stockInOrder/StockInOrderApi.java | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java index 530189443..9013df4c2 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java @@ -1,6 +1,7 @@ package com.mhd.wms.interfaces.facadeApi.stockInOrder; import com.mhd.common.core.web.controller.BaseController; +import com.mhd.common.core.utils.bean.BeanUtils; import com.mhd.common.core.web.domain.AjaxResult; import com.mhd.common.core.web.page.TableDataInfo; import com.mhd.common.core.exception.ServiceException; @@ -8,12 +9,15 @@ import com.mhd.common.core.utils.StringUtils; import com.mhd.wms.application.service.stockInOrder.StockInOrderApplicationService; import com.mhd.wms.domain.inMaterialDetail.entity.InMaterialDetail; import com.mhd.wms.domain.inMaterialDetail.repository.po.InMaterialDetailPO; +import com.mhd.wms.domain.inMaterialDetail.repository.todo.InMaterialDetailDO; +import com.mhd.wms.domain.inMaterialDetail.repository.todo.InMaterialDetailDO; import com.mhd.wms.domain.stockInOrder.entity.StockInOrder; import com.mhd.wms.domain.stockInOrder.repository.po.StockInOrderPO; import com.mhd.wms.domain.stockInOrder.repository.todo.StockInOrderDO; import com.mhd.wms.domain.stockOutOrder.repository.todo.StockOutOrderDO; import com.mhd.wms.interfaces.assember.stockInOrder.StockInOrderAssembler; import com.mhd.wms.interfaces.assember.stockOutOrder.StockOutOrderAssembler; +import com.mhd.wms.interfaces.dto.inMaterialDetail.InMaterialDetailDTO; import com.mhd.wms.interfaces.dto.stockInOrder.StockInOrderDTO; import com.mhd.wms.interfaces.dto.stockOutOrder.StockOutOrderDTO; import io.swagger.annotations.ApiOperation; @@ -22,6 +26,7 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.List; @@ -199,6 +204,17 @@ public class StockInOrderApi extends BaseController { @PostMapping(value = "/receiptEasyMode") public AjaxResult receiptEasyMode(@RequestBody StockInOrderDTO stockInOrderDTO) { StockInOrderDO stockInOrderDO = stockInOrderAssembler.toDO(stockInOrderDTO); + List materialDetailList = stockInOrderDTO.getMaterialDetailList(); + if (materialDetailList != null && !materialDetailList.isEmpty()) { + List inMaterialDetailDOList = new ArrayList<>(); + for (InMaterialDetailDTO dto : materialDetailList) { + InMaterialDetailDO detailDO = new InMaterialDetailDO(); + BeanUtils.copyProperties(dto, detailDO); + inMaterialDetailDOList.add(detailDO); + } + stockInOrderDO.setMaterialDetailList(inMaterialDetailDOList); + } + return AjaxResult.success(stockInOrderApplicationService.receiptEasyMode(stockInOrderDO)); } @@ -209,6 +225,16 @@ public class StockInOrderApi extends BaseController { @PostMapping(value = "/shelfEasyMode") public AjaxResult shelfEasyMode(@RequestBody StockInOrderDTO stockInOrderDTO) { StockInOrderDO stockInOrderDO = stockInOrderAssembler.toDO(stockInOrderDTO); + List materialDetailList = stockInOrderDTO.getMaterialDetailList(); + if (materialDetailList != null && !materialDetailList.isEmpty()) { + List inMaterialDetailDOList = new ArrayList<>(); + for (InMaterialDetailDTO dto : materialDetailList) { + InMaterialDetailDO detailDO = new InMaterialDetailDO(); + BeanUtils.copyProperties(dto, detailDO); + inMaterialDetailDOList.add(detailDO); + } + stockInOrderDO.setMaterialDetailList(inMaterialDetailDOList); + } return AjaxResult.success(stockInOrderApplicationService.shelfEasyMode(stockInOrderDO)); } From 73b1a76cb69598ef8ec5968dc4efcf8e14f2c7bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Mon, 13 Jul 2026 16:47:05 +0800 Subject: [PATCH 14/58] =?UTF-8?q?=E7=AE=80=E6=98=93=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E6=94=B6=E8=B4=A7=E5=8F=8A=E4=B8=8A=E6=9E=B6;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stockInOrder/service/StockInOrderDomainService.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java index bd8d9a999..1baf11431 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java @@ -576,9 +576,7 @@ public class StockInOrderDomainService { log.info("生成上架单成功，上架单编号：{}，上架单明细编号：{}", stockShelfOrder.getShelfOrderNumber(), shelfMaterialDetail.getShelfOrderNumber()); } } - return stockInOrderService.update(null, new UpdateWrapper().lambda() - .set(StockInOrder::getAuditStatus, stockInOrderDO.getAuditStatus()) - .in(StockInOrder::getInOrderId, stockInOrderDO.getInOrderIds())); + return true; } @Transactional(rollbackFor = Exception.class) From 0f2e2e769bc85c51a2c329275bbfbffb43d1a885 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Mon, 13 Jul 2026 17:34:44 +0800 Subject: [PATCH 15/58] =?UTF-8?q?=E7=AE=80=E6=98=93=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E6=94=B6=E8=B4=A7=E5=8F=8A=E4=B8=8A=E6=9E=B6;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StockInOrderApplicationService.java | 23 +++++++++++++++++++ .../stockInOrder/StockInOrderApi.java | 10 ++++++++ .../InMaterialDetailMapper.xml | 4 +++- 3 files changed, 36 insertions(+), 1 deletion(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java index 85c960d55..13cbeeab8 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java @@ -52,6 +52,10 @@ import com.mhd.wms.domain.stockInOrder.repository.vo.GwInDetail; import com.mhd.wms.domain.stockInOrder.repository.vo.GwStockInOrder; import com.mhd.wms.domain.stockInOrder.service.StockInOrderDomainService; import com.mhd.wms.domain.stockOutOrder.repository.mapper.StockOutOrderMapper; +import com.mhd.wms.domain.stockReceiptOrder.service.StockReceiptOrderDomainService; +import com.mhd.wms.domain.stockShelfOrder.entity.StockShelfOrder; +import com.mhd.wms.domain.stockShelfOrder.repository.facade.IStockShelfOrderService; +import com.mhd.wms.domain.stockShelfOrder.service.StockShelfOrderDomainService; import com.mhd.wms.interfaces.dto.stockInOrder.StockInOrderDTO; import com.mhd.wms.domain.stockOutOrder.entity.StockOutOrder; import com.mhd.wms.domain.stockOutOrder.repository.facade.IStockOutOrderService; @@ -93,6 +97,10 @@ import java.util.stream.Collectors; public class StockInOrderApplicationService { @Autowired private StockInOrderDomainService stockInOrderDomainService; + @Autowired + private StockReceiptOrderDomainService stockReceiptOrderDomainService; + @Autowired + private StockShelfOrderDomainService stockShelfOrderDomainService; @Resource private UserServiceFeign userServiceFeign; @Resource @@ -110,6 +118,8 @@ public class StockInOrderApplicationService { @Autowired private IStockReceiptOrderService stockReceiptOrderService; @Autowired + private IStockShelfOrderService stockShelfOrderService; + @Autowired private IReceiptMaterialDetailService receiptMaterialDetailService; @Autowired private IStockOutOrderService stockOutOrderService; @@ -557,6 +567,19 @@ public class StockInOrderApplicationService { return b; } + public Boolean checkUploadEasyMode(StockInOrderDO stockInOrderDO){ + String inOrderNumber = stockInOrderDO.getInOrderNumber(); + StockReceiptOrder stockReceiptOrder = stockReceiptOrderService.getOne(new LambdaQueryWrapper() + .eq(StockReceiptOrder::getInOrderNumber, inOrderNumber) + .eq(StockReceiptOrder::getDelFlag, 1), false); + Boolean b = stockReceiptOrderDomainService.completeReceipt(stockReceiptOrder.getReceiptOrderId(), false); + StockShelfOrder stockShelfOrder = stockShelfOrderService.getOne(new LambdaQueryWrapper() + .eq(StockShelfOrder::getInOrderNumber, inOrderNumber) + .eq(StockShelfOrder::getDelFlag, 1), false); + Boolean b1 = stockShelfOrderDomainService.completeUpShelf(stockShelfOrder.getShelfOrderId()); + return b && b1; + } + public void omsOrderAdd(StockInOrder stockInOrder){ // 设置任务下发用户ID diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java index 9013df4c2..9c78b4d63 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java @@ -238,6 +238,16 @@ public class StockInOrderApi extends BaseController { return AjaxResult.success(stockInOrderApplicationService.shelfEasyMode(stockInOrderDO)); } + /** + * 审核入库单 + */ + @ApiOperation("pda简易模式核对上传") + @PostMapping(value = "/checkUploadEasyMode") + public AjaxResult checkUploadEasyMode(@RequestBody StockInOrderDTO stockInOrderDTO) { + StockInOrderDO stockInOrderDO = stockInOrderAssembler.toDO(stockInOrderDTO); + return AjaxResult.success(stockInOrderApplicationService.checkUploadEasyMode(stockInOrderDO)); + } + /** * oms下发单明细保存 */ diff --git a/mhd_wms/src/main/resources/mapper/inMaterialDetail/InMaterialDetailMapper.xml b/mhd_wms/src/main/resources/mapper/inMaterialDetail/InMaterialDetailMapper.xml index cece22329..cfee42bf1 100644 --- a/mhd_wms/src/main/resources/mapper/inMaterialDetail/InMaterialDetailMapper.xml +++ b/mhd_wms/src/main/resources/mapper/inMaterialDetail/InMaterialDetailMapper.xml @@ -96,6 +96,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -109,7 +111,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.lot_no , a.material_detail_id, a.organization_id, a.organization_name, a.top_organization_id, a.unique_id, a.in_order_number, a.material_base_info_id, a.material_code, a.material_name, a.bar_code, a.quantity, a.receipt_quantity, a.shelves_quantity, - a.receipt_status, a.shelves_status, a.pack_id, a.pack_code, a.pack_name, + a.receipt_status, a.shelves_status, a.pack_id, a.pack_code, a.pack_name,a.SHELF_JSON,a.COLLECT_QUANTITY, CASE WHEN a.pack_detail_id IS NULL OR TRIM(a.pack_detail_id) = '' THEN NULL ELSE CAST(a.pack_detail_id AS BIGINT) From 34a146514fafd127729f52340293d4a75f1add36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Mon, 13 Jul 2026 17:45:22 +0800 Subject: [PATCH 16/58] =?UTF-8?q?=E7=AE=80=E6=98=93=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E6=94=B6=E8=B4=A7=E5=8F=8A=E4=B8=8A=E6=9E=B6;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stockInOrder/service/StockInOrderDomainService.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java index 1baf11431..299c02b3c 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java @@ -516,6 +516,11 @@ public class StockInOrderDomainService { BigDecimal collectQuantity = inMaterialDetailDO.getCollectQuantity(); Long materialBaseInfoId = inMaterialDetailDO.getMaterialBaseInfoId(); Long uniqueId = inMaterialDetailDO.getUniqueId(); + + InMaterialDetail materialDetail = materialDetailService.getById(inMaterialDetailDO.getMaterialDetailId()); + materialDetail.setCollectQuantity(collectQuantity); + materialDetailService.updateById(materialDetail); + ReceiptMaterialDetail receiptMaterialDetail = receiptMaterialDetailService.getOne(new QueryWrapper().lambda() .eq(ReceiptMaterialDetail::getMaterialBaseInfoId, materialBaseInfoId) .eq(ReceiptMaterialDetail::getInUniqueId, uniqueId) From 52172dc3d733bbacf357edff9fd356ae2a1147cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Mon, 13 Jul 2026 18:04:43 +0800 Subject: [PATCH 17/58] =?UTF-8?q?=E7=AE=80=E6=98=93=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E6=94=B6=E8=B4=A7=E5=8F=8A=E4=B8=8A=E6=9E=B6;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/stockInOrder/service/StockInOrderDomainService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java index 299c02b3c..c559b23ed 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java @@ -526,6 +526,7 @@ public class StockInOrderDomainService { .eq(ReceiptMaterialDetail::getInUniqueId, uniqueId) .eq(ReceiptMaterialDetail::getDelFlag, 1), false); receiptMaterialDetail.setReceiptQuantity(collectQuantity); + receiptMaterialDetail.setAlreadyReceiptQuantity(collectQuantity); BigDecimal quantity = receiptMaterialDetail.getQuantity(); if (quantity != null && quantity.compareTo(BigDecimal.ZERO) == 0) { receiptMaterialDetail.setReceiptStatus(3); From fad5eb66fafb384b657b728c5f6e606e9726436f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Tue, 14 Jul 2026 09:29:02 +0800 Subject: [PATCH 18/58] =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E8=BD=AC=E6=8D=A2?= =?UTF-8?q?=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/StockInOrderDomainService.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java index c559b23ed..11caf9976 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java @@ -613,7 +613,8 @@ public class StockInOrderDomainService { } int index=0; for (Map stringObjectMap : shelfList) { - BigDecimal shelvesQuantity = (BigDecimal) stringObjectMap.get("shelvesQuantity"); + Object shelvesQuantityObj = stringObjectMap.get("shelvesQuantity"); + BigDecimal shelvesQuantity = shelvesQuantityObj != null ? new BigDecimal(String.valueOf(shelvesQuantityObj)) : null; String shelfOrderNumber = (String) stringObjectMap.get("shelfOrderNumber"); String warehouseCode = (String) stringObjectMap.get("warehouseCode"); String warehouseName = (String) stringObjectMap.get("warehouseName"); @@ -621,9 +622,12 @@ public class StockInOrderDomainService { String storageName = (String) stringObjectMap.get("storageName"); String storageLocationCode = (String) stringObjectMap.get("storageLocationCode"); String storageLocationName = (String) stringObjectMap.get("storageLocationName"); - Long warehouseId = (Long) stringObjectMap.get("warehouseId"); - Long storageSectionId = (Long) stringObjectMap.get("storageSectionId"); - Long storageLocationId = (Long) stringObjectMap.get("storageLocationId"); + Object warehouseIdObj = stringObjectMap.get("warehouseId"); + Long warehouseId = warehouseIdObj != null ? Long.valueOf(String.valueOf(warehouseIdObj)) : null; + Object storageSectionIdObj = stringObjectMap.get("storageSectionId"); + Long storageSectionId = storageSectionIdObj != null ? Long.valueOf(String.valueOf(storageSectionIdObj)) : null; + Object storageLocationIdObj = stringObjectMap.get("storageLocationId"); + Long storageLocationId = storageLocationIdObj != null ? Long.valueOf(String.valueOf(storageLocationIdObj)) : null; // Integer level = (Integer) stringObjectMap.get("level"); // 如果 materialDetailId 不为空，则更新上架单明细 From c536d2c5c675779e7031883a4c5bf3ee9d4329d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Tue, 14 Jul 2026 09:33:45 +0800 Subject: [PATCH 19/58] =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E8=BD=AC=E6=8D=A2?= =?UTF-8?q?=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/stockInOrder/StockInOrderApplicationService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java index 13cbeeab8..830f8dec8 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java @@ -572,7 +572,8 @@ public class StockInOrderApplicationService { StockReceiptOrder stockReceiptOrder = stockReceiptOrderService.getOne(new LambdaQueryWrapper() .eq(StockReceiptOrder::getInOrderNumber, inOrderNumber) .eq(StockReceiptOrder::getDelFlag, 1), false); - Boolean b = stockReceiptOrderDomainService.completeReceipt(stockReceiptOrder.getReceiptOrderId(), false); + stockReceiptOrder.setStatus(3); + boolean b = stockReceiptOrderService.updateById(stockReceiptOrder); StockShelfOrder stockShelfOrder = stockShelfOrderService.getOne(new LambdaQueryWrapper() .eq(StockShelfOrder::getInOrderNumber, inOrderNumber) .eq(StockShelfOrder::getDelFlag, 1), false); From c3b4923ce9697e844ab84a2d35eb566145763ee3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Tue, 14 Jul 2026 13:52:36 +0800 Subject: [PATCH 20/58] =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E8=BD=AC=E6=8D=A2?= =?UTF-8?q?=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StockOutOrderApplicationService.java | 11 ++ .../entity/OutMaterialDetail.java | 13 +++ .../repository/po/OutMaterialDetailPO.java | 12 +++ .../repository/todo/OutMaterialDetailDO.java | 8 ++ .../service/StockOutOrderDomainService.java | 100 ++++++++++++++++++ .../OutMaterialDetailDTO.java | 12 +++ .../stockOutOrder/StockOutOrderApi.java | 23 ++++ 7 files changed, 179 insertions(+) diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java index 4501c2ff2..61b914cf4 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java @@ -1141,6 +1141,17 @@ public class StockOutOrderApplicationService { return b; } + + public Boolean adjustPicking(StockOutOrderDO stockOutOrderDO){ + Boolean b = stockOutOrderDomainService.adjustPicking(stockOutOrderDO); + return b; + } + + public Boolean checkUpload(StockOutOrderDO stockOutOrderDO){ + Boolean b = stockOutOrderDomainService.checkUpload(stockOutOrderDO); + return b; + } + public Boolean genPickingOrderByOms(StockOutOrderDO stockOutOrderDO){ Boolean b = stockOutOrderDomainService.genPickingOrderByOms(stockOutOrderDO); // List outOrderIds = stockOutOrderDO.getOutOrderIds(); diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/entity/OutMaterialDetail.java b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/entity/OutMaterialDetail.java index 1a5115a0f..830f67c50 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/entity/OutMaterialDetail.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/entity/OutMaterialDetail.java @@ -528,4 +528,17 @@ public class OutMaterialDetail extends BaseVOEntity { private String bondInvtNoGw; private String whNoGw; private String seatNoGw; + + //仓码简易模式 + @ApiModelProperty("出库重量") + @Excel(name = "出库重量") + private BigDecimal outWeight; + + @ApiModelProperty("出库体积") + @Excel(name = "出库体积") + private BigDecimal outVolume; + + @ApiModelProperty("出库数量") + @Excel(name = "出库数量") + private BigDecimal outQuantity; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/po/OutMaterialDetailPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/po/OutMaterialDetailPO.java index 982a283eb..f37fdea55 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/po/OutMaterialDetailPO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/po/OutMaterialDetailPO.java @@ -568,4 +568,16 @@ public class OutMaterialDetailPO extends StockOutOrderBaseDO { private String whNoGw; private String seatNoGw; private String khdm; + //仓码简易模式 + @ApiModelProperty("出库重量") + @Excel(name = "出库重量") + private BigDecimal outWeight; + + @ApiModelProperty("出库体积") + @Excel(name = "出库体积") + private BigDecimal outVolume; + + @ApiModelProperty("出库数量") + @Excel(name = "出库数量") + private BigDecimal outQuantity; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/todo/OutMaterialDetailDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/todo/OutMaterialDetailDO.java index 1dd1cc9aa..32838018a 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/todo/OutMaterialDetailDO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/todo/OutMaterialDetailDO.java @@ -520,4 +520,12 @@ public class OutMaterialDetailDO extends BaseVOEntity { private String bondInvtNoGw; private String whNoGw; private String seatNoGw; + //仓码简易模式 + @ApiModelProperty("出库重量") + @Excel(name = "出库重量") + private BigDecimal outWeight; + + @ApiModelProperty("出库体积") + @Excel(name = "出库体积") + private BigDecimal outVolume; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java index 6bf396e6d..0a900d0b1 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java @@ -23,8 +23,10 @@ import com.mhd.wms.domain.copyCodeReference.repository.po.CopyCodeReferencePO; import com.mhd.wms.domain.deliveTask.repository.facade.IDeliveTaskService; import com.mhd.wms.domain.deliveTask.repository.todo.DeliveTaskDO; import com.mhd.wms.domain.deliveryDetailsLink.repository.facade.IDeliveryDetailsLinkService; +import com.mhd.wms.domain.handoverTaskOrder.entity.HandoverTaskOrder; import com.mhd.wms.domain.handoverTaskOrder.repository.facade.IHandoverTaskOrderService; import com.mhd.wms.domain.handoverTaskOrder.repository.todo.HandoverTaskOrderDO; +import com.mhd.wms.domain.handoverTaskOrder.service.HandoverTaskOrderDomainService; import com.mhd.wms.domain.inMaterialDetail.entity.InMaterialDetail; import com.mhd.wms.domain.inMaterialDetail.repository.todo.InMaterialDetailDO; import com.mhd.wms.domain.inventoryAdjustmentRecord.entity.InventoryAdjustmentRecord; @@ -113,6 +115,8 @@ public class StockOutOrderDomainService { @Autowired private IHandoverTaskOrderService handoverTaskOrderService; @Autowired + private HandoverTaskOrderDomainService handoverTaskOrderDomainService; + @Autowired private IOutOrderAbnormalService outOrderAbnormalService; @Autowired private PickingOrderDomainService pickingOrderDomainService; @@ -867,6 +871,102 @@ public class StockOutOrderDomainService { return inserted; } + @Transactional(rollbackFor = Exception.class) + public Boolean adjustPicking(StockOutOrderDO stockOutOrderDO){ + String outOrderNumber = stockOutOrderDO.getOutOrderNumber(); + PickingOrder pickingOrder = pickingOrderService.getOne(new QueryWrapper().lambda() + .eq(PickingOrder::getOrderNumber, outOrderNumber) + .eq(PickingOrder::getDelFlag, 1), false); + if (pickingOrder == null) { + throw new RuntimeException("拣货单不存在!"); + } + pickingOrder.setStatus(2); + pickingOrderService.updateById(pickingOrder); + List materialDetailList = stockOutOrderDO.getMaterialDetailList(); + if (CollectionUtils.isEmpty(materialDetailList)) { + throw new RuntimeException("出库单明细不存在!"); + } + List pickingMaterialDetailList = materialDetailList.stream() + .filter(m -> m.getOutWeight() != null || m.getOutVolume() != null) + .collect(Collectors.toList()); + if (pickingMaterialDetailList != null && pickingMaterialDetailList.size() > 0) { + for (OutMaterialDetailDO outMaterialDetailDO : pickingMaterialDetailList) { + Long uniqueId = outMaterialDetailDO.getUniqueId(); + BigDecimal outWeight = outMaterialDetailDO.getOutWeight(); + BigDecimal outVolume = outMaterialDetailDO.getOutVolume(); + PickingMaterialDetail pickingMaterialDetail = pickingMaterialDetailService.getOne(new QueryWrapper().lambda() + .eq(PickingMaterialDetail::getOutUniqueId, uniqueId) + .eq(PickingMaterialDetail::getDelFlag, 1), false); + if (pickingMaterialDetail != null) { + pickingMaterialDetail.setWeightLimit(outWeight); + pickingMaterialDetail.setTotalNetWeight(outWeight); + pickingMaterialDetail.setTotalGrossWeight(outVolume); + pickingMaterialDetail.setVolumeLimit(outVolume); + pickingMaterialDetail.setTotalVolume(outVolume); + pickingMaterialDetail.setPickingQuantity(pickingMaterialDetail.getQuantity()); + pickingMaterialDetail.setAlreadyPickingQuantity(pickingMaterialDetail.getQuantity()); + pickingMaterialDetailService.updateById(pickingMaterialDetail); + } + } + } + return Boolean.TRUE; + } + + @Transactional(rollbackFor = Exception.class) + public Boolean checkUpload(StockOutOrderDO stockOutOrderDO){ + String outOrderNumber = stockOutOrderDO.getOutOrderNumber(); + StockOutOrder stockOutOrder = stockOutOrderService.getOne(new QueryWrapper().lambda() + .eq(StockOutOrder::getOutOrderNumber, outOrderNumber) + .eq(StockOutOrder::getDelFlag, 1), false); + if (stockOutOrder == null) { + throw new RuntimeException("出库单不存在!"); + } + PickingOrder pickingOrder = pickingOrderService.getOne(new QueryWrapper().lambda() + .eq(PickingOrder::getOrderNumber, outOrderNumber) + .eq(PickingOrder::getDelFlag, 1), false); + if (pickingOrder == null) { + throw new RuntimeException("拣货单不存在!"); + } + PickingOrderDO pickingOrderDO = new PickingOrderDO(); + pickingOrderDO.setType(1); + pickingOrderDO.setPickingOrderId(pickingOrder.getPickingOrderId()); + pickingOrderDomainService.completePicking(pickingOrderDO); + + + //复核 + List materialDetailList = stockOutOrderDO.getMaterialDetailList(); + if (materialDetailList != null && materialDetailList.size() > 0) { + for (OutMaterialDetailDO outMaterialDetailDO : materialDetailList) { + Long uniqueId = outMaterialDetailDO.getUniqueId(); + PickingMaterialDetail pickingMaterialDetail = pickingMaterialDetailService.getOne(new QueryWrapper().lambda() + .eq(PickingMaterialDetail::getOutUniqueId, uniqueId) + .eq(PickingMaterialDetail::getDelFlag, 1), false); + if (pickingMaterialDetail != null) { + outMaterialDetailDO.setActualQuantity(pickingMaterialDetail.getPickingQuantity()); + outMaterialDetailDO.setCheckArea(pickingMaterialDetail.getTotalArea()); + outMaterialDetailDO.setCheckVolume(pickingMaterialDetail.getTotalVolume()); + outMaterialDetailDO.setCheckNetWeight(pickingMaterialDetail.getTotalNetWeight()); + outMaterialDetailDO.setCheckGrossWeight(pickingMaterialDetail.getTotalGrossWeight()); + } + } + } + stockOutOrderDO.setMaterialDetailList(materialDetailList); + batchCheck(stockOutOrderDO); + checkConfirm(stockOutOrderDO); + //交接 + HandoverTaskOrder handoverTaskOrder = handoverTaskOrderService.getOne(new LambdaQueryWrapper() + .eq(HandoverTaskOrder::getOrderNumber, outOrderNumber) + .eq(HandoverTaskOrder::getDelFlag, 1)); + if (handoverTaskOrder != null) { + HandoverTaskOrderDO handoverTaskOrderDO = new HandoverTaskOrderDO(); + List handoverTaskOrderId = new ArrayList<>(); + handoverTaskOrderId.add(handoverTaskOrder.getHandoverTaskOrderId()); + handoverTaskOrderDO.setHandoverTaskOrderIds(handoverTaskOrderId); + handoverTaskOrderDomainService.completeHandover(handoverTaskOrderDO); + } + return Boolean.TRUE; + } + @Transactional(rollbackFor = Exception.class) public Boolean genPickingOrderByOms(StockOutOrderDO stockOutOrderDO){ List stockOutOrderList = stockOutOrderService.list(new QueryWrapper().lambda() diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/outMaterialDetail/OutMaterialDetailDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/outMaterialDetail/OutMaterialDetailDTO.java index 0fa14e65e..67cfc6d1e 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/outMaterialDetail/OutMaterialDetailDTO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/outMaterialDetail/OutMaterialDetailDTO.java @@ -506,4 +506,16 @@ public class OutMaterialDetailDTO extends BaseVOEntity { private String bondInvtNoGw; private String whNoGw; private String seatNoGw; + //仓码简易模式 + @ApiModelProperty("出库重量") + @Excel(name = "出库重量") + private BigDecimal outWeight; + + @ApiModelProperty("出库体积") + @Excel(name = "出库体积") + private BigDecimal outVolume; + + @ApiModelProperty("出库数量") + @Excel(name = "出库数量") + private BigDecimal outQuantity; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockOutOrder/StockOutOrderApi.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockOutOrder/StockOutOrderApi.java index d383bed5a..30dbd3023 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockOutOrder/StockOutOrderApi.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockOutOrder/StockOutOrderApi.java @@ -347,6 +347,29 @@ public class StockOutOrderApi extends BaseController { return toAjax(stockOutOrderApplicationService.genPickingOrder(stockOutOrderDO)); } + + /** + * 生成拣货单 + */ + @ApiOperation("生成拣货单") + @PostMapping("/adjustPicking") + public AjaxResult adjustPicking(@RequestBody StockOutOrderDTO stockOutOrderDTO) { + StockOutOrderDO stockOutOrderDO = JSONUtil.toBean(JSONUtil.toJsonStr(stockOutOrderDTO), StockOutOrderDO.class); + return toAjax(stockOutOrderApplicationService.adjustPicking(stockOutOrderDO)); + } + + + + /** + * 生成拣货单 + */ + @ApiOperation("生成拣货单") + @PostMapping("/checkUpload") + public AjaxResult checkUpload(@RequestBody StockOutOrderDTO stockOutOrderDTO) { + StockOutOrderDO stockOutOrderDO = JSONUtil.toBean(JSONUtil.toJsonStr(stockOutOrderDTO), StockOutOrderDO.class); + return toAjax(stockOutOrderApplicationService.checkUpload(stockOutOrderDO)); + } + /** * 生成拣货单 */ From ce4f56962fd9b188a6b5e73c99eba4639b7926ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Tue, 14 Jul 2026 15:07:37 +0800 Subject: [PATCH 21/58] =?UTF-8?q?=E6=8B=A3=E8=B4=A7=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/todo/OutMaterialDetailDO.java | 4 ++++ .../stockOutOrder/service/StockOutOrderDomainService.java | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/todo/OutMaterialDetailDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/todo/OutMaterialDetailDO.java index 32838018a..ea24b9fe7 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/todo/OutMaterialDetailDO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/todo/OutMaterialDetailDO.java @@ -528,4 +528,8 @@ public class OutMaterialDetailDO extends BaseVOEntity { @ApiModelProperty("出库体积") @Excel(name = "出库体积") private BigDecimal outVolume; + + @ApiModelProperty("出库数量") + @Excel(name = "出库数量") + private BigDecimal outQuantity; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java index 0a900d0b1..4c6f3ac51 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java @@ -887,7 +887,7 @@ public class StockOutOrderDomainService { throw new RuntimeException("出库单明细不存在!"); } List pickingMaterialDetailList = materialDetailList.stream() - .filter(m -> m.getOutWeight() != null || m.getOutVolume() != null) + .filter(m -> m.getOutWeight() != null || m.getOutVolume() != null || m.getOutQuantity() != null) .collect(Collectors.toList()); if (pickingMaterialDetailList != null && pickingMaterialDetailList.size() > 0) { for (OutMaterialDetailDO outMaterialDetailDO : pickingMaterialDetailList) { @@ -903,8 +903,8 @@ public class StockOutOrderDomainService { pickingMaterialDetail.setTotalGrossWeight(outVolume); pickingMaterialDetail.setVolumeLimit(outVolume); pickingMaterialDetail.setTotalVolume(outVolume); - pickingMaterialDetail.setPickingQuantity(pickingMaterialDetail.getQuantity()); - pickingMaterialDetail.setAlreadyPickingQuantity(pickingMaterialDetail.getQuantity()); + pickingMaterialDetail.setPickingQuantity(outMaterialDetailDO.getOutQuantity()); + pickingMaterialDetail.setAlreadyPickingQuantity(outMaterialDetailDO.getOutQuantity()); pickingMaterialDetailService.updateById(pickingMaterialDetail); } } From cdb21fe96122ab20f337094c1b1060aec1ded318 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Tue, 14 Jul 2026 17:18:57 +0800 Subject: [PATCH 22/58] =?UTF-8?q?=E5=9B=9E=E6=98=BE=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E9=87=8D=E9=87=8F=E7=AD=89;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StockInOrderApplicationService.java | 37 +++++++++++++++++++ .../OutMaterialDetailMapper.xml | 5 +++ 2 files changed, 42 insertions(+) diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java index 830f8dec8..2c51f8806 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java @@ -27,6 +27,8 @@ import com.mhd.system.api.domain.WarehouseFeignPO; import com.mhd.system.api.domain.cache.AssociationWarehouseCacheDO; import com.mhd.system.api.domain.cache.SystemServiceCacheUtil; import com.mhd.system.api.model.LoginUser; +import com.mhd.wms.application.service.stockReceiptOrder.StockReceiptOrderApplicationService; +import com.mhd.wms.application.service.stockShelfOrder.StockShelfOrderApplicationService; import com.mhd.wms.domain.handoverTaskOrder.entity.HandoverTaskOrder; import com.mhd.wms.domain.handoverTaskOrder.repository.facade.IHandoverTaskOrderService; import com.mhd.wms.domain.inMaterialDetail.entity.InMaterialDetail; @@ -55,6 +57,7 @@ import com.mhd.wms.domain.stockOutOrder.repository.mapper.StockOutOrderMapper; import com.mhd.wms.domain.stockReceiptOrder.service.StockReceiptOrderDomainService; import com.mhd.wms.domain.stockShelfOrder.entity.StockShelfOrder; import com.mhd.wms.domain.stockShelfOrder.repository.facade.IStockShelfOrderService; +import com.mhd.wms.domain.stockShelfOrder.repository.todo.StockShelfOrderDO; import com.mhd.wms.domain.stockShelfOrder.service.StockShelfOrderDomainService; import com.mhd.wms.interfaces.dto.stockInOrder.StockInOrderDTO; import com.mhd.wms.domain.stockOutOrder.entity.StockOutOrder; @@ -133,6 +136,10 @@ public class StockInOrderApplicationService { private StockInOrderMapper stockInOrderMapper; @Autowired private PickingMaterialDetailMapper pickingMaterialDetailMapper; + @Autowired + private StockReceiptOrderApplicationService stockReceiptOrderApplicationService; + @Autowired + private StockShelfOrderApplicationService stockShelfOrderApplicationService; private static final String PUSH_API_URL = "http://10.102.192.15/nagu-erp-api/transfer/pushData"; private static final String API_NAME = "save_order_i"; private static final String VERIFY = "ESLuxAmB6VXCgbqP1eFzxTPVRagkQ62BUkfhElrgQ6XmE/g2reHVflY/SiCSU7JD"; @@ -577,6 +584,16 @@ public class StockInOrderApplicationService { StockShelfOrder stockShelfOrder = stockShelfOrderService.getOne(new LambdaQueryWrapper() .eq(StockShelfOrder::getInOrderNumber, inOrderNumber) .eq(StockShelfOrder::getDelFlag, 1), false); + + //上架任务下发 + StockShelfOrderDO stockShelfOrderDO = new StockShelfOrderDO(); + Long inOrderId = stockInOrderDO.getInOrderId(); + StockInOrder stockInOrder = stockInOrderService.getById(inOrderId); + stockShelfOrderDO.setOperatorsBy(stockInOrder.getWorkUserId()); + List ids = new ArrayList<>(); + ids.add(stockShelfOrder.getShelfOrderId()); + stockShelfOrderDO.setShelfOrderIds(ids); + stockShelfOrderApplicationService.taskDistribution(stockShelfOrderDO); Boolean b1 = stockShelfOrderDomainService.completeUpShelf(stockShelfOrder.getShelfOrderId()); return b && b1; } @@ -595,6 +612,26 @@ public class StockInOrderApplicationService { if (workUserId == null || workUserName == null) { throw new ServiceException("作业人员id或名称为空!"); } + + //pda任务中心下发 + StockReceiptOrderDO stockReceiptOrderDO = new StockReceiptOrderDO(); + stockReceiptOrderDO.setOperatorsBy(workUserId); + stockReceiptOrderDO.setOperatorsName(workUserName); + Long inOrderId = stockInOrder.getInOrderId(); + StockInOrder stock = stockInOrderService.getById(inOrderId); + String inOrderNumber = stock.getInOrderNumber(); + StockReceiptOrder stockReceiptOrder = stockReceiptOrderService.getOne(new LambdaQueryWrapper() + .eq(StockReceiptOrder::getInOrderNumber, inOrderNumber) + .eq(StockReceiptOrder::getDelFlag, 1), false); + if (stockReceiptOrder == null) { + throw new ServiceException("收货单不存在!"); + } + List ids = new ArrayList<>(); + ids.add(stockReceiptOrder.getReceiptOrderId()); + stockReceiptOrderDO.setReceiptOrderIds(ids); + stockReceiptOrderApplicationService.taskDistribution(stockReceiptOrderDO); + + stockInOrderService.update(null, new LambdaUpdateWrapper() .set(StockInOrder::getWorkUserId, workUserId) .set(StockInOrder::getWorkUserName, workUserName) diff --git a/mhd_wms/src/main/resources/mapper/OutMaterialDetail/OutMaterialDetailMapper.xml b/mhd_wms/src/main/resources/mapper/OutMaterialDetail/OutMaterialDetailMapper.xml index f73d0359a..02df3d80f 100644 --- a/mhd_wms/src/main/resources/mapper/OutMaterialDetail/OutMaterialDetailMapper.xml +++ b/mhd_wms/src/main/resources/mapper/OutMaterialDetail/OutMaterialDetailMapper.xml @@ -104,6 +104,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + @@ -117,6 +121,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.lot_no , a.stock_quantity , a.stock_unit ,a.in_order_number , + a.OUT_WEIGHT,a.OUT_VOLUME,a.OUT_QUANTITY, a.material_detail_id, a.organization_id, a.organization_name, a.top_organization_id, a.unique_id, a.out_order_number, a.material_base_info_id, a.line_number, a.material_code, a.material_name, a.bar_code, a.weight_limit, a.volume_limit, a.quantity, a.already_allocation_quantity, a.allocation_quantity, a.picking_quantity, a.check_quantity, ROUND(GREATEST(0, IFNULL(a.quantity, 0) - IFNULL(a.check_quantity, 0), IFNULL(a.picking_quantity, 0) - IFNULL(a.check_quantity, 0)), 2) AS wait_check_quantity, a.pack_id, a.pack_code, a.pack_name, a.pack_detail_id, a.unit_code, a.unit_name, a.material_warehouse_control_id, a.serial_number_manage, From 2fb7d117c0b3462f857697a2e1a64af13f425062 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Tue, 14 Jul 2026 17:30:35 +0800 Subject: [PATCH 23/58] =?UTF-8?q?=E5=9B=9E=E6=98=BE=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E9=87=8D=E9=87=8F=E7=AD=89;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/StockOutOrderDomainService.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java index 4c6f3ac51..aa0066995 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java @@ -894,6 +894,7 @@ public class StockOutOrderDomainService { Long uniqueId = outMaterialDetailDO.getUniqueId(); BigDecimal outWeight = outMaterialDetailDO.getOutWeight(); BigDecimal outVolume = outMaterialDetailDO.getOutVolume(); + BigDecimal outQuantity = outMaterialDetailDO.getOutQuantity(); PickingMaterialDetail pickingMaterialDetail = pickingMaterialDetailService.getOne(new QueryWrapper().lambda() .eq(PickingMaterialDetail::getOutUniqueId, uniqueId) .eq(PickingMaterialDetail::getDelFlag, 1), false); @@ -903,9 +904,18 @@ public class StockOutOrderDomainService { pickingMaterialDetail.setTotalGrossWeight(outVolume); pickingMaterialDetail.setVolumeLimit(outVolume); pickingMaterialDetail.setTotalVolume(outVolume); - pickingMaterialDetail.setPickingQuantity(outMaterialDetailDO.getOutQuantity()); - pickingMaterialDetail.setAlreadyPickingQuantity(outMaterialDetailDO.getOutQuantity()); + pickingMaterialDetail.setPickingQuantity(outQuantity == null || outQuantity.compareTo(BigDecimal.ZERO) == 0 ? outMaterialDetailDO.getOutQuantity() : outQuantity); + pickingMaterialDetail.setAlreadyPickingQuantity(outQuantity == null || outQuantity.compareTo(BigDecimal.ZERO) == 0 ? outMaterialDetailDO.getOutQuantity() : outQuantity); pickingMaterialDetailService.updateById(pickingMaterialDetail); + OutMaterialDetail outMaterialDetail = outMaterialDetailService.getOne(new LambdaQueryWrapper() + .eq(OutMaterialDetail::getUniqueId, uniqueId) + .eq(OutMaterialDetail::getDelFlag, 1), false); + if (outMaterialDetail != null) { + outMaterialDetail.setOutWeight(outWeight); + outMaterialDetail.setOutVolume(outVolume); + outMaterialDetail.setOutQuantity(outQuantity == null || outQuantity.compareTo(BigDecimal.ZERO) == 0 ? outMaterialDetailDO.getOutQuantity() : outQuantity); + outMaterialDetailService.updateById(outMaterialDetail); + } } } } From b303c78b39f31369baec89c0a6eef86d6f1d8194 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Tue, 14 Jul 2026 17:53:09 +0800 Subject: [PATCH 24/58] =?UTF-8?q?=E5=9B=9E=E6=98=BE=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E9=87=8D=E9=87=8F=E7=AD=89;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stockOutOrder/service/StockOutOrderDomainService.java | 6 ++++++ .../facadeApi/stockOutOrder/StockOutOrderApi.java | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java index aa0066995..3e8bdc587 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java @@ -874,6 +874,12 @@ public class StockOutOrderDomainService { @Transactional(rollbackFor = Exception.class) public Boolean adjustPicking(StockOutOrderDO stockOutOrderDO){ String outOrderNumber = stockOutOrderDO.getOutOrderNumber(); + StockOutOrder stockOutOrder = stockOutOrderService.getOne(new LambdaQueryWrapper() + .eq(StockOutOrder::getOutOrderNumber, outOrderNumber) + .eq(StockOutOrder::getDelFlag, 1), false); + stockOutOrder.setStatus(6); + stockOutOrder.setUpdateTime(new Date()); + stockOutOrderService.updateById(stockOutOrder); PickingOrder pickingOrder = pickingOrderService.getOne(new QueryWrapper().lambda() .eq(PickingOrder::getOrderNumber, outOrderNumber) .eq(PickingOrder::getDelFlag, 1), false); diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockOutOrder/StockOutOrderApi.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockOutOrder/StockOutOrderApi.java index 30dbd3023..e35ddf4e5 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockOutOrder/StockOutOrderApi.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockOutOrder/StockOutOrderApi.java @@ -351,7 +351,7 @@ public class StockOutOrderApi extends BaseController { /** * 生成拣货单 */ - @ApiOperation("生成拣货单") + @ApiOperation("简易模式拣货") @PostMapping("/adjustPicking") public AjaxResult adjustPicking(@RequestBody StockOutOrderDTO stockOutOrderDTO) { StockOutOrderDO stockOutOrderDO = JSONUtil.toBean(JSONUtil.toJsonStr(stockOutOrderDTO), StockOutOrderDO.class); @@ -363,7 +363,7 @@ public class StockOutOrderApi extends BaseController { /** * 生成拣货单 */ - @ApiOperation("生成拣货单") + @ApiOperation("简易核对上传") @PostMapping("/checkUpload") public AjaxResult checkUpload(@RequestBody StockOutOrderDTO stockOutOrderDTO) { StockOutOrderDO stockOutOrderDO = JSONUtil.toBean(JSONUtil.toJsonStr(stockOutOrderDTO), StockOutOrderDO.class); From 11ad2ea20fc219921a4d29c4f4f98a59741ffd92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Tue, 14 Jul 2026 17:54:17 +0800 Subject: [PATCH 25/58] =?UTF-8?q?=E5=9B=9E=E6=98=BE=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E9=87=8D=E9=87=8F=E7=AD=89;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stockOutOrder/service/StockOutOrderDomainService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java index 3e8bdc587..4c7b4f7e5 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java @@ -1688,9 +1688,9 @@ public class StockOutOrderDomainService { if (stockOutOrderDb.getStatus() > 8){ throw new ServiceException("出库单【" + stockOutOrderDb.getOutOrderNumber() + "】已出库，请重新选择"); } - if (stockOutOrderDb.getUpdateTime().compareTo(stockOutOrderDO.getUpdateTime()) != 0){ - throw new ServiceException("出库单【" + stockOutOrderDb.getOutOrderNumber() + "】数据已被更新，请刷新后重新进行收货"); - } +// if (stockOutOrderDb.getUpdateTime().compareTo(stockOutOrderDO.getUpdateTime()) != 0){ +// throw new ServiceException("出库单【" + stockOutOrderDb.getOutOrderNumber() + "】数据已被更新，请刷新后重新进行收货"); +// } LoginUser loginUser = SecurityUtils.getLoginUser(); stockOutOrderService.update(null, new UpdateWrapper().lambda() .set(StockOutOrder::getCheckStatus, 2) From 7bcf11baaf2565c2b3123b10c0fb1e32f0b2800a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Tue, 14 Jul 2026 18:08:28 +0800 Subject: [PATCH 26/58] =?UTF-8?q?pda=E4=BB=BB=E5=8A=A1=E4=B8=8B=E5=8F=91;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StockOutOrderApplicationService.java | 11 +++++++ .../service/StockOutOrderDomainService.java | 30 +++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java index 61b914cf4..ac9dbd8a9 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java @@ -1148,6 +1148,17 @@ public class StockOutOrderApplicationService { } public Boolean checkUpload(StockOutOrderDO stockOutOrderDO){ + //pda复核下发 + String outOrderNumber = stockOutOrderDO.getOutOrderNumber(); + StockOutOrder stockOutOrder = stockOutOrderService.getOne(new QueryWrapper().lambda() + .eq(StockOutOrder::getOutOrderNumber, outOrderNumber) + .eq(StockOutOrder::getDelFlag, 1), false); + stockOutOrderDO.setCheckOperatorsBy(stockOutOrder.getWorkUserId()); + List outOrderIds = new ArrayList<>(); + outOrderIds.add(stockOutOrder.getOutOrderId()); + stockOutOrderDO.setOutOrderIds(outOrderIds); + checkTaskDistribution(stockOutOrderDO); + Boolean b = stockOutOrderDomainService.checkUpload(stockOutOrderDO); return b; } diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java index 4c7b4f7e5..11ca0b915 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java @@ -19,6 +19,10 @@ import com.mhd.system.api.domain.BatchDetailFeignPO; import com.mhd.system.api.domain.DeliveryDetailsLink; import com.mhd.system.api.domain.PackDetailFeignPO; import com.mhd.system.api.model.LoginUser; +import com.mhd.wms.application.service.handoverTaskOrder.HandoverTaskOrderApplicationService; +import com.mhd.wms.application.service.pickingOrder.PickingOrderApplicationService; +import com.mhd.wms.application.service.reviewOrder.ReviewOrderApplicationService; +import com.mhd.wms.application.service.stockOutOrder.StockOutOrderApplicationService; import com.mhd.wms.domain.copyCodeReference.repository.po.CopyCodeReferencePO; import com.mhd.wms.domain.deliveTask.repository.facade.IDeliveTaskService; import com.mhd.wms.domain.deliveTask.repository.todo.DeliveTaskDO; @@ -70,6 +74,7 @@ import com.mhd.wms.domain.pickingOrder.service.PickingOrderDomainService; import com.mhd.wms.domain.pushSyncBms.PushSyncBmsDomainService; import com.mhd.wms.domain.replenishmentNotice.repository.todo.ReplenishmentNoticeDO; import com.mhd.wms.domain.replenishmentNotice.service.ReplenishmentNoticeDomainService; +import com.mhd.wms.domain.reviewOrder.repository.todo.ReviewOrderDO; import com.mhd.wms.domain.statementStatistics.po.ImmediateInventoryPO; import com.mhd.wms.domain.stockInOrder.entity.StockInOrder; import com.mhd.wms.domain.stockInOrder.repository.mapper.StockInOrderMapper; @@ -156,6 +161,11 @@ public class StockOutOrderDomainService { private IPickingOrderService pickingOrderService; @Autowired private StockInOrderMapper stockInOrderMapper; + @Autowired + private PickingOrderApplicationService pickingOrderApplicationService; + @Autowired + private HandoverTaskOrderApplicationService handoverTaskOrderApplicationService; + /** * 分页查询出库单列表 */ @@ -888,6 +898,15 @@ public class StockOutOrderDomainService { } pickingOrder.setStatus(2); pickingOrderService.updateById(pickingOrder); + + //拣货任务下发 + PickingOrderDO pickingOrderDO = new PickingOrderDO(); + pickingOrderDO.setOperatorsBy(stockOutOrder.getWorkUserId()); + List ids = new ArrayList<>(); + ids.add(pickingOrder.getPickingOrderId()); + pickingOrderDO.setPickingOrderIdList(ids); + pickingOrderApplicationService.allDistribution(pickingOrderDO); + List materialDetailList = stockOutOrderDO.getMaterialDetailList(); if (CollectionUtils.isEmpty(materialDetailList)) { throw new RuntimeException("出库单明细不存在!"); @@ -950,6 +969,7 @@ public class StockOutOrderDomainService { //复核 + ReviewOrderDO reviewOrderDO = new ReviewOrderDO(); List materialDetailList = stockOutOrderDO.getMaterialDetailList(); if (materialDetailList != null && materialDetailList.size() > 0) { for (OutMaterialDetailDO outMaterialDetailDO : materialDetailList) { @@ -970,10 +990,20 @@ public class StockOutOrderDomainService { batchCheck(stockOutOrderDO); checkConfirm(stockOutOrderDO); //交接 + + HandoverTaskOrder handoverTaskOrder = handoverTaskOrderService.getOne(new LambdaQueryWrapper() .eq(HandoverTaskOrder::getOrderNumber, outOrderNumber) .eq(HandoverTaskOrder::getDelFlag, 1)); if (handoverTaskOrder != null) { + //交接pda下发 + HandoverTaskOrderDO handoverTaskOrderDO1 = new HandoverTaskOrderDO(); + handoverTaskOrderDO1.setOperatorsBy(stockOutOrder.getWorkUserId()); + List ids = new ArrayList<>(); + ids.add(handoverTaskOrder.getHandoverTaskOrderId()); + handoverTaskOrderDO1.setHandoverTaskOrderIds(ids); + handoverTaskOrderApplicationService.taskDistribution(handoverTaskOrderDO1); + //完成交接 HandoverTaskOrderDO handoverTaskOrderDO = new HandoverTaskOrderDO(); List handoverTaskOrderId = new ArrayList<>(); handoverTaskOrderId.add(handoverTaskOrder.getHandoverTaskOrderId()); From 4091f20e7a410c41b961bf0dee1c7406631e4bd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Tue, 14 Jul 2026 18:09:53 +0800 Subject: [PATCH 27/58] =?UTF-8?q?pda=E4=BB=BB=E5=8A=A1=E4=B8=8B=E5=8F=91;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/stockInOrder/StockInOrderApplicationService.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java index 2c51f8806..7d89d698e 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java @@ -594,6 +594,8 @@ public class StockInOrderApplicationService { ids.add(stockShelfOrder.getShelfOrderId()); stockShelfOrderDO.setShelfOrderIds(ids); stockShelfOrderApplicationService.taskDistribution(stockShelfOrderDO); + + //完成上架 Boolean b1 = stockShelfOrderDomainService.completeUpShelf(stockShelfOrder.getShelfOrderId()); return b && b1; } From 7326407d1340e830d9ccad0b20413b2d14fe14dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Wed, 15 Jul 2026 14:36:19 +0800 Subject: [PATCH 28/58] =?UTF-8?q?=E5=A4=8D=E6=A0=B8=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/StockOutOrderDomainService.java | 77 ++++++++++++++----- 1 file changed, 59 insertions(+), 18 deletions(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java index 11ca0b915..c91f84814 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java @@ -74,6 +74,11 @@ import com.mhd.wms.domain.pickingOrder.service.PickingOrderDomainService; import com.mhd.wms.domain.pushSyncBms.PushSyncBmsDomainService; import com.mhd.wms.domain.replenishmentNotice.repository.todo.ReplenishmentNoticeDO; import com.mhd.wms.domain.replenishmentNotice.service.ReplenishmentNoticeDomainService; +import com.mhd.wms.domain.reviewOrder.entity.ReviewMaterialDetail; +import com.mhd.wms.domain.reviewOrder.entity.ReviewOrder; +import com.mhd.wms.domain.reviewOrder.repository.mapper.ReviewMaterialDetailMapper; +import com.mhd.wms.domain.reviewOrder.repository.mapper.ReviewOrderMapper; +import com.mhd.wms.domain.reviewOrder.repository.po.ReviewMaterialDetailPO; import com.mhd.wms.domain.reviewOrder.repository.todo.ReviewOrderDO; import com.mhd.wms.domain.statementStatistics.po.ImmediateInventoryPO; import com.mhd.wms.domain.stockInOrder.entity.StockInOrder; @@ -165,6 +170,12 @@ public class StockOutOrderDomainService { private PickingOrderApplicationService pickingOrderApplicationService; @Autowired private HandoverTaskOrderApplicationService handoverTaskOrderApplicationService; + @Autowired + private ReviewOrderApplicationService reviewOrderApplicationService; + @Autowired + private ReviewOrderMapper reviewOrderMapper; + @Autowired + private ReviewMaterialDetailMapper reviewMaterialDetailMapper; /** * 分页查询出库单列表 @@ -969,26 +980,56 @@ public class StockOutOrderDomainService { //复核 - ReviewOrderDO reviewOrderDO = new ReviewOrderDO(); - List materialDetailList = stockOutOrderDO.getMaterialDetailList(); - if (materialDetailList != null && materialDetailList.size() > 0) { - for (OutMaterialDetailDO outMaterialDetailDO : materialDetailList) { - Long uniqueId = outMaterialDetailDO.getUniqueId(); - PickingMaterialDetail pickingMaterialDetail = pickingMaterialDetailService.getOne(new QueryWrapper().lambda() - .eq(PickingMaterialDetail::getOutUniqueId, uniqueId) - .eq(PickingMaterialDetail::getDelFlag, 1), false); - if (pickingMaterialDetail != null) { - outMaterialDetailDO.setActualQuantity(pickingMaterialDetail.getPickingQuantity()); - outMaterialDetailDO.setCheckArea(pickingMaterialDetail.getTotalArea()); - outMaterialDetailDO.setCheckVolume(pickingMaterialDetail.getTotalVolume()); - outMaterialDetailDO.setCheckNetWeight(pickingMaterialDetail.getTotalNetWeight()); - outMaterialDetailDO.setCheckGrossWeight(pickingMaterialDetail.getTotalGrossWeight()); - } +// ReviewOrderDO reviewOrderDO = new ReviewOrderDO(); +// List materialDetailList = stockOutOrderDO.getMaterialDetailList(); +// if (materialDetailList != null && materialDetailList.size() > 0) { +// for (OutMaterialDetailDO outMaterialDetailDO : materialDetailList) { +// Long uniqueId = outMaterialDetailDO.getUniqueId(); +// PickingMaterialDetail pickingMaterialDetail = pickingMaterialDetailService.getOne(new QueryWrapper().lambda() +// .eq(PickingMaterialDetail::getOutUniqueId, uniqueId) +// .eq(PickingMaterialDetail::getDelFlag, 1), false); +// if (pickingMaterialDetail != null) { +// outMaterialDetailDO.setActualQuantity(pickingMaterialDetail.getPickingQuantity()); +// outMaterialDetailDO.setCheckArea(pickingMaterialDetail.getTotalArea()); +// outMaterialDetailDO.setCheckVolume(pickingMaterialDetail.getTotalVolume()); +// outMaterialDetailDO.setCheckNetWeight(pickingMaterialDetail.getTotalNetWeight()); +// outMaterialDetailDO.setCheckGrossWeight(pickingMaterialDetail.getTotalGrossWeight()); +// } +// } +// } +// stockOutOrderDO.setMaterialDetailList(materialDetailList); +// batchCheck(stockOutOrderDO); +// checkConfirm(stockOutOrderDO); + ReviewOrderDO cmd1 = new ReviewOrderDO(); + List reviewOrders = reviewOrderMapper.selectList(new QueryWrapper().lambda() + .eq(ReviewOrder::getOutOrderId, stockOutOrderDO.getOutOrderId()) + .eq(ReviewOrder::getDelFlag, 1)); + if (reviewOrders != null && reviewOrders.size() > 0) { + ReviewOrder reviewOrder = reviewOrders.get(0); + BeanUtils.copyProperties(reviewOrder,cmd1); + List details = new ArrayList<>(); + for (OutMaterialDetailDO outMaterialDetailDO : stockOutOrderDO.getMaterialDetailList()) { + ReviewMaterialDetailPO detailPO = new ReviewMaterialDetailPO(); + Long materialDetailId = outMaterialDetailDO.getMaterialDetailId(); + ReviewMaterialDetail reviewMaterialDetailPO = reviewMaterialDetailMapper.selectOne(new QueryWrapper().lambda() + .eq(ReviewMaterialDetail::getMaterialDetailId, materialDetailId) + .eq(ReviewMaterialDetail::getDelFlag, 1)); + reviewMaterialDetailPO.setReviewedQty(BigDecimal.ZERO); + reviewMaterialDetailPO.setReviewQtyEa(reviewMaterialDetailPO.getPendingReviewQty()); + reviewMaterialDetailPO.setVolumeCbm(outMaterialDetailDO.getOutVolume()); + reviewMaterialDetailPO.setNetWeightKg(outMaterialDetailDO.getOutWeight()); + reviewMaterialDetailPO.setGrossWeightKg(outMaterialDetailDO.getOutVolume()); + BeanUtils.copyProperties(reviewMaterialDetailPO, detailPO); + details.add(detailPO); } + cmd1.setDetails(details); } - stockOutOrderDO.setMaterialDetailList(materialDetailList); - batchCheck(stockOutOrderDO); - checkConfirm(stockOutOrderDO); + + + reviewOrderApplicationService.batchCheck(cmd1); + ReviewOrderDO cmd2 = new ReviewOrderDO(); + cmd2.setReviewOrderId(cmd1.getReviewOrderId()); + reviewOrderApplicationService.checkConfirm(cmd2); //交接 From 72b2a153a0e6263dbc533ca5a83908714536d414 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Wed, 15 Jul 2026 14:41:21 +0800 Subject: [PATCH 29/58] =?UTF-8?q?=E5=A4=8D=E6=A0=B8=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StockOutOrderApplicationService.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java index ac9dbd8a9..6184ff5c4 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java @@ -1149,15 +1149,15 @@ public class StockOutOrderApplicationService { public Boolean checkUpload(StockOutOrderDO stockOutOrderDO){ //pda复核下发 - String outOrderNumber = stockOutOrderDO.getOutOrderNumber(); - StockOutOrder stockOutOrder = stockOutOrderService.getOne(new QueryWrapper().lambda() - .eq(StockOutOrder::getOutOrderNumber, outOrderNumber) - .eq(StockOutOrder::getDelFlag, 1), false); - stockOutOrderDO.setCheckOperatorsBy(stockOutOrder.getWorkUserId()); - List outOrderIds = new ArrayList<>(); - outOrderIds.add(stockOutOrder.getOutOrderId()); - stockOutOrderDO.setOutOrderIds(outOrderIds); - checkTaskDistribution(stockOutOrderDO); +// String outOrderNumber = stockOutOrderDO.getOutOrderNumber(); +// StockOutOrder stockOutOrder = stockOutOrderService.getOne(new QueryWrapper().lambda() +// .eq(StockOutOrder::getOutOrderNumber, outOrderNumber) +// .eq(StockOutOrder::getDelFlag, 1), false); +// stockOutOrderDO.setCheckOperatorsBy(stockOutOrder.getWorkUserId()); +// List outOrderIds = new ArrayList<>(); +// outOrderIds.add(stockOutOrder.getOutOrderId()); +// stockOutOrderDO.setOutOrderIds(outOrderIds); +// checkTaskDistribution(stockOutOrderDO); Boolean b = stockOutOrderDomainService.checkUpload(stockOutOrderDO); return b; From 87eea6a8cdf64756c3b4657f0c49488d188b6b59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Wed, 15 Jul 2026 14:56:58 +0800 Subject: [PATCH 30/58] =?UTF-8?q?=E5=A4=8D=E6=A0=B8=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stockOutOrder/service/StockOutOrderDomainService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java index c91f84814..b7fa6edeb 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java @@ -1014,8 +1014,8 @@ public class StockOutOrderDomainService { ReviewMaterialDetail reviewMaterialDetailPO = reviewMaterialDetailMapper.selectOne(new QueryWrapper().lambda() .eq(ReviewMaterialDetail::getMaterialDetailId, materialDetailId) .eq(ReviewMaterialDetail::getDelFlag, 1)); - reviewMaterialDetailPO.setReviewedQty(BigDecimal.ZERO); - reviewMaterialDetailPO.setReviewQtyEa(reviewMaterialDetailPO.getPendingReviewQty()); +// reviewMaterialDetailPO.setReviewedQty(BigDecimal.ZERO); + reviewMaterialDetailPO.setReviewQtyEa(reviewMaterialDetailPO.getMaterialPlanQty()); reviewMaterialDetailPO.setVolumeCbm(outMaterialDetailDO.getOutVolume()); reviewMaterialDetailPO.setNetWeightKg(outMaterialDetailDO.getOutWeight()); reviewMaterialDetailPO.setGrossWeightKg(outMaterialDetailDO.getOutVolume()); From 5029ae8d420e554f855e37b9435046c9d833d465 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Wed, 15 Jul 2026 15:10:51 +0800 Subject: [PATCH 31/58] =?UTF-8?q?=E5=A4=8D=E6=A0=B8=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/StockOutOrderDomainService.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java index b7fa6edeb..af732981b 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java @@ -1008,7 +1008,18 @@ public class StockOutOrderDomainService { ReviewOrder reviewOrder = reviewOrders.get(0); BeanUtils.copyProperties(reviewOrder,cmd1); List details = new ArrayList<>(); - for (OutMaterialDetailDO outMaterialDetailDO : stockOutOrderDO.getMaterialDetailList()) { + List materialDetailList = stockOutOrderDO.getMaterialDetailList(); + // 将每个明细的children提取出来，与父级合并为一个扁平list + List flatMaterialDetailList = new ArrayList<>(); + for (OutMaterialDetailDO detail : materialDetailList) { + flatMaterialDetailList.add(detail); + if (!CollectionUtils.isEmpty(detail.getChildren())) { + flatMaterialDetailList.addAll(detail.getChildren()); + } + } + materialDetailList = flatMaterialDetailList; + + for (OutMaterialDetailDO outMaterialDetailDO : materialDetailList) { ReviewMaterialDetailPO detailPO = new ReviewMaterialDetailPO(); Long materialDetailId = outMaterialDetailDO.getMaterialDetailId(); ReviewMaterialDetail reviewMaterialDetailPO = reviewMaterialDetailMapper.selectOne(new QueryWrapper().lambda() From 73f7bbd8031c399bdc48c436f21c97df9d07ed84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Wed, 15 Jul 2026 15:14:45 +0800 Subject: [PATCH 32/58] =?UTF-8?q?=E5=A4=8D=E6=A0=B8=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stockOutOrder/service/StockOutOrderDomainService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java index af732981b..44b246a7d 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java @@ -1054,7 +1054,7 @@ public class StockOutOrderDomainService { List ids = new ArrayList<>(); ids.add(handoverTaskOrder.getHandoverTaskOrderId()); handoverTaskOrderDO1.setHandoverTaskOrderIds(ids); - handoverTaskOrderApplicationService.taskDistribution(handoverTaskOrderDO1); +// handoverTaskOrderApplicationService.taskDistribution(handoverTaskOrderDO1); //完成交接 HandoverTaskOrderDO handoverTaskOrderDO = new HandoverTaskOrderDO(); List handoverTaskOrderId = new ArrayList<>(); From 20f60d490f0fbbc8ed397b08eecc7abb05b48040 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Wed, 15 Jul 2026 16:07:16 +0800 Subject: [PATCH 33/58] =?UTF-8?q?=E5=A4=8D=E6=A0=B8=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/stockInOrder/StockInOrderApplicationService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java index 7d89d698e..4deef97ac 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java @@ -631,7 +631,7 @@ public class StockInOrderApplicationService { List ids = new ArrayList<>(); ids.add(stockReceiptOrder.getReceiptOrderId()); stockReceiptOrderDO.setReceiptOrderIds(ids); - stockReceiptOrderApplicationService.taskDistribution(stockReceiptOrderDO); +// stockReceiptOrderApplicationService.taskDistribution(stockReceiptOrderDO); stockInOrderService.update(null, new LambdaUpdateWrapper() From d683774b889cc2d68398dc37704399c76922572a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Wed, 15 Jul 2026 16:19:46 +0800 Subject: [PATCH 34/58] =?UTF-8?q?=E5=A4=8D=E6=A0=B8=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StockInOrderApplicationService.java | 17 +++++++++++++++++ .../facadeApi/stockInOrder/StockInOrderApi.java | 7 +++++++ 2 files changed, 24 insertions(+) diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java index 4deef97ac..56cb844c7 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java @@ -569,6 +569,23 @@ public class StockInOrderApplicationService { return b; } + public Boolean updateQuantity( BigDecimal quantity, Long materialDetailId){ + Boolean result = false; + InMaterialDetail inMaterialDetail = inMaterialDetailService.getById(materialDetailId); + if (inMaterialDetail != null) { + inMaterialDetail.setQuantity(quantity); + boolean b = inMaterialDetailService.updateById(inMaterialDetail); + Long uniqueId = inMaterialDetail.getUniqueId(); + ReceiptMaterialDetail one = receiptMaterialDetailService.getOne(new LambdaQueryWrapper() + .eq(ReceiptMaterialDetail::getInUniqueId, uniqueId) + .eq(ReceiptMaterialDetail::getDelFlag, 1)); + one.setQuantity(quantity); + boolean b1 = receiptMaterialDetailService.updateById(one); + result = b && b1; + } + return result; + } + public Boolean shelfEasyMode(StockInOrderDO stockInOrderDO){ Boolean b = stockInOrderDomainService.shelfEasyMode(stockInOrderDO); return b; diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java index 9c78b4d63..706ae5b4f 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java @@ -26,6 +26,7 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -218,6 +219,12 @@ public class StockInOrderApi extends BaseController { return AjaxResult.success(stockInOrderApplicationService.receiptEasyMode(stockInOrderDO)); } + @ApiOperation("pda简易模式修改计划数量") + @GetMapping(value = "/updateQuantity") + public AjaxResult updateQuantity(@RequestParam BigDecimal quantity, @RequestParam Long materialDetailId) { + return AjaxResult.success(stockInOrderApplicationService.updateQuantity(quantity, materialDetailId)); + } + /** * 审核入库单 */ From 80b96b0f17509f54a772a5583cc88aaae106fc79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Wed, 15 Jul 2026 16:34:03 +0800 Subject: [PATCH 35/58] =?UTF-8?q?=E5=A4=8D=E6=A0=B8=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stockInOrder/StockInOrderApplicationService.java | 12 +++++++++++- .../facadeApi/stockInOrder/StockInOrderApi.java | 8 ++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java index 56cb844c7..774aa4995 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java @@ -78,6 +78,7 @@ import org.apache.poi.ss.usermodel.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; @@ -569,17 +570,26 @@ public class StockInOrderApplicationService { return b; } - public Boolean updateQuantity( BigDecimal quantity, Long materialDetailId){ + public Boolean updateQuantity( BigDecimal quantity, Long materialDetailId,BigDecimal area, + BigDecimal volume,BigDecimal weight){ Boolean result = false; InMaterialDetail inMaterialDetail = inMaterialDetailService.getById(materialDetailId); if (inMaterialDetail != null) { inMaterialDetail.setQuantity(quantity); + inMaterialDetail.setTotalArea(area); + inMaterialDetail.setTotalVolume(volume); + inMaterialDetail.setTotalNetWeight(weight); + inMaterialDetail.setTotalGrossWeight(weight); boolean b = inMaterialDetailService.updateById(inMaterialDetail); Long uniqueId = inMaterialDetail.getUniqueId(); ReceiptMaterialDetail one = receiptMaterialDetailService.getOne(new LambdaQueryWrapper() .eq(ReceiptMaterialDetail::getInUniqueId, uniqueId) .eq(ReceiptMaterialDetail::getDelFlag, 1)); one.setQuantity(quantity); + one.setTotalArea(area); + one.setTotalVolume(volume); + one.setTotalNetWeight(weight); + one.setTotalGrossWeight(weight); boolean b1 = receiptMaterialDetailService.updateById(one); result = b && b1; } diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java index 706ae5b4f..988275c98 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java @@ -221,8 +221,12 @@ public class StockInOrderApi extends BaseController { @ApiOperation("pda简易模式修改计划数量") @GetMapping(value = "/updateQuantity") - public AjaxResult updateQuantity(@RequestParam BigDecimal quantity, @RequestParam Long materialDetailId) { - return AjaxResult.success(stockInOrderApplicationService.updateQuantity(quantity, materialDetailId)); + public AjaxResult updateQuantity(@RequestParam BigDecimal quantity, + @RequestParam Long materialDetailId, + @RequestParam BigDecimal area, + @RequestParam BigDecimal volume + ,@RequestParam BigDecimal weight) { + return AjaxResult.success(stockInOrderApplicationService.updateQuantity(quantity, materialDetailId, area, volume, weight)); } /** From 81dc017b68c6d7814a0875f76827e3ab1f3d97e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Wed, 15 Jul 2026 18:17:46 +0800 Subject: [PATCH 36/58] =?UTF-8?q?=E7=94=9F=E6=88=90=E4=BB=BB=E5=8A=A1;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StockInOrderApplicationService.java | 23 ++++++++++++++++++- .../StockOutOrderApplicationService.java | 23 +++++++++++++++++++ .../service/StockOutOrderDomainService.java | 19 +++++++++++++++ 3 files changed, 64 insertions(+), 1 deletion(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java index 774aa4995..cc68fd571 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java @@ -29,6 +29,8 @@ import com.mhd.system.api.domain.cache.SystemServiceCacheUtil; import com.mhd.system.api.model.LoginUser; import com.mhd.wms.application.service.stockReceiptOrder.StockReceiptOrderApplicationService; import com.mhd.wms.application.service.stockShelfOrder.StockShelfOrderApplicationService; +import com.mhd.wms.domain.deliveTask.entity.DeliveTask; +import com.mhd.wms.domain.deliveTask.repository.facade.IDeliveTaskService; import com.mhd.wms.domain.handoverTaskOrder.entity.HandoverTaskOrder; import com.mhd.wms.domain.handoverTaskOrder.repository.facade.IHandoverTaskOrderService; import com.mhd.wms.domain.inMaterialDetail.entity.InMaterialDetail; @@ -140,6 +142,8 @@ public class StockInOrderApplicationService { @Autowired private StockReceiptOrderApplicationService stockReceiptOrderApplicationService; @Autowired + private IDeliveTaskService deliveTaskService; + @Autowired private StockShelfOrderApplicationService stockShelfOrderApplicationService; private static final String PUSH_API_URL = "http://10.102.192.15/nagu-erp-api/transfer/pushData"; private static final String API_NAME = "save_order_i"; @@ -624,6 +628,15 @@ public class StockInOrderApplicationService { //完成上架 Boolean b1 = stockShelfOrderDomainService.completeUpShelf(stockShelfOrder.getShelfOrderId()); +// DeliveTask deliveTask = deliveTaskService.getOne(new LambdaQueryWrapper() +// .eq(DeliveTask::getTrackingNumber, stockReceiptOrder.getReceiptOrderNumber()) +// .eq(DeliveTask::getDelFlag, 1)); +// if (deliveTask != null) { +// deliveTask.setOperatorsBy(workUserId); +// deliveTask.setOperatorsName(workUserName); +// deliveTask.setTaskStatus(2); +// deliveTaskService.updateById(deliveTask); +// } return b && b1; } @@ -659,7 +672,15 @@ public class StockInOrderApplicationService { ids.add(stockReceiptOrder.getReceiptOrderId()); stockReceiptOrderDO.setReceiptOrderIds(ids); // stockReceiptOrderApplicationService.taskDistribution(stockReceiptOrderDO); - + DeliveTask deliveTask = deliveTaskService.getOne(new LambdaQueryWrapper() + .eq(DeliveTask::getTrackingNumber, stockReceiptOrder.getReceiptOrderNumber()) + .eq(DeliveTask::getDelFlag, 1)); + if (deliveTask != null) { + deliveTask.setOperatorsBy(workUserId); + deliveTask.setOperatorsName(workUserName); + deliveTask.setTaskStatus(2); + deliveTaskService.updateById(deliveTask); + } stockInOrderService.update(null, new LambdaUpdateWrapper() .set(StockInOrder::getWorkUserId, workUserId) diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java index 6184ff5c4..8e6556798 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java @@ -27,6 +27,8 @@ import com.mhd.system.api.domain.cache.AssociationWarehouseCacheDO; import com.mhd.system.api.domain.cache.SystemServiceCacheUtil; import com.mhd.system.api.model.LoginUser; import com.mhd.wms.domain.copyCodeReference.repository.po.CopyCodeReferencePO; +import com.mhd.wms.domain.deliveTask.entity.DeliveTask; +import com.mhd.wms.domain.deliveTask.repository.facade.IDeliveTaskService; import com.mhd.wms.domain.deliveryDetailsLink.entity.DeliveryDetailsLink; import com.mhd.wms.domain.deliveryDetailsLink.repository.facade.IDeliveryDetailsLinkService; import com.mhd.wms.domain.inMaterialDetail.entity.InMaterialDetail; @@ -48,6 +50,8 @@ import com.mhd.wms.domain.pickingMaterialDetail.repository.facade.IPickingMateri import com.mhd.wms.domain.pickingMaterialDetail.repository.mapper.PickingMaterialDetailMapper; import com.mhd.wms.domain.pickingMaterialDetail.repository.po.PickingAggByOutOrderRow; import com.mhd.wms.domain.pickingMaterialDetail.repository.po.PickingMaterialDetailPO; +import com.mhd.wms.domain.pickingOrder.entity.PickingOrder; +import com.mhd.wms.domain.pickingOrder.repository.facade.IPickingOrderService; import com.mhd.wms.domain.stockInOrder.entity.StockInOrder; import com.mhd.wms.domain.receiptOrderAccount.entity.ReceiptOrderAccount; import com.mhd.wms.domain.receiptOrderAccount.repository.facade.IReceiptOrderAccountService; @@ -112,6 +116,8 @@ public class StockOutOrderApplicationService { @Autowired private IPickingMaterialDetailService pickingMaterialDetailService; @Autowired + private IPickingOrderService pickingOrderService; + @Autowired private IReceiptOrderAccountService receiptOrderAccountService; @Autowired private IDeliveryDetailsLinkService deliveryDetailsLinkService; @@ -123,6 +129,8 @@ public class StockOutOrderApplicationService { private StockInOrderMapper stockInOrderMapper; @Autowired private PickingMaterialDetailMapper pickingMaterialDetailMapper; + @Autowired + private IDeliveTaskService deliveTaskService; private static final String PUSH_API_URL = "http://10.102.192.15/nagu-erp-api/transfer/pushData"; private static final String API_NAME = "save_order_e"; private static final String VERIFY = "ESLuxAmB6VXCgbqP1eFzxTPVRagkQ62BUkfhElrgQ6XmE/g2reHVflY/SiCSU7JD"; @@ -1647,6 +1655,21 @@ public class StockOutOrderApplicationService { if (workUserId == null || workUserName == null) { throw new ServiceException("作业人员id或名称为空!"); } + PickingOrder pickingOrder = pickingOrderService.getOne(new LambdaQueryWrapper() + .eq(PickingOrder::getOrderNumber, stockOutOrder.getOutOrderNumber()) + .eq(PickingOrder::getDelFlag, 1),false); + if (pickingOrder != null) { + DeliveTask deliveTask = deliveTaskService.getOne(new LambdaQueryWrapper() + .eq(DeliveTask::getTrackingNumber, pickingOrder.getPickingOrderNumber()) + .eq(DeliveTask::getDelFlag, 1)); + if (deliveTask != null) { + deliveTask.setOperatorsBy(workUserId); + deliveTask.setOperatorsName(workUserName); + deliveTask.setTaskStatus(2); + deliveTaskService.updateById(deliveTask); + } + } + stockOutOrderService.update(null, new LambdaUpdateWrapper() .set(StockOutOrder::getWorkUserId, workUserId) .set(StockOutOrder::getWorkUserName, workUserName) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java index 44b246a7d..78e0a2913 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java @@ -24,6 +24,7 @@ import com.mhd.wms.application.service.pickingOrder.PickingOrderApplicationServi import com.mhd.wms.application.service.reviewOrder.ReviewOrderApplicationService; import com.mhd.wms.application.service.stockOutOrder.StockOutOrderApplicationService; import com.mhd.wms.domain.copyCodeReference.repository.po.CopyCodeReferencePO; +import com.mhd.wms.domain.deliveTask.entity.DeliveTask; import com.mhd.wms.domain.deliveTask.repository.facade.IDeliveTaskService; import com.mhd.wms.domain.deliveTask.repository.todo.DeliveTaskDO; import com.mhd.wms.domain.deliveryDetailsLink.repository.facade.IDeliveryDetailsLinkService; @@ -1041,6 +1042,15 @@ public class StockOutOrderDomainService { ReviewOrderDO cmd2 = new ReviewOrderDO(); cmd2.setReviewOrderId(cmd1.getReviewOrderId()); reviewOrderApplicationService.checkConfirm(cmd2); + DeliveTask reviewdeliveTask = deliveTaskService.getOne(new LambdaQueryWrapper() + .eq(DeliveTask::getTrackingNumber, cmd1.getReviewOrderNumber()) + .eq(DeliveTask::getDelFlag, 1)); + if (reviewdeliveTask != null) { + reviewdeliveTask.setOperatorsBy(stockOutOrder.getWorkUserId()); + reviewdeliveTask.setOperatorsName(stockOutOrder.getWorkUserName()); + reviewdeliveTask.setTaskStatus(2); + deliveTaskService.updateById(reviewdeliveTask); + } //交接 @@ -1054,6 +1064,15 @@ public class StockOutOrderDomainService { List ids = new ArrayList<>(); ids.add(handoverTaskOrder.getHandoverTaskOrderId()); handoverTaskOrderDO1.setHandoverTaskOrderIds(ids); + DeliveTask deliveTask = deliveTaskService.getOne(new LambdaQueryWrapper() + .eq(DeliveTask::getTrackingNumber, handoverTaskOrder.getTaskNumber()) + .eq(DeliveTask::getDelFlag, 1)); + if (deliveTask != null) { + deliveTask.setOperatorsBy(stockOutOrder.getWorkUserId()); + deliveTask.setOperatorsName(stockOutOrder.getWorkUserName()); + deliveTask.setTaskStatus(2); + deliveTaskService.updateById(deliveTask); + } // handoverTaskOrderApplicationService.taskDistribution(handoverTaskOrderDO1); //完成交接 HandoverTaskOrderDO handoverTaskOrderDO = new HandoverTaskOrderDO(); From b0999402cdb33ddc71b57da3c2d2a789548a7509 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Thu, 16 Jul 2026 08:58:00 +0800 Subject: [PATCH 37/58] =?UTF-8?q?=E7=94=9F=E6=88=90=E4=BB=BB=E5=8A=A1;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/stockInOrder/StockInOrderMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml b/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml index b981cb8d4..7cfb2cdb0 100644 --- a/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml +++ b/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml @@ -591,7 +591,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" From 47688bfe3443e3630f048430b536a7514d40ccb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Thu, 16 Jul 2026 09:44:13 +0800 Subject: [PATCH 38/58] =?UTF-8?q?=E7=94=9F=E6=88=90=E4=BB=BB=E5=8A=A1;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StockInOrderApplicationService.java | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java index cc68fd571..d6c3f698b 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java @@ -618,13 +618,17 @@ public class StockInOrderApplicationService { //上架任务下发 StockShelfOrderDO stockShelfOrderDO = new StockShelfOrderDO(); - Long inOrderId = stockInOrderDO.getInOrderId(); - StockInOrder stockInOrder = stockInOrderService.getById(inOrderId); - stockShelfOrderDO.setOperatorsBy(stockInOrder.getWorkUserId()); - List ids = new ArrayList<>(); - ids.add(stockShelfOrder.getShelfOrderId()); - stockShelfOrderDO.setShelfOrderIds(ids); - stockShelfOrderApplicationService.taskDistribution(stockShelfOrderDO); + String inOrderId = stockInOrderDO.getInOrderNumber(); + StockInOrder stockInOrder = stockInOrderService.getOne(new LambdaQueryWrapper() + .eq(StockInOrder::getInOrderNumber, inOrderId) + .eq(StockInOrder::getDelFlag,1) ,false); + if (stockInOrder != null) { + stockShelfOrderDO.setOperatorsBy(stockInOrder.getWorkUserId()); + List ids = new ArrayList<>(); + ids.add(stockShelfOrder.getShelfOrderId()); + stockShelfOrderDO.setShelfOrderIds(ids); + stockShelfOrderApplicationService.taskDistribution(stockShelfOrderDO); + } //完成上架 Boolean b1 = stockShelfOrderDomainService.completeUpShelf(stockShelfOrder.getShelfOrderId()); From 521e4ca5bd21a86db47b7a3b3774d33cbc38452f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Thu, 16 Jul 2026 09:50:09 +0800 Subject: [PATCH 39/58] =?UTF-8?q?=E7=94=9F=E6=88=90=E4=BB=BB=E5=8A=A1;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StockInOrderApplicationService.java | 30 +++++++++---------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java index d6c3f698b..117efb435 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java @@ -618,29 +618,27 @@ public class StockInOrderApplicationService { //上架任务下发 StockShelfOrderDO stockShelfOrderDO = new StockShelfOrderDO(); + + + //完成上架 + Boolean b1 = stockShelfOrderDomainService.completeUpShelf(stockShelfOrder.getShelfOrderId()); + String inOrderId = stockInOrderDO.getInOrderNumber(); StockInOrder stockInOrder = stockInOrderService.getOne(new LambdaQueryWrapper() .eq(StockInOrder::getInOrderNumber, inOrderId) .eq(StockInOrder::getDelFlag,1) ,false); if (stockInOrder != null) { - stockShelfOrderDO.setOperatorsBy(stockInOrder.getWorkUserId()); - List ids = new ArrayList<>(); - ids.add(stockShelfOrder.getShelfOrderId()); - stockShelfOrderDO.setShelfOrderIds(ids); - stockShelfOrderApplicationService.taskDistribution(stockShelfOrderDO); + DeliveTask deliveTask = deliveTaskService.getOne(new LambdaQueryWrapper() + .eq(DeliveTask::getTrackingNumber, stockShelfOrder.getShelfOrderNumber()) + .eq(DeliveTask::getDelFlag, 1)); + if (deliveTask != null) { + deliveTask.setOperatorsBy(stockInOrder.getWorkUserId()); + deliveTask.setOperatorsName(stockInOrder.getWorkUserName()); + deliveTask.setTaskStatus(2); + deliveTaskService.updateById(deliveTask); + } } - //完成上架 - Boolean b1 = stockShelfOrderDomainService.completeUpShelf(stockShelfOrder.getShelfOrderId()); -// DeliveTask deliveTask = deliveTaskService.getOne(new LambdaQueryWrapper() -// .eq(DeliveTask::getTrackingNumber, stockReceiptOrder.getReceiptOrderNumber()) -// .eq(DeliveTask::getDelFlag, 1)); -// if (deliveTask != null) { -// deliveTask.setOperatorsBy(workUserId); -// deliveTask.setOperatorsName(workUserName); -// deliveTask.setTaskStatus(2); -// deliveTaskService.updateById(deliveTask); -// } return b && b1; } From 71765b339f36651da971ec7c10757a0c0a19feb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Thu, 16 Jul 2026 10:10:51 +0800 Subject: [PATCH 40/58] =?UTF-8?q?=E6=98=8E=E7=BB=86=E4=B8=8A=E6=9E=B6?= =?UTF-8?q?=E5=8D=95=E5=8F=B7=E4=B8=BA=E7=A9=BA=E9=97=AE=E9=A2=98;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stockInOrder/service/StockInOrderDomainService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java index 11caf9976..7db8e133e 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java @@ -672,7 +672,7 @@ public class StockInOrderDomainService { one.setWarehouseId(warehouseId); one.setStorageSectionId(storageSectionId); one.setStorageLocationId(storageLocationId); - one.setShelfOrderNumber(shelfOrderNumber); + one.setShelfOrderNumber(stockShelfOrder.getShelfOrderNumber()); one.setWarehouseCode(warehouseCode); one.setWarehouseName(warehouseName); one.setStorageCode(storageCode); @@ -691,7 +691,7 @@ public class StockInOrderDomainService { shelfMaterialDetail.setQuantity(BigDecimal.ZERO); shelfMaterialDetail.setShelvesQuantity(shelvesQuantity); shelfMaterialDetail.setAlreadyShelvesQuantity(shelvesQuantity); - shelfMaterialDetail.setShelfOrderNumber(shelfOrderNumber); + shelfMaterialDetail.setShelfOrderNumber(stockShelfOrder.getShelfOrderNumber()); shelfMaterialDetail.setWarehouseCode(warehouseCode); shelfMaterialDetail.setWarehouseName(warehouseName); shelfMaterialDetail.setStorageCode(storageCode); From a23a4acef30543df311f9e8a9897f1c8951cdb02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Thu, 16 Jul 2026 12:21:57 +0800 Subject: [PATCH 41/58] =?UTF-8?q?=E5=8F=91=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mhd-modules/mhd-system/src/main/resources/bootstrap.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mhd-modules/mhd-system/src/main/resources/bootstrap.yml b/mhd-modules/mhd-system/src/main/resources/bootstrap.yml index aa660b126..58c770a17 100644 --- a/mhd-modules/mhd-system/src/main/resources/bootstrap.yml +++ b/mhd-modules/mhd-system/src/main/resources/bootstrap.yml @@ -14,18 +14,18 @@ spring: nacos: discovery: # server-addr: 127.0.0.1:8848 -# server-addr: 10.33.0.129:6010 + server-addr: 10.33.0.129:6010 # 线上测试环境配置 容器名+端口号 - server-addr: 10.102.192.30:6848 +# server-addr: 10.102.192.30:6848 username: nacos password: manhuoda@2023 #线上正式环境 # server-addr: 10.102.192.105:6848 config: # server-addr: 127.0.0.1:8848 -# server-addr: 10.33.0.129:6010 + server-addr: 10.33.0.129:6010 # 线上测试环境配置 容器名+端口号 - server-addr: 10.102.192.30:6848 +# server-addr: 10.102.192.30:6848 username: nacos password: manhuoda@2023 #线上正式环境 From 4fad415cb7c5973dbb8319c2f53cade21808639d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Thu, 16 Jul 2026 13:51:59 +0800 Subject: [PATCH 42/58] =?UTF-8?q?=E5=BA=93=E4=BD=8D=E6=9D=A1=E7=A0=81;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/storageLocation/entity/StorageLocation.java | 6 ++++-- .../storageLocation/repository/po/StorageLocationPO.java | 6 ++++-- .../storageLocation/repository/todo/StorageLocationDO.java | 6 +++++- .../interfaces/dto/storageLocation/StorageLocationDTO.java | 6 +++++- .../mapper/basic/storageLocation/StorageLocationMapper.xml | 3 ++- 5 files changed, 20 insertions(+), 7 deletions(-) diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/storageLocation/entity/StorageLocation.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/storageLocation/entity/StorageLocation.java index 70ffc6d94..dd0080288 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/storageLocation/entity/StorageLocation.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/storageLocation/entity/StorageLocation.java @@ -165,6 +165,8 @@ public class StorageLocation extends BaseVOEntity{ @ApiModelProperty("是否作废: 1-否 2-是") @Excel(name = "是否作废: 1-否 2-是") private Integer nullify; + @ApiModelProperty("库位条码") + @Excel(name = "库位条码") + private String locationBarCode; - -} +} \ No newline at end of file diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/storageLocation/repository/po/StorageLocationPO.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/storageLocation/repository/po/StorageLocationPO.java index 6a3a87500..f5ed89202 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/storageLocation/repository/po/StorageLocationPO.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/storageLocation/repository/po/StorageLocationPO.java @@ -165,6 +165,8 @@ public class StorageLocationPO extends BaseVOEntity{ @Excel(name = "是否作废: 1-否 2-是") private Integer nullify; + @ApiModelProperty("库位条码") + @Excel(name = "库位条码") + private String locationBarCode; - -} +} \ No newline at end of file diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/storageLocation/repository/todo/StorageLocationDO.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/storageLocation/repository/todo/StorageLocationDO.java index e7ca22e26..b46cbb574 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/storageLocation/repository/todo/StorageLocationDO.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/storageLocation/repository/todo/StorageLocationDO.java @@ -204,4 +204,8 @@ public class StorageLocationDO extends BaseVOEntity{ @ApiModelProperty("坐标-层 终止") @Excel(name = "坐标-层 终止") private String coordinateLayerEnd; -} + + @ApiModelProperty("库位条码") + @Excel(name = "库位条码") + private String locationBarCode; +} \ No newline at end of file diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/storageLocation/StorageLocationDTO.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/storageLocation/StorageLocationDTO.java index 7c5968adb..3693b405c 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/storageLocation/StorageLocationDTO.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/storageLocation/StorageLocationDTO.java @@ -212,7 +212,11 @@ public class StorageLocationDTO extends BaseVOEntity{ @Excel(name = "坐标-层 终止") private String coordinateLayerEnd; + @ApiModelProperty("库位条码") + @Excel(name = "库位条码") + private String locationBarCode; + public interface Edit {} public interface BatchInsert {} -} +} \ No newline at end of file diff --git a/mhd-modules/mhd-system/src/main/resources/mapper/basic/storageLocation/StorageLocationMapper.xml b/mhd-modules/mhd-system/src/main/resources/mapper/basic/storageLocation/StorageLocationMapper.xml index 4ff52f6cc..e2915658e 100644 --- a/mhd-modules/mhd-system/src/main/resources/mapper/basic/storageLocation/StorageLocationMapper.xml +++ b/mhd-modules/mhd-system/src/main/resources/mapper/basic/storageLocation/StorageLocationMapper.xml @@ -47,6 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -58,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.storage_location_classify, a.storage_location_classify_name, a.storage_location_type, a.storage_location_type_name, a.mixing_strategy, a.mixing_strategy_name, a.storage_location_group_id, a.storage_location_group_code, a.storage_location_group_name, a.weight_limit, a.volume_limit, a.location_size, a.location_length, a.location_width, a.location_height, - a.coordinate, a.coordinate_area, a.coordinate_column, a.coordinate_row, a.coordinate_layer, a.remark, + a.coordinate, a.coordinate_area, a.coordinate_column, a.coordinate_row, a.coordinate_layer, a.remark, a.LOCATION_BAR_CODE, a.opening_up, a.nullify, a.status, a.create_time, a.create_by, a.create_by_name, a.update_time, a.update_by, a.update_by_name, a.del_flag from storage_location a LEFT JOIN warehouse w ON a.warehouse_id = w.warehouse_id AND w.del_flag = 1 From a7eed8590f3549dee6d71d717017e4e6ee235431 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Thu, 16 Jul 2026 14:11:33 +0800 Subject: [PATCH 43/58] =?UTF-8?q?=E5=BA=93=E4=BD=8D=E6=9D=A1=E7=A0=81;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/StockOutOrderDomainService.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java index 78e0a2913..4c106af4b 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java @@ -917,7 +917,7 @@ public class StockOutOrderDomainService { List ids = new ArrayList<>(); ids.add(pickingOrder.getPickingOrderId()); pickingOrderDO.setPickingOrderIdList(ids); - pickingOrderApplicationService.allDistribution(pickingOrderDO); +// pickingOrderApplicationService.allDistribution(pickingOrderDO); List materialDetailList = stockOutOrderDO.getMaterialDetailList(); if (CollectionUtils.isEmpty(materialDetailList)) { @@ -978,7 +978,15 @@ public class StockOutOrderDomainService { pickingOrderDO.setType(1); pickingOrderDO.setPickingOrderId(pickingOrder.getPickingOrderId()); pickingOrderDomainService.completePicking(pickingOrderDO); - + DeliveTask pickdeliveTask = deliveTaskService.getOne(new LambdaQueryWrapper() + .eq(DeliveTask::getTrackingNumber, pickingOrder.getPickingOrderNumber()) + .eq(DeliveTask::getDelFlag, 1)); + if (pickdeliveTask != null) { + pickdeliveTask.setOperatorsBy(stockOutOrder.getWorkUserId()); + pickdeliveTask.setOperatorsName(stockOutOrder.getWorkUserName()); + pickdeliveTask.setTaskStatus(2); + deliveTaskService.updateById(pickdeliveTask); + } //复核 // ReviewOrderDO reviewOrderDO = new ReviewOrderDO(); From 9bb5a7c2cff0e3e22fe2a3c2864b27f2de20d819 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Thu, 16 Jul 2026 18:19:15 +0800 Subject: [PATCH 44/58] =?UTF-8?q?=E5=BA=93=E4=BD=8D=E6=9D=A1=E7=A0=81;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/ReservationStockInOrderDomainService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java index 48da47d00..6c00c3764 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java @@ -718,13 +718,13 @@ public class ReservationStockInOrderDomainService { BigDecimal quantity = details.stream().map(ReservationInMaterialDetail::getQuantity).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add); reservationStockInOrder.setQuantity(quantity); executionStockInOrderService.save(reservationStockInOrder); + executionInMaterialDetailService.saveBatch(inMaterialDetailList); ExecutionStockInOrderDO param = new ExecutionStockInOrderDO(); Long inOrderId1 = reservationStockInOrder.getInOrderId(); List inOrderIdList1 = new ArrayList<>(); inOrderIdList1.add(inOrderId1); param.setInOrderIds(inOrderIdList1); stockInOrderApplicationService.issueOrder(param); - executionInMaterialDetailService.saveBatch(inMaterialDetailList); }); } From 1f0703bc648ffa44074c45e5d31822fd840fbbb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Thu, 16 Jul 2026 18:35:32 +0800 Subject: [PATCH 45/58] =?UTF-8?q?=E5=88=86=E6=89=B9=E4=B8=8A=E6=9E=B6?= =?UTF-8?q?=E5=A4=9A=E4=BD=99=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/StockInOrderDomainService.java | 38 ++++++++++--------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java index 7db8e133e..c022ecaa9 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java @@ -631,23 +631,23 @@ public class StockInOrderDomainService { // Integer level = (Integer) stringObjectMap.get("level"); // 如果 materialDetailId 不为空，则更新上架单明细 - if (stringObjectMap.containsKey("materialDetailId")) { - Long materialDetailId = (Long) stringObjectMap.get("materialDetailId"); - ShelfMaterialDetail detail = shelfMaterialDetailService.getById(materialDetailId); - detail.setShelvesQuantity(shelvesQuantity); - detail.setAlreadyShelvesQuantity(shelvesQuantity); - detail.setWarehouseId(warehouseId); - detail.setStorageSectionId(storageSectionId); - detail.setStorageLocationId(storageLocationId); - detail.setWarehouseCode(warehouseCode); - detail.setWarehouseName(warehouseName); - detail.setStorageCode(storageCode); - detail.setStorageName(storageName); - detail.setStorageLocationCode(storageLocationCode); - detail.setStorageLocationName(storageLocationName); - shelfMaterialDetailService.updateById(detail); - continue; - } +// if (stringObjectMap.containsKey("materialDetailId")) { +// Long materialDetailId = (Long) stringObjectMap.get("materialDetailId"); +// ShelfMaterialDetail detail = shelfMaterialDetailService.getById(materialDetailId); +// detail.setShelvesQuantity(shelvesQuantity); +// detail.setAlreadyShelvesQuantity(shelvesQuantity); +// detail.setWarehouseId(warehouseId); +// detail.setStorageSectionId(storageSectionId); +// detail.setStorageLocationId(storageLocationId); +// detail.setWarehouseCode(warehouseCode); +// detail.setWarehouseName(warehouseName); +// detail.setStorageCode(storageCode); +// detail.setStorageName(storageName); +// detail.setStorageLocationCode(storageLocationCode); +// detail.setStorageLocationName(storageLocationName); +// shelfMaterialDetailService.updateById(detail); +// continue; +// } // 如果 materialDetailId 为空，则创建上架单明细 List list = stockShelfOrderService.list(new QueryWrapper().lambda() @@ -665,6 +665,10 @@ public class StockInOrderDomainService { .eq(ShelfMaterialDetail::getMaterialBaseInfoId, materialBaseInfoId) .eq(ShelfMaterialDetail::getInUniqueId, uniqueId) .eq(ShelfMaterialDetail::getDelFlag, 1), false); + shelfMaterialDetailService.remove(new QueryWrapper().lambda() + .eq(ShelfMaterialDetail::getLevel, 2) + .ne(ShelfMaterialDetail::getParentUniqueId, 0l) + .eq(ShelfMaterialDetail::getDelFlag, 1)); if (one != null) { if (index == 0) { one.setShelvesQuantity(shelvesQuantity); From 2d03084f0c95120253895bfa755cf518b981bf54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Thu, 16 Jul 2026 19:00:49 +0800 Subject: [PATCH 46/58] =?UTF-8?q?=E5=88=86=E6=89=B9=E4=B8=8A=E6=9E=B6?= =?UTF-8?q?=E5=A4=9A=E4=BD=99=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/StockInOrderDomainService.java | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java index c022ecaa9..d4ba915cb 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java @@ -3,6 +3,7 @@ package com.mhd.wms.domain.stockInOrder.service; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.TypeReference; import com.alibaba.fastjson2.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.mhd.common.core.constant.SnowFlakeConstants; @@ -525,6 +526,10 @@ public class StockInOrderDomainService { .eq(ReceiptMaterialDetail::getMaterialBaseInfoId, materialBaseInfoId) .eq(ReceiptMaterialDetail::getInUniqueId, uniqueId) .eq(ReceiptMaterialDetail::getDelFlag, 1), false); + BigDecimal alreadyReceiptQuantity = receiptMaterialDetail.getAlreadyReceiptQuantity(); + if (alreadyReceiptQuantity != null && alreadyReceiptQuantity.compareTo(collectQuantity) == 0) { + continue; + } receiptMaterialDetail.setReceiptQuantity(collectQuantity); receiptMaterialDetail.setAlreadyReceiptQuantity(collectQuantity); BigDecimal quantity = receiptMaterialDetail.getQuantity(); @@ -722,6 +727,23 @@ public class StockInOrderDomainService { materialDetailService.updateById(inMaterialDetail); } } + StockShelfOrder stockShelfOrder = stockShelfOrderService.getOne(new QueryWrapper().lambda() + .eq(StockShelfOrder::getInOrderNumber, inOrderNumber) + .eq(StockShelfOrder::getDelFlag, 1), false); + if (stockShelfOrder != null) { + String shelfOrderNumber = stockShelfOrder.getShelfOrderNumber(); + List list = shelfMaterialDetailService.list(new LambdaQueryWrapper() + .eq(ShelfMaterialDetail::getShelfOrderNumber, shelfOrderNumber) + .eq(ShelfMaterialDetail::getDelFlag, 1)); + if (list!=null&&list.size() > 0) { + BigDecimal quantity = BigDecimal.ZERO; + for (ShelfMaterialDetail shelfMaterialDetail : list) { + quantity = quantity.add(shelfMaterialDetail.getAlreadyShelvesQuantity()); + } + stockShelfOrder.setShelvesQuantity(quantity); + stockShelfOrderService.updateById(stockShelfOrder); + } + } return true; } From 165927bc3dc309a8313ab689b428df3325400b74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Thu, 16 Jul 2026 20:55:11 +0800 Subject: [PATCH 47/58] =?UTF-8?q?=E6=89=A7=E8=A1=8C=E5=8D=95=E4=B8=8B?= =?UTF-8?q?=E5=8F=91=E5=88=86=E5=8F=91=E7=BB=84=E7=BB=87;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ExecutionStockInOrderDomainService.java | 15 ++++++++++++++- .../ExecutionStockOutOrderDomainService.java | 14 +++++++++++++- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/executionStockInOrder/service/ExecutionStockInOrderDomainService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/executionStockInOrder/service/ExecutionStockInOrderDomainService.java index 044e7cc9c..9bf82170f 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/executionStockInOrder/service/ExecutionStockInOrderDomainService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/executionStockInOrder/service/ExecutionStockInOrderDomainService.java @@ -29,6 +29,7 @@ import com.mhd.oms.domain.executionStockInOrder.repository.po.ExecutionStockInOr import com.mhd.oms.domain.executionStockInOrder.repository.todo.ExecutionStockInOrderDO; import com.mhd.oms.domain.executionStockOutOrder.entity.ExecutionStockOutOrder; import com.mhd.oms.domain.executionStockOutOrder.repository.facade.IExecutionStockOutOrderService; +import com.mhd.oms.domain.reservationStockInOrder.repository.mapper.ReservationStockInOrderMapper; import com.mhd.system.api.SystemServiceFeign; import com.mhd.system.api.WmsServiceFeign; import com.mhd.system.api.domain.*; @@ -39,6 +40,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; +import javax.annotation.Resource; import java.lang.reflect.Field; import java.math.BigDecimal; import java.util.ArrayList; @@ -85,7 +87,8 @@ public class ExecutionStockInOrderDomainService { // private IReceiptMaterialDetailService receiptMaterialDetailService; // @Autowired // private IShelfMaterialDetailService shelfMaterialDetailService; - + @Resource + private ReservationStockInOrderMapper stockInOrderMapper; /** * 分页查询入库单列表 */ @@ -497,6 +500,13 @@ public class ExecutionStockInOrderDomainService { StockInOrder stockInOrder = new StockInOrder(); BeanUtils.copyProperties(byId, stockInOrder,"inOrderId"); stockInOrder.setOmsStockInOrderId(String.valueOf(byId.getInOrderId())); + Long warehouseId = stockInOrder.getWarehouseId(); + Long topOrgId = stockInOrderMapper.getTopOrgId(warehouseId); + Long orgId = stockInOrderMapper.getOrgId(warehouseId); + String orgName = stockInOrderMapper.getOrgName(warehouseId); + stockInOrder.setOrganizationId(orgId); + stockInOrder.setOrganizationName(orgName); + stockInOrder.setTopOrganizationId(topOrgId); wmsServiceFeign.omsInOrderAdd(stockInOrder); String inOrderNumber = stockInOrder.getInOrderNumber(); List materialDetailList = materialDetailService.list(new QueryWrapper().lambda().eq(ExecutionInMaterialDetail::getInOrderNumber, inOrderNumber)); @@ -505,6 +515,9 @@ public class ExecutionStockInOrderDomainService { InMaterialDetail inMaterialDetail = new InMaterialDetail(); BeanUtils.copyProperties(reservationInMaterialDetail, inMaterialDetail,"materialDetailId"); inMaterialDetail.setOmsInMaterialDetail(String.valueOf(reservationInMaterialDetail.getMaterialDetailId())); + inMaterialDetail.setOrganizationId(orgId); + inMaterialDetail.setOrganizationName(orgName); + inMaterialDetail.setTopOrganizationId(topOrgId); inMaterialDetailList.add(inMaterialDetail); } wmsServiceFeign.omsInOrderAddDetail(inMaterialDetailList); diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/executionStockOutOrder/service/ExecutionStockOutOrderDomainService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/executionStockOutOrder/service/ExecutionStockOutOrderDomainService.java index ed9c53e21..27e1ea97f 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/executionStockOutOrder/service/ExecutionStockOutOrderDomainService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/executionStockOutOrder/service/ExecutionStockOutOrderDomainService.java @@ -37,6 +37,7 @@ import com.mhd.oms.domain.reservationInventoryAdjustmentRecord.entity.Reservatio import com.mhd.oms.domain.reservationInventoryAdjustmentRecord.repository.mapper.ReservationInventoryAdjustmentRecordMapper; import com.mhd.oms.domain.reservationMaterialInventory.entity.ReservationMaterialInventory; import com.mhd.oms.domain.reservationMaterialInventory.repository.mapper.ReservationMaterialInventoryMapper; +import com.mhd.oms.domain.reservationStockInOrder.repository.mapper.ReservationStockInOrderMapper; import com.mhd.system.api.SystemServiceFeign; import com.mhd.system.api.WmsServiceFeign; import com.mhd.system.api.domain.*; @@ -93,7 +94,8 @@ public class ExecutionStockOutOrderDomainService { private ReservationInventoryAdjustmentRecordMapper inventoryAdjustmentRecordMapper; @Autowired private ReservationMaterialInventoryMapper reservationMaterialInventoryMapper; - + @Autowired + private ReservationStockInOrderMapper stockInOrderMapper; /** * 分页查询出库单列表 */ @@ -396,6 +398,13 @@ public class ExecutionStockOutOrderDomainService { ExecutionStockOutOrder byId = stockOutOrderService.getById(inOrderId); StockOutOrder stockOutOrder = new StockOutOrder(); BeanUtils.copyProperties(byId, stockOutOrder,"outOrderId"); + Long warehouseId = stockOutOrder.getWarehouseId(); + Long topOrgId = stockInOrderMapper.getTopOrgId(warehouseId); + Long orgId = stockInOrderMapper.getOrgId(warehouseId); + String orgName = stockInOrderMapper.getOrgName(warehouseId); + stockOutOrder.setOrganizationId(orgId); + stockOutOrder.setOrganizationName(orgName); + stockOutOrder.setTopOrganizationId(topOrgId); wmsServiceFeign.omsOutOrderAdd(stockOutOrder); List list = deliveryDetailsLinkService.list(new QueryWrapper().lambda().eq(ReservationDeliveryDetailsLink::getOrderNumber, byId.getOutOrderNumber())); @@ -415,6 +424,9 @@ public class ExecutionStockOutOrderDomainService { for (ExecutionOutMaterialDetail reservationOutMaterialDetail : materialDetailList) { OutMaterialDetail outMaterialDetail = new OutMaterialDetail(); BeanUtils.copyProperties(reservationOutMaterialDetail, outMaterialDetail,"materialDetailId"); + outMaterialDetail.setOrganizationId(orgId); + outMaterialDetail.setOrganizationName(orgName); + outMaterialDetail.setTopOrganizationId(topOrgId); outMaterialDetailList.add(outMaterialDetail); } wmsServiceFeign.omsOutOrderAddDetail(outMaterialDetailList); From 5c591d3b5718ffd49ae028108ebe003539987c28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Thu, 16 Jul 2026 22:53:45 +0800 Subject: [PATCH 48/58] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=B9=E6=AC=A1?= =?UTF-8?q?=E5=8F=B7=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/StockInOrderDomainService.java | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java index d4ba915cb..4ef8c6cd0 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson.TypeReference; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.mhd.common.core.constant.SnowFlakeConstants; import com.mhd.common.core.exception.ServiceException; @@ -63,6 +64,8 @@ import org.springframework.util.CollectionUtils; import javax.annotation.Resource; import java.lang.reflect.Field; import java.math.BigDecimal; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -508,6 +511,30 @@ public class StockInOrderDomainService { ? loginUser.getUserPo().getUserName() : (loginUser.getRealname() != null ? loginUser.getRealname() : loginUser.getUsername()); String inOrderNumber = stockInOrderDO.getInOrderNumber(); + // 查询当天创建的入库单数量,用于生成batchNo + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); + String todayStr = dateFormat.format(new Date()); + String todayStart = todayStr + " 00:00:00"; + String todayEnd = todayStr + " 23:59:59"; + SimpleDateFormat fullDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Date todayStartDate = null; + try { + todayStartDate = fullDateFormat.parse(todayStart); + } catch (ParseException e) { + throw new RuntimeException(e); + } + Date todayEndDate = null; + try { + todayEndDate = fullDateFormat.parse(todayEnd); + } catch (ParseException e) { + throw new RuntimeException(e); + } + long todayStockInOrderCount = stockInOrderService.count(new LambdaQueryWrapper() + .ge(StockInOrder::getCreateTime, todayStartDate) + .le(StockInOrder::getCreateTime, todayEndDate) + .eq(StockInOrder::getDelFlag, 1)); + String batchNo = "PC"+inOrderNumber+"-"+todayStockInOrderCount; List materialDetailList = stockInOrderDO.getMaterialDetailList(); List receiptMaterialDetailList = materialDetailList.stream() .filter(m -> m.getCollectQuantity() != null && m.getCollectQuantity().compareTo(BigDecimal.ZERO) != 0) @@ -532,6 +559,8 @@ public class StockInOrderDomainService { } receiptMaterialDetail.setReceiptQuantity(collectQuantity); receiptMaterialDetail.setAlreadyReceiptQuantity(collectQuantity); + + receiptMaterialDetail.setBatchNo(batchNo); BigDecimal quantity = receiptMaterialDetail.getQuantity(); if (quantity != null && quantity.compareTo(BigDecimal.ZERO) == 0) { receiptMaterialDetail.setReceiptStatus(3); @@ -544,6 +573,7 @@ public class StockInOrderDomainService { if (stockReceiptOrder != null) { stockReceiptOrder.setStatus(2); stockReceiptOrder.setReceiptQuantity(stockReceiptOrder.getReceiptQuantity().add(collectQuantity)); + stockReceiptOrder.setBatchNo(batchNo); stockReceiptOrderService.updateById(stockReceiptOrder); } @@ -563,6 +593,7 @@ public class StockInOrderDomainService { } else { BeanUtils.copyProperties(stockReceiptOrder, stockShelfOrder); stockShelfOrder.setShelfOrderNumber(OrderSequence.getOrderCode("SJ")); + stockShelfOrder.setBatchNo(batchNo); stockShelfOrderService.save(stockShelfOrder); } log.info("生成上架单成功，上架单编号：{}", stockShelfOrder.getShelfOrderNumber()); @@ -574,6 +605,7 @@ public class StockInOrderDomainService { .eq(ShelfMaterialDetail::getDelFlag, 1), false); if (one != null) { one.setQuantity(collectQuantity); + one.setBatchNo(batchNo); shelfMaterialDetailService.updateById(one); } else { BeanUtils.copyProperties(inMaterialDetailDO, shelfMaterialDetail); @@ -581,6 +613,7 @@ public class StockInOrderDomainService { shelfMaterialDetail.setQuantity(collectQuantity); shelfMaterialDetail.setInUniqueId(uniqueId); shelfMaterialDetail.setReceiptUniqueId(receiptMaterialDetail.getUniqueId()); + shelfMaterialDetail.setBatchNo(batchNo); shelfMaterialDetailService.save(shelfMaterialDetail); } @@ -654,6 +687,10 @@ public class StockInOrderDomainService { // continue; // } + StockReceiptOrder stockReceiptOrder = stockReceiptOrderService.getOne(new LambdaUpdateWrapper() + .eq(StockReceiptOrder::getInOrderNumber, inOrderNumber) + .eq(StockReceiptOrder::getDelFlag, 1), false); + // 如果 materialDetailId 为空，则创建上架单明细 List list = stockShelfOrderService.list(new QueryWrapper().lambda() .eq(StockShelfOrder::getInOrderNumber, inOrderNumber) @@ -713,6 +750,9 @@ public class StockInOrderDomainService { shelfMaterialDetail.setInUniqueId(idGenerator.snowflakeId(SnowFlakeConstants.wmsId)); shelfMaterialDetail.setReceiptUniqueId(idGenerator.snowflakeId(SnowFlakeConstants.wmsId)); shelfMaterialDetail.setShelvesStatus(3); + if (stockReceiptOrder!= null) { + shelfMaterialDetail.setBatchNo(stockReceiptOrder.getBatchNo()); + } shelfMaterialDetailService.save(shelfMaterialDetail); stringObjectMap.put("materialDetailId", shelfMaterialDetail.getMaterialDetailId()); stringObjectMap.put("level",2 ); From cf0a42ec8a31e650797aa6d6e7aec8bfc987be9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Thu, 16 Jul 2026 23:13:30 +0800 Subject: [PATCH 49/58] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=B9=E6=AC=A1?= =?UTF-8?q?=E5=8F=B7=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/stockInOrder/service/StockInOrderDomainService.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java index 4ef8c6cd0..5689c1ba9 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java @@ -744,6 +744,8 @@ public class StockInOrderDomainService { shelfMaterialDetail.setStorageName(storageName); shelfMaterialDetail.setStorageLocationCode(storageLocationCode); shelfMaterialDetail.setStorageLocationName(storageLocationName); + shelfMaterialDetail.setStorageSectionId(storageSectionId); + shelfMaterialDetail.setStorageLocationId(storageLocationId); shelfMaterialDetail.setLevel(2); shelfMaterialDetail.setParentUniqueId(one.getUniqueId()); shelfMaterialDetail.setUniqueId(idGenerator.snowflakeId(SnowFlakeConstants.wmsId)); From 6f5fa138d9fae2f40556632892c416b83d264e63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Fri, 17 Jul 2026 00:11:53 +0800 Subject: [PATCH 50/58] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=B9=E6=AC=A1?= =?UTF-8?q?=E5=8F=B7=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ReservationStockInOrderDomainService.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java index 6c00c3764..b8313f252 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java @@ -685,9 +685,9 @@ public class ReservationStockInOrderDomainService { reservationStockInOrder.setBusinessType("pu_tong_ru_ku"); reservationStockInOrder.setReservationOrderSource("客户预约"); reservationStockInOrder.setWarehouseId(warehouseId); - reservationStockInOrder.setOrganizationId(orgId); - reservationStockInOrder.setOrganizationName(orgName); - reservationStockInOrder.setTopOrganizationId(topOrgId); +// reservationStockInOrder.setOrganizationId(orgId); +// reservationStockInOrder.setOrganizationName(orgName); +// reservationStockInOrder.setTopOrganizationId(topOrgId); reservationStockInOrder.setWarehouseCode(warehouseCode); reservationStockInOrder.setWarehouseName(warehouseName); reservationStockInOrder.setBusinessInOrderNumber(inOrderNumber); @@ -703,9 +703,9 @@ public class ReservationStockInOrderDomainService { ExecutionInMaterialDetail reservationInMaterialDetail = new ExecutionInMaterialDetail(); BeanUtils.copyProperties(reserveInMaterialDetail, reservationInMaterialDetail,"materialDetailId"); reservationInMaterialDetail.setQuantity(reserveInMaterialDetail.getQuantity()); - reservationInMaterialDetail.setOrganizationId(orgId); - reservationInMaterialDetail.setOrganizationName(orgName); - reservationInMaterialDetail.setTopOrganizationId(topOrgId); +// reservationInMaterialDetail.setOrganizationId(orgId); +// reservationInMaterialDetail.setOrganizationName(orgName); +// reservationInMaterialDetail.setTopOrganizationId(topOrgId); reservationInMaterialDetail.setWarehouseCode(warehouseCode); reservationInMaterialDetail.setWarehouseName(warehouseName); reservationInMaterialDetail.setInOrderNumber(reservationStockInOrder.getInOrderNumber()); From d27cca0217de38a265b29aaf5084c567c4a27f47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Fri, 17 Jul 2026 00:44:34 +0800 Subject: [PATCH 51/58] =?UTF-8?q?=E5=8F=9131?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/mhd/system/api/BmsServiceFeign.java | 2 +- .../src/main/java/com/mhd/system/api/OmsServiceFeign.java | 2 +- .../main/java/com/mhd/system/api/WlhyServiceFeign.java | 2 +- .../src/main/java/com/mhd/system/api/WmsServiceFeign.java | 2 +- .../src/main/java/com/mhd/system/api/YmsServiceFeign.java | 2 +- mhd-modules/mhd-system/src/main/resources/bootstrap.yml | 8 ++++---- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java index 91f2f8a11..8cc8bfd57 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java @@ -18,7 +18,7 @@ import java.util.Set; /** * bms财务结算系统feign调用接口 */ -@FeignClient(contextId = "BmsService", value = ServiceNameConstants.BMS_SERVICE, url = "http://10.33.0.109:8019",fallbackFactory = RemoteBmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class) +@FeignClient(contextId = "BmsService", value = ServiceNameConstants.BMS_SERVICE, url = "http://10.102.192.32:8019",fallbackFactory = RemoteBmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class) public interface BmsServiceFeign { diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java index 03d48d2f4..560febea1 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java @@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RequestBody; import java.util.List; import java.util.concurrent.CompletableFuture; -@FeignClient(contextId = "OmsService", value = ServiceNameConstants.OMS_SERVICE,url = "http://10.33.0.99:8017", fallbackFactory = RemoteOmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class) +@FeignClient(contextId = "OmsService", value = ServiceNameConstants.OMS_SERVICE,url = "http://10.102.192.33:8017", fallbackFactory = RemoteOmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class) public interface OmsServiceFeign { diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java index ba9a45148..d976fcc98 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java @@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; import java.util.Map; -@FeignClient(contextId = "commonWlhyServiceFeign",value = ServiceNameConstants.WLHY_SERVICE,url = "http://10.33.0.129:8014",configuration = FeignAutoConfiguration.class) +@FeignClient(contextId = "commonWlhyServiceFeign",value = ServiceNameConstants.WLHY_SERVICE,url = "http://10.102.192.31:8014",configuration = FeignAutoConfiguration.class) public interface WlhyServiceFeign { /** diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java index 688e5ea7c..653f44d4b 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java @@ -21,7 +21,7 @@ import java.util.Map; * @description: TODO * @date 2024/5/10 8:58 **/ -@FeignClient(contextId = "remoteWmsServiceFeign",value = ServiceNameConstants.WMS_SERVICE, url = "http://10.33.0.109:8016", fallbackFactory = RemoteWmsFallbackFactory.class, configuration = FeignAutoConfiguration.class) +@FeignClient(contextId = "remoteWmsServiceFeign",value = ServiceNameConstants.WMS_SERVICE, url = "http://10.102.192.32:8016", fallbackFactory = RemoteWmsFallbackFactory.class, configuration = FeignAutoConfiguration.class) public interface WmsServiceFeign { /** diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/YmsServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/YmsServiceFeign.java index 48d76d01e..238ec5f81 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/YmsServiceFeign.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/YmsServiceFeign.java @@ -9,7 +9,7 @@ import com.mhd.system.api.feign.FeignAutoConfiguration; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; -@FeignClient(contextId = "YmsService", value = ServiceNameConstants.YMS_SERVICE,fallbackFactory = RemoteBmsFeignFallbackFactory.class,url = "http://10.33.0.99:8018", configuration = FeignAutoConfiguration.class) +@FeignClient(contextId = "YmsService", value = ServiceNameConstants.YMS_SERVICE,fallbackFactory = RemoteBmsFeignFallbackFactory.class,url = "http://10.102.192.33:8018", configuration = FeignAutoConfiguration.class) public interface YmsServiceFeign { /** diff --git a/mhd-modules/mhd-system/src/main/resources/bootstrap.yml b/mhd-modules/mhd-system/src/main/resources/bootstrap.yml index 58c770a17..79f1a3df7 100644 --- a/mhd-modules/mhd-system/src/main/resources/bootstrap.yml +++ b/mhd-modules/mhd-system/src/main/resources/bootstrap.yml @@ -14,18 +14,18 @@ spring: nacos: discovery: # server-addr: 127.0.0.1:8848 - server-addr: 10.33.0.129:6010 +# server-addr: 10.33.0.129:6010 # 线上测试环境配置 容器名+端口号 -# server-addr: 10.102.192.30:6848 + server-addr: 10.102.192.31:6848 username: nacos password: manhuoda@2023 #线上正式环境 # server-addr: 10.102.192.105:6848 config: # server-addr: 127.0.0.1:8848 - server-addr: 10.33.0.129:6010 +# server-addr: 10.33.0.129:6010 # 线上测试环境配置 容器名+端口号 -# server-addr: 10.102.192.30:6848 + server-addr: 10.102.192.31:6848 username: nacos password: manhuoda@2023 #线上正式环境 From 4c588388423a5e02fbbcbcee92bb3cd8f0e7c929 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Fri, 17 Jul 2026 00:48:43 +0800 Subject: [PATCH 52/58] =?UTF-8?q?=E5=8F=9130?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/mhd/system/api/BmsServiceFeign.java | 2 +- .../src/main/java/com/mhd/system/api/OmsServiceFeign.java | 2 +- .../src/main/java/com/mhd/system/api/WlhyServiceFeign.java | 2 +- .../src/main/java/com/mhd/system/api/WmsServiceFeign.java | 2 +- .../src/main/java/com/mhd/system/api/YmsServiceFeign.java | 2 +- mhd-modules/mhd-system/src/main/resources/bootstrap.yml | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java index 8cc8bfd57..e18484e8d 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java @@ -18,7 +18,7 @@ import java.util.Set; /** * bms财务结算系统feign调用接口 */ -@FeignClient(contextId = "BmsService", value = ServiceNameConstants.BMS_SERVICE, url = "http://10.102.192.32:8019",fallbackFactory = RemoteBmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class) +@FeignClient(contextId = "BmsService", value = ServiceNameConstants.BMS_SERVICE, url = "http://10.102.192.3:8019",fallbackFactory = RemoteBmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class) public interface BmsServiceFeign { diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java index 560febea1..e34bb9cd4 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java @@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RequestBody; import java.util.List; import java.util.concurrent.CompletableFuture; -@FeignClient(contextId = "OmsService", value = ServiceNameConstants.OMS_SERVICE,url = "http://10.102.192.33:8017", fallbackFactory = RemoteOmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class) +@FeignClient(contextId = "OmsService", value = ServiceNameConstants.OMS_SERVICE,url = "http://10.102.192.4:8017", fallbackFactory = RemoteOmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class) public interface OmsServiceFeign { diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java index d976fcc98..e4a817238 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java @@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; import java.util.Map; -@FeignClient(contextId = "commonWlhyServiceFeign",value = ServiceNameConstants.WLHY_SERVICE,url = "http://10.102.192.31:8014",configuration = FeignAutoConfiguration.class) +@FeignClient(contextId = "commonWlhyServiceFeign",value = ServiceNameConstants.WLHY_SERVICE,url = "http://10.102.192.30:8014",configuration = FeignAutoConfiguration.class) public interface WlhyServiceFeign { /** diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java index 653f44d4b..743be7c29 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java @@ -21,7 +21,7 @@ import java.util.Map; * @description: TODO * @date 2024/5/10 8:58 **/ -@FeignClient(contextId = "remoteWmsServiceFeign",value = ServiceNameConstants.WMS_SERVICE, url = "http://10.102.192.32:8016", fallbackFactory = RemoteWmsFallbackFactory.class, configuration = FeignAutoConfiguration.class) +@FeignClient(contextId = "remoteWmsServiceFeign",value = ServiceNameConstants.WMS_SERVICE, url = "http://10.102.192.3:8016", fallbackFactory = RemoteWmsFallbackFactory.class, configuration = FeignAutoConfiguration.class) public interface WmsServiceFeign { /** diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/YmsServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/YmsServiceFeign.java index 238ec5f81..dfac7337f 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/YmsServiceFeign.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/YmsServiceFeign.java @@ -9,7 +9,7 @@ import com.mhd.system.api.feign.FeignAutoConfiguration; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; -@FeignClient(contextId = "YmsService", value = ServiceNameConstants.YMS_SERVICE,fallbackFactory = RemoteBmsFeignFallbackFactory.class,url = "http://10.102.192.33:8018", configuration = FeignAutoConfiguration.class) +@FeignClient(contextId = "YmsService", value = ServiceNameConstants.YMS_SERVICE,fallbackFactory = RemoteBmsFeignFallbackFactory.class,url = "http://10.102.192.4:8018", configuration = FeignAutoConfiguration.class) public interface YmsServiceFeign { /** diff --git a/mhd-modules/mhd-system/src/main/resources/bootstrap.yml b/mhd-modules/mhd-system/src/main/resources/bootstrap.yml index 79f1a3df7..aa660b126 100644 --- a/mhd-modules/mhd-system/src/main/resources/bootstrap.yml +++ b/mhd-modules/mhd-system/src/main/resources/bootstrap.yml @@ -16,7 +16,7 @@ spring: # server-addr: 127.0.0.1:8848 # server-addr: 10.33.0.129:6010 # 线上测试环境配置 容器名+端口号 - server-addr: 10.102.192.31:6848 + server-addr: 10.102.192.30:6848 username: nacos password: manhuoda@2023 #线上正式环境 @@ -25,7 +25,7 @@ spring: # server-addr: 127.0.0.1:8848 # server-addr: 10.33.0.129:6010 # 线上测试环境配置 容器名+端口号 - server-addr: 10.102.192.31:6848 + server-addr: 10.102.192.30:6848 username: nacos password: manhuoda@2023 #线上正式环境 From aff19e1536ad3d15b92422b328ef72b4da9fde36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Fri, 17 Jul 2026 01:48:15 +0800 Subject: [PATCH 53/58] =?UTF-8?q?=E5=8F=9130?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/stockInOrder/service/StockInOrderDomainService.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java index 5689c1ba9..6571cc374 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java @@ -606,6 +606,7 @@ public class StockInOrderDomainService { if (one != null) { one.setQuantity(collectQuantity); one.setBatchNo(batchNo); +// one.setLotNumber(receiptMaterialDetail.getLotNo()); shelfMaterialDetailService.updateById(one); } else { BeanUtils.copyProperties(inMaterialDetailDO, shelfMaterialDetail); @@ -614,6 +615,7 @@ public class StockInOrderDomainService { shelfMaterialDetail.setInUniqueId(uniqueId); shelfMaterialDetail.setReceiptUniqueId(receiptMaterialDetail.getUniqueId()); shelfMaterialDetail.setBatchNo(batchNo); + shelfMaterialDetail.setLotNumber(receiptMaterialDetail.getLotNo()); shelfMaterialDetailService.save(shelfMaterialDetail); } From 50b10ad19f58107b015239531fd712f7c534f71a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Fri, 17 Jul 2026 01:51:20 +0800 Subject: [PATCH 54/58] =?UTF-8?q?=E5=8F=9130?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/stockInOrder/service/StockInOrderDomainService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java index 6571cc374..8abce3094 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java @@ -754,6 +754,7 @@ public class StockInOrderDomainService { shelfMaterialDetail.setInUniqueId(idGenerator.snowflakeId(SnowFlakeConstants.wmsId)); shelfMaterialDetail.setReceiptUniqueId(idGenerator.snowflakeId(SnowFlakeConstants.wmsId)); shelfMaterialDetail.setShelvesStatus(3); + shelfMaterialDetail.setLotNumber(one.getLotNumber()); if (stockReceiptOrder!= null) { shelfMaterialDetail.setBatchNo(stockReceiptOrder.getBatchNo()); } From a852c0844e85beb827a39f7b3f5a074c92096967 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Fri, 17 Jul 2026 01:55:08 +0800 Subject: [PATCH 55/58] =?UTF-8?q?=E5=8F=91=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/mhd/system/api/BmsServiceFeign.java | 2 +- .../src/main/java/com/mhd/system/api/OmsServiceFeign.java | 2 +- .../src/main/java/com/mhd/system/api/WlhyServiceFeign.java | 2 +- .../src/main/java/com/mhd/system/api/WmsServiceFeign.java | 2 +- .../src/main/java/com/mhd/system/api/YmsServiceFeign.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java index e18484e8d..91f2f8a11 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java @@ -18,7 +18,7 @@ import java.util.Set; /** * bms财务结算系统feign调用接口 */ -@FeignClient(contextId = "BmsService", value = ServiceNameConstants.BMS_SERVICE, url = "http://10.102.192.3:8019",fallbackFactory = RemoteBmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class) +@FeignClient(contextId = "BmsService", value = ServiceNameConstants.BMS_SERVICE, url = "http://10.33.0.109:8019",fallbackFactory = RemoteBmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class) public interface BmsServiceFeign { diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java index e34bb9cd4..03d48d2f4 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java @@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RequestBody; import java.util.List; import java.util.concurrent.CompletableFuture; -@FeignClient(contextId = "OmsService", value = ServiceNameConstants.OMS_SERVICE,url = "http://10.102.192.4:8017", fallbackFactory = RemoteOmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class) +@FeignClient(contextId = "OmsService", value = ServiceNameConstants.OMS_SERVICE,url = "http://10.33.0.99:8017", fallbackFactory = RemoteOmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class) public interface OmsServiceFeign { diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java index e4a817238..ba9a45148 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java @@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; import java.util.Map; -@FeignClient(contextId = "commonWlhyServiceFeign",value = ServiceNameConstants.WLHY_SERVICE,url = "http://10.102.192.30:8014",configuration = FeignAutoConfiguration.class) +@FeignClient(contextId = "commonWlhyServiceFeign",value = ServiceNameConstants.WLHY_SERVICE,url = "http://10.33.0.129:8014",configuration = FeignAutoConfiguration.class) public interface WlhyServiceFeign { /** diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java index 743be7c29..688e5ea7c 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java @@ -21,7 +21,7 @@ import java.util.Map; * @description: TODO * @date 2024/5/10 8:58 **/ -@FeignClient(contextId = "remoteWmsServiceFeign",value = ServiceNameConstants.WMS_SERVICE, url = "http://10.102.192.3:8016", fallbackFactory = RemoteWmsFallbackFactory.class, configuration = FeignAutoConfiguration.class) +@FeignClient(contextId = "remoteWmsServiceFeign",value = ServiceNameConstants.WMS_SERVICE, url = "http://10.33.0.109:8016", fallbackFactory = RemoteWmsFallbackFactory.class, configuration = FeignAutoConfiguration.class) public interface WmsServiceFeign { /** diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/YmsServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/YmsServiceFeign.java index dfac7337f..48d76d01e 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/YmsServiceFeign.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/YmsServiceFeign.java @@ -9,7 +9,7 @@ import com.mhd.system.api.feign.FeignAutoConfiguration; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; -@FeignClient(contextId = "YmsService", value = ServiceNameConstants.YMS_SERVICE,fallbackFactory = RemoteBmsFeignFallbackFactory.class,url = "http://10.102.192.4:8018", configuration = FeignAutoConfiguration.class) +@FeignClient(contextId = "YmsService", value = ServiceNameConstants.YMS_SERVICE,fallbackFactory = RemoteBmsFeignFallbackFactory.class,url = "http://10.33.0.99:8018", configuration = FeignAutoConfiguration.class) public interface YmsServiceFeign { /** From 9dfcf4ef5a44e95ccd507d94e7c1a306afa2736c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Fri, 17 Jul 2026 14:22:38 +0800 Subject: [PATCH 56/58] =?UTF-8?q?=E5=8F=9131?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/mhd/system/api/BmsServiceFeign.java | 2 +- .../src/main/java/com/mhd/system/api/OmsServiceFeign.java | 2 +- .../main/java/com/mhd/system/api/WlhyServiceFeign.java | 2 +- .../src/main/java/com/mhd/system/api/WmsServiceFeign.java | 2 +- .../src/main/java/com/mhd/system/api/YmsServiceFeign.java | 2 +- mhd_oms/src/main/resources/bootstrap.yml | 8 ++++---- mhd_wms/src/main/resources/bootstrap.yml | 8 ++++---- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java index 91f2f8a11..8cc8bfd57 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java @@ -18,7 +18,7 @@ import java.util.Set; /** * bms财务结算系统feign调用接口 */ -@FeignClient(contextId = "BmsService", value = ServiceNameConstants.BMS_SERVICE, url = "http://10.33.0.109:8019",fallbackFactory = RemoteBmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class) +@FeignClient(contextId = "BmsService", value = ServiceNameConstants.BMS_SERVICE, url = "http://10.102.192.32:8019",fallbackFactory = RemoteBmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class) public interface BmsServiceFeign { diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java index 03d48d2f4..560febea1 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java @@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RequestBody; import java.util.List; import java.util.concurrent.CompletableFuture; -@FeignClient(contextId = "OmsService", value = ServiceNameConstants.OMS_SERVICE,url = "http://10.33.0.99:8017", fallbackFactory = RemoteOmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class) +@FeignClient(contextId = "OmsService", value = ServiceNameConstants.OMS_SERVICE,url = "http://10.102.192.33:8017", fallbackFactory = RemoteOmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class) public interface OmsServiceFeign { diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java index ba9a45148..d976fcc98 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java @@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; import java.util.Map; -@FeignClient(contextId = "commonWlhyServiceFeign",value = ServiceNameConstants.WLHY_SERVICE,url = "http://10.33.0.129:8014",configuration = FeignAutoConfiguration.class) +@FeignClient(contextId = "commonWlhyServiceFeign",value = ServiceNameConstants.WLHY_SERVICE,url = "http://10.102.192.31:8014",configuration = FeignAutoConfiguration.class) public interface WlhyServiceFeign { /** diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java index 688e5ea7c..653f44d4b 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java @@ -21,7 +21,7 @@ import java.util.Map; * @description: TODO * @date 2024/5/10 8:58 **/ -@FeignClient(contextId = "remoteWmsServiceFeign",value = ServiceNameConstants.WMS_SERVICE, url = "http://10.33.0.109:8016", fallbackFactory = RemoteWmsFallbackFactory.class, configuration = FeignAutoConfiguration.class) +@FeignClient(contextId = "remoteWmsServiceFeign",value = ServiceNameConstants.WMS_SERVICE, url = "http://10.102.192.32:8016", fallbackFactory = RemoteWmsFallbackFactory.class, configuration = FeignAutoConfiguration.class) public interface WmsServiceFeign { /** diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/YmsServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/YmsServiceFeign.java index 48d76d01e..238ec5f81 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/YmsServiceFeign.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/YmsServiceFeign.java @@ -9,7 +9,7 @@ import com.mhd.system.api.feign.FeignAutoConfiguration; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; -@FeignClient(contextId = "YmsService", value = ServiceNameConstants.YMS_SERVICE,fallbackFactory = RemoteBmsFeignFallbackFactory.class,url = "http://10.33.0.99:8018", configuration = FeignAutoConfiguration.class) +@FeignClient(contextId = "YmsService", value = ServiceNameConstants.YMS_SERVICE,fallbackFactory = RemoteBmsFeignFallbackFactory.class,url = "http://10.102.192.33:8018", configuration = FeignAutoConfiguration.class) public interface YmsServiceFeign { /** diff --git a/mhd_oms/src/main/resources/bootstrap.yml b/mhd_oms/src/main/resources/bootstrap.yml index 09ef96b56..b4cc01e39 100644 --- a/mhd_oms/src/main/resources/bootstrap.yml +++ b/mhd_oms/src/main/resources/bootstrap.yml @@ -18,15 +18,15 @@ spring: discovery: # server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - server-addr: 10.33.0.129:6010 -# server-addr: 10.102.192.30:6848 +# server-addr: 10.33.0.129:6010 + server-addr: 10.102.192.31:6848 username: nacos password: manhuoda@2023 config: # server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - server-addr: 10.33.0.129:6010 -# server-addr: 10.102.192.30:6848 +# server-addr: 10.33.0.129:6010 + server-addr: 10.102.192.31:6848 username: nacos password: manhuoda@2023 #线上正式环境 diff --git a/mhd_wms/src/main/resources/bootstrap.yml b/mhd_wms/src/main/resources/bootstrap.yml index b97ce9a79..e8f169bf2 100644 --- a/mhd_wms/src/main/resources/bootstrap.yml +++ b/mhd_wms/src/main/resources/bootstrap.yml @@ -14,18 +14,18 @@ spring: nacos: discovery: # server-addr: 127.0.0.1:8848 - server-addr: 10.33.0.129:6010 +# server-addr: 10.33.0.129:6010 # 线上测试环境配置 容器名+端口号 -# server-addr: 10.102.192.31:6848 + server-addr: 10.102.192.31:6848 username: nacos password: manhuoda@2023 #线上正式环境 # server-addr: 10.102.192.105:6848 config: # server-addr: 127.0.0.1:8848 - server-addr: 10.33.0.129:6010 +# server-addr: 10.33.0.129:6010 # 线上测试环境配置 容器名+端口号 -# server-addr: 10.102.192.31:6848 + server-addr: 10.102.192.31:6848 username: nacos password: manhuoda@2023 #线上正式环境 From 587550025d704da9e6250187c0f2dd9291fae2a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Fri, 17 Jul 2026 14:29:43 +0800 Subject: [PATCH 57/58] =?UTF-8?q?=E5=8F=9130?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/mhd/system/api/BmsServiceFeign.java | 2 +- .../src/main/java/com/mhd/system/api/OmsServiceFeign.java | 2 +- .../src/main/java/com/mhd/system/api/WlhyServiceFeign.java | 2 +- .../src/main/java/com/mhd/system/api/WmsServiceFeign.java | 2 +- .../src/main/java/com/mhd/system/api/YmsServiceFeign.java | 2 +- mhd_oms/src/main/resources/bootstrap.yml | 4 ++-- mhd_wms/src/main/resources/bootstrap.yml | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java index 8cc8bfd57..e18484e8d 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java @@ -18,7 +18,7 @@ import java.util.Set; /** * bms财务结算系统feign调用接口 */ -@FeignClient(contextId = "BmsService", value = ServiceNameConstants.BMS_SERVICE, url = "http://10.102.192.32:8019",fallbackFactory = RemoteBmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class) +@FeignClient(contextId = "BmsService", value = ServiceNameConstants.BMS_SERVICE, url = "http://10.102.192.3:8019",fallbackFactory = RemoteBmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class) public interface BmsServiceFeign { diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java index 560febea1..e34bb9cd4 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java @@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RequestBody; import java.util.List; import java.util.concurrent.CompletableFuture; -@FeignClient(contextId = "OmsService", value = ServiceNameConstants.OMS_SERVICE,url = "http://10.102.192.33:8017", fallbackFactory = RemoteOmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class) +@FeignClient(contextId = "OmsService", value = ServiceNameConstants.OMS_SERVICE,url = "http://10.102.192.4:8017", fallbackFactory = RemoteOmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class) public interface OmsServiceFeign { diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java index d976fcc98..e4a817238 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java @@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; import java.util.Map; -@FeignClient(contextId = "commonWlhyServiceFeign",value = ServiceNameConstants.WLHY_SERVICE,url = "http://10.102.192.31:8014",configuration = FeignAutoConfiguration.class) +@FeignClient(contextId = "commonWlhyServiceFeign",value = ServiceNameConstants.WLHY_SERVICE,url = "http://10.102.192.30:8014",configuration = FeignAutoConfiguration.class) public interface WlhyServiceFeign { /** diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java index 653f44d4b..743be7c29 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java @@ -21,7 +21,7 @@ import java.util.Map; * @description: TODO * @date 2024/5/10 8:58 **/ -@FeignClient(contextId = "remoteWmsServiceFeign",value = ServiceNameConstants.WMS_SERVICE, url = "http://10.102.192.32:8016", fallbackFactory = RemoteWmsFallbackFactory.class, configuration = FeignAutoConfiguration.class) +@FeignClient(contextId = "remoteWmsServiceFeign",value = ServiceNameConstants.WMS_SERVICE, url = "http://10.102.192.3:8016", fallbackFactory = RemoteWmsFallbackFactory.class, configuration = FeignAutoConfiguration.class) public interface WmsServiceFeign { /** diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/YmsServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/YmsServiceFeign.java index 238ec5f81..dfac7337f 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/YmsServiceFeign.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/YmsServiceFeign.java @@ -9,7 +9,7 @@ import com.mhd.system.api.feign.FeignAutoConfiguration; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; -@FeignClient(contextId = "YmsService", value = ServiceNameConstants.YMS_SERVICE,fallbackFactory = RemoteBmsFeignFallbackFactory.class,url = "http://10.102.192.33:8018", configuration = FeignAutoConfiguration.class) +@FeignClient(contextId = "YmsService", value = ServiceNameConstants.YMS_SERVICE,fallbackFactory = RemoteBmsFeignFallbackFactory.class,url = "http://10.102.192.4:8018", configuration = FeignAutoConfiguration.class) public interface YmsServiceFeign { /** diff --git a/mhd_oms/src/main/resources/bootstrap.yml b/mhd_oms/src/main/resources/bootstrap.yml index b4cc01e39..08923fbaf 100644 --- a/mhd_oms/src/main/resources/bootstrap.yml +++ b/mhd_oms/src/main/resources/bootstrap.yml @@ -19,14 +19,14 @@ spring: # server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 # server-addr: 10.33.0.129:6010 - server-addr: 10.102.192.31:6848 + server-addr: 10.102.192.30:6848 username: nacos password: manhuoda@2023 config: # server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 # server-addr: 10.33.0.129:6010 - server-addr: 10.102.192.31:6848 + server-addr: 10.102.192.30:6848 username: nacos password: manhuoda@2023 #线上正式环境 diff --git a/mhd_wms/src/main/resources/bootstrap.yml b/mhd_wms/src/main/resources/bootstrap.yml index e8f169bf2..fc7380c20 100644 --- a/mhd_wms/src/main/resources/bootstrap.yml +++ b/mhd_wms/src/main/resources/bootstrap.yml @@ -16,7 +16,7 @@ spring: # server-addr: 127.0.0.1:8848 # server-addr: 10.33.0.129:6010 # 线上测试环境配置 容器名+端口号 - server-addr: 10.102.192.31:6848 + server-addr: 10.102.192.30:6848 username: nacos password: manhuoda@2023 #线上正式环境 @@ -25,7 +25,7 @@ spring: # server-addr: 127.0.0.1:8848 # server-addr: 10.33.0.129:6010 # 线上测试环境配置 容器名+端口号 - server-addr: 10.102.192.31:6848 + server-addr: 10.102.192.30:6848 username: nacos password: manhuoda@2023 #线上正式环境 From 5fe5ce7e8278d570850b5b84a79c8cb9acccc654 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Fri, 17 Jul 2026 18:04:56 +0800 Subject: [PATCH 58/58] =?UTF-8?q?=E5=A4=8D=E6=A0=B8=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=B4=A7=E4=B8=BBid=E6=9F=A5=E8=AF=A2;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/reviewOrder/ReviewOrderMapper.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mhd_wms/src/main/resources/mapper/reviewOrder/ReviewOrderMapper.xml b/mhd_wms/src/main/resources/mapper/reviewOrder/ReviewOrderMapper.xml index 5db3cdaca..86a8a0466 100644 --- a/mhd_wms/src/main/resources/mapper/reviewOrder/ReviewOrderMapper.xml +++ b/mhd_wms/src/main/resources/mapper/reviewOrder/ReviewOrderMapper.xml @@ -154,6 +154,9 @@ and a.shipper_name like concat('%', #{shipperName}, '%') + + and a.shipper_id like concat('%', #{shipperId}, '%') + and date_format(a.create_time, '%Y-%m-%d') >= #{createTimeStart}