0412更新

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

@@ -27,4 +27,5 @@ public class SOOPInspectData extends SOOpsTransferHeaderData{
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date endDate;
     private String shiftNo;
+    private String user;
 }

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

@@ -64,6 +64,7 @@ public class StockPrintData {
     private String status;
     private Integer printQty;
     private Double weight;
+    private Double qtyOnHand;
     public String getPartDesc() {
         return partDesc;
     }
@@ -215,5 +216,13 @@ public class StockPrintData {
     public void setWeight(Double weight) {
         this.weight = weight;
     }
+
+    public Double getQtyOnHand() {
+        return qtyOnHand;
+    }
+
+    public void setQtyOnHand(Double qtyOnHand) {
+        this.qtyOnHand = qtyOnHand;
+    }
 }
 

src/main/resources/mapper/pad/PadMapper.xml

@@ -65,6 +65,7 @@
                 AND OrderRef1 = #{partNo}
             </if>
                 AND DelFlag='N'
+                and OrderRef3='*'
         </where>
     </select>
 

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

@@ -521,37 +521,39 @@
         Group by QtyReported
     </select>
     <select id="getStockPrint" resultType="com.heai.modules.production.entity.StockPrintData">
-        select TransNo,Site,WareHouseId,BatchNo,LocationId,PartNo,OrderNo,TransDate,Qty,PrintFlag,dbo.Get_PartDesc(Site,PartNo) as partDesc,Round(dbo.Get_Part_NetWeight(Site,PartNo)*Qty/1000,2) weight
-        ,dbo.Get_WareHouseDesc(Site,WareHouseId) as wareHouseDesc,dbo.Get_Part_UMID(Site,PartNo) umid,dbo.get_expiredDate_print(Site,PartNo,BatchNo) expiredDate
-        ,dbo.Get_StorePrintPartStatus(Site,PartNo,BatchNo) status
-        from StockPrint
+        select a.TransNo,a.Site,a.WareHouseId,a.BatchNo,a.LocationId,a.PartNo,a.OrderNo,a.TransDate,a.Qty,a.PrintFlag,dbo.Get_PartDesc(a.Site,a.PartNo) as partDesc,Round(dbo.Get_Part_NetWeight(a.Site,a.PartNo)*a.Qty/1000,2) weight
+        ,dbo.Get_WareHouseDesc(a.Site,a.WareHouseId) as wareHouseDesc,dbo.Get_Part_UMID(a.Site,a.PartNo) umid,dbo.get_expiredDate_print(a.Site,a.PartNo,a.BatchNo) expiredDate
+        ,dbo.Get_StorePrintPartStatus(a.Site,a.PartNo,a.BatchNo) status,isnull(Round(b.QtyOnHand,3),0) QtyOnHand
+        from StockPrint a
+        left join InventoryStock b on a.Site=b.site and a.WareHouseId=b.WarehouseID and a.PartNo=b.PartNo and a.BatchNo=b.BatchNo and
+         a.LocationId=b.LocationId
           <where>
             <if test="startDate != null ">
-                and TransDate >= #{startDate}
+                and a.TransDate >= #{startDate}
             </if>
             <if test="endDate != null ">
-                and #{endDate} >= TransDate -1
+                and #{endDate} >= a.TransDate -1
             </if>
              <if test="site != null and site != ''">
-                AND site = #{site}
+                AND a.site = #{site}
             </if>
             <if test="orderNo != null and orderNo != ''">
-                AND orderNo LIKE  #{orderNo}
+                AND a.orderNo LIKE  #{orderNo}
             </if>
              <if test="seqNo != null and seqNo != ''">
-                AND seqNo =  #{seqNo}
+                AND a.seqNo =  #{seqNo}
             </if>
              <if test="printFlag != null and printFlag != ''">
-                AND printFlag =  #{printFlag}
+                AND a.printFlag =  #{printFlag}
             </if>
             <if test="batchNo != null and batchNo != ''">
-                AND BatchNo LIKE  #{batchNo}
+                AND a.BatchNo LIKE  #{batchNo}
             </if>
             <if test="partNo != null and partNo != ''">
-                AND PartNo LIKE  #{partNo}
+                AND a.PartNo LIKE  #{partNo}
             </if>
       </where>
-      order by TransDate desc
+      order by a.TransDate desc
     </select>
 
     <update id="updatePrintStock">
@@ -841,10 +843,10 @@
 
        <insert id="saveSOOpsTransferHeaderForShiYanShi">
         	INSERT INTO SOOpsTransferHeader (TransNo,Site,FromProLineNo,ToProLineNo,ToWarehouseID,FromEnteredby,FromEnteredDate,TransDate,ToReceiver,FromReceiver,
-			FromRemark,ToRemark,ConfirmedFlag,ToConfirmedBy,ToEnteredby,LatestUpdatedBy,LatestUpdatedDate,RecordVersion,
+			FromRemark,ToRemark,ConfirmedFlag,ToConfirmedBy,ToEnteredby,RecordVersion,
 			Status,ToTypeFlag_DB,ToTypeFlag,ConfirmedTransNo,need_inspect_flag,NeedReceiveFlag,inspect_remark) VALUES
 			(#{transNo},#{site},'*','*','*',#{operatorId},GETDATE(),GETDATE(),'',#{operatorId},
-			'','','N','N','',#{operatorId},GETDATE(),'0',
+			'','','N','N','','0',
 			'已录入','I',#{toTypeFlag},'','Y','N',#{inspectRemark})
     </insert>
 

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

@@ -105,7 +105,7 @@
 
     <update id="inspectSave">
         update SOOpsTransferHeader set inspected_flag='Y' ,inspect_result=#{inspectResult} ,inspect_remark=#{inspectRemark}
-        ,NeedReceiveFlag=#{needReceiveFlag},ToEnteredDate=#{newDate}
+        ,NeedReceiveFlag=#{needReceiveFlag},ToEnteredDate=#{newDate},LatestUpdatedDate=GETDATE(),LatestUpdatedBy=#{user}
         where site=#{site} and transNo=#{transNo}
     </update>
  <select id="checkSOOPInspectData" resultType="com.heai.modules.production.entity.SOOPInspectData" >