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

fix(oms): 出入库明细查询状态过滤口径修正-改为issue_status=4

Browse Source 
问题：OMS执行出库单status不随WMS出库完成流转（回写代码被注释），推送创建的单据status也是默认值，
原过滤条件 status in(9,12,13)/status=5 会导致明细页查不到数据。

修复：
- 出库明细SQL：status in(9,12,13) 改为 issue_status=4（issueStatus: 0-已创建 2-已审核 3-已驳回 4-已出库）
- 入库明细SQL：status=5 改为 issue_status=4（WMS回写status=5时同步issueStatus=4，推送创建直接置4）
- 两个明细SQL新增返回 b.issue_status，前端状态列绑定issueStatus
- WithOrderPO新增issueStatus字段（导出"单据状态"列自动转文字），outOrderStatus/inOrderStatus保留返回但不再导出
This commit is contained in:
rcx
2026-09-09 17:23:54 +08:00
parent f217d6ec5c
commit e3826d6333
4 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_oms/src/main/java/com/mhd/oms/domain/executionInMaterialDetail/repository/po/ExecutionInMaterialDetailWithOrderPO.java
+5 -2
View File
@@ -17,10 +17,13 @@ import java.util.Date;
public class ExecutionInMaterialDetailWithOrderPO extends ExecutionInMaterialDetailPO {
private static final long serialVersionUID = 1L;
@ApiModelProperty("入库单状态: 1-已创建 2-已审核 3-收货中 4-上架中 5-已入库 6-已取消 7-已关闭")
@Excel(name = "入库单状态: 1-已创建 2-已审核 3-收货中 4-上架中 5-已入库 6-已取消 7-已关闭")
@ApiModelProperty("入库单流转状态(参考): 1-已创建 2-已审核 3-收货中 4-上架中 5-已入库 6-已取消 7-已关闭")
private Integer inOrderStatus;
@ApiModelProperty("入库单展示状态: 0-已创建 2-已审核 3-已驳回 4-已入库（WMS回写status=5时同步/推送创建时置4，前端状态列绑定此字段）")
@Excel(name = "单据状态", readConverterExp = "0=已创建,2=已审核,3=已驳回,4=已入库")
private Integer issueStatus;
@ApiModelProperty("入库单审核状态: 1-未审核 2-审核不通过 3-审核通过")
@Excel(name = "入库单审核状态: 1-未审核 2-审核不通过 3-审核通过")
private Integer inOrderAuditStatus;
mhd_oms/src/main/java/com/mhd/oms/domain/executionOutMaterialDetail/repository/po/ExecutionOutMaterialDetailWithOrderPO.java
+5 -2
View File
@@ -19,10 +19,13 @@ import java.util.Date;
public class ExecutionOutMaterialDetailWithOrderPO extends ExecutionOutMaterialDetailPO {
private static final long serialVersionUID = 1L;
@ApiModelProperty("出库单状态: 1-已创建 2-已审核 3-部分分配 4-已分配 5-拣货中 6-波次中 7-拣货完成 8-复核中 9-已出库 10-已取消 11-已关闭")
@Excel(name = "出库单状态: 1-已创建 2-已审核 3-部分分配 4-已分配 5-拣货中 6-波次中 7-拣货完成 8-复核中 9-已出库 10-已取消 11-已关闭 12-已复核 13-已交接")
@ApiModelProperty("出库单流转状态(参考): 1-已创建 2-已审核 3-部分分配 4-已分配 5-拣货中 6-波次中 7-拣货完成 8-复核中 9-已出库 10-已取消 11-已关闭 12-已复核 13-已交接；WMS出库完成不回写此字段")
private Integer outOrderStatus;
@ApiModelProperty("出库单展示状态: 0-已创建 2-已审核 3-已驳回 4-已出库（WMS出库完成/推送创建时回写，前端状态列绑定此字段）")
@Excel(name = "单据状态", readConverterExp = "0=已创建,2=已审核,3=已驳回,4=已出库")
private Integer issueStatus;
@ApiModelProperty("出库单审核状态: 1-未审核 2-审核不通过 3-审核通过")
@Excel(name = "出库单审核状态: 1-未审核 2-审核不通过 3-审核通过")
private Integer outOrderAuditStatus;
mhd_oms/src/main/resources/mapper/executionInMaterialDetail/executionInMaterialDetailMapper.xml
+5 -2
View File
@@ -365,6 +365,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<resultMap type="com.mhd.oms.domain.executionInMaterialDetail.repository.po.ExecutionInMaterialDetailWithOrderPO" id="InMaterialDetailWithOrderResult" extends="MaterialDetailResult">
<result property="inOrderStatus" column="in_order_status" />
<result property="inOrderAuditStatus" column="in_order_audit_status" />
<result property="issueStatus" column="issue_status" />
<result property="orderShipperId" column="order_shipper_id" />
<result property="orderShipperCode" column="order_shipper_code" />
<result property="orderShipperName" column="order_shipper_name" />
@@ -409,6 +410,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
b.shipper_name as order_shipper_name,
b.status as in_order_status,
b.audit_status as in_order_audit_status,
b.issue_status as issue_status,
b.warehouse_date
from execution_in_material_detail a
left join execution_stock_in_order b on a.in_order_number = b.in_order_number
@@ -450,8 +452,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="inOrderTypeCode != null and inOrderTypeCode != ''">
and b.order_type_code = #{inOrderTypeCode}
</if>
<!-- 入库状态: 1-已创建 2-已审核 3-收货中 4-上架中 5-已入库 6-已取消 7-已关闭，只统计已入库(5)的明细 -->
and b.status = 5
<!-- 入库单展示状态issue_status: 0-已创建 2-已审核 3-已驳回 4-已入库(WMS回写status=5时同步为4)；
"已入库"以issue_status=4为准（推送创建的单据直接置4，status不一定为5） -->
and b.issue_status = 4
<if test="inOrderExpectStartTime != null">
and b.expect_time &gt;= #{inOrderExpectStartTime}
</if>
mhd_oms/src/main/resources/mapper/executionOutMaterialDetail/ExecutionOutMaterialDetailMapper.xml
+6 -3
View File
@@ -454,6 +454,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
id="OutMaterialDetailWithOrderResult" extends="MaterialDetailResult">
<result property="outOrderStatus" column="out_order_status" />
<result property="outOrderAuditStatus" column="out_order_audit_status" />
<result property="issueStatus" column="issue_status" />
<result property="orderShipperId" column="order_shipper_id" />
<result property="orderShipperCode" column="order_shipper_code" />
<result property="orderShipperName" column="order_shipper_name" />
@@ -502,7 +503,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
b.OUTBOUND_DATE as order_outbound_date,
b.OUTBOUND_TIME as order_outbound_time,
b.status as out_order_status,
b.audit_status as out_order_audit_status
b.audit_status as out_order_audit_status,
b.issue_status as issue_status
from execution_out_material_detail a
left join execution_stock_out_order b on a.out_order_number = b.out_order_number
left join NGWL_TEST_WMS.material_base_info c on a.material_base_info_id = c.material_base_info_id
@@ -543,8 +545,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="outOrderTypeCode != null and outOrderTypeCode != ''">
and b.order_type_code = #{outOrderTypeCode}
</if>
<!-- 出库状态: 1-已创建 2-已审核 3-部分分配 4-已分配 5-拣货中 6-波次中 7-拣货完成 8-复核中 9-已出库 10-已取消 11-已关闭 12-已复核 13-已交接，只统计已出库(9/12/13)的明细 -->
and b.status in (9, 12, 13)
<!-- 出库单展示状态issue_status: 0-已创建 2-已审核 3-已驳回 4-已出库；
执行出库单status不随WMS出库完成流转(回写被注释)，"已出库"以issue_status=4为准 -->
and b.issue_status = 4
<if test="outOrderExpectStartTime != null">
and b.expect_time &gt;= #{outOrderExpectStartTime}
</if>