From 5a07bb3f4e4846ac5425b5ec73d4017e2b7c57dd Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期四, 16 四月 2026 12:44:40 +0800
Subject: [PATCH] erp上报完成时间修复
---
src/main/resources/mapper/WrkDetlMapper.xml | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/mapper/WrkDetlMapper.xml b/src/main/resources/mapper/WrkDetlMapper.xml
index b5add8a..dd1530a 100644
--- a/src/main/resources/mapper/WrkDetlMapper.xml
+++ b/src/main/resources/mapper/WrkDetlMapper.xml
@@ -12,6 +12,12 @@
<result column="maktx" property="maktx" />
<result column="batch" property="batch" />
<result column="order_no" property="orderNo" />
+ <result column="container_no" property="containerNo" />
+ <result column="teu" property="teu" />
+ <result column="plate_no" property="plateNo" />
+ <result column="train_no" property="trainNo" />
+ <result column="freq_type" property="freqType" />
+ <result column="cube_number" property="cubeNumber" />
<result column="specs" property="specs" />
<result column="model" property="model" />
@@ -28,7 +34,7 @@
<result column="item_num" property="itemNum" />
<result column="safe_qty" property="safeQty" />
<result column="weight" property="weight" />
- <result column="length" property="length" />
+ <result column="man_length" property="manLength" />
<result column="volume" property="volume" />
<result column="three_code" property="threeCode" />
<result column="supp" property="supp" />
@@ -45,6 +51,12 @@
<result column="appe_user" property="appeUser" />
<result column="appe_time" property="appeTime" />
<result column="memo" property="memo" />
+ <result column="standby1" property="standby1" />
+ <result column="standby2" property="standby2" />
+ <result column="standby3" property="standby3" />
+ <result column="box_type1" property="boxType1" />
+ <result column="box_type2" property="boxType2" />
+ <result column="box_type3" property="boxType3" />
</resultMap>
<sql id="batchSeq">
@@ -70,7 +82,9 @@
and matnr = #{matnr}
<include refid="batchSeq"></include>
</delete>
-
+ <select id="findByBarcode" resultMap="BaseResultMap">
+ select * from asr_wrk_detl where 1=1 and zpallet = #{barcode} and wrk_no != 9996
+ </select>
<update id="updateAnfme">
update asr_wrk_detl
set anfme = #{anfme}
@@ -109,19 +123,19 @@
</select>
<select id="selectAndLogByOrderNoGroupByMatnrOfSum" resultMap="BaseResultMap">
- select awd.wrk_no, awd.io_time, awd.matnr,awd.zpallet,awd.specs, sum(awd.anfme) as anfme
+ select awd.wrk_no, awd.io_time, awd.matnr,awd.zpallet,awd.specs,awd.maktx, sum(awd.anfme) as anfme
from asr_wrk_detl awd
left join asr_wrk_mast awm on awd.wrk_no = awm.wrk_no and awd.io_time = awm.io_time
where order_no = #{orderNo}
- group by awd.wrk_no, awd.io_time, awd.matnr ,awd.zpallet,awd.specs
+ group by awd.wrk_no, awd.io_time, awd.matnr ,awd.zpallet,awd.specs,awd.maktx
union
- select distinct awdl.wrk_no, awdl.io_time, awdl.matnr,awdl.zpallet,awdl.specs, sum(awdl.anfme) as anfme
+ select distinct awdl.wrk_no, awdl.io_time, awdl.matnr,awdl.zpallet,awdl.specs,awdl.maktx, sum(awdl.anfme) as anfme
from asr_wrk_detl_log awdl
left join asr_wrk_mast_log awml on awdl.wrk_no = awml.wrk_no and awdl.io_time = awml.io_time
where awdl.order_no = #{orderNo}
and (awml.manu_type is null or awml.manu_type != '鎵嬪姩鍙栨秷')
and awml.io_type != 103
- group by awdl.wrk_no, awdl.io_time, awdl.matnr ,awdl.zpallet,awdl.specs
+ group by awdl.wrk_no, awdl.io_time, awdl.matnr ,awdl.zpallet,awdl.specs,awdl.maktx
</select>
</mapper>
--
Gitblit v1.9.1