From 7b1e26eb36c22b812568b7385e59d357bffd5ecf Mon Sep 17 00:00:00 2001
From: Leon <3066758958@qq.com>
Date: Fri, 6 Aug 2021 11:43:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=AB=E6=96=99=E7=95=8C=E9=9D=A2=E5=A2=9E?=
=?UTF-8?q?=E5=8A=A0=E7=BB=84=E4=BB=B6=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/com/foreverwin/mesnac/common/dto/SfcDispatchDto.java | 1 +
dispatch/src/main/resources/mapper/CallItemMapper.xml | 4 ++++
2 files changed, 5 insertions(+)
diff --git a/common/src/main/java/com/foreverwin/mesnac/common/dto/SfcDispatchDto.java b/common/src/main/java/com/foreverwin/mesnac/common/dto/SfcDispatchDto.java
index 96bfb08f..198779cf 100644
--- a/common/src/main/java/com/foreverwin/mesnac/common/dto/SfcDispatchDto.java
+++ b/common/src/main/java/com/foreverwin/mesnac/common/dto/SfcDispatchDto.java
@@ -131,6 +131,7 @@ public class SfcDispatchDto implements Serializable{
/**
* 派工备注
*/
+ @ExcelColumn("备注")
private String remark;
/**
* 前置工序
diff --git a/dispatch/src/main/resources/mapper/CallItemMapper.xml b/dispatch/src/main/resources/mapper/CallItemMapper.xml
index 214b4d3c..e8b29342 100644
--- a/dispatch/src/main/resources/mapper/CallItemMapper.xml
+++ b/dispatch/src/main/resources/mapper/CallItemMapper.xml
@@ -647,6 +647,7 @@
LEFT JOIN CUSTOM_FIELDS CS ON CS.HANDLE = SO.HANDLE AND CS.ATTRIBUTE = 'ITEM_NUMBER'
INNER JOIN ITEM IT ON IT.HANDLE = SO.ITEM_BO
LEFT JOIN ITEM_T ITT ON ITT.ITEM_BO = IT.HANDLE AND ITT.LOCALE = 'zh'
+ INNER JOIN ITEM CP ON CP.HANDLE = ZCI.COMPONENT_BO
INNER JOIN OPERATION OP ON OP.SITE = ZCI.SITE AND OP.OPERATION = ZCI.OPERATION AND OP.CURRENT_REVISION = 'true'
LEFT JOIN OPERATION_T OPT ON OPT.OPERATION_BO = OP.HANDLE AND OPT.LOCALE = 'zh'
LEFT JOIN (
@@ -680,6 +681,9 @@
AND ZCI.RESRCE = #{resrce}
+
+ AND CP.ITEM = #{component}
+
AND ZSD.PLANNED_START_DATE >= #{startFromDate}