|
|
|
|
@ -12,7 +12,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
|
|
|
|
import com.logpm.basic.entity.BasicMaterialEntity; |
|
|
|
|
import com.logpm.basic.entity.BasicPrintTemplateEntity; |
|
|
|
|
import com.logpm.basic.feign.IBasicMaterialClient; |
|
|
|
|
import com.logpm.basic.feign.IBasicPrintTemplateClient; |
|
|
|
|
import com.logpm.basicdata.entity.*; |
|
|
|
|
import com.logpm.basicdata.feign.*; |
|
|
|
|
import com.logpm.basicdata.vo.BasicdataClientVO; |
|
|
|
|
@ -54,6 +56,7 @@ import org.springblade.common.constant.IncomingTypeEnum;
|
|
|
|
|
import org.springblade.common.constant.WorkNodeEnums; |
|
|
|
|
import org.springblade.common.constant.broadcast.FanoutConstants; |
|
|
|
|
import org.springblade.common.constant.order.*; |
|
|
|
|
import org.springblade.common.constant.printTemplate.PrintTemplateStatusConstant; |
|
|
|
|
import org.springblade.common.enums.BizOperationEnums; |
|
|
|
|
import org.springblade.common.enums.PackageTypeEnums; |
|
|
|
|
import org.springblade.common.exception.CustomerException; |
|
|
|
|
@ -61,6 +64,8 @@ import org.springblade.common.model.FanoutMsg;
|
|
|
|
|
import org.springblade.common.model.NodeFanoutMsg; |
|
|
|
|
import org.springblade.common.model.PackageData; |
|
|
|
|
import org.springblade.common.utils.CommonUtil; |
|
|
|
|
import org.springblade.common.utils.QRCodeUtil; |
|
|
|
|
import org.springblade.common.utils.TemplateUtil; |
|
|
|
|
import org.springblade.core.redis.cache.BladeRedis; |
|
|
|
|
import org.springblade.core.secure.utils.AuthUtil; |
|
|
|
|
import org.springblade.core.tool.api.R; |
|
|
|
|
@ -128,6 +133,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
|
|
|
|
|
private final IWarehouseWaybillAbolishClient waybillAbolishClient; |
|
|
|
|
private final IWarehouseWaybillDetailAbolishClient waybillDetailAbolishClient; |
|
|
|
|
private final IPackageTrackLogAsyncService packageTrackLogAsyncService; |
|
|
|
|
private final IBasicPrintTemplateClient basicPrintTemplateClient; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
@ -228,6 +234,64 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
public R findZeroWaybillLabelInfo(OpenOrderDTO openOrderDTO) throws Exception { |
|
|
|
|
String waybillNo = openOrderDTO.getWaybillNo(); |
|
|
|
|
|
|
|
|
|
WarehouseWaybillEntity waybillEntity = warehouseWaybillClient.findByWaybillNo(waybillNo); |
|
|
|
|
if(Objects.isNull(waybillEntity)){ |
|
|
|
|
log.warn("################findZeroWaybillLabelInfo: 运单信息不存在 waybillNo={}",waybillNo); |
|
|
|
|
return R.fail(405,"运单信息不存在"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
List<WarehouseWayBillDetail> wayBillDetailList = warehouseWaybillDetailClient.findListByWaybillNo(waybillNo); |
|
|
|
|
|
|
|
|
|
BasicPrintTemplateEntity template = basicPrintTemplateClient.getPrintTemplate(PrintTemplateStatusConstant.zero_label_18 .getValue()); |
|
|
|
|
if (org.springblade.core.tool.utils.ObjectUtil.isEmpty(template)) { |
|
|
|
|
log.warn("################findZeroWaybillLabelInfo: 未找到模版 waybillNo={}",waybillNo); |
|
|
|
|
return R.fail(405,"未找到模版"); |
|
|
|
|
} |
|
|
|
|
String html = TemplateUtil.getTemplateByUrl(template.getTemplateUrl()); |
|
|
|
|
|
|
|
|
|
Map<String,Object> map = new HashMap<>(); |
|
|
|
|
|
|
|
|
|
map.put("waybillNo",waybillNo); |
|
|
|
|
map.put("orderNo",waybillEntity.getOrderNo()); |
|
|
|
|
map.put("createDate",CommonUtil.dateToStringGeneral(waybillEntity.getCreateTime())); |
|
|
|
|
map.put("departureWarehouseName",waybillEntity.getDepartureWarehouseName()); |
|
|
|
|
map.put("destinationWarehouseName",waybillEntity.getDestinationWarehouseName()); |
|
|
|
|
map.put("destination",waybillEntity.getDestination()); |
|
|
|
|
map.put("departure",waybillEntity.getDeparture()); |
|
|
|
|
map.put("totalCount",waybillEntity.getTotalCount()); |
|
|
|
|
map.put("totalWeight",waybillEntity.getTotalWeight()); |
|
|
|
|
map.put("total_volume",waybillEntity.getTotalVolume()); |
|
|
|
|
map.put("shipper",waybillEntity.getShipper()); |
|
|
|
|
map.put("shipperName",waybillEntity.getShipperName()); |
|
|
|
|
map.put("shipperMobile",waybillEntity.getShipperName()); |
|
|
|
|
map.put("shipperAddress",waybillEntity.getShipperAddress()); |
|
|
|
|
map.put("consignee",waybillEntity.getConsignee()); |
|
|
|
|
map.put("consigneeName",waybillEntity.getConsigneeName()); |
|
|
|
|
map.put("consigneeMobile",waybillEntity.getConsigneeMobile()); |
|
|
|
|
map.put("consigneeAddress",waybillEntity.getConsigneeAddress()); |
|
|
|
|
String fileTypeName = QRCodeUtil.createCodeToFile(waybillNo); |
|
|
|
|
String image = QRCodeUtil.getEmpAutograph(fileTypeName); |
|
|
|
|
map.put("waybillNoCode",image); |
|
|
|
|
map.put("delivery_way",DictBizCache.getValue(DictBizConstant.OPEN_ORDER_DELIVERY_WAY,waybillEntity.getDeliveryWay())); |
|
|
|
|
map.put("waybillNoCode",image); |
|
|
|
|
|
|
|
|
|
List<Map<String,Object>> detailList = new ArrayList<>(); |
|
|
|
|
wayBillDetailList.forEach(item->{ |
|
|
|
|
Map<String,Object> m = new HashMap<>(); |
|
|
|
|
m.put("productName",item.getProductName()); |
|
|
|
|
m.put("num",item.getNum()); |
|
|
|
|
detailList.add(m); |
|
|
|
|
}); |
|
|
|
|
map.put("detailList",detailList); |
|
|
|
|
map.put("template",html); |
|
|
|
|
|
|
|
|
|
return R.data(map); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
public List<TrunklineAdvanceDetailVO> findAdvanceDetailList(Long advanceId) { |
|
|
|
|
return advanceDetailService.findList(advanceId); |
|
|
|
|
@ -1216,6 +1280,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
|
|
|
|
|
|
|
|
|
|
Map<String, Object> map = new HashMap<>(); |
|
|
|
|
map.put("waybillId", waybillId); |
|
|
|
|
map.put("waybillNo", waybillNo); |
|
|
|
|
return R.data(map); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@ -5614,7 +5679,23 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
|
|
|
|
|
WarehouseWayBillDetail warehouseWayBillDetail = new WarehouseWayBillDetail(); |
|
|
|
|
warehouseWayBillDetail.setWaybillNo(waybillEntity.getWaybillNo()); |
|
|
|
|
warehouseWayBillDetail.setWaybillId(waybillEntity.getId()); |
|
|
|
|
warehouseWayBillDetail.setProductId(waybillDetailDTO.getGoodsId()); |
|
|
|
|
|
|
|
|
|
Long goodsId = waybillDetailDTO.getGoodsId(); |
|
|
|
|
|
|
|
|
|
if (Objects.isNull(goodsId)) { |
|
|
|
|
//如果品名id没有就先通过goodsName查寻，没有就新增
|
|
|
|
|
BasicdataCategoryEntity basicdataCategoryEntity = basicdataCategoryClient.findByName(goodsName); |
|
|
|
|
if (Objects.isNull(basicdataCategoryEntity)) { |
|
|
|
|
basicdataCategoryEntity = new BasicdataCategoryEntity(); |
|
|
|
|
basicdataCategoryEntity.setName(goodsName); |
|
|
|
|
basicdataCategoryEntity.setType("1"); |
|
|
|
|
goodsId = basicdataCategoryClient.addReturnId(basicdataCategoryEntity); |
|
|
|
|
} else { |
|
|
|
|
goodsId = basicdataCategoryEntity.getId(); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
warehouseWayBillDetail.setProductId(goodsId); |
|
|
|
|
warehouseWayBillDetail.setProductName(waybillDetailDTO.getGoodsName()); |
|
|
|
|
warehouseWayBillDetail.setChargeType(waybillDetailDTO.getChargeType()); |
|
|
|
|
warehouseWayBillDetail.setNum(waybillDetailDTO.getNum()); |
|
|
|
|
@ -5622,6 +5703,8 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
|
|
|
|
|
warehouseWayBillDetail.setWeight(waybillDetailDTO.getWeight()); |
|
|
|
|
warehouseWayBillDetail.setPrice(waybillDetailDTO.getPrice()); |
|
|
|
|
warehouseWayBillDetail.setSubtotalFreight(waybillDetailDTO.getSubtotalFreight()); |
|
|
|
|
warehouseWayBillDetail.setDeliveryPrice(waybillDetailDTO.getDeliveryPrice()); |
|
|
|
|
warehouseWayBillDetail.setSubtotalDeliveryFee(waybillDetailDTO.getSubtotalDeliveryFee()); |
|
|
|
|
warehouseWayBillDetail.setPickupPrice(waybillDetailDTO.getPickupPrice()); |
|
|
|
|
warehouseWayBillDetail.setFreightPrice(waybillDetailDTO.getFreightPrice()); |
|
|
|
|
warehouseWayBillDetail.setSystemChargeType(waybillDetailDTO.getChargeType()); |
|
|
|
|
|
zhenghaoyu
1 month ago