|
|
@ -164,16 +164,21 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl<DeliveryNoteMapper, |
|
|
|
advanceEntity.setOrderCode(orderInfoVO.getOrderNo()); |
|
|
|
advanceEntity.setOrderCode(orderInfoVO.getOrderNo()); |
|
|
|
advanceEntity.setServiceNum(orderInfoVO.getMainOrderNo()); |
|
|
|
advanceEntity.setServiceNum(orderInfoVO.getMainOrderNo()); |
|
|
|
advanceEntity.setSenderFactory(vo.getSendAddr()); |
|
|
|
advanceEntity.setSenderFactory(vo.getSendAddr()); |
|
|
|
|
|
|
|
// 工长名字为无,则取客户名字 工长名字不为无 则取工长电话 客户名字转工长名字
|
|
|
|
|
|
|
|
if(StrUtil.equals(orderInfoVO.getConnectName(),"无")){ |
|
|
|
|
|
|
|
advanceEntity.setCustomerName(orderInfoVO.getReceiver()); |
|
|
|
|
|
|
|
advanceEntity.setCustomerPhone(orderInfoVO.getReceiveTel()); |
|
|
|
|
|
|
|
}else{ |
|
|
|
|
|
|
|
advanceEntity.setCustomerName(orderInfoVO.getReceiver() + " 转 " + orderInfoVO.getConnectName()); |
|
|
|
|
|
|
|
advanceEntity.setCustomerPhone(orderInfoVO.getConnectPhone()); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
advanceEntity.setCustomerAddress(orderInfoVO.getReceiveAddr()); |
|
|
|
for (PackageInfoVO orderPackageDTO : packageInfoVOS) { |
|
|
|
for (PackageInfoVO orderPackageDTO : packageInfoVOS) { |
|
|
|
advanceEntity.setDealerCode(orderPackageDTO.getDealerNo()); |
|
|
|
advanceEntity.setDealerCode(orderPackageDTO.getDealerNo()); |
|
|
|
advanceEntity.setDealerName(orderPackageDTO.getDealerName()); |
|
|
|
advanceEntity.setDealerName(orderPackageDTO.getDealerName()); |
|
|
|
advanceEntity.setStoreCode(orderPackageDTO.getDealerNo()); |
|
|
|
advanceEntity.setStoreCode(orderPackageDTO.getDealerNo()); |
|
|
|
advanceEntity.setStoreName(orderPackageDTO.getDealerName()); |
|
|
|
advanceEntity.setStoreName(orderPackageDTO.getDealerName()); |
|
|
|
advanceEntity.setCustomerName(orderInfoVO.getReceiver() + " 转 " + orderInfoVO.getConnectName()); |
|
|
|
|
|
|
|
advanceEntity.setCustomerPhone(orderInfoVO.getConnectPhone()); |
|
|
|
|
|
|
|
advanceEntity.setCustomerAddress(orderInfoVO.getReceiveAddr()); |
|
|
|
|
|
|
|
// 封装包件
|
|
|
|
// 封装包件
|
|
|
|
TrunklineAdvanceDetailEntity advanceDetailEntity = new TrunklineAdvanceDetailEntity(); |
|
|
|
TrunklineAdvanceDetailEntity advanceDetailEntity = new TrunklineAdvanceDetailEntity(); |
|
|
|
advanceDetailEntity.setWarehouseId(startWarehouseId); |
|
|
|
advanceDetailEntity.setWarehouseId(startWarehouseId); |
|
|
|