From c3779c474b7c41236e42b8f18c87c1342c5f4d9c Mon Sep 17 00:00:00 2001 From: "[li_she]" <[li.she@xujiesoft.com]> Date: Tue, 7 Mar 2023 11:07:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E7=BB=B4=E6=8A=A4=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E6=97=A5=E5=8E=86=E6=98=AF=E5=90=A6=E5=8C=85=E5=90=AB?= =?UTF-8?q?=202023=E5=B9=B43=E6=9C=887=E6=97=A5=20=20sxm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/base/entity/CalendarData.java | 1 + src/main/resources/mapper/base/BaseMapper.xml | 138 +++++++++++------- 2 files changed, 90 insertions(+), 49 deletions(-) diff --git a/src/main/java/com/gaotao/modules/base/entity/CalendarData.java b/src/main/java/com/gaotao/modules/base/entity/CalendarData.java index 000d335..c7a4cd6 100644 --- a/src/main/java/com/gaotao/modules/base/entity/CalendarData.java +++ b/src/main/java/com/gaotao/modules/base/entity/CalendarData.java @@ -57,6 +57,7 @@ public class CalendarData { private String scheduledDate;//排产的时间 LR 2022-03-21 + private String isIncluding; //是否包含 sxm 2023-03-07 } diff --git a/src/main/resources/mapper/base/BaseMapper.xml b/src/main/resources/mapper/base/BaseMapper.xml index 39fec9b..313997f 100644 --- a/src/main/resources/mapper/base/BaseMapper.xml +++ b/src/main/resources/mapper/base/BaseMapper.xml @@ -9,15 +9,17 @@ AND site = #{site} + - AND CalendarID LIKE #{calendarId} + AND CalendarID ${isIncluding} #{calendarId} + + + AND CalendarDesc ${isIncluding} #{calendarDesc} AND status = #{status} - - AND CalendarDesc LIKE #{calendarDesc} - + @@ -421,7 +423,8 @@ T.CostTypeDesc, T.Active, T.BatchCreatedMethod, - T.CheckPercentage,T.InspectFlag + T.CheckPercentage, + T.InspectFlag from PartFamily as T where T.Site in (Select Site from AccessSite where upper(UserID) = #{user}) @@ -435,9 +438,11 @@ T.CostTypeDesc, T.Active, T.BatchCreatedMethod, - T.CheckPercentage,T.InspectFlag + T.CheckPercentage, + T.InspectFlag from PartFamily as T - where T.Site = #{site} and T.FamilyID = #{familyID} + where T.Site = #{site} + and T.FamilyID = #{familyID} - INSERT INTO PartFamily (FamilyID, Site, FamilyName, Active, CheckPercentage,InspectFlag) - values (#{familyID}, #{site}, #{familyName}, #{active}, #{checkPercentage},#{inspectFlag}) + INSERT INTO PartFamily (FamilyID, Site, FamilyName, Active, CheckPercentage, InspectFlag) + values (#{familyID}, #{site}, #{familyName}, #{active}, #{checkPercentage}, #{inspectFlag}) UPDATE PartFamily SET Site=#{site}, FamilyName=#{familyName}, Active=#{active}, - CheckPercentage=#{checkPercentage},InspectFlag=#{inspectFlag} + CheckPercentage=#{checkPercentage}, + InspectFlag=#{inspectFlag} where FamilyID = #{familyID} and Site = #{site} @@ -986,9 +992,9 @@ Remark=#{remark} WHERE partNo = #{partNo} - and site = #{site} - and revNo = #{revNo} - and ItemNo = #{itemNo} + and site = #{site} + and revNo = #{revNo} + and ItemNo = #{itemNo} @@ -1107,7 +1113,7 @@ update RoutingTool SET ToolQty=#{toolQty}, Remark=#{remark}, - ToolID = #{newToolId} + ToolID = #{newToolId} WHERE Site = #{site} and PartNo = #{partNo} and ToolID = #{toolID} @@ -1786,21 +1792,22 @@ SELECT ReportID labelNo, ReportFamily labelType, Reportfile labelName, ReportType labelClass, Remark remark FROM ReportFileList - AND ReportID = #{labelNo} + AND ReportID = #{labelNo} INSERT INTO ReportFileList(ReportID, ReportFamily, Reportfile, ReportType, Remark) - VALUES(#{labelNo}, #{labelType}, #{labelName}, #{labelClass}, #{remark}) + VALUES (#{labelNo}, #{labelType}, #{labelName}, #{labelClass}, #{remark}) - UPDATE ReportFileList SET ReportFamily = #{labelType}, Reportfile = #{labelName}, ReportType = #{labelClass}, Remark = #{remark} + UPDATE ReportFileList SET ReportFamily = #{labelType}, Reportfile = #{labelName}, ReportType = #{labelClass}, + Remark = #{remark} - AND ReportID = #{labelNo} + AND ReportID = #{labelNo} @@ -1813,8 +1820,10 @@ - + SELECT rfd.ReportFamily labelType, rfd.ReportID labelNo, rfl.ReportType labelClass, rfl.Reportfile labelName, + rfd.Remark remark, rfd.SubReportFlag subLabelFlag, rfd.ParentReportID parentLabelNo FROM ReportFileDefDefault rfd LEFT JOIN ReportFileList rfl ON rfl.ReportID = rfd.ReportID @@ -1835,12 +1844,13 @@ INSERT INTO ReportFileDefDefault(FamilyID, ReportFamily, ReportID, Remark, SubReportFlag, ParentReportID) - VALUES('*', #{labelType}, #{labelNo}, #{remark}, #{subLabelFlag}, #{parentLabelNo}) + VALUES ('*', #{labelType}, #{labelNo}, #{remark}, #{subLabelFlag}, #{parentLabelNo}) - UPDATE ReportFileDefDefault SET SubReportFlag = #{subLabelFlag}, ParentReportID = #{parentLabelNo}, Remark = #{remark} + UPDATE ReportFileDefDefault SET SubReportFlag = #{subLabelFlag}, ParentReportID = #{parentLabelNo}, Remark = + #{remark} AND ReportID = #{labelNo} AND ReportFamily = #{labelType} AND FamilyID = '*' @@ -1855,9 +1865,12 @@ - + SELECT rfc.ReportFamily labelType, rfc.CustomerID customerId, dbo.Get_CustomerDesc(rfc.Site, rfc.CustomerID) + customerDesc, rfc.ReportID labelNo, + rfl.Reportfile labelName, rfl.ReportType labelClass, rfc.Site site, rfc.Remark remark, rfc.SubReportFlag + subLabelFlag, rfc.ParentReportID parentLabelNo FROM ReportFileDefCustomer rfc LEFT JOIN ReportFileList rfl ON rfl.ReportID = rfc.ReportID AND rfl.ReportFamily = rfc.ReportFamily @@ -1880,13 +1893,15 @@ - INSERT INTO ReportFileDefCustomer(Site, CustomerID, FamilyID, ReportFamily, ReportID, Remark, SubReportFlag, ParentReportID) - VALUES(#{site}, #{customerId}, '*', #{labelType}, #{labelNo}, #{remark}, #{subLabelFlag}, #{parentLabelNo}) + INSERT INTO ReportFileDefCustomer(Site, CustomerID, FamilyID, ReportFamily, ReportID, Remark, SubReportFlag, + ParentReportID) + VALUES (#{site}, #{customerId}, '*', #{labelType}, #{labelNo}, #{remark}, #{subLabelFlag}, #{parentLabelNo}) - UPDATE ReportFileDefCustomer SET SubReportFlag = #{subLabelFlag}, ParentReportID = #{parentLabelNo}, Remark = #{remark} + UPDATE ReportFileDefCustomer SET SubReportFlag = #{subLabelFlag}, ParentReportID = #{parentLabelNo}, Remark = + #{remark} AND ReportID = #{labelNo} AND CustomerID = #{customerId} AND FamilyID = '*' @@ -1902,7 +1917,8 @@ - SELECT ReportID labelNo, ItemNo itemNo, ShowSeqNo showSeqNo, ParameterDesc parameterDesc, ParameterName parameterName, + SELECT ReportID labelNo, ItemNo itemNo, ShowSeqNo showSeqNo, ParameterDesc parameterDesc, ParameterName + parameterName, ValueType_DB valueTypeDb, ValueType valueType, OptionValue optionValue, DefaultValue defaultValue FROM ReportParameters @@ -1975,13 +1992,14 @@ INSERT INTO ReportParameters(ReportID, ItemNo, ShowSeqNo, ParameterDesc, ParameterName, ValueType_DB, ValueType, OptionValue, DefaultValue) - VALUES(#{labelNo}, #{itemNo}, #{showSeqNo}, #{parameterDesc}, #{parameterName}, #{valueTypeDb}, - #{valueType}, #{optionValue}, #{defaultValue}) + VALUES (#{labelNo}, #{itemNo}, #{showSeqNo}, #{parameterDesc}, #{parameterName}, #{valueTypeDb}, + #{valueType}, #{optionValue}, #{defaultValue}) - UPDATE ReportParameters SET OptionValue = #{optionValue}, DefaultValue = #{defaultValue}, ShowSeqNo = #{showSeqNo} + UPDATE ReportParameters SET OptionValue = #{optionValue}, DefaultValue = #{defaultValue}, ShowSeqNo = + #{showSeqNo} AND ReportID = #{labelNo} AND ItemNo = #{itemNo} @@ -1998,7 +2016,8 @@ SELECT ItemNo itemNo, ShowSeqNo showSeqNo, ItemDesc itemDesc, ObjectName objectName, ObjectGroup objectGroup, - DBFieldName dbFieldName, SequenceNoflag sequenceNoFlag, SequenceBits sequenceBits, [Interval] intervalValue, ReportID labelNo + DBFieldName dbFieldName, SequenceNoflag sequenceNoFlag, SequenceBits sequenceBits, [Interval] intervalValue, + ReportID labelNo FROM ReportContentItem AND ReportID = #{labelNo} AND ItemNo != #{itemNo} @@ -2100,7 +2129,7 @@ INSERT INTO ReportFile_SeqInfo(ReportID, ItemNo, KeyInfo, LastSeqNo) - VALUES(#{labelNo}, #{itemNo}, #{keyInfo}, #{lastSeqNo}) + VALUES (#{labelNo}, #{itemNo}, #{keyInfo}, #{lastSeqNo}) @@ -2121,15 +2150,26 @@ - INSERT INTO Calendar_Exception_Shift(Site, CalendarID, ShiftNo, ScheduleDate, ShiftDesc, StartExactTime, EndExactTime, StartTime, EndTime) - SELECT site,#{calendarId},ShiftNo,#{scheduledate} , ShiftDesc, StartExactTime, EndExactTime, StartTime, EndTime FROM Calendar_DateType_Shift - WHERE DateType = #{datetype} AND site = #{site} + INSERT INTO Calendar_Exception_Shift(Site, CalendarID, ShiftNo, ScheduleDate, ShiftDesc, StartExactTime, + EndExactTime, StartTime, EndTime) + SELECT site, + #{calendarId}, + ShiftNo, + #{scheduledate}, + ShiftDesc, + StartExactTime, + EndExactTime, + StartTime, + EndTime + FROM Calendar_DateType_Shift + WHERE DateType = #{datetype} + AND site = #{site} - DELETE Calendar_Exception_Shift - WHERE site = #{site} - AND CalendarID = #{calendarId} - AND scheduledate = #{scheduledate} + DELETE Calendar_Exception_Shift + WHERE site = #{site} + AND CalendarID = #{calendarId} + AND scheduledate = #{scheduledate} \ No newline at end of file