1008更新

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;
+    }
 }
 

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;
+    }
 }
 

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);

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

@@ -19,7 +19,7 @@
 
     <select id="productionBlankingBoard" resultType="com.heai.modules.board.entity.ViewKanbanSoHunlianPlanData">
         select OrderNo,site,PartNo,PartDescSpec,ComponentPartNo,CompPartDescSpec,SJPH1,SJPH_QtyReq1,SJPH2,SJPH_QtyReq2,QtyRequired,QtyFinished,PlanStartDate,CompOrderNo,
-        FinishedFlag FROM view_KANBAN_SO_Hunlian_Plan
+        FinishedFlag,erpStatus FROM view_KANBAN_SO_Hunlian_Plan
         <where>
              <if test="startDate != null ">
                  AND PlanStartDate >=   #{startDate}
@@ -28,25 +28,25 @@
                  AND #{endDate} >=   PlanStartDate
             </if>
             AND Site IN ('1','2')
-                        AND (FinishedFlag='1' or PlanStartDate >= GETDATE() )
+
         </where>
         Order By PlanStartDate
     </select>
     <select id="productionBlankingSearch" resultType="com.heai.modules.board.entity.ViewKanbanSoHunlianPlanData" parameterType="com.heai.modules.production.entity.DailyPlanInData">
         select OrderNo,site,PartNo,PartDescSpec,ComponentPartNo,CompPartDescSpec,SJPH1,SJPH_QtyReq1,SJPH2,SJPH_QtyReq2,QtyRequired,QtyFinished,PlanStartDate,CompOrderNo,
-        FinishedFlag FROM view_KANBAN_SO_Hunlian_Plan
+        FinishedFlag,erpStatus FROM view_KANBAN_SO_Hunlian_Plan
         <where>
              <if test="sql != null ">
                  AND  #{sql} >=   PlanStartDate
             </if>
-            <if test="orderNo != null and orderNo != ''">
+                <if test="orderNo != null and orderNo != ''">
                 AND OrderNo like #{orderNo}
             </if>
             <if test="partDescSpec != null and partDescSpec != ''">
                 AND PartDescSpec like #{partDescSpec}
             </if>
             AND Site IN ('1','2')
-            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,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)
 </insert>
 
 <select id="getWorkPlanData" resultType="com.heai.modules.production.entity.SOTaskOrderHeaderData" parameterType="com.heai.modules.production.entity.DailyPlanInData">
@@ -56,7 +56,7 @@ PartNo,UserName,EnterDate,Qtyfinished,ShiftId FROM SOTaskOrderHeader
 </select>
 
 <select id="findWorkPlanData" parameterType="com.heai.modules.production.entity.DailyPlanInData" resultType="com.heai.modules.production.entity.SOTaskOrderHeaderData">
-    SELECT OrderNo,OrderDate,OrderQty,UserName,EnterDate,OrderRef1 FROM SOTaskOrderHeader
+    SELECT OrderNo,OrderDate,OrderQty,UserName,EnterDate,OrderRef1,isnull(Version,0) as version FROM SOTaskOrderHeader
     <where>
         <if test="orderNo != null and orderNo != ''">
             AND OrderRef1 = #{orderNo}
@@ -69,12 +69,12 @@ PartNo,UserName,EnterDate,Qtyfinished,ShiftId FROM SOTaskOrderHeader
 </select>
 
 <update id="updateWorkPlan" parameterType="com.heai.modules.production.entity.SOTaskOrderHeaderData">
-    UPDATE SOTaskOrderHeader SET OrderQty=#{orderQty} WHERE OrderNo = #{orderNo}
+    UPDATE SOTaskOrderHeader SET OrderQty=#{orderQty} ,Version=#{version},UpdateTime= GETDATE() WHERE OrderNo = #{orderNo}
 
 </update>
 
 <update id="delPlan" parameterType="com.heai.modules.production.entity.SOTaskOrderHeaderData">
-    UPDATE SOTaskOrderHeader SET Status='已取消'
+    UPDATE SOTaskOrderHeader SET Status='已取消' , ClosedDate=GETDATE()
      <where>
             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
+<!--    LEFT join  ShopOrder s on  s.site=SOT.Site and s.orderNo=SOT.OrderRef1-->
      <where>
      <if test="orderNo != null and orderNo != ''">
             AND SOT.OrderNo like #{orderNo}
@@ -108,7 +109,8 @@ SOT.PartNo,SOT.UserName,SOT.EnterDate,SOT.Qtyfinished,SOT.QtyFinished_Ontime,SOT
         <if test="finishFlag != null and finishFlag != ''">
                AND SOT.FinishFlag=#{finishFlag}
         </if>
-         AND Status !='已取消'
+         AND SOT.Status !='已取消'
+
        ${sql}
     </where>
     order by OrderDate