入库逻辑修改

This commit is contained in:
liuhanqing
2026-03-23 11:31:31 +08:00
parent 556e9a8300
commit 59da6f91e1
33 changed files with 2223 additions and 351 deletions

View File

@@ -42,16 +42,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="warehouseId" column="warehouse_id" />
<result property="productName" column="product_name" />
<result property="supplierName" column="supplier_name" />
<!-- <association property="extraField" javaType="ExtraField">-->
<!-- <result property="productId" column="product_id" />-->
<!-- <result property="materialDesc" column="product_name" />-->
<!-- <result property="englishDesc" column="englishDesc" />-->
<!-- <result property="length" column="length" />-->
<!-- <result property="width" column="width" />-->
<!-- <result property="height" column="height" />-->
<!-- <result property="volume" column="volume" />-->
<!-- <result property="netWeight" column="netWeight" />-->
<!-- </association>-->
<collection
property="trayList"
javaType="java.util.List"
ofType="InStockTraycodeBindMsg">
<result property="id" column="bind_msg_id"/>
<result property="quantity" column="traycode_quantity"/>
<result property="trayCode" column="tray_code"/>
<result property="location" column="location"/>
</collection>
</resultMap>
<sql id="selectInStockinDetailVo">
@@ -62,8 +61,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
isd.supplier_id, isd.customer_id, bp.unit, bp.spec, isd.spare1, isd.spare2, isd.spare3, isd.spare4,
isd.spare5, isd.spare6, isd.scan_num, isd.scan_num_x, isd.scan_num_j,
bp.product_name,
isd.spare7,isd.spare8,isd.spare9,bs.supplier_name
isd.spare7,
isd.spare8,
isd.spare9,
bs.supplier_name,
istbm.tray_code,
istbm.location,
istbm.quantity as traycode_quantity,
istbm.id as bind_msg_id
from in_stockin_detail isd
left join in_stock_traycode_bind_msg istbm on isd.stockin_detail_id = istbm.in_stock_detail_id
left join bas_product bp on bp.product_id = isd.product_id
left join bas_supplier bs on bs.supplier_no = isd.supplier_id
</sql>