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:
@@ -391,10 +391,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<result property="directWarehouse" column="direct_warehouse" />
|
||||
<result property="annexUrl" column="annex_url" />
|
||||
<result property="outOrderStatus" column="out_order_status" />
|
||||
<result property="status" column="status" />
|
||||
<result property="outOrderAuditStatus" column="out_order_audit_status"/>
|
||||
<result property="outboundDate" column="outbound_date" />
|
||||
<result property="completeTime" column="complete_time" />
|
||||
<result property="insureAmount" column="insure_amount" />
|
||||
<result property="goodsType" column="goods_type" />
|
||||
<result property="materialClassifyName" column="material_classify_name" />
|
||||
</resultMap>
|
||||
|
||||
<!--
|
||||
@@ -418,9 +421,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
, b.direct_warehouse
|
||||
, b.annex_url
|
||||
, b.status as out_order_status
|
||||
, b.status as status
|
||||
, b.audit_status as out_order_audit_status
|
||||
, b.outbound_date
|
||||
, c.insure_amount, c.goods_type
|
||||
, b.complete_time
|
||||
, c.insure_amount, c.goods_type, c.material_classify_name
|
||||
from out_material_detail a
|
||||
join stock_out_order b on a.out_order_number = b.out_order_number
|
||||
left join material_base_info c on a.material_base_info_id = c.material_base_info_id
|
||||
@@ -506,7 +511,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
a.weight_limit as weightLimit,
|
||||
a.single_volume as singleVolume,
|
||||
a.unit_price as unitPrice,
|
||||
a.TOTAL_PRICE as totalPrice,
|
||||
a.TOTAL_AMOUNT as totalPrice,
|
||||
a.discount_rate as discountRate,
|
||||
a.monthly_warehouse_fee as monthlyWarehouseFee,
|
||||
a.half_month_wh_fee as halfMonthWhFee,
|
||||
@@ -516,8 +521,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
a.TOTAL_GROSS_WEIGHT as totalGrossWeight,
|
||||
a.storage_name as storageName,
|
||||
a.in_order_number as inOrderNumber,
|
||||
c.goods_type as goodsType,
|
||||
a.TOTAL_AMOUNT as totalAmount,
|
||||
c.material_classify_name as materialClassifyName,
|
||||
CAST(NULL AS DECIMAL) as totalAmount,
|
||||
b.status as outOrderStatus
|
||||
from out_material_detail a
|
||||
join stock_out_order b on a.out_order_number = b.out_order_number
|
||||
|
||||
Reference in New Issue
Block a user