diff --git a/src/main/java/com/jianteng/modules/Schedule/entity/ShopOrderRoutingData.java b/src/main/java/com/jianteng/modules/Schedule/entity/ShopOrderRoutingData.java index d7a72e6..d00ecc4 100644 --- a/src/main/java/com/jianteng/modules/Schedule/entity/ShopOrderRoutingData.java +++ b/src/main/java/com/jianteng/modules/Schedule/entity/ShopOrderRoutingData.java @@ -68,6 +68,7 @@ public class ShopOrderRoutingData extends ShopOrderData{ private String soremark; private String planTypeDesc; private String workCenterDesc; + private String productionLineDesc; public float getItemNo() { return itemNo; } @@ -368,4 +369,12 @@ public class ShopOrderRoutingData extends ShopOrderData{ public void setPlanTypeDesc(String planTypeDesc) { this.planTypeDesc = planTypeDesc; } + + public String getProductionLineDesc() { + return productionLineDesc; + } + + public void setProductionLineDesc(String productionLineDesc) { + this.productionLineDesc = productionLineDesc; + } } diff --git a/src/main/java/com/jianteng/modules/Schedule/service/impl/ScheduleServiceImpl.java b/src/main/java/com/jianteng/modules/Schedule/service/impl/ScheduleServiceImpl.java index b0bf3c0..9612ef7 100644 --- a/src/main/java/com/jianteng/modules/Schedule/service/impl/ScheduleServiceImpl.java +++ b/src/main/java/com/jianteng/modules/Schedule/service/impl/ScheduleServiceImpl.java @@ -286,17 +286,17 @@ public class ScheduleServiceImpl implements ScheduleService { //----------检查下是否第一道工序 是否发料-----------------end //----------检查前道工序是否报工----------------- if(checkFirstItem.size()>0) { - + //0326 //如果不是首道工序 需要记录上道派工单 - if(result.getPreviousSeqNo()==null&&inData.getPreviousSeqNo()==null){ - throw new RuntimeException("该派工单不是首道工序且未扫描交接派工单!请扫描上道派工单"); - } - List checkLast = scheduleMapper.checkLastItemReport(result); - if(checkLast.size()>0){ - if(checkLast.get(0).getQtyReported().doubleValue()<=0){ - throw new RuntimeException("上道工序的派工单未报工无法开始生产"); - } - } + // if(result.getPreviousSeqNo()==null&&inData.getPreviousSeqNo()==null){ + // throw new RuntimeException("该派工单不是首道工序且未扫描交接派工单!请扫描上道派工单"); + // } + // List checkLast = scheduleMapper.checkLastItemReport(result); + // if(checkLast.size()>0){ + // if(checkLast.get(0).getQtyReported().doubleValue()<=0){ + // throw new RuntimeException("上道工序的派工单未报工无法对接"); + // } + // } if(inData.getPreviousSeqNo()!=null){ List sfdcCheck=scheduleMapper.sfdcCheck(inData.getPreviousSeqNo()); if(sfdcCheck.size()==0){ diff --git a/src/main/java/com/jianteng/modules/base/entity/DefectData.java b/src/main/java/com/jianteng/modules/base/entity/DefectData.java index 4af26ce..f72b490 100644 --- a/src/main/java/com/jianteng/modules/base/entity/DefectData.java +++ b/src/main/java/com/jianteng/modules/base/entity/DefectData.java @@ -8,6 +8,7 @@ public class DefectData { */ private String defectNo; private String defectCode; + private Double defectQty; /** * */ @@ -72,5 +73,13 @@ public class DefectData { public void setDefectCode(String defectCode) { this.defectCode = defectCode; } + + public Double getDefectQty() { + return defectQty; + } + + public void setDefectQty(Double defectQty) { + this.defectQty = defectQty; + } } diff --git a/src/main/resources/mapper/production/DailyPlanMapper.xml b/src/main/resources/mapper/production/DailyPlanMapper.xml index 1255e33..ea4a464 100644 --- a/src/main/resources/mapper/production/DailyPlanMapper.xml +++ b/src/main/resources/mapper/production/DailyPlanMapper.xml @@ -228,7 +228,7 @@ PartNo,UserName,EnterDate,Qtyfinished,ShiftId,dispatched_hunlian FROM SOTaskOrde P.Spec+'/'+isnull(P.PartDescription,'') PartDescription,P.Spec,isnull(SL.scheduledQty,0) as scheduledQty,s.workCenterNo,S.machSetupTime, S.machRunFactor,S.factorUnit,S.ItemNo,S.OperationDesc,s.Efficiency,a.qtyfinished,a.finishFlag, so.needDate,dbo.Get_WorkCenterDesc( a.site,s.workCenterNo) WorkCenterDesc,so.remark soremark, - dbo.Get_ShopOrder_PlanerDesc(a.site,so.Planner) planTypeDesc + dbo.Get_ShopOrder_PlanerDesc(a.site,so.Planner) planTypeDesc,dbo.Get_ProductionLineDesc(a.Site,dbo.Get_WorkCenter_ProLineNo(a.site,s.workCenterNo)) ProductionLineDesc FROM SOTaskOrderHeader a LEFT JOIN Part P ON P.PartNo=a.PartNo AND a.site=P.Site LEFT JOIN v_SORouting S on S.site=a.site and S.OrderNo=a.OrderRef1 @@ -247,6 +247,9 @@ PartNo,UserName,EnterDate,Qtyfinished,ShiftId,dispatched_hunlian FROM SOTaskOrde AND S.workCenterNo LIKE #{workCenterNo} + + + AND dbo.Get_ProductionLineDesc(a.Site,dbo.Get_WorkCenter_ProLineNo(a.site,s.workCenterNo)) LIKE #{productionLineDesc} AND S.OperationDesc LIKE #{operationDesc} @@ -291,7 +294,7 @@ PartNo,UserName,EnterDate,Qtyfinished,ShiftId,dispatched_hunlian FROM SOTaskOrde - order by a.OrderDate desc,s.itemNo + order by a.OrderDate ,a.OrderNo,s.itemNo