diff --git a/src/main/java/com/gaotao/modules/handlingunit/entity/HandlingUnit.java b/src/main/java/com/gaotao/modules/handlingunit/entity/HandlingUnit.java
index 4c76181..56ce48a 100644
--- a/src/main/java/com/gaotao/modules/handlingunit/entity/HandlingUnit.java
+++ b/src/main/java/com/gaotao/modules/handlingunit/entity/HandlingUnit.java
@@ -34,6 +34,9 @@ public class HandlingUnit {
private String orderRef2;
private String orderRef3;
private String supplierId;
+ @TableField("supplier_batch_no")
+ private String supplierBatchNo;
+ private Date supplierManufactureDate;
private String customerId;
private Date manufactureDate;
private Date expiredDate;
@@ -87,14 +90,14 @@ public class HandlingUnit {
private String engChgLevel;
// ==================== 盘点相关字段 - rqrq ====================
-
+
/**
* 是否已盘点 - rqrq
*
Y=已盘点,N=未盘点,默认N
*/
@TableField("count_flag")
private String countFlag;
-
+
/**
* 上次盘点日期 - rqrq
*/
diff --git a/src/main/java/com/gaotao/modules/po/service/impl/PoServiceImpl.java b/src/main/java/com/gaotao/modules/po/service/impl/PoServiceImpl.java
index a5b0ca9..e5c4187 100644
--- a/src/main/java/com/gaotao/modules/po/service/impl/PoServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/po/service/impl/PoServiceImpl.java
@@ -249,6 +249,7 @@ public class PoServiceImpl extends ServiceImpl implemen
private void handlingUnitPart(TransDetailDto inData, int i, TransHeader transHeader,
SysUserEntity currentUser, Integer shelfLife,PoReceiptDetail receiptDetail) {
TransDetailSubDto huInfo = inData.getHandlingUnitList().get(i);
+ Date supplierManufactureDate = inData.getSupplierManufactureDate();
for (int j = 0; j < huInfo.getPackageQty(); j++) {
// 生成处理单元ID - 使用新的格式:A+site+YYYYMMDD+8位自增流水码
String unitId = handlingUnitIdGeneratorService.generateUnitId(inData.getSite());
@@ -326,6 +327,7 @@ public class PoServiceImpl extends ServiceImpl implemen
handlingUnit.setOrderRef2(inData.getReceiptNo());
handlingUnit.setOrderRef3(inData.getOrderRef3());
handlingUnit.setSupplierId(inData.getSupplierNo());
+ handlingUnit.setSupplierBatchNo(inData.getSupplierBatchNo());
handlingUnit.setCreatedDate(new Date());
handlingUnit.setCreatedBy(currentUser.getUserDisplay());
handlingUnit.setModifiedDate(new Date());
@@ -343,7 +345,7 @@ public class PoServiceImpl extends ServiceImpl implemen
handlingUnit.setReceiveDate(inData.getArrivalDate()!=null?inData.getArrivalDate():new Date());
handlingUnit.setWidth(receiptDetail.getWidth());
handlingUnit.setLength(receiptDetail.getLength());
- handlingUnit.setManufactureDate(inData.getManufactureDate());
+ handlingUnit.setSupplierManufactureDate(supplierManufactureDate);
handlingUnit.setHeight(inData.getHeight());
handlingUnit.setEngChgLevel(inData.getEngChgLevel()!=null?inData.getEngChgLevel():"1");
handlingUnit.setUmId(inData.getPurchaseUOM() != null ? inData.getPurchaseUOM() : "");
@@ -555,8 +557,8 @@ public class PoServiceImpl extends ServiceImpl implemen
Map.entry("arrivalDate", inData.getArrivalDate()!=null?
DateUtils.format(inData.getArrivalDate(), DateUtils.DATE_TIME_PATTERN)
:DateUtils.format(new Date(), DateUtils.DATE_TIME_PATTERN)),
- Map.entry("receiptReference", StringUtils.isNotBlank(inData.getSupplierBatchNo())?
- inData.getSupplierBatchNo():"1"),
+ Map.entry("receiptReference", StringUtils.isNotBlank(inData.getDeliveryNote())?
+ inData.getDeliveryNote():"1"),
Map.entry("lotBatchNo", inData.getBatchNo()),
Map.entry("wdrNo", inData.getWdr() != null ? inData.getWdr() : "*"),
Map.entry("qtyToInspect",qtyToInspect)
@@ -616,7 +618,7 @@ public class PoServiceImpl extends ServiceImpl implemen
poReceipt.setSupplierId(inData.getSupplierNo());
poReceipt.setReceiver(currentUser.getUserDisplay());
poReceipt.setUsername(currentUser.getUserDisplay());
- //poReceipt.setDeliveryNoteNo(inData.getPoNo()); // UI和ifs没有返回送货单号
+ poReceipt.setDeliveryNoteNo(inData.getDeliveryNote());
poReceipt.setPrinted("N");
poReceipt.setRemark("PO接收自动创建 - " + inData.getRemark());
poReceipt.setWarehouseId(warehouseId);
diff --git a/src/main/java/com/gaotao/modules/trans/entity/TransDetailDto.java b/src/main/java/com/gaotao/modules/trans/entity/TransDetailDto.java
index 8d5f3f6..c915de0 100644
--- a/src/main/java/com/gaotao/modules/trans/entity/TransDetailDto.java
+++ b/src/main/java/com/gaotao/modules/trans/entity/TransDetailDto.java
@@ -42,7 +42,10 @@ public class TransDetailDto extends TransDetail{
// 日期字段
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date manufactureDate; // 制造日期
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date supplierManufactureDate; // 供应商生产日期
private String supplierBatchNo; // 供应商批次号
+ private String deliveryNote; // 送货单信息
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date expiredDate; // 失效日期
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
diff --git a/src/main/resources/mapper/procurement/PoReceiptDetailMapper.xml b/src/main/resources/mapper/procurement/PoReceiptDetailMapper.xml
index f3581a8..0b5526d 100644
--- a/src/main/resources/mapper/procurement/PoReceiptDetailMapper.xml
+++ b/src/main/resources/mapper/procurement/PoReceiptDetailMapper.xml
@@ -63,7 +63,9 @@
prd.wdr,
prd.delivery_date,
prd.arrival_date,
+ pr.delivery_note_no as [deliveryNote],
prd.manu_facture_date as [manufactureDate],
+ prd.manu_facture_date as [supplierManufactureDate],
pr.receive_date as [receiveDate],
pr.receiver,
pr.username,