feat(oms/wms): 出入库明细货物种类改显物料分类名称、单据类型回显与查询条件
一、货物种类 - O/W出入库明细查询新增返回materialClassifyName(物料分类名称,多个逗号分隔) - WMS入库导出"货物种类"列、出库导出"种类"列改为物料分类名称(原为goodsType编码转文字) - OMS出入库导出新增"货物种类"列,货物类型列加字典转换不再显示0/1/2编码 二、单据类型 - O/W入库明细查询新增orderTypeCode/orderTypeName回显与查询条件(编码精确/名称模糊) - WMS入库明细导出新增"业务单据类型"列(第31列) 三、时间字段 - OMS出库明细查询返回增加completeTime完成时间 - OMS orderOutboundDate出仓日期格式恢复为yyyy-MM-dd HH:mm:ss - OMS出库时间过滤改为三级兜底:出库时间OUTBOUND_TIME→出仓日期→建档时间 四、修复 - WMS出库导出SQL修复TOTAL_PRICE列不存在(总价改用TOTAL_AMOUNT),总价值暂无来源占位空列
This commit is contained in:
+12
-1
@@ -366,6 +366,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<result property="inOrderStatus" column="in_order_status" />
|
||||
<result property="inOrderAuditStatus" column="in_order_audit_status" />
|
||||
<result property="issueStatus" column="issue_status" />
|
||||
<result property="materialClassifyName" column="material_classify_name" />
|
||||
<result property="orderTypeCode" column="order_type_code" />
|
||||
<result property="orderTypeName" column="order_type_name" />
|
||||
<result property="orderShipperId" column="order_shipper_id" />
|
||||
<result property="orderShipperCode" column="order_shipper_code" />
|
||||
<result property="orderShipperName" column="order_shipper_name" />
|
||||
@@ -404,10 +407,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
a.single_volume, a.single_gross_weight, a.lot_no,
|
||||
a.drink_date, a.fire_insure_fee, a.unit_price,
|
||||
a.line_num_gw, a.spec_gw, a.unit_gw, a.qty_gw, a.erp_curr_gw, a.erp_price_gw, a.amount_gw,
|
||||
c.insure_amount, c.goods_type,
|
||||
c.insure_amount, c.goods_type, c.material_classify_name,
|
||||
b.shipper_id as order_shipper_id,
|
||||
b.shipper_code as order_shipper_code,
|
||||
b.shipper_name as order_shipper_name,
|
||||
b.order_type_code,
|
||||
b.order_type_name,
|
||||
b.status as in_order_status,
|
||||
b.audit_status as in_order_audit_status,
|
||||
b.issue_status as issue_status,
|
||||
@@ -452,6 +457,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="inOrderTypeCode != null and inOrderTypeCode != ''">
|
||||
and b.order_type_code = #{inOrderTypeCode}
|
||||
</if>
|
||||
<if test="orderTypeCode != null and orderTypeCode != ''">
|
||||
and b.order_type_code = #{orderTypeCode}
|
||||
</if>
|
||||
<if test="orderTypeName != null and orderTypeName != ''">
|
||||
and b.order_type_name like concat('%', #{orderTypeName}, '%')
|
||||
</if>
|
||||
<!-- 入库单展示状态issue_status: 0-已创建 2-已审核 3-已驳回 4-已入库(WMS回写status=5时同步为4);
|
||||
"已入库"以issue_status=4为准(推送创建的单据直接置4,status不一定为5) -->
|
||||
and b.issue_status = 4
|
||||
|
||||
Reference in New Issue
Block a user