From 2a2ec0141ddca73ae2d55c222bc27701506b1d38 Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Tue, 22 Nov 2022 17:18:04 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=81=93=E4=B8=8D=E5=9B=BA=E5=AE=9A?=
 =?UTF-8?q?=E4=B8=BA10=202022=E5=B9=B411=E6=9C=8822=E6=97=A5=20sxm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gaotao/modules/schedule/data/ShopOrderOutData.java | 10 ++++++++++
 .../schedule/service/impl/ScheduleServiceImpl.java     |  3 ++-
 .../resources/mapper/schedule/SchedulingMapper.xml     |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/schedule/data/ShopOrderOutData.java b/src/main/java/com/gaotao/modules/schedule/data/ShopOrderOutData.java
index 35750ec..5b011d3 100644
--- a/src/main/java/com/gaotao/modules/schedule/data/ShopOrderOutData.java
+++ b/src/main/java/com/gaotao/modules/schedule/data/ShopOrderOutData.java
@@ -47,6 +47,16 @@ public class ShopOrderOutData extends BaseShopOrderData {
     private Date prePlanFinishTime;//前道结束时间
     private Float timeRequired;//需求时间
 
+    private String resourceList; // 可用机台列表
+
+    public String getResourceList() {
+        return resourceList;
+    }
+
+    public void setResourceList(String resourceList) {
+        this.resourceList = resourceList;
+    }
+
     public ShopOrderOutData() {
     }
 
diff --git a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
index 0ebc800..270c66a 100644
--- a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
@@ -2056,8 +2056,9 @@ public class ScheduleServiceImpl implements ScheduleService {
             if (netIssueQty > transQty) {
                 throw new XJException("材料上本卷耗用数量大于发料数量!");
             }
+            int orderFirstItemNo = getOrderFirstItemNo(site,orderNo);
             //判断是否是正常的报工
-            if("N".equalsIgnoreCase(createNewRollFlag) && itemNo > 10){
+            if("N".equalsIgnoreCase(createNewRollFlag) && itemNo != orderFirstItemNo ){
                 if (netIssueQty.floatValue() != transQty.floatValue()) {
                     throw new XJException("正常结束卷时,主材必须完全耗用!");
                 }
diff --git a/src/main/resources/mapper/schedule/SchedulingMapper.xml b/src/main/resources/mapper/schedule/SchedulingMapper.xml
index 7fac9dc..317054a 100644
--- a/src/main/resources/mapper/schedule/SchedulingMapper.xml
+++ b/src/main/resources/mapper/schedule/SchedulingMapper.xml
@@ -194,7 +194,7 @@
         T.QtyScheduled qtyScheduled,(round(T.QtyRequired,3) - Round(T.QtyScheduled,3)) qtyToSchedule, Isnull(S1.QtyScheduled,0.0) qtyScheduledPreOps,
         dbo.getScheduleToPlanTime(D.LotSize, T.MachSetupTime, T.MachRunFactor, T.FactorUnit, t.Efficiency) scheduleToPlanTime,
         D.OriSOOrderNo oriSOOrderNo, P.Remark custPartNo, 1*t.Efficiency efficiency, D.CostRollUpFlag costRollUpFlag, isnull(S1.QtyApprove,0.0) qtyApprovedPreOps,
-        d.ManualFlag manualFlag, d.RepairSOFlag repairSOFlag
+        d.ManualFlag manualFlag, d.RepairSOFlag repairSOFlag ,dbo.Get_ShopOrderAvailResource( T.Site,T.OrderNo,T.WorkCenterNo,T.ItemNo) resourceList
         from SORouting as T
         Left Join ShopOrder as D On T.Site=D.Site and T.OrderNo=D.OrderNo
         Left Join Part as P On T.Site=P.Site and T.PartNo=P.PartNo