|
@@ -96,6 +96,9 @@ open class StockInLineService( |
|
|
this.purchaseOrderLine = purchaseOrderLine |
|
|
this.purchaseOrderLine = purchaseOrderLine |
|
|
this.stockIn = stockIn |
|
|
this.stockIn = stockIn |
|
|
acceptedQty = request.acceptedQty |
|
|
acceptedQty = request.acceptedQty |
|
|
|
|
|
dnNo = request.dnNo |
|
|
|
|
|
dnDate = request.dnDate?.atStartOfDay() |
|
|
|
|
|
productLotNo = request.productLotNo |
|
|
status = StockInLineStatus.PENDING.status |
|
|
status = StockInLineStatus.PENDING.status |
|
|
} |
|
|
} |
|
|
val savedInLine = saveAndFlush(stockInLine) |
|
|
val savedInLine = saveAndFlush(stockInLine) |
|
@@ -278,6 +281,7 @@ open class StockInLineService( |
|
|
this.productionDate = request.productionDate?.atStartOfDay() // maybe need to change the request to LocalDateTime |
|
|
this.productionDate = request.productionDate?.atStartOfDay() // maybe need to change the request to LocalDateTime |
|
|
this.productLotNo = request.productLotNo |
|
|
this.productLotNo = request.productLotNo |
|
|
this.dnNo = request.dnNo |
|
|
this.dnNo = request.dnNo |
|
|
|
|
|
this.dnDate = request.dnDate?.atStartOfDay() |
|
|
this.invoiceNo = request.invoiceNo |
|
|
this.invoiceNo = request.invoiceNo |
|
|
this.receiptDate = request.receiptDate?.atStartOfDay() |
|
|
this.receiptDate = request.receiptDate?.atStartOfDay() |
|
|
this.status = request.status |
|
|
this.status = request.status |
|
@@ -327,6 +331,7 @@ open class StockInLineService( |
|
|
this.purchaseOrderLine = stockInLine.purchaseOrderLine |
|
|
this.purchaseOrderLine = stockInLine.purchaseOrderLine |
|
|
this.productLotNo = stockInLine.productLotNo |
|
|
this.productLotNo = stockInLine.productLotNo |
|
|
this.dnNo = stockInLine.dnNo |
|
|
this.dnNo = stockInLine.dnNo |
|
|
|
|
|
this.dnDate = stockInLine.dnDate |
|
|
this.invoiceNo = stockInLine.invoiceNo |
|
|
this.invoiceNo = stockInLine.invoiceNo |
|
|
this.remarks = stockInLine.remarks ?: request.remarks |
|
|
this.remarks = stockInLine.remarks ?: request.remarks |
|
|
this.receiptDate = stockInLine.receiptDate |
|
|
this.receiptDate = stockInLine.receiptDate |
|
@@ -362,6 +367,7 @@ open class StockInLineService( |
|
|
this.expiryDate = stockInLine.expiryDate ?: request.expiryDate |
|
|
this.expiryDate = stockInLine.expiryDate ?: request.expiryDate |
|
|
this.productLotNo = stockInLine.productLotNo ?: request.productLotNo |
|
|
this.productLotNo = stockInLine.productLotNo ?: request.productLotNo |
|
|
this.dnNo = stockInLine.dnNo ?: request.dnNo |
|
|
this.dnNo = stockInLine.dnNo ?: request.dnNo |
|
|
|
|
|
this.dnDate = stockInLine.dnDate ?: request.dnDate?.atStartOfDay() |
|
|
this.invoiceNo = stockInLine.invoiceNo ?: request.invoiceNo |
|
|
this.invoiceNo = stockInLine.invoiceNo ?: request.invoiceNo |
|
|
this.remarks = stockInLine.remarks ?: request.remarks |
|
|
this.remarks = stockInLine.remarks ?: request.remarks |
|
|
} |
|
|
} |
|
|