From dc9228656b202a8f1ec7720d78eb0421a94a28c9 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 23 十月 2025 16:20:14 +0800
Subject: [PATCH] 聚乳酸明细增加丙交酯含量,%指标
---
src/main/resources/mapper/OrderDetlMapper.xml | 104 +++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 90 insertions(+), 14 deletions(-)
diff --git a/src/main/resources/mapper/OrderDetlMapper.xml b/src/main/resources/mapper/OrderDetlMapper.xml
index f57cc3f..415abc7 100644
--- a/src/main/resources/mapper/OrderDetlMapper.xml
+++ b/src/main/resources/mapper/OrderDetlMapper.xml
@@ -8,11 +8,11 @@
<result column="order_id" property="orderId" />
<result column="order_no" property="orderNo" />
<result column="anfme" property="anfme" />
+ <result column="work_qty" property="workQty" />
<result column="qty" property="qty" />
<result column="matnr" property="matnr" />
<result column="maktx" property="maktx" />
<result column="batch" property="batch" />
-
<result column="specs" property="specs" />
<result column="model" property="model" />
<result column="color" property="color" />
@@ -39,13 +39,23 @@
<result column="source" property="source" />
<result column="inspect" property="inspect" />
<result column="danger" property="danger" />
-
<result column="status" property="status" />
<result column="create_by" property="createBy" />
<result column="create_time" property="createTime" />
<result column="update_by" property="updateBy" />
<result column="update_time" property="updateTime" />
<result column="memo" property="memo" />
+ <result column="owner" property="owner" />
+ <result column="payment" property="payment" />
+ <result column="uuid" property="uuid" />
+ <result column="finger_melting_min" property="fingerMeltingMin" />
+ <result column="finger_melting_max" property="fingerMeltingMax" />
+ <result column="fusing_point_min" property="fusingPointMin" />
+ <result column="fusing_point_max" property="fusingPointMax" />
+ <result column="yellowness_min" property="yellownessMin" />
+ <result column="yellowness_max" property="yellownessMax" />
+ <result column="opacity_min" property="opacityMin" />
+ <result column="opacity_max" property="opacityMax" />
</resultMap>
@@ -69,14 +79,9 @@
where 1=1
and order_no = #{orderNo}
and matnr = #{matnr}
- <choose>
- <when test="batch != null and batch != ''">
- and batch = #{batch}
- </when>
- <otherwise>
- and (batch IS NULL OR batch = '')
- </otherwise>
- </choose>
+<!-- <if test="batch!=null and batch!=''">-->
+<!-- and batch = #{batch}-->
+<!-- </if>-->
</select>
<select id="selectWorkingDetls" resultMap="BaseResultMap">
@@ -130,10 +135,45 @@
and mdt.pakout = 1
<include refid="pakOutPageCondition"></include>
</select>
+ <select id="checkAllDetlFinish" resultType="java.lang.Integer">
+ SELECT count(*) From man_order_detl WHERE qty < anfme and order_no = #{orderNo}
+ </select>
+ <select id="sameOrderComb" resultType="java.lang.Integer">
+ SELECT SUM(anfme) FROM cust_wait_pakin WHERE 1=1
+ <if test="orderNo!=null and orderNo!='' ">
+ and order_no like '%' + #{orderNo} + '%'
+ </if>
+ and matnr = #{matnr}
+ and batch = #{batch}
+ </select>
+ <select id="selectExportExcelAllDataList" resultType="com.zy.asrs.entity.OrderDetlExcelVo">
+ select
+ mo.order_no orderNo,
+ md.anfme ,
+ md.work_qty workQty,
+ md.qty ,
+ md.matnr ,
+ md.maktx ,
+ md.specs ,
+ md.weight ,
+ md.owner ,
+ md.payment
+ from
+ man_order mo
+ left join man_order_detl md on
+ mo.id = md.order_id
+ where mo.status = 1
+ <if test="userId != null and userId != ''">
+ and mo.create_by = #{userId}
+ </if>
+ order by
+ mo.settle asc,
+ mo.create_time desc
+ </select>
<update id="increase">
update man_order_detl
- set qty = qty + #{qty}
+ set work_qty = work_qty + #{workQty}
where 1=1
and order_id = #{orderId}
and matnr = #{matnr}
@@ -149,7 +189,34 @@
<update id="decrease">
update man_order_detl
- set qty = qty - #{qty}
+ set work_qty = work_qty - #{workQty}
+ where 1=1
+ and order_no = #{orderNo}
+ and matnr = #{matnr}
+ <choose>
+ <when test="batch != null">
+ and batch = #{batch}
+ </when>
+ <otherwise>
+ and (batch IS NULL )
+ </otherwise>
+ </choose>
+ </update>
+
+ <update id="modifyStatus">
+ update man_order_detl
+ set status = #{status}
+ where 1=1
+ and order_id = #{orderId}
+ </update>
+
+ <insert id="addToLogTable">
+ INSERT INTO man_order_detl_log SELECT * FROM man_order_detl WHERE id = #{id}
+ </insert>
+
+ <update id="increaseQtyByOrderNo">
+ update man_order_detl
+ set qty = qty + #{qty}
where 1=1
and order_no = #{orderNo}
and matnr = #{matnr}
@@ -163,11 +230,20 @@
</choose>
</update>
- <update id="modifyStatus">
+ <update id="increaseWorkQty">
update man_order_detl
- set status = #{status}
+ set work_qty = work_qty + #{workQty}
where 1=1
and order_id = #{orderId}
+ and matnr = #{matnr}
+ <choose>
+ <when test="batch != null and batch != ''">
+ and batch = #{batch}
+ </when>
+ <otherwise>
+ and (batch IS NULL OR batch = '')
+ </otherwise>
+ </choose>
</update>
</mapper>
--
Gitblit v1.9.1