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:
+5
-4
@@ -455,6 +455,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<result property="outOrderStatus" column="out_order_status" />
|
||||
<result property="outOrderAuditStatus" column="out_order_audit_status" />
|
||||
<result property="issueStatus" column="issue_status" />
|
||||
<result property="materialClassifyName" column="material_classify_name" />
|
||||
<result property="orderShipperId" column="order_shipper_id" />
|
||||
<result property="orderShipperCode" column="order_shipper_code" />
|
||||
<result property="orderShipperName" column="order_shipper_name" />
|
||||
@@ -496,7 +497,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
a.stock_unit, a.stock_quantity, a.inventory_quantity,
|
||||
a.line_num_gw, a.spec_gw, a.unit_gw, a.qty_gw,
|
||||
a.erp_curr_gw, a.erp_price_gw, a.amount_gw, a.in_order_number_gw, a.in_line_num_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,
|
||||
@@ -554,12 +555,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="outOrderExpectEndTime != null">
|
||||
and b.expect_time <= #{outOrderExpectEndTime}
|
||||
</if>
|
||||
<!-- 实际出仓日期区间(为空的历史单按建档时间兜底),用于统计当天出库 -->
|
||||
<!-- 出库时间区间(统计当天出库):优先实际出库时间OUTBOUND_TIME,为空按出仓日期OUTBOUND_DATE,再为空按建档时间兜底 -->
|
||||
<if test="outboundDateStart != null and outboundDateStart != ''">
|
||||
and date_format(IFNULL(b.OUTBOUND_DATE, b.create_time), '%Y-%m-%d') >= #{outboundDateStart}
|
||||
and date_format(IFNULL(b.OUTBOUND_TIME, IFNULL(b.OUTBOUND_DATE, b.create_time)), '%Y-%m-%d') >= #{outboundDateStart}
|
||||
</if>
|
||||
<if test="outboundDateEnd != null and outboundDateEnd != ''">
|
||||
and date_format(IFNULL(b.OUTBOUND_DATE, b.create_time), '%Y-%m-%d') <= #{outboundDateEnd}
|
||||
and date_format(IFNULL(b.OUTBOUND_TIME, IFNULL(b.OUTBOUND_DATE, b.create_time)), '%Y-%m-%d') <= #{outboundDateEnd}
|
||||
</if>
|
||||
and a.del_flag = 1
|
||||
and b.del_flag = 1
|
||||
|
||||
Reference in New Issue
Block a user