diff --git a/src/main/java/com/heai/modules/app/entity/SaveTransData.java b/src/main/java/com/heai/modules/app/entity/SaveTransData.java index bbff68a..25f8ce7 100644 --- a/src/main/java/com/heai/modules/app/entity/SaveTransData.java +++ b/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; } diff --git a/src/main/java/com/heai/modules/app/service/impl/FunctionServiceImpl.java b/src/main/java/com/heai/modules/app/service/impl/FunctionServiceImpl.java index 7bb80fb..98acfc6 100644 --- a/src/main/java/com/heai/modules/app/service/impl/FunctionServiceImpl.java +++ b/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()); diff --git a/src/main/java/com/heai/modules/board/entity/POBoardData.java b/src/main/java/com/heai/modules/board/entity/POBoardData.java index baf41ff..0d53782 100644 --- a/src/main/java/com/heai/modules/board/entity/POBoardData.java +++ b/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; + } } diff --git a/src/main/resources/mapper/board/BoardMapper.xml b/src/main/resources/mapper/board/BoardMapper.xml index a060f72..6e3c9d2 100644 --- a/src/main/resources/mapper/board/BoardMapper.xml +++ b/src/main/resources/mapper/board/BoardMapper.xml @@ -105,12 +105,22 @@ diff --git a/src/main/resources/static/js/pda/productionIssue4.js b/src/main/resources/static/js/pda/productionIssue4.js index d11e161..6637658 100644 --- a/src/main/resources/static/js/pda/productionIssue4.js +++ b/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); }