From 9c0dbc95b469f9f28184afa83fedaaba7a0b8d49 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期四, 12 三月 2026 13:51:43 +0800
Subject: [PATCH] erp出库作业完善 1.出库任务下发给wcs之前会先卡住，等erp发立即出库时再给wcs下发（补丁，后需要删掉） 2.给wcs自动下发出库任务 3.新增出库任务完成后上报erp接口（三次上报失败后直接转历史档这个地方有点问题）
---
src/main/resources/mapper/WrkMastMapper.xml | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 23fd172..520db00 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -56,6 +56,7 @@
<result column="log_err_time" property="logErrTime" />
<result column="log_err_memo" property="logErrMemo" />
<result column="barcode" property="barcode" />
+ <result column="Pdc_type" property="PdcType" />
<result column="ctn_no" property="ctnNo" />
<result column="full_plt" property="fullPlt" />
<result column="pre_have" property="preHave" />
@@ -70,6 +71,7 @@
select * from asr_wrk_mast
where wrk_sts=5
or (wrk_sts=15 and take_none = '1' and ove_mk='Y' and wrk_no not in (select wrk_no from asr_bas_devp) and wrk_no not in (select wrk_no from asr_wrk_mast_sta))
+ or (wrk_sts=15 and log_mk='F' and exp_time >= 3 and wrk_no not in (select wrk_no from asr_bas_devp))
or (wrk_sts=15 and dateadd(mi,3,crn_end_time) <= getdate() and wrk_no not in (select wrk_no from asr_bas_devp))
or (wrk_sts=15 and crn_end_time is null and wrk_no not in (select wrk_no from asr_bas_devp))
or (wrk_no in (9997,9996) and wrk_sts = 15)
@@ -156,3 +158,4 @@
</select>
</mapper>
+
--
Gitblit v1.9.1