diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineAdvanceEntity.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineAdvanceEntity.java index 8e3597646..b4e7a16b2 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineAdvanceEntity.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineAdvanceEntity.java @@ -125,4 +125,14 @@ public class TrunklineAdvanceEntity extends TenantEntity { @ApiModelProperty(name = "发货工厂",notes = "") private String senderFactory ; + @ApiModelProperty(name = "商场收货人",notes = "") + private String consigneePerson; + + @ApiModelProperty(name = "商场收货人电话",notes = "") + private String consigneeMobile; + + @ApiModelProperty(name = "商场收货地址",notes = "") + private String consigneeAddress; + + } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java index 4dd3c0eea..7d657cd7e 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java @@ -348,6 +348,13 @@ public class OpenOrderServiceImpl implements IOpenOrderService { goodsId = basicdataCategoryEntity.getId(); } } + warehouseWayBillDetail.setCreateUser(AuthUtil.getUserId()); + warehouseWayBillDetail.setUpdateUser(AuthUtil.getUserId()); + Date date = new Date(); + warehouseWayBillDetail.setCreateTime(date); + warehouseWayBillDetail.setUpdateTime(date); + warehouseWayBillDetail.setStatus(1); + warehouseWayBillDetail.setIsDeleted(0); warehouseWayBillDetail.setProductId(goodsId); warehouseWayBillDetail.setProductName(goodsName); warehouseWayBillDetail.setNum(waybillDetailDTO.getNum()); @@ -900,6 +907,9 @@ public class OpenOrderServiceImpl implements IOpenOrderService { advanceEntity.setPackName(firsts); advanceEntity.setDealerCode(pacakgeDetailExcelDTO.getDealerCode()); advanceEntity.setDealerName(pacakgeDetailExcelDTO.getDealerName()); + advanceEntity.setConsigneePerson(pacakgeDetailExcelDTO.getConsigneePerson()); + advanceEntity.setConsigneeMobile(pacakgeDetailExcelDTO.getConsigneeMobile()); + advanceEntity.setConsigneeAddress(pacakgeDetailExcelDTO.getConsigneeAddress()); advanceEntity.setCustomerName(pacakgeDetailExcelDTO.getCustomerName()); advanceEntity.setCustomerPhone(pacakgeDetailExcelDTO.getCustomerTelephone()); advanceEntity.setCustomerAddress(pacakgeDetailExcelDTO.getCustomerAddress());