From 6b782485313d56905016f27d93779eaf829b9321 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com> Date: Sat, 25 Jul 2026 13:32:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93=E7=AD=BE=E5=90=8D=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2=E4=BB=A5=E5=8F=8A=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StockOutOrderApplicationService.java | 63 +++++++++++++++++++ .../stockOutOrder/entity/StockOutOrder.java | 15 +++++ .../repository/po/StockOutOrderPO.java | 21 +++++++ .../repository/todo/StockOutOrderDO.java | 19 ++++++ .../service/StockOutOrderDomainService.java | 13 ++++ .../dto/stockOutOrder/StockOutOrderDTO.java | 8 +++ .../stockOutOrder/StockOutOrderApi.java | 16 +++++ .../stockOutOrder/StockOutOrderMapper.xml | 15 ++++- 8 files changed, 169 insertions(+), 1 deletion(-) 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 8e6556798..c958b72a8 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 @@ -301,6 +301,60 @@ public class StockOutOrderApplicationService { return stockOutOrderPOS; } + /** + * PDA出库签名列表查询 + * + *

参照简易模式快捷出库列表实现，默认 status=已出库(9)，支持 workUserNameLike 模糊查询。

+ */ + public List querySignatureList(StockOutOrderDO stockOutOrderDO) { + LoginUser loginUser = SecurityUtils.getLoginUser(); + if (loginUser != null && loginUser.getUserPo() != null) { + Long userOrganizationId = loginUser.getUserPo().getOrganizationId(); + Long frontendOrganizationId = stockOutOrderDO.getOrganizationId(); + if (userOrganizationId != null && userOrganizationId == 2827L) { + if (frontendOrganizationId != null) { + stockOutOrderDO.setOrganizationId(frontendOrganizationId); + stockOutOrderDO.setTopOrganizationId(null); + } else { + stockOutOrderDO.setOrganizationId(null); + stockOutOrderDO.setTopOrganizationId(null); + } + } else { + if (frontendOrganizationId != null && userOrganizationId != null) { + if (!frontendOrganizationId.equals(userOrganizationId)) { + stockOutOrderDO.setOrganizationId(userOrganizationId); + } + } else { + if (userOrganizationId != null) { + stockOutOrderDO.setOrganizationId(userOrganizationId); + } + } + if (stockOutOrderDO.getOrganizationId() == null) { + Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId(); + if (topOrganizationId != null && topOrganizationId != 1) { + stockOutOrderDO.setTopOrganizationId(topOrganizationId); + } + } else { + stockOutOrderDO.setTopOrganizationId(2827L); + } + } + } + if (stockOutOrderDO.getStatus() == null) { + stockOutOrderDO.setStatus(9); + } + List list = stockOutOrderDomainService.querySignatureList(stockOutOrderDO); + for (StockOutOrderPO po : list) { + Integer ss = po.getSignatureStatus(); + if (ss != null) { + po.setSignatureStatusName(ss == 1 ? "待签名" : ss == 2 ? "已签名" : null); + } + if (po.getStatus() != null && po.getStatus() == 9) { + po.setStatusName("已出库"); + } + } + return list; + } + /** * 新增出库单 @@ -409,6 +463,15 @@ public class StockOutOrderApplicationService { List list = deliveryDetailsLinkService.list(new LambdaQueryWrapper().eq(DeliveryDetailsLink::getOrderNumber, stockOutOrderPO.getOutOrderNumber())); stockOutOrderPO.setDeliveryDetailsLinkList(list); + // PDA出库签名 - 签名状态名称翻译 + Integer signatureStatus = stockOutOrderPO.getSignatureStatus(); + if (signatureStatus != null) { + stockOutOrderPO.setSignatureStatusName(signatureStatus == 1 ? "待签名" : signatureStatus == 2 ? "已签名" : null); + } + if (stockOutOrderPO.getStatus() != null && stockOutOrderPO.getStatus() == 9) { + stockOutOrderPO.setStatusName("已出库"); + } + return stockOutOrderPO; } 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 ca13c0772..18d489c24 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 @@ -434,4 +434,19 @@ public class StockOutOrder extends BaseVOEntity { @ApiModelProperty("任务下发用户ID") private String taskIssueUserId; + + // ========== PDA出库签名字段 ========== + @ApiModelProperty("签名状态：1-待签名 2-已签名") + private Integer signatureStatus; + + @ApiModelProperty("签名时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date signatureTime; + + @ApiModelProperty("签名图片（base64/URL）") + private String signaturePic; + + @ApiModelProperty("签名备注") + private String signatureRemark; } \ No newline at end of file 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 73ce5b5bf..5dbd97ba1 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 @@ -460,4 +460,25 @@ public class StockOutOrderPO extends BaseVOEntity { @ApiModelProperty("任务下发用户ID") private String taskIssueUserId; + + // ========== PDA出库签名字段 ========== + @ApiModelProperty("签名状态：1-待签名 2-已签名") + private Integer signatureStatus; + + @ApiModelProperty("签名状态名称") + private String signatureStatusName; + + @ApiModelProperty("出库单状态名称") + private String statusName; + + @ApiModelProperty("签名时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date signatureTime; + + @ApiModelProperty("签名图片（base64/URL）") + private String signaturePic; + + @ApiModelProperty("签名备注") + private String signatureRemark; } \ 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 559c21fe9..443fe8f04 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 @@ -513,4 +513,23 @@ public class StockOutOrderDO extends BaseVOEntity { @ApiModelProperty("任务移除用户ID") private String removeUserId; + + // ========== PDA出库签名字段 ========== + @ApiModelProperty("签名状态：1-待签名 2-已签名") + private Integer signatureStatus; + + @ApiModelProperty("签名时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date signatureTime; + + @ApiModelProperty("签名图片（base64/URL）") + private String signaturePic; + + @ApiModelProperty("签名备注") + private String signatureRemark; + + /** PDA出库签名列表专用：作业任务人员模糊查询字段 */ + @ApiModelProperty("作业任务人员模糊查询") + private String workUserNameLike; } \ 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 4c106af4b..9f169c772 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 @@ -185,6 +185,19 @@ public class StockOutOrderDomainService { return stockOutOrderService.queryList(stockOutOrderDO); } + /** + * PDA出库签名列表查询，默认 status=已出库(9) + */ + public List querySignatureList(StockOutOrderDO stockOutOrderDO) { + if (stockOutOrderDO.getStatus() == null) { + stockOutOrderDO.setStatus(9); + } + return stockOutOrderService.queryList(stockOutOrderDO); + } + + + + /** * 新增出库单 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 39e3c8793..e2a4423d2 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 @@ -502,4 +502,12 @@ public class StockOutOrderDTO extends StockOutOrderBaseDTO { @ApiModelProperty("任务移除用户ID") private String removeUserId; + + // ========== PDA出库签名字段 ========== + @ApiModelProperty("签名状态：1-待签名 2-已签名") + private Integer signatureStatus; + + /** PDA出库签名列表专用：作业任务人员模糊查询字段 */ + @ApiModelProperty("作业任务人员（模糊查询）") + private String workUserNameLike; } \ 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 e35ddf4e5..de21d757f 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 @@ -107,6 +107,22 @@ public class StockOutOrderApi extends BaseController { return getDataTable(list); } + /** + * PDA出库签名列表查询 + * + *

查询出库单状态「已出库」(status=9) 的出库单列表， + * 支持「作业任务人员」(workUserName) like 模糊查询， + * 参照简易模式快捷出库列表实现。

+ */ + @ApiOperation("PDA出库签名列表查询") + @GetMapping("/signatureList") + public TableDataInfo signatureList(StockOutOrderDTO stockOutOrderDTO) { + StockOutOrderDO stockOutOrderDO = stockOutOrderAssembler.toDO(stockOutOrderDTO); + startPage(); + List list = stockOutOrderApplicationService.querySignatureList(stockOutOrderDO); + return getDataTable(list); + } + /** * 上传并解析出仓委托单Excel */ diff --git a/mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml b/mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml index ff7954d80..133295d88 100644 --- a/mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml +++ b/mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml @@ -104,6 +104,10 @@ + + + + @@ -124,7 +128,8 @@ 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.WORK_USER_NAME + 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, + a.SIGNATURE_STATUS, a.SIGNATURE_TIME, a.SIGNATURE_PIC, a.SIGNATURE_REMARK @@ -340,6 +345,14 @@ and a.PUSH_STATUS = #{pushStatus} + + + and a.WORK_USER_NAME like concat('%', #{workUserNameLike}, '%') + + + + and a.SIGNATURE_STATUS = #{signatureStatus} + and exists (