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

fix：供应商中增加物料清单和采购记录相关接口开发。

Browse Source
This commit is contained in:
zhangxuanming
2025-01-22 10:57:51 +08:00
parent fb3c63922a
commit 9f405b5aa0
6 changed files with 315 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,6 +39,87 @@
<result property="updateTime" column="update_time" />
</resultMap>
<resultMap type="WmItemRecptLine" id="WmItemRecptLineResult">
<result property="lineId" column="line_id" />
<result property="recptId" column="recpt_id" />
<result property="noticeLineId" column="notice_line_id" />
<result property="itemId" column="item_id" />
<result property="itemCode" column="item_code" />
<result property="itemName" column="item_name" />
<result property="specification" column="specification" />
<result property="unitOfMeasure" column="unit_of_measure" />
<result property="quantityRecived" column="quantity_recived" />
<result property="batchCode" column="batch_code" />
<result property="warehouseId" column="warehouse_id" />
<result property="warehouseCode" column="warehouse_code" />
<result property="warehouseName" column="warehouse_name" />
<result property="locationId" column="location_id" />
<result property="locationCode" column="location_code" />
<result property="locationName" column="location_name" />
<result property="areaId" column="area_id" />
<result property="areaCode" column="area_code" />
<result property="areaName" column="area_name" />
<result property="expireDate" column="expire_date" />
<result property="iqcCheck" column="iqc_check" ></result>
<result property="iqcId" column="iqc_id"></result>
<result property="iqcCode" column="iqc_code"></result>
<result property="remark" column="remark" />
<result property="attr1" column="attr1" />
<result property="attr2" column="attr2" />
<result property="attr3" column="attr3" />
<result property="attr4" column="attr4" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
</resultMap>
<resultMap id="ProcurementRecordVOResult" type="ProcurementRecordVO">
<result property="recptId" column="recpt_id" />
<result property="recptCode" column="recpt_code" />
<result property="recptName" column="recpt_name" />
<result property="iqcId" column="iqc_id" />
<result property="iqcCode" column="iqc_code" />
<result property="noticeId" column="notice_id" />
<result property="noticeCode" column="notice_code" />
<result property="poCode" column="po_code" />
<result property="vendorId" column="vendor_id" />
<result property="vendorCode" column="vendor_code" />
<result property="vendorName" column="vendor_name" />
<result property="vendorNick" column="vendor_nick" />
<result property="warehouseId" column="warehouse_id" />
<result property="warehouseCode" column="warehouse_code" />
<result property="warehouseName" column="warehouse_name" />
<result property="locationId" column="location_id" />
<result property="locationCode" column="location_code" />
<result property="locationName" column="location_name" />
<result property="areaId" column="area_id" />
<result property="areaCode" column="area_code" />
<result property="areaName" column="area_name" />
<result property="recptDate" column="recpt_date" />
<result property="status" column="status" />
<result property="lineId" column="line_id" />
<result property="recptId" column="recpt_id" />
<result property="noticeLineId" column="notice_line_id" />
<result property="itemId" column="item_id" />
<result property="itemCode" column="item_code" />
<result property="itemName" column="item_name" />
<result property="specification" column="specification" />
<result property="unitOfMeasure" column="unit_of_measure" />
<result property="quantityRecived" column="quantity_recived" />
<result property="batchCode" column="batch_code" />
<result property="warehouseId" column="warehouse_id" />
<result property="warehouseCode" column="warehouse_code" />
<result property="warehouseName" column="warehouse_name" />
<result property="locationId" column="location_id" />
<result property="locationCode" column="location_code" />
<result property="locationName" column="location_name" />
<result property="areaId" column="area_id" />
<result property="areaCode" column="area_code" />
<result property="areaName" column="area_name" />
<result property="expireDate" column="expire_date" />
</resultMap>
<resultMap type="ItemRecptTxBean" id="ItemRecptTxBeanResult">
<result property="itemId" column="item_id"></result>
<result property="itemCode" column="item_code"></result>
@@ -129,6 +210,17 @@
ON ir.recpt_id = irl.`recpt_id`
WHERE ir.`recpt_id` = #{recptId}
</select>
<select id="getItem" resultType="com.ktg.mes.wm.domain.WmItemRecptLine" resultMap="WmItemRecptLineResult">
select * from wm_item_recpt_line
where recpt_id in ( select recpt_id from wm_item_recpt where vendor_id = #{vendorId} )
</select>
<select id="getProcurementRecord" resultType="com.ktg.mes.wm.domain.vo.ProcurementRecordVO" resultMap="ProcurementRecordVOResult">
SELECT * FROM wm_item_recpt_line wl
LEFT JOIN (select * from wm_item_recpt) wr ON wr.recpt_id = wl.recpt_id
WHERE
wr.vendor_id = #{vendorId}
</select>
<insert id="insertWmItemRecpt" parameterType="WmItemRecpt" useGeneratedKeys="true" keyProperty="recptId">