fix(oms): 出入库明细查询状态过滤口径修正-改为issue_status=4
问题: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:
+5
-2
@@ -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 >= #{inOrderExpectStartTime}
|
||||
</if>
|
||||
|
||||
Reference in New Issue
Block a user