0412更新

src/main/java/com/heai/modules/app/entity/SaveTransData.java

@@ -50,4 +50,5 @@ public class SaveTransData {
     private String orderRef2;
     private String orderRef3;
     private String allowNegativeStockFlag;
+    private String transDate;
 }

src/main/java/com/heai/modules/app/service/impl/FunctionServiceImpl.java

@@ -165,7 +165,7 @@ public class FunctionServiceImpl implements FunctionService {
         params.add(inList.get(0).getSite());
         params.add(inList.get(0).getWarehouseId());
         params.add(inList.get(0).getTransTypeDb());
-        params.add(new Date());
+        params.add(inList.get(0).getTransDate());
         params.add(inList.get(0).getUserId());
         params.add(inList.get(0).getReceiver());
         params.add(inList.get(0).getPartnerType());

src/main/java/com/heai/modules/board/entity/POBoardData.java

@@ -10,7 +10,7 @@ public class POBoardData {
     private String site;
     private String orderNo;
     private String partNo;
-    private String partDesc;
+    private String partDescription;
     private String qty;
     private String receiveQty;
     private String arriveQty;
@@ -18,8 +18,19 @@ public class POBoardData {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date wantReceiveDate;
-
-
+    private Float receiptNo;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date receiveDate;
+    private String itemNo;
+    private String receiver;
+    private String supplierID;
+    private String supplierName;
+    private String status;
+    private String inspectCode;
+    private Float qtytoInspect;
+    private Float qtyInspected;
+    private String pOUmID;
     public String getSite() {
         return site;
     }
@@ -44,13 +55,7 @@ public class POBoardData {
         this.partNo = partNo;
     }
 
-    public String getPartDesc() {
-        return partDesc;
-    }
 
-    public void setPartDesc(String partDesc) {
-        this.partDesc = partDesc;
-    }
 
     public String getQty() {
         return qty;
@@ -91,4 +96,103 @@ public class POBoardData {
     public void setWantReceiveDate(Date wantReceiveDate) {
         this.wantReceiveDate = wantReceiveDate;
     }
+
+    public String getPartDescription() {
+        return partDescription;
+    }
+
+    public void setPartDescription(String partDescription) {
+        this.partDescription = partDescription;
+    }
+
+
+    public Date getReceiveDate() {
+        return receiveDate;
+    }
+
+    public void setReceiveDate(Date receiveDate) {
+        this.receiveDate = receiveDate;
+    }
+
+    public String getItemNo() {
+        return itemNo;
+    }
+
+    public void setItemNo(String itemNo) {
+        this.itemNo = itemNo;
+    }
+
+    public String getReceiver() {
+        return receiver;
+    }
+
+    public void setReceiver(String receiver) {
+        this.receiver = receiver;
+    }
+
+    public String getSupplierID() {
+        return supplierID;
+    }
+
+    public void setSupplierID(String supplierID) {
+        this.supplierID = supplierID;
+    }
+
+    public String getSupplierName() {
+        return supplierName;
+    }
+
+    public void setSupplierName(String supplierName) {
+        this.supplierName = supplierName;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getInspectCode() {
+        return inspectCode;
+    }
+
+    public void setInspectCode(String inspectCode) {
+        this.inspectCode = inspectCode;
+    }
+
+
+
+    public String getpOUmID() {
+        return pOUmID;
+    }
+
+    public void setpOUmID(String pOUmID) {
+        this.pOUmID = pOUmID;
+    }
+
+    public Float getReceiptNo() {
+        return receiptNo;
+    }
+
+    public void setReceiptNo(Float receiptNo) {
+        this.receiptNo = receiptNo;
+    }
+
+    public Float getQtytoInspect() {
+        return qtytoInspect;
+    }
+
+    public void setQtytoInspect(Float qtytoInspect) {
+        this.qtytoInspect = qtytoInspect;
+    }
+
+    public Float getQtyInspected() {
+        return qtyInspected;
+    }
+
+    public void setQtyInspected(Float qtyInspected) {
+        this.qtyInspected = qtyInspected;
+    }
 }

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

@@ -105,12 +105,22 @@
     </select>
 
      <select id="PODetailForW" resultType="POBoardData">
-        SELECT pd.Site, pd.orderNo, pd.PartNo,dbo.Get_Part_DescSpec(pd.Site,pd.PartNo) partDesc,pd.Qty,pd.ArriveQty,pd.ReceiveQty,
-        dbo.Get_SupplierDesc(pd.Site,ph.SupplierID) supplierDesc,pd.WantReceiveDate
-        FROM PODetail pd left join POHeader ph on pd.site=ph.site and pd.orderNo=ph.orderNo
-        left join SupplierforPart sp on ph.site=sp.Site and ph.SupplierID =sp.SupplierID and  pd.PartNo=sp.PartNo
-        where pd.Status='已接收' and pd.InspectType_DB ='2' and sp.site is not null and pd.ArriveQty>pd.ReceiveQty
-        ORDER BY pd.WantReceiveDate desc
+        Select Convert(float(8),T.ReceiptNo) as ReceiptNo,D.ItemNo,T.ReceiveDate,T.EnterDate,T.SupplierID,T.Receiver,T.Username,
+        T.DeliveryNoteNo,T.Remark,T.WarehouseID,s.SupplierName,W.WarehouseName,T.Site,D.PartNo,P.PartDescription,P.Spec,P.UMid,
+        D.ArriveQty,D.POUmID,D.ConvertFactor,D.Status,D.QtytoInspect,D.QtyInspected,D.QtyApproved,D.QtyReturned,D.QtyReplace,
+        D.QtyScrapt,D.QtyToReceived,D.QtyReceived,D.LocationID,D.OrderNo,D.OrderItemNo,D.NeedInspectFlag,D.SampleInspectionLevelNo,
+        D.SampleInspectionMethodID,
+        (Case when D.InspectCode='F' then '全检' when D.InspectCode='Q' then '数量抽检' when D.InspectCode='P' then '比例抽检' when D.InspectCode='V' then '不固定抽检' end) as InspectCode,
+        D.QtySample,D.PercentSample
+        from POReceipt as T,POReceiptDetail as D,Warehouse as W,Part as P,Supplier as S where T.Site=D.Site
+        and T.ReceiptNo=D.ReceiptNo and T.Site=W.Site and T.WareHouseID=W.WareHouseID and D.Site=P.Site and
+        D.PartNo=P.PartNo and D.NeedInspectFlag='Y' and T.Site=S.Site and T.SupplierID=S.SupplierID and
+        round(D.ArriveQty,3)>round(D.QtyInspected_New,3)  and D.Status!='已取消'
+
+
+
+         Order by
+         Convert(float(8),T.ReceiptNo)
     </select>
 </mapper>
 

src/main/resources/static/js/pda/productionIssue4.js

@@ -166,7 +166,8 @@ function saveIssueList(){
 			orderRef2 : tableList[i].itemNo,
 			orderRef3 : currentData.seqNo,
 			allowNegativeStockFlag : StockFlag,
-			seqNo:currentData.seqNo
+			seqNo:currentData.seqNo,
+			transDate:$("#outStrDate").val()
 		}
 		jsonList.push(jsonData);
 	}