1008更新

src/main/java/com/heai/modules/job/config/ScheduleConfig.java

@@ -14,10 +14,10 @@ import java.util.Properties;
  *
  *  
  */
-@Configuration
+//@Configuration
 public class ScheduleConfig {
 
-    @Bean
+    //@Bean
     public SchedulerFactoryBean schedulerFactoryBean(DataSource dataSource) {
         SchedulerFactoryBean factory = new SchedulerFactoryBean();
         factory.setDataSource(dataSource);

src/main/java/com/heai/modules/production/dao/SOTaskOrderHeaderMapper.java

@@ -131,4 +131,15 @@ public interface SOTaskOrderHeaderMapper {
      * @throw
      */
     void dailyPlanReportSave( DailyReportInData inData);
+
+    /**
+     * @Description 把输入的打料公斤数转换成订单数量
+     * @Title getReportQtyByInputQty
+      * @param
+     * @author rq
+     * @date 2021/10/12 12:00
+     * @return Double
+     * @throw
+     */
+    Double getReportQtyByInputQty(DailyReportInData inData);
 }

src/main/java/com/heai/modules/production/entity/DailyReportInData.java

@@ -8,12 +8,13 @@ import java.util.Date;
 public class DailyReportInData {
     private String site;
     private String orderNo;
+    private String orderRef1;
     private Double reportQty;
     @DateTimeFormat(pattern = "yyyy-MM-dd hh:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss", timezone = "GMT+8")
     private Date reportTime;
     private String reportBy;
-
+    private Double inputQty;
     public String getSite() {
         return site;
     }
@@ -53,4 +54,20 @@ public class DailyReportInData {
     public void setReportBy(String reportBy) {
         this.reportBy = reportBy;
     }
+
+    public String getOrderRef1() {
+        return orderRef1;
+    }
+
+    public void setOrderRef1(String orderRef1) {
+        this.orderRef1 = orderRef1;
+    }
+
+    public Double getInputQty() {
+        return inputQty;
+    }
+
+    public void setInputQty(Double inputQty) {
+        this.inputQty = inputQty;
+    }
 }

src/main/java/com/heai/modules/production/entity/SOTaskOrderHeaderData.java

@@ -143,7 +143,7 @@ public class SOTaskOrderHeaderData {
      *
      */
     private Double qtyfinished;
-
+    private Double inputQty;
     /**
      *
      */
@@ -157,6 +157,9 @@ public class SOTaskOrderHeaderData {
     private String shiftdesc;
 
     private double qtyCirculation;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date reportTime;
 
     public String getOrderNo() {
         return orderNo;
@@ -431,5 +434,21 @@ public class SOTaskOrderHeaderData {
     public void setShiftdesc(String shiftdesc) {
         this.shiftdesc = shiftdesc;
     }
+
+    public Double getInputQty() {
+        return inputQty;
+    }
+
+    public void setInputQty(Double inputQty) {
+        this.inputQty = inputQty;
+    }
+
+    public Date getReportTime() {
+        return reportTime;
+    }
+
+    public void setReportTime(Date reportTime) {
+        this.reportTime = reportTime;
+    }
 }
 

src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java

@@ -334,10 +334,13 @@ public class DailyPlanServiceImpl implements DailyPlanService {
         if(checkList.size()==0){
             throw new RuntimeException("该日计划已不存在，请刷新页面！");
         }
-        double newQty=inData.getReportQty()+checkList.get(0).getQtyfinished();
-        // if(newQty>checkList.get(0).getOrderQty()){
-        //     throw new RuntimeException("报工数量大于未报工数量请重试！");
-        // }
+
+        inData.setInputQty(inData.getReportQty());
+        double newQty=sOTaskOrderHeaderMapper.getReportQtyByInputQty(inData);
+        if(newQty<checkList.get(0).getOrderQty()){
+            throw new RuntimeException("报工数量小于计划数量！");
+        }
+
         inData.setReportQty(newQty);
         inData.setReportTime(new Date());
         sOTaskOrderHeaderMapper.dailyPlanReportSave(inData);
@@ -349,13 +352,11 @@ public class DailyPlanServiceImpl implements DailyPlanService {
             if(checkList.size()==0){
                 throw new RuntimeException("该日计划已不存在，请刷新页面！");
             }
-            if(checkList.get(0).getOrderQty()<inList.get(i).getReportQty()){
-                throw new RuntimeException("该日计划已不存在，请刷新页面！");
+            inList.get(i).setInputQty(inList.get(i).getReportQty());
+            double newQty=sOTaskOrderHeaderMapper.getReportQtyByInputQty(inList.get(i));
+            if(newQty<checkList.get(0).getOrderQty()){
+                throw new RuntimeException("报工数量小于计划数量！");
             }
-            double newQty=inList.get(i).getReportQty()+checkList.get(0).getQtyfinished();
-            // if(newQty>checkList.get(0).getOrderQty()){
-            //     throw new RuntimeException("报工数量大于未报工数量请重试！");
-            // }
             inList.get(i).setReportQty(newQty);
             inList.get(i).setReportTime(new Date());
             sOTaskOrderHeaderMapper.dailyPlanReportSave(inList.get(i));

src/main/resources/mapper/board/BoardMapper.xml

@@ -28,7 +28,7 @@
                  AND #{endDate} >=   PlanStartDate
             </if>
             AND Site IN ('1','2')
-                        AND (FinishedFlag!='3' or PlanStartDate >= GETDATE() )
+                        AND (FinishedFlag='1' or PlanStartDate >= GETDATE() )
         </where>
         Order By PlanStartDate
     </select>

src/main/resources/mapper/production/SOTaskOrderHeaderMapper.xml

@@ -31,8 +31,8 @@ PartNo,UserName,EnterDate,Qtyfinished,ShiftId FROM SOTaskOrderHeader
     </where>
 </select>
 <insert id="savePlan" parameterType="com.heai.modules.production.entity.SOTaskOrderHeaderData" >
-    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)
-    VALUES (#{orderNo},#{site},#{orderDate},#{planStartDate},#{orderQty},#{userName},#{enterDate},#{orderRefType},#{planOrderNo},0,0,'未发料','未入库','N',#{userName},#{enterDate},#{partNo},Null,'已计划','N',0,'N')
+    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>
 
 <select id="getWorkPlanData" resultType="com.heai.modules.production.entity.SOTaskOrderHeaderData" parameterType="com.heai.modules.production.entity.DailyPlanInData">
@@ -83,7 +83,7 @@ PartNo,UserName,EnterDate,Qtyfinished,ShiftId FROM SOTaskOrderHeader
 
 <select id="getDailyPlanData" parameterType="com.heai.modules.production.entity.DailyPlanInData" resultType="com.heai.modules.production.entity.SOTaskOrderHeaderData">
     SELECT top 10000 SOT.OrderNo,SOT.Site,SOT.Status,SOT.OrderDate,SOT.OrderQty,SOT.OrderRefType,SOT.OrderRef1, CASE WHEN SOT.CloseFlag ='N' THEN '正常' ELSE '已流转' END as CloseFlag,
-SOT.PartNo,SOT.UserName,SOT.EnterDate,SOT.Qtyfinished,SOT.QtyFinished_Ontime,SOT.ShiftId,P.PartDescription,SOT.QtyCirculation
+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
      <where>
@@ -123,8 +123,10 @@ SOT.PartNo,SOT.UserName,SOT.EnterDate,SOT.Qtyfinished,SOT.QtyFinished_Ontime,SOT
     </update>
 
     <update id="dailyPlanReportSave" parameterType="com.heai.modules.production.entity.DailyReportInData">
-     update SOTaskOrderHeader SET Qtyfinished=#{reportQty},ReportTime=#{reportTime},FinishFlag='Y',ReportBy=#{reportBy}  where OrderNo=#{orderNo} and site =#{site}
+     update SOTaskOrderHeader SET Qtyfinished=#{reportQty},ReportTime=#{reportTime},FinishFlag='Y',ReportBy=#{reportBy} ,InputQty=#{inputQty} where OrderNo=#{orderNo} and site =#{site}
     </update>
 
-
+    <select id="getReportQtyByInputQty" resultType="double">
+        select top 1 round(#{reportQty}*(1 - d.ScraptFactor/100.0)/ d.QtyAssembly,1)  from SOBOM as d where d.OrderNo=#{orderRef1} and Site=#{site}
+    </select>
 </mapper>