weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

出库签名列表查询以及详情

Browse Source
This commit is contained in:
秦鸿展
2026-07-25 13:32:26 +08:00
parent 21db85ef2b
commit 6b78248531
8 changed files with 169 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java
+63
View File
@@ -301,6 +301,60 @@ public class StockOutOrderApplicationService {
return stockOutOrderPOS;
}
/**
* PDA出库签名列表查询
*
* <p>参照简易模式快捷出库列表实现，默认 status=已出库(9)，支持 workUserNameLike 模糊查询。</p>
*/
public List<StockOutOrderPO> 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<StockOutOrderPO> 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<DeliveryDetailsLink> list = deliveryDetailsLinkService.list(new LambdaQueryWrapper<DeliveryDetailsLink>().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;
}
mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/entity/StockOutOrder.java
+15
View File
@@ -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;
}
mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/po/StockOutOrderPO.java
+21
View File
@@ -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;
}
mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/todo/StockOutOrderDO.java
+19
View File
@@ -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;
}
mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java
+13
View File
@@ -185,6 +185,19 @@ public class StockOutOrderDomainService {
return stockOutOrderService.queryList(stockOutOrderDO);
}
/**
* PDA出库签名列表查询，默认 status=已出库(9)
*/
public List<StockOutOrderPO> querySignatureList(StockOutOrderDO stockOutOrderDO) {
if (stockOutOrderDO.getStatus() == null) {
stockOutOrderDO.setStatus(9);
}
return stockOutOrderService.queryList(stockOutOrderDO);
}
/**
* 新增出库单
mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockOutOrder/StockOutOrderDTO.java
+8
View File
@@ -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;
}
mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockOutOrder/StockOutOrderApi.java
+16
View File
@@ -107,6 +107,22 @@ public class StockOutOrderApi extends BaseController {
return getDataTable(list);
}
/**
* PDA出库签名列表查询
*
* <p>查询出库单状态「已出库」(status=9) 的出库单列表，
* 支持「作业任务人员」(workUserName) like 模糊查询，
* 参照简易模式快捷出库列表实现。</p>
*/
@ApiOperation("PDA出库签名列表查询")
@GetMapping("/signatureList")
public TableDataInfo signatureList(StockOutOrderDTO stockOutOrderDTO) {
StockOutOrderDO stockOutOrderDO = stockOutOrderAssembler.toDO(stockOutOrderDTO);
startPage();
List<StockOutOrderPO> list = stockOutOrderApplicationService.querySignatureList(stockOutOrderDO);
return getDataTable(list);
}
/**
* 上传并解析出仓委托单Excel
*/
mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml
+14 -1
View File
@@ -104,6 +104,10 @@
<result property="workUserName" column="WORK_USER_NAME" />
<result property="workTaskReceiveStatus" column="WORK_TASK_RECEIVE_STATUS" />
<result property="taskIssueUserId" column="TASK_ISSUE_USER_ID" />
<result property="signatureStatus" column="SIGNATURE_STATUS" />
<result property="signatureTime" column="SIGNATURE_TIME" />
<result property="signaturePic" column="SIGNATURE_PIC" />
<result property="signatureRemark" column="SIGNATURE_REMARK" />
</resultMap>
@@ -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
</sql>
@@ -340,6 +345,14 @@
<if test="pushStatus != null">
and a.PUSH_STATUS = #{pushStatus}
</if>
<!-- PDA出库签名列表：作业任务人员模糊查询 -->
<if test="workUserNameLike != null and workUserNameLike != ''">
and a.WORK_USER_NAME like concat('%', #{workUserNameLike}, '%')
</if>
<!-- PDA出库签名列表：按签名状态精确查询 -->
<if test="signatureStatus != null">
and a.SIGNATURE_STATUS = #{signatureStatus}
</if>
<!-- 出库明细：物料名称、物料编码（同一明细行同时满足；与出库明细口径一致）。关联 material_base_info 避免明细冗余名称与主档不一致时筛不到 -->
<if test="(materialName != null and materialName != '') or (materialCode != null and materialCode != '')">
and exists (