|
|
@@ -106,81 +106,152 @@ public class DeliveryClient implements IDeliveryClient {
|
|
|
|
|
|
@Override
|
|
|
public R<Delivery> saveAddDelivery(Order order) {
|
|
|
- Delivery delivery = new Delivery();
|
|
|
- R billNo = serialClient.getBillNo("FH", "JK", "FH");
|
|
|
- if (billNo.isSuccess() && billNo.getData() != null) {
|
|
|
- delivery.setSysNo((String) billNo.getData());
|
|
|
+
|
|
|
+ Delivery deliveryNew = new Delivery();
|
|
|
+ List<DeliveryItems> deliveryItemsList = new ArrayList<>();
|
|
|
+ LambdaQueryWrapper<Delivery> lambdaQueryWrapper = new LambdaQueryWrapper<>();
|
|
|
+ lambdaQueryWrapper.eq(Delivery::getIsDeleted, 0)
|
|
|
+ .eq(Delivery::getTenantId, AuthUtil.getTenantId())
|
|
|
+ .eq(Delivery::getSrcId, order.getId())
|
|
|
+ .eq(Delivery::getBillType, "FH")
|
|
|
+ .eq(Delivery::getTradeType, "CK")
|
|
|
+ .eq(Delivery::getSrcOrderNo, order.getOrderNo())
|
|
|
+ .eq(Delivery::getOrgOrderNo, order.getSysNo())
|
|
|
+ .eq(Delivery::getOrgId, order.getId());
|
|
|
+ Delivery delivery1 = deliveryService.getOne(lambdaQueryWrapper);
|
|
|
+ if (ObjectUtils.isNotNull(delivery1)) {
|
|
|
+ delivery1.setCorpId(order.getCorpId());
|
|
|
+ delivery1.setCorpName(order.getCorpName());
|
|
|
+ delivery1.setClientMessage(order.getClientMessage());
|
|
|
+ delivery1.setBusinesDate(order.getBusinesDate());
|
|
|
+ delivery1.setPlannedDeliveryDate(order.getPlannedDeliveryDate());
|
|
|
+ delivery1.setPortOfLoad(order.getPortOfLoad());
|
|
|
+ delivery1.setPortOfDestination(order.getPortOfDestination());
|
|
|
+ delivery1.setTransport(order.getTransport());
|
|
|
+ delivery1.setDateClause(order.getDateClause());
|
|
|
+ delivery1.setDateDesc(order.getDateDesc());
|
|
|
+ delivery1.setCargoType(order.getCargoType());
|
|
|
+ delivery1.setPriceTerms(order.getPriceTerms());
|
|
|
+ delivery1.setPriceTermsDescription(order.getPriceTermsDescription());
|
|
|
+ delivery1.setPaymentType(order.getPaymentType());
|
|
|
+ delivery1.setPaymentTypeDescription(order.getPaymentTypeDescription());
|
|
|
+ delivery1.setCurrency(order.getCurrency());
|
|
|
+ delivery1.setExchangeRate(order.getExchangeRate());
|
|
|
+ delivery1.setPurchaseRemark(order.getPurchaseRemark());
|
|
|
+ delivery1.setShippingRemark(order.getShippingRemark());
|
|
|
+ delivery1.setBelongToCorpId(order.getBelongToCorpId());
|
|
|
+ delivery1.setCorpAttn(order.getCorpAttn());
|
|
|
+ delivery1.setCorpTel(order.getCorpTel());
|
|
|
+ deliveryService.updateById(delivery1);
|
|
|
+ deliveryNew = delivery1;
|
|
|
} else {
|
|
|
- return R.fail(500, "系统编号生成失败");
|
|
|
+ Delivery delivery = new Delivery();
|
|
|
+ R billNo = serialClient.getBillNo("FH", "JK", "FH");
|
|
|
+ if (billNo.isSuccess() && billNo.getData() != null) {
|
|
|
+ delivery.setSysNo((String) billNo.getData());
|
|
|
+ } else {
|
|
|
+ return R.fail(500, "系统编号生成失败");
|
|
|
+ }
|
|
|
+ delivery.setSrcOrderNo(order.getOrderNo());
|
|
|
+ delivery.setSrcId(order.getId());
|
|
|
+ delivery.setOrgOrderNo(order.getSysNo());
|
|
|
+ delivery.setOrgId(order.getId());
|
|
|
+ delivery.setBillType("FH");
|
|
|
+ delivery.setTradeType("CK");
|
|
|
+ delivery.setCorpId(order.getCorpId());
|
|
|
+ delivery.setCorpName(order.getCorpName());
|
|
|
+ delivery.setClientMessage(order.getClientMessage());
|
|
|
+ delivery.setBusinesDate(order.getBusinesDate());
|
|
|
+ delivery.setPlannedDeliveryDate(order.getPlannedDeliveryDate());
|
|
|
+ delivery.setPortOfLoad(order.getPortOfLoad());
|
|
|
+ delivery.setPortOfDestination(order.getPortOfDestination());
|
|
|
+ delivery.setTransport(order.getTransport());
|
|
|
+ delivery.setDateClause(order.getDateClause());
|
|
|
+ delivery.setDateDesc(order.getDateDesc());
|
|
|
+ delivery.setCargoType(order.getCargoType());
|
|
|
+ delivery.setPriceTerms(order.getPriceTerms());
|
|
|
+ delivery.setPriceTermsDescription(order.getPriceTermsDescription());
|
|
|
+ delivery.setPaymentType(order.getPaymentType());
|
|
|
+ delivery.setPaymentTypeDescription(order.getPaymentTypeDescription());
|
|
|
+ delivery.setCurrency(order.getCurrency());
|
|
|
+ delivery.setExchangeRate(order.getExchangeRate());
|
|
|
+ delivery.setPurchaseRemark(order.getPurchaseRemark());
|
|
|
+ delivery.setShippingRemark(order.getShippingRemark());
|
|
|
+ delivery.setDocumentaryStatus(order.getDocumentaryStatus());
|
|
|
+ delivery.setDocumentaryDate(order.getDocumentaryDate());
|
|
|
+ delivery.setCreateUser(order.getDocumenterId());
|
|
|
+ delivery.setCreateTime(new Date());
|
|
|
+ delivery.setTenantId(SecureUtil.getTenantId());
|
|
|
+ delivery.setDeliveryStatus("录入");
|
|
|
+ delivery.setBelongToCorpId(order.getBelongToCorpId());
|
|
|
+ delivery.setCorpAttn(order.getCorpAttn());
|
|
|
+ delivery.setCorpTel(order.getCorpTel());
|
|
|
+ deliveryService.save(delivery);
|
|
|
+ deliveryNew = delivery;
|
|
|
}
|
|
|
- delivery.setSrcOrderNo(order.getOrderNo());
|
|
|
- delivery.setSrcId(order.getId());
|
|
|
- delivery.setOrgOrderNo(order.getSysNo());
|
|
|
- delivery.setOrgId(order.getId());
|
|
|
- delivery.setBillType("FH");
|
|
|
- delivery.setTradeType("CK");
|
|
|
- delivery.setCorpId(order.getCorpId());
|
|
|
- delivery.setCorpName(order.getCorpName());
|
|
|
- delivery.setClientMessage(order.getClientMessage());
|
|
|
- delivery.setBusinesDate(order.getBusinesDate());
|
|
|
- delivery.setPlannedDeliveryDate(order.getPlannedDeliveryDate());
|
|
|
- delivery.setPortOfLoad(order.getPortOfLoad());
|
|
|
- delivery.setPortOfDestination(order.getPortOfDestination());
|
|
|
- delivery.setTransport(order.getTransport());
|
|
|
- delivery.setDateClause(order.getDateClause());
|
|
|
- delivery.setDateDesc(order.getDateDesc());
|
|
|
- delivery.setCargoType(order.getCargoType());
|
|
|
- delivery.setPriceTerms(order.getPriceTerms());
|
|
|
- delivery.setPriceTermsDescription(order.getPriceTermsDescription());
|
|
|
- delivery.setPaymentType(order.getPaymentType());
|
|
|
- delivery.setPaymentTypeDescription(order.getPaymentTypeDescription());
|
|
|
- delivery.setCurrency(order.getCurrency());
|
|
|
- delivery.setExchangeRate(order.getExchangeRate());
|
|
|
- delivery.setPurchaseRemark(order.getPurchaseRemark());
|
|
|
- delivery.setShippingRemark(order.getShippingRemark());
|
|
|
- delivery.setDocumentaryStatus(order.getDocumentaryStatus());
|
|
|
- delivery.setDocumentaryDate(order.getDocumentaryDate());
|
|
|
- delivery.setCreateUser(order.getDocumenterId());
|
|
|
- delivery.setCreateTime(new Date());
|
|
|
- delivery.setTenantId(SecureUtil.getTenantId());
|
|
|
- delivery.setDeliveryStatus("录入");
|
|
|
- deliveryService.save(delivery);
|
|
|
-
|
|
|
if (ObjectUtils.isNotNull(order.getOrderItemsList()) && order.getOrderItemsList().size() > 0) {
|
|
|
- List<DeliveryItems> deliveryItemsList = new ArrayList<>();
|
|
|
for (OrderItems orderItems : order.getOrderItemsList()) {
|
|
|
- DeliveryItems deliveryItems = new DeliveryItems();
|
|
|
- deliveryItems.setPid(delivery.getId());
|
|
|
- deliveryItems.setSort(1);
|
|
|
- deliveryItems.setSrcOrderNo(order.getOrderNo());//来源订单号
|
|
|
- deliveryItems.setOrgOrderNo(order.getSysNo());//原始订单号
|
|
|
- deliveryItems.setSrcId(orderItems.getId());//来源id
|
|
|
- deliveryItems.setItemId(orderItems.getItemId());//货物
|
|
|
- deliveryItems.setPriceCategory(orderItems.getPriceCategory());//商品类别
|
|
|
- deliveryItems.setProductDesc(orderItems.getItemDescription());//产品描述
|
|
|
- deliveryItems.setSpecificationAndModel(orderItems.getItemType());//产品型号
|
|
|
- deliveryItems.setPriceCategoryNames(orderItems.getPriceCategory());//商品类别名称
|
|
|
- deliveryItems.setItemProp(orderItems.getItemProp());//产品属性
|
|
|
- deliveryItems.setPackageRemarks(orderItems.getPartsColourName());//包装要求
|
|
|
- deliveryItems.setActualQuantity(orderItems.getOrderQuantity());//数量
|
|
|
- deliveryItems.setPrice(orderItems.getPrice());//单价
|
|
|
- deliveryItems.setPurchaseAmount(orderItems.getAmount());//采购金额
|
|
|
- deliveryItems.setPurchaseTotalAmount(orderItems.getAmount());//采购总价
|
|
|
- deliveryItems.setPurchaseQuantity(orderItems.getOrderQuantity());//采购数量
|
|
|
- deliveryItems.setUnit(orderItems.getUnit());//计量单位
|
|
|
- deliveryItems.setTaxRate(orderItems.getTaxRate());//税率
|
|
|
- deliveryItems.setCurrency(order.getCurrency());//币别
|
|
|
- deliveryItems.setExRate(order.getExchangeRate());//汇率
|
|
|
- deliveryItems.setGoodType(0);//默认0为商品信息 1为赠品信息
|
|
|
- deliveryItems.setCreateUser(order.getDocumenterId());
|
|
|
- deliveryItems.setCreateTime(new Date());
|
|
|
- deliveryItems.setTenantId(SecureUtil.getTenantId());
|
|
|
- deliveryItemsService.save(deliveryItems);
|
|
|
- deliveryItemsList.add(deliveryItems);
|
|
|
- delivery.setDeliveryItemsList(deliveryItemsList);
|
|
|
+ LambdaQueryWrapper<DeliveryItems> itemsLambdaQueryWrapper = new LambdaQueryWrapper<>();
|
|
|
+ itemsLambdaQueryWrapper.eq(DeliveryItems::getIsDeleted, 0)
|
|
|
+ .eq(DeliveryItems::getTenantId, AuthUtil.getTenantId())
|
|
|
+ .eq(DeliveryItems::getSrcId, orderItems.getId())
|
|
|
+ .eq(DeliveryItems::getSrcOrderNo, order.getOrderNo())
|
|
|
+ .eq(DeliveryItems::getOrgOrderNo, order.getSysNo());
|
|
|
+ DeliveryItems deliveryItems1 = deliveryItemsService.getOne(itemsLambdaQueryWrapper);
|
|
|
+ if (ObjectUtils.isNotNull(deliveryItems1)){
|
|
|
+ deliveryItems1.setItemId(orderItems.getItemId());//货物
|
|
|
+ deliveryItems1.setPriceCategory(orderItems.getPriceCategory());//商品类别
|
|
|
+ deliveryItems1.setProductDesc(orderItems.getItemDescription());//产品描述
|
|
|
+ deliveryItems1.setSpecificationAndModel(orderItems.getItemType());//产品型号
|
|
|
+ deliveryItems1.setPriceCategoryNames(orderItems.getPriceCategory());//商品类别名称
|
|
|
+ deliveryItems1.setItemProp(orderItems.getItemProp());//产品属性
|
|
|
+ deliveryItems1.setPackageRemarks(orderItems.getPartsColourName());//包装要求
|
|
|
+ deliveryItems1.setActualQuantity(orderItems.getOrderQuantity());//数量
|
|
|
+ deliveryItems1.setPrice(orderItems.getPrice());//单价
|
|
|
+ deliveryItems1.setPurchaseAmount(orderItems.getAmount());//采购金额
|
|
|
+ deliveryItems1.setPurchaseTotalAmount(orderItems.getAmount());//采购总价
|
|
|
+ deliveryItems1.setPurchaseQuantity(orderItems.getOrderQuantity());//采购数量
|
|
|
+ deliveryItems1.setUnit(orderItems.getUnit());//计量单位
|
|
|
+ deliveryItems1.setTaxRate(orderItems.getTaxRate());//税率
|
|
|
+ deliveryItems1.setCurrency(order.getCurrency());//币别
|
|
|
+ deliveryItems1.setExRate(order.getExchangeRate());//汇率
|
|
|
+ deliveryItems1.setGoodType(0);//默认0为商品信息 1为赠品信息
|
|
|
+ deliveryItemsService.updateById(deliveryItems1);
|
|
|
+ deliveryItemsList.add(deliveryItems1);
|
|
|
+ }else{
|
|
|
+ DeliveryItems deliveryItems = new DeliveryItems();
|
|
|
+ deliveryItems.setPid(deliveryNew.getId());
|
|
|
+ deliveryItems.setSort(1);
|
|
|
+ deliveryItems.setSrcOrderNo(order.getOrderNo());//来源订单号
|
|
|
+ deliveryItems.setOrgOrderNo(order.getSysNo());//原始订单号
|
|
|
+ deliveryItems.setSrcId(orderItems.getId());//来源id
|
|
|
+ deliveryItems.setItemId(orderItems.getItemId());//货物
|
|
|
+ deliveryItems.setPriceCategory(orderItems.getPriceCategory());//商品类别
|
|
|
+ deliveryItems.setProductDesc(orderItems.getItemDescription());//产品描述
|
|
|
+ deliveryItems.setSpecificationAndModel(orderItems.getItemType());//产品型号
|
|
|
+ deliveryItems.setPriceCategoryNames(orderItems.getPriceCategory());//商品类别名称
|
|
|
+ deliveryItems.setItemProp(orderItems.getItemProp());//产品属性
|
|
|
+ deliveryItems.setPackageRemarks(orderItems.getPartsColourName());//包装要求
|
|
|
+ deliveryItems.setActualQuantity(orderItems.getOrderQuantity());//数量
|
|
|
+ deliveryItems.setPrice(orderItems.getPrice());//单价
|
|
|
+ deliveryItems.setPurchaseAmount(orderItems.getAmount());//采购金额
|
|
|
+ deliveryItems.setPurchaseTotalAmount(orderItems.getAmount());//采购总价
|
|
|
+ deliveryItems.setPurchaseQuantity(orderItems.getOrderQuantity());//采购数量
|
|
|
+ deliveryItems.setUnit(orderItems.getUnit());//计量单位
|
|
|
+ deliveryItems.setTaxRate(orderItems.getTaxRate());//税率
|
|
|
+ deliveryItems.setCurrency(order.getCurrency());//币别
|
|
|
+ deliveryItems.setExRate(order.getExchangeRate());//汇率
|
|
|
+ deliveryItems.setGoodType(0);//默认0为商品信息 1为赠品信息
|
|
|
+ deliveryItems.setCreateUser(order.getDocumenterId());
|
|
|
+ deliveryItems.setCreateTime(new Date());
|
|
|
+ deliveryItems.setTenantId(SecureUtil.getTenantId());
|
|
|
+ deliveryItemsService.save(deliveryItems);
|
|
|
+ deliveryItemsList.add(deliveryItems);
|
|
|
+ }
|
|
|
}
|
|
|
+ deliveryNew.setDeliveryItemsList(deliveryItemsList);
|
|
|
}
|
|
|
- return R.data(delivery);
|
|
|
+ return R.data(deliveryNew);
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
@@ -208,8 +279,8 @@ public class DeliveryClient implements IDeliveryClient {
|
|
|
return deliveryService.count(new LambdaQueryWrapper<Delivery>()
|
|
|
.eq(Delivery::getIsDeleted, 0)
|
|
|
.eq(Delivery::getTenantId, AuthUtil.getTenantId())
|
|
|
- .eq(Delivery::getCreateUser,userId)
|
|
|
- .eq(Delivery::getTradeType,"CK")
|
|
|
- .eq(Delivery::getBillType,"FH"));
|
|
|
+ .eq(Delivery::getCreateUser, userId)
|
|
|
+ .eq(Delivery::getTradeType, "CK")
|
|
|
+ .eq(Delivery::getBillType, "FH"));
|
|
|
}
|
|
|
}
|
纪新园