From f354492d515070d2176a9118eda95f14b9c5e98b Mon Sep 17 00:00:00 2001 From: ruanqi Date: Wed, 26 Jan 2022 09:18:50 +0800 Subject: [PATCH] =?UTF-8?q?1008=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/ViewKanbanSoHunlianPlanData.java | 9 +++++++++ .../entity/SOTaskOrderHeaderData.java | 19 +++++++++++++++++++ .../service/impl/DailyPlanServiceImpl.java | 1 + .../resources/mapper/board/BoardMapper.xml | 10 +++++----- .../production/SOTaskOrderHeaderMapper.xml | 14 ++++++++------ 5 files changed, 42 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/heai/modules/board/entity/ViewKanbanSoHunlianPlanData.java b/src/main/java/com/heai/modules/board/entity/ViewKanbanSoHunlianPlanData.java index 24695c7..b9028af 100644 --- a/src/main/java/com/heai/modules/board/entity/ViewKanbanSoHunlianPlanData.java +++ b/src/main/java/com/heai/modules/board/entity/ViewKanbanSoHunlianPlanData.java @@ -84,6 +84,7 @@ public class ViewKanbanSoHunlianPlanData { */ private String finishedFlag; private int number; + private String erpStatus; public String getOrderNo() { return orderNo; } @@ -219,5 +220,13 @@ public class ViewKanbanSoHunlianPlanData { public void setNumber(int number) { this.number = number; } + + public String getErpStatus() { + return erpStatus; + } + + public void setErpStatus(String erpStatus) { + this.erpStatus = erpStatus; + } } diff --git a/src/main/java/com/heai/modules/production/entity/SOTaskOrderHeaderData.java b/src/main/java/com/heai/modules/production/entity/SOTaskOrderHeaderData.java index f826743..1d0856c 100644 --- a/src/main/java/com/heai/modules/production/entity/SOTaskOrderHeaderData.java +++ b/src/main/java/com/heai/modules/production/entity/SOTaskOrderHeaderData.java @@ -160,6 +160,9 @@ public class SOTaskOrderHeaderData { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date reportTime; + private int version; + private Date updateTime; + public String getOrderNo() { return orderNo; @@ -450,5 +453,21 @@ public class SOTaskOrderHeaderData { public void setReportTime(Date reportTime) { this.reportTime = reportTime; } + + public int getVersion() { + return version; + } + + public void setVersion(int version) { + this.version = version; + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } } diff --git a/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java b/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java index 7799433..9a3576a 100644 --- a/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java +++ b/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java @@ -213,6 +213,7 @@ public class DailyPlanServiceImpl implements DailyPlanService { dailyPlanInData.setSchedulingSize(number); SOTaskOrderHeaderData soTaskOrderHeaderData = new SOTaskOrderHeaderData(); soTaskOrderHeaderData.setOrderNo(l1.get(0).getOrderNo()); + soTaskOrderHeaderData.setVersion(l1.get(0).getVersion()+1); soTaskOrderHeaderData.setOrderQty(dailyPlanInData.getOrderQty()); sOTaskOrderHeaderMapper.updateWorkPlan(soTaskOrderHeaderData); soScheduledListMapper.updateWorkPlanData(dailyPlanInData); diff --git a/src/main/resources/mapper/board/BoardMapper.xml b/src/main/resources/mapper/board/BoardMapper.xml index 90d2cc0..433242e 100644 --- a/src/main/resources/mapper/board/BoardMapper.xml +++ b/src/main/resources/mapper/board/BoardMapper.xml @@ -19,7 +19,7 @@ diff --git a/src/main/resources/mapper/production/SOTaskOrderHeaderMapper.xml b/src/main/resources/mapper/production/SOTaskOrderHeaderMapper.xml index 9cd1d66..4028733 100644 --- a/src/main/resources/mapper/production/SOTaskOrderHeaderMapper.xml +++ b/src/main/resources/mapper/production/SOTaskOrderHeaderMapper.xml @@ -31,8 +31,8 @@ PartNo,UserName,EnterDate,Qtyfinished,ShiftId FROM SOTaskOrderHeader - INSERT INTO SOTaskOrderHeader (OrderNo,Site,OrderDate,PlanStartDate,OrderQty,UserName,EnterDate,OrderRefType,OrderRef1,Qtyfinished,QtyFinished_Ontime,IssueStatus,ReceiveStatus,POCreatedFlag,LastUpdatedBy,LastUpdatedDate,PartNo,PRCreatedFlag,Status,CloseFlag,QtyCirculation,FinishFlag,InputQty) - VALUES (#{orderNo},#{site},#{orderDate},#{planStartDate},#{orderQty},#{userName},#{enterDate},#{orderRefType},#{planOrderNo},0,0,'未发料','未入库','N',#{userName},#{enterDate},#{partNo},Null,'已计划','N',0,'N',0) + INSERT INTO SOTaskOrderHeader (OrderNo,Site,OrderDate,PlanStartDate,OrderQty,UserName,EnterDate,OrderRefType,OrderRef1,Qtyfinished,QtyFinished_Ontime,IssueStatus,ReceiveStatus,POCreatedFlag,LastUpdatedBy,LastUpdatedDate,PartNo,PRCreatedFlag,Status,CloseFlag,QtyCirculation,FinishFlag,InputQty,Version) + VALUES (#{orderNo},#{site},#{orderDate},#{planStartDate},#{orderQty},#{userName},#{enterDate},#{orderRefType},#{planOrderNo},0,0,'未发料','未入库','N',#{userName},#{enterDate},#{partNo},Null,'已计划','N',0,'N',0,0) - UPDATE SOTaskOrderHeader SET OrderQty=#{orderQty} WHERE OrderNo = #{orderNo} + UPDATE SOTaskOrderHeader SET OrderQty=#{orderQty} ,Version=#{version},UpdateTime= GETDATE() WHERE OrderNo = #{orderNo} - UPDATE SOTaskOrderHeader SET Status='已取消' + UPDATE SOTaskOrderHeader SET Status='已取消' , ClosedDate=GETDATE() AND OrderNo = #{orderNo} AND OrderQty = #{orderQty} @@ -86,6 +86,7 @@ PartNo,UserName,EnterDate,Qtyfinished,ShiftId FROM SOTaskOrderHeader SOT.PartNo,SOT.UserName,SOT.EnterDate,SOT.Qtyfinished,SOT.QtyFinished_Ontime,SOT.ShiftId,P.PartDescription,SOT.QtyCirculation,isnull(SOT.InputQty,0)as InputQty,SOT.ReportTime FROM SOTaskOrderHeader SOT LEFT join Part P on P.Site= SOT.Site and P.PartNo=SOT.PartNo + AND SOT.OrderNo like #{orderNo} @@ -108,7 +109,8 @@ SOT.PartNo,SOT.UserName,SOT.EnterDate,SOT.Qtyfinished,SOT.QtyFinished_Ontime,SOT AND SOT.FinishFlag=#{finishFlag} - AND Status !='已取消' + AND SOT.Status !='已取消' + ${sql} order by OrderDate