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

通过生产报工更新生产任务和生产工单的进度；进行物料的消耗；进行产品的产出。

Browse Source
This commit is contained in:
DESKTOP-J7ED0MB\yinjinlu
2022-10-09 18:27:39 +08:00
parent 6559979ca8
commit 2d300808a7
19 changed files with 406 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ktg-mes/src/main/resources/mapper/pro/ProRouteMapper.xml
View File

@@ -40,6 +40,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where route_id = #{routeId}
</select>
<select id="getRouteByProductId" parameterType="Long" resultMap="ProRouteResult">
select r.*
from pro_route r
left join pro_route_product p
on p.route_id = r.route_id
where r.enable_flag = 'Y'
and p.item_id = #{itemId}
</select>
<select id="checkRouteCodeUnique" parameterType="ProRoute" resultMap="ProRouteResult">
<include refid="selectProRouteVo"/>
where route_code = #{routeCode} limit 1

43
ktg-mes/src/main/resources/mapper/wm/WmItemConsumeMapper.xml
View File

@@ -31,6 +31,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="updateTime" column="update_time" />
</resultMap>
<resultMap id="ItemConsumeTxBeanResult" type="ItemConsumeTxBean">
<result property="materialStockId" column="material_stock_id"></result>
<result property="itemId" column="item_id"></result>
<result property="itemCode" column="item_code"></result>
<result property="itemName" column="item_name"></result>
<result property="specification" column="specification"></result>
<result property="unitOfMeasure" column="unit_of_measure"></result>
<result property="batchCode" column="batch_code"></result>
<result property="warehouseId" column="warehouse_id"></result>
<result property="warehouseCode" column="warehouse_code"></result>
<result property="warehouseName" column="warehouse_name"></result>
<result property="locationId" column="location_id"></result>
<result property="locationCode" column="location_code"></result>
<result property="locationName" column="location_name"></result>
<result property="areaId" column="area_id"></result>
<result property="areaCode" column="area_code"></result>
<result property="areaName" column="area_name"></result>
<result property="sourceDocType" column="source_doc_type"></result>
<result property="sourceDocId" column="source_doc_id"></result>
<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="workorderId" column="workorder_id"></result>
<result property="workorderCode" column="workorder_code"></result>
<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>
<sql id="selectWmItemConsumeVo">
select record_id, workorder_id, workorder_code, workorder_name, task_id, task_code, task_name, workstation_id, workstation_code, workstation_name, process_id, process_code, process_name, consume_date, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_item_consume
</sql>
@@ -59,7 +88,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectWmItemConsumeVo"/>
where record_id = #{recordId}
</select>
<select id="getTxBeans" parameterType="Long" resultMap="ItemConsumeTxBeanResult">
SELECT irl.`item_id`,irl.`item_code`,irl.`item_name`,irl.`specification`,irl.`unit_of_measure`,irl.`batch_code`,
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`,
'ITEM_CONSUME' AS source_doc_type,ir.`record_id` AS source_doc_id,"" AS source_doc_code,irl.`line_id` AS source_doc_line_id,
irl.`quantity_consume` AS transaction_quantity,ir.workorder_id,ir.workorder_code,
ir.`create_by`,ir.`create_time`,ir.`update_by`,ir.`update_time`
FROM wm_item_consume ir
LEFT JOIN wm_item_consume_line irl
ON ir.record_id = irl.`record_id`
WHERE ir.`record_id` = #{recordId}
</select>
<insert id="insertWmItemConsume" parameterType="WmItemConsume" useGeneratedKeys="true" keyProperty="recordId">
insert into wm_item_consume
<trim prefix="(" suffix=")" suffixOverrides=",">

43
ktg-mes/src/main/resources/mapper/wm/WmProductProduceMapper.xml
View File

@@ -31,6 +31,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="updateTime" column="update_time" />
</resultMap>
<resultMap id="ProductProductTxBeanResult" type="ProductProductTxBean">
<result property="itemId" column="item_id"></result>
<result property="itemCode" column="item_code"></result>
<result property="itemName" column="item_name"></result>
<result property="specification" column="specification"></result>
<result property="unitOfMeasure" column="unit_of_measure"></result>
<result property="batchCode" column="batch_code"></result>
<result property="warehouseId" column="warehouse_id"></result>
<result property="warehouseCode" column="warehouse_code"></result>
<result property="warehouseName" column="warehouse_name"></result>
<result property="locationId" column="location_id"></result>
<result property="locationCode" column="location_code"></result>
<result property="locationName" column="location_name"></result>
<result property="areaId" column="area_id"></result>
<result property="areaCode" column="area_code"></result>
<result property="areaName" column="area_name"></result>
<result property="sourceDocType" column="source_doc_type"></result>
<result property="sourceDocId" column="source_doc_id"></result>
<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="workorderId" column="workorder_id"></result>
<result property="workorderCode" column="workorder_code"></result>
<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>
<sql id="selectWmProductProduceVo">
select record_id, workorder_id, workorder_code, workorder_name, task_id, task_code, task_name, workstation_id, workstation_code, workstation_name, process_id, process_code, process_name, produce_date, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_product_produce
</sql>
@@ -59,7 +88,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectWmProductProduceVo"/>
where record_id = #{recordId}
</select>
<select id="getTxBeans" parameterType="Long" resultMap="ProductProductTxBeanResult">
SELECT irl.`item_id`,irl.`item_code`,irl.`item_name`,irl.`specification`,irl.`unit_of_measure`,irl.`batch_code`,
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`,
'PRODUCT_PRODUCT' AS source_doc_type,ir.`record_id` AS source_doc_id,"" AS source_doc_code,irl.`line_id` AS source_doc_line_id,
irl.`quantity_produce` AS transaction_quantity,ir.workorder_id,ir.workorder_code,
ir.`create_by`,ir.`create_time`,ir.`update_by`,ir.`update_time`
FROM wm_product_produce ir
LEFT JOIN wm_product_produce_line irl
ON ir.record_id = irl.`record_id`
WHERE ir.`record_id` = #{recordId}
</select>
<insert id="insertWmProductProduce" parameterType="WmProductProduce" useGeneratedKeys="true" keyProperty="recordId">
insert into wm_product_produce
<trim prefix="(" suffix=")" suffixOverrides=",">