首次提交

src/main/java/com/xujie/sys/modules/orderIssure/entity/SOScheduledRoutingData.java

@@ -1,8 +1,12 @@
 package com.xujie.sys.modules.orderIssure.entity;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.xujie.sys.modules.orderIssure.vo.Soscheduledrouting;
 import lombok.Data;
 import org.apache.ibatis.type.Alias;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
 
 @Data
 @Alias("SOScheduledRoutingData")
@@ -15,4 +19,10 @@ public class SOScheduledRoutingData extends Soscheduledrouting {
     private String operatorDesc;
     private String userName;
     private String notifyNo;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date startDate;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date endDate;
 }

src/main/java/com/xujie/sys/modules/orderIssure/vo/SOIssueNotifyOrderList.java

@@ -1,6 +1,10 @@
 package com.xujie.sys.modules.orderIssure.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import java.math.BigDecimal;
+import java.util.Date;
 
 public class SOIssueNotifyOrderList {
     /**
@@ -47,7 +51,10 @@ public class SOIssueNotifyOrderList {
      *
      */
     private String outWorkOrderFlag;
-
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    private Date needDate;
+    private String locationNo;
     public String getNotifyNo() {
         return notifyNo;
     }
@@ -119,5 +126,21 @@ public class SOIssueNotifyOrderList {
     public void setOutWorkOrderFlag(String outWorkOrderFlag) {
         this.outWorkOrderFlag = outWorkOrderFlag;
     }
+
+    public Date getNeedDate() {
+        return needDate;
+    }
+
+    public void setNeedDate(Date needDate) {
+        this.needDate = needDate;
+    }
+
+    public String getLocationNo() {
+        return locationNo;
+    }
+
+    public void setLocationNo(String locationNo) {
+        this.locationNo = locationNo;
+    }
 }
 

src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml

@@ -22,7 +22,7 @@ RecordVersion,OutWorkOrderFlag,ProjectID,OrderType,AuthRuleID)
     </insert>
 
     <select id="getNotifyNoDetail" resultType="SOIssueNotifyOrderListData">
-        select a.NotifyNo,a.Site,a.ItemNo,a.FGPartNo,a.SOOrderNo,a.OpsItemNo,a.SeqNo,a.IssureQty,a.OutWorkOrderFlag
+        select a.NotifyNo,a.Site,a.ItemNo,a.FGPartNo,a.SOOrderNo,a.OpsItemNo,a.SeqNo,a.IssureQty,a.OutWorkOrderFlag,a.locationNo,a.needDate
         ,b.operation_desc itemDesc
         from SOIssueNotifyOrderList a
         left join so_routing b on a.site=b.site and a.SOOrderNo=b.order_no and b.item_no=a.OpsItemNo
@@ -63,6 +63,12 @@ RecordVersion,OutWorkOrderFlag,ProjectID,OrderType,AuthRuleID)
             </if>
                <if test="operatorId != null and operatorId != ''">
               and  a.operator_id like #{operatorId}
+            </if>
+             <if test="startDate != null ">
+                AND a.s_scheduleddate >= #{startDate}
+            </if>
+            <if test="endDate != null ">
+                AND #{endDate} >= a.s_scheduleddate
             </if>
             and a.site=#{site}
         </where>
@@ -72,7 +78,7 @@ RecordVersion,OutWorkOrderFlag,ProjectID,OrderType,AuthRuleID)
     <select id="getSOSBOMForIssure" resultType="SOIssueNotifyOrderMaterialListData">
         select  a.site,b.ItemNo,a.item_no_mat as BOMItemNo,a.component_partno as ComponentPartNo,
        round(a.qty_assembly*b.IssureQty,2) qty_required , round(a.qty_issue,2) qty_issue,c.QtyToIssue,#{notifyNo} as notifyNo
-        ,dbo.Get_PartDesc(a.site,a.component_partno) partDesc,dbo.get_MaterialOnUse(a.site,a.order_no,a.item_no,a.component_partno) qtyOnHand
+        ,dbo.Get_PartDesc(a.site,a.component_partno) partDesc,Round( dbo.get_MaterialOnUse(a.site,a.order_no,a.item_no,a.component_partno),3)  qtyOnHand
         from so_bom a
         left join SOIssueNotifyOrderList b on a.site=b.site and b.NotifyNo=#{notifyNo}  and b.seqNo=#{seqno}
         left join SOIssueNotifyOrderMaterialList c on a.site=c.site and a.item_no_mat=c.BOMItemNo  and c.NotifyNo=#{notifyNo} and c.itemNo=b.itemNo
@@ -85,8 +91,9 @@ RecordVersion,OutWorkOrderFlag,ProjectID,OrderType,AuthRuleID)
     </select>
 
     <insert id="saveSOIssueNotifyOrderList">
-        insert into SOIssueNotifyOrderList(NotifyNo,Site,ItemNo,FGPartNo,SOOrderNo,OpsItemNo,SeqNo,IssureQty,OutWorkOrderFlag)
-        values(#{notifyNo},#{site},#{itemNo},#{fGPartNo},#{sOOrderNo},#{opsItemNo},#{seqNo},#{issureQty,jdbcType=DECIMAL},#{outWorkOrderFlag})
+        insert into SOIssueNotifyOrderList(NotifyNo,Site,ItemNo,FGPartNo,SOOrderNo,OpsItemNo,SeqNo,IssureQty,OutWorkOrderFlag,LocationNo,needDate)
+        values(#{notifyNo},#{site},#{itemNo},#{fGPartNo},#{sOOrderNo},#{opsItemNo},#{seqNo},#{issureQty,jdbcType=DECIMAL},#{outWorkOrderFlag}
+        ,#{locationNo},#{needDate})
     </insert>
     <delete id="deleteSOIssueNotifyOrderMaterialListData">
        delete from SOIssueNotifyOrderMaterialList where site=#{site} and NotifyNo=#{notifyNo} and ItemNo=#{itemNo}
@@ -138,7 +145,7 @@ RecordVersion,OutWorkOrderFlag,ProjectID,OrderType,AuthRuleID)
 
     <select id="searchNotifyOrderList" resultType="SOIssueNotifyOrderListData">
         select a.NotifyNo,a.Site,a.ItemNo,a.FGPartNo,a.SOOrderNo,a.OpsItemNo,a.SeqNo,
-        a.IssureQty,a.OutWorkOrderFlag  ,b.operation_desc itemDesc,
+        a.IssureQty,a.OutWorkOrderFlag  ,b.operation_desc itemDesc,a.locationNo,a.needDate,
         dbo.Get_PartDesc(a.site,a.FGPartNo) partDesc
         from SOIssueNotifyOrderList a
         left join so_routing b on a.site=b.site and a.SOOrderNo=b.order_no and a.OpsItemNo=b.item_no