From b3db233eb7f65cd28915952f4ffa022c057fad94 Mon Sep 17 00:00:00 2001 From: ruanqi Date: Mon, 5 Aug 2024 12:33:25 +0800 Subject: [PATCH] =?UTF-8?q?0412=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/production/entity/SobomData.java | 188 ------------------ .../service/impl/DailyPlanServiceImpl.java | 2 +- 2 files changed, 1 insertion(+), 189 deletions(-) delete mode 100644 src/main/java/com/heai/modules/production/entity/SobomData.java diff --git a/src/main/java/com/heai/modules/production/entity/SobomData.java b/src/main/java/com/heai/modules/production/entity/SobomData.java deleted file mode 100644 index 230d11a..0000000 --- a/src/main/java/com/heai/modules/production/entity/SobomData.java +++ /dev/null @@ -1,188 +0,0 @@ -package com.heai.modules.production.entity; - -import java.util.Date; - -public class SobomData { - /** - * - */ - private String site; - - /** - * - */ - private String orderNo; - - /** - * - */ - private Double itemNo; - - /** - * - */ - private String componentPartNo; - - /** - * - */ - private Double qtyAssembly; - - /** - * - */ - private Double qtyFixedScrapt; - - /** - * - */ - private Double scraptFactor; - - /** - * - */ - private String remark; - - /** - * - */ - private Double qtyRequired; - - /** - * - */ - private Double qtyIssue; - - /** - * - */ - private Date issueDate; - - /** - * - */ - private Double qtyReserved; - - /** - * - */ - private String matGroup; - - /** - * - */ - private Double qtyNotified; - - public String getSite() { - return site; - } - - public void setSite(String site) { - this.site = site; - } - - public String getOrderNo() { - return orderNo; - } - - public void setOrderNo(String orderNo) { - this.orderNo = orderNo; - } - - public Double getItemNo() { - return itemNo; - } - - public void setItemNo(Double itemNo) { - this.itemNo = itemNo; - } - - public String getComponentPartNo() { - return componentPartNo; - } - - public void setComponentPartNo(String componentPartNo) { - this.componentPartNo = componentPartNo; - } - - public Double getQtyAssembly() { - return qtyAssembly; - } - - public void setQtyAssembly(Double qtyAssembly) { - this.qtyAssembly = qtyAssembly; - } - - public Double getQtyFixedScrapt() { - return qtyFixedScrapt; - } - - public void setQtyFixedScrapt(Double qtyFixedScrapt) { - this.qtyFixedScrapt = qtyFixedScrapt; - } - - public Double getScraptFactor() { - return scraptFactor; - } - - public void setScraptFactor(Double scraptFactor) { - this.scraptFactor = scraptFactor; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public Double getQtyRequired() { - return qtyRequired; - } - - public void setQtyRequired(Double qtyRequired) { - this.qtyRequired = qtyRequired; - } - - public Double getQtyIssue() { - return qtyIssue; - } - - public void setQtyIssue(Double qtyIssue) { - this.qtyIssue = qtyIssue; - } - - public Date getIssueDate() { - return issueDate; - } - - public void setIssueDate(Date issueDate) { - this.issueDate = issueDate; - } - - public Double getQtyReserved() { - return qtyReserved; - } - - public void setQtyReserved(Double qtyReserved) { - this.qtyReserved = qtyReserved; - } - - public String getMatGroup() { - return matGroup; - } - - public void setMatGroup(String matGroup) { - this.matGroup = matGroup; - } - - public Double getQtyNotified() { - return qtyNotified; - } - - public void setQtyNotified(Double qtyNotified) { - this.qtyNotified = qtyNotified; - } -} - 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 7287ad5..15afa58 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 @@ -1049,7 +1049,7 @@ public class DailyPlanServiceImpl implements DailyPlanService { // } for (int i = 0; i checkRouting=dailyPlanMapper.checkRoutingMachRunFactor(inData.getSite(),inData.getOrderNo(),inData.getItemNo()); + List checkRouting=dailyPlanMapper.checkRoutingMachRunFactor(inData.getSite(),inData.getOrderRef1(),inData.getItemNo()); if(checkRouting.size()==0){ throw new RuntimeException("该生产订单工序不存在!"); }