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 | 45 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 40 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/OrderDetlMapper.xml b/src/main/resources/mapper/OrderDetlMapper.xml
index 57f2b30..415abc7 100644
--- a/src/main/resources/mapper/OrderDetlMapper.xml
+++ b/src/main/resources/mapper/OrderDetlMapper.xml
@@ -45,6 +45,17 @@
<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>
@@ -68,9 +79,9 @@
where 1=1
and order_no = #{orderNo}
and matnr = #{matnr}
- <if test="batch!=null">
- and batch = #{batch}
- </if>
+<!-- <if test="batch!=null and batch!=''">-->
+<!-- and batch = #{batch}-->
+<!-- </if>-->
</select>
<select id="selectWorkingDetls" resultMap="BaseResultMap">
@@ -135,10 +146,34 @@
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}
@@ -154,7 +189,7 @@
<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}
--
Gitblit v1.9.1