mes/mes-lxsm
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

采购入库的入库日期处理。

Browse Source
This commit is contained in:
JinLu.Yin
2022-09-10 11:17:49 +08:00
parent 8daa2ea520
commit 315be9a5b5
6 changed files with 76 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ktg-mes/src/main/resources/mapper/wm/WmItemRecptMapper.xml
View File

@@ -62,6 +62,7 @@
<result property="sourceDocCode" column="source_doc_code"></result>
<result property="sourceDocLineId" column="source_doc_line_id"></result>
<result property="transactionQuantity" column="transaction_quantity"></result>
<result property="recptDate" column="recpt_date"></result>
<result property="expireDate" column="expire_date"></result>
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
@@ -116,7 +117,7 @@
irl.`warehouse_id`,irl.`warehouse_code`,irl.`warehouse_name`,irl.`location_id`,irl.`location_code`,irl.`location_name`,irl.`area_id`,irl.`area_code`,irl.`area_name`,
ir.`vendor_id`,ir.`vendor_code`,ir.`vendor_name`,ir.`vendor_nick`,
'IR' AS source_doc_type,ir.`recpt_id` AS source_doc_id,ir.`recpt_code` AS source_doc_code,irl.`line_id` AS source_doc_line_id,
irl.`quantity_recived` AS transaction_quantity,irl.`expire_date`,
irl.`quantity_recived` AS transaction_quantity,ir.recpt_date, irl.`expire_date`,
ir.`create_by`,ir.`create_time`,ir.`update_by`,ir.`update_time`
FROM wm_item_recpt ir
LEFT JOIN wm_item_recpt_line irl

7
ktg-mes/src/main/resources/mapper/wm/WmTransactionMapper.xml
View File

@@ -35,6 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="transactionQuantity" column="transaction_quantity" />
<result property="transactionDate" column="transaction_date" />
<result property="relatedTransactionId" column="related_transaction_id" />
<result property="recptDate" column="recpt_date"></result>
<result property="erpDate" column="erp_date" />
<result property="expireDate" column="expire_date" />
<result property="attr1" column="attr1" />
@@ -48,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectWmTransactionVo">
select transaction_id, transaction_type, item_id, item_code, item_name, specification, unit_of_measure, batch_code, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, vendor_id, vendor_code, vendor_name, vendor_nick, source_doc_type, source_doc_id, source_doc_code, source_doc_line_id, material_stock_id, transaction_flag, transaction_quantity, transaction_date, related_transaction_id, erp_date, expire_date, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_transaction
select transaction_id, transaction_type, item_id, item_code, item_name, specification, unit_of_measure, batch_code, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, vendor_id, vendor_code, vendor_name, vendor_nick, source_doc_type, source_doc_id, source_doc_code, source_doc_line_id, material_stock_id, transaction_flag, transaction_quantity, transaction_date, related_transaction_id, erp_date,recpt_date, expire_date, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_transaction
</sql>
<select id="selectWmTransactionList" parameterType="WmTransaction" resultMap="WmTransactionResult">
@@ -83,6 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="transactionQuantity != null "> and transaction_quantity = #{transactionQuantity}</if>
<if test="transactionDate != null "> and transaction_date = #{transactionDate}</if>
<if test="relatedTransactionId != null "> and related_transaction_id = #{relatedTransactionId}</if>
<if test="recptDate ！= null"> and recpt_date = #{recptDate}</if>
<if test="erpDate != null "> and erp_date = #{erpDate}</if>
<if test="expireDate != null "> and expire_date = #{expireDate}</if>
<if test="attr1 != null and attr1 != ''"> and attr1 = #{attr1}</if>
@@ -130,6 +132,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="transactionDate != null">transaction_date,</if>
<if test="relatedTransactionId != null">related_transaction_id,</if>
<if test="erpDate != null">erp_date,</if>
<if test="recptDate != null">recpt_date,</if>
<if test="expireDate != null">expire_date,</if>
<if test="attr1 != null">attr1,</if>
<if test="attr2 != null">attr2,</if>
@@ -171,6 +174,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="transactionDate != null">#{transactionDate},</if>
<if test="relatedTransactionId != null">#{relatedTransactionId},</if>
<if test="erpDate != null">#{erpDate},</if>
<if test="recptDate != null">#{recptDate},</if>
<if test="expireDate != null">#{expireDate},</if>
<if test="attr1 != null">#{attr1},</if>
<if test="attr2 != null">#{attr2},</if>
@@ -216,6 +220,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="transactionDate != null">transaction_date = #{transactionDate},</if>
<if test="relatedTransactionId != null">related_transaction_id = #{relatedTransactionId},</if>
<if test="erpDate != null">erp_date = #{erpDate},</if>
<if test="recptDate != null">recp_date = #{recptDate},</if>
<if test="expireDate != null">expire_date = #{expireDate},</if>
<if test="attr1 != null">attr1 = #{attr1},</if>
<if test="attr2 != null">attr2 = #{attr2},</if>