1.干线 运单关联包件实体

2.修复一些正式bug

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java

@@ -372,6 +372,8 @@ public class DistributionParcelListEntity extends TenantEntity {
 	@ApiModelProperty(value = "体积")
 	private BigDecimal volume;//体积
 
+	@ApiModelProperty(value = "是否中转")
+	private Integer isTransfer;//是否中转
 
 //	/**
 //	 * 配送状态

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java

@@ -129,4 +129,6 @@ public interface IDistributionParcelListClient {
 	@GetMapping(API_PREFIX+"/findByOrderInfoByOrderPackageCodeAndWarehouseId")
 	Map<String,Object> findByOrderInfoByOrderPackageCodeAndWarehouseId(@RequestParam  String orderPackCode,@RequestParam Long warehouseId);
 
+	@GetMapping(API_PREFIX+"/updateTransferStatus")
+    void updateTransferStatus(@RequestParam String orderCode, @RequestParam Long warehouseId, @RequestParam Integer isTransfer);
 }

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineWaybillPackageEntity.java

@@ -0,0 +1,53 @@
+package com.logpm.trunkline.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+@Data
+@TableName("logpm_trunkline_waybill_package")
+@ApiModel(value = "TrunklineWaybillPackage对象", description = "运单包件关联表")
+@EqualsAndHashCode(callSuper = true)
+public class TrunklineWaybillPackageEntity extends TenantEntity {
+
+	/** 预留1 */
+	@ApiModelProperty(name = "预留1",notes = "")
+	private String reserve1 ;
+	/** 预留2 */
+	@ApiModelProperty(name = "预留2",notes = "")
+	private String reserve2 ;
+	/** 预留3 */
+	@ApiModelProperty(name = "预留3",notes = "")
+	private String reserve3 ;
+	/** 预留4 */
+	@ApiModelProperty(name = "预留4",notes = "")
+	private String reserve4 ;
+	/** 预留5 */
+	@ApiModelProperty(name = "预留5",notes = "")
+	private String reserve5 ;
+	/** 运单id */
+	@ApiModelProperty(name = "运单id",notes = "")
+	private Long waybillId;
+	/** 运单号 */
+	@ApiModelProperty(name = "运单号",notes = "")
+	private String waybillNo;
+	/** 暂存单包件id */
+	@ApiModelProperty(name = "暂存单包件id",notes = "")
+	private Long advanceDetailId;
+	/** 包件码 */
+	@ApiModelProperty(name = "包件码",notes = "")
+	private String orderPackageCode;
+	/** 是否签收 */
+	@ApiModelProperty(name = "是否签收",notes = "")
+	private Integer isSignfor;
+	/** 暂存单id */
+	@ApiModelProperty(name = "暂存单id",notes = "")
+	private Long advanceId;
+	/** 订单自编号 */
+	@ApiModelProperty(name = "订单自编号",notes = "")
+	private String orderCode;
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCodeServiceImpl.java

@@ -173,7 +173,7 @@ public class BasicdataCodeServiceImpl implements IBasicdataCodeService {
 
 		}
 
-		return warehouseCode+"TH"+dateShort+CommonUtil.geFourNumber(incr,5);
+		return warehouseCode+"TH"+CommonUtil.geFourNumber(incr,5);
 	}
 
 	private String generateExOrderCode(Integer type, String warehouseCode, String orderCode) {

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java

@@ -259,4 +259,11 @@ public class DistributionParcelListClient implements IDistributionParcelListClie
 
 
 	}
+
+	@Override
+	public void updateTransferStatus(String orderCode, Long warehouseId,Integer isTransfer) {
+
+		distributionParcelListService.updateTransferStatus(orderCode,warehouseId,isTransfer);
+
+	}
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java

@@ -165,4 +165,6 @@ public interface DistributionParcelListMapper extends BaseMapper<DistributionPar
 	 * @return
 	 */
     int updateOrderPackageInceptionStatus(@Param("packageIds") List<Long> packageIds);
+
+    void updateTransferStatus(@Param("orderCode") String orderCode, @Param("warehouseId") Long warehouseId, @Param("isTransfer") Integer isTransfer);
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml

@@ -250,6 +250,9 @@
             <if test="param.orderPackageStatus !='' and param.orderPackageStatus != null">
                 and ldpl.order_package_status = #{param.orderPackageStatus}
             </if>
+            <if test="param.waybillNumber != '' and param.waybillNumber != null ">
+                and ldpl.waybill_number = #{param.waybillNumber}
+            </if>
 
         </where>
 
@@ -1048,4 +1051,11 @@
         and warehouse_id = #{warehouseId}
     </update>
 
+    <update id="updateTransferStatus">
+        update logpm_distribution_parcel_list
+        set is_transfer = #{isTransfer}
+        where order_code = #{orderCode}
+        and warehouse_id = #{warehouseId}
+    </update>
+
 </mapper>

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java

@@ -164,9 +164,11 @@ public interface IDistributionParcelListService extends BaseService<Distribution
 
 	/**
 	 * 根据二维码查询包件
-	 * @param barcode
-	 * @param id
+	 * @param orderPackageCode
+	 * @param warehouseId
 	 * @return
 	 */
     DistributionParcelListEntity selectByOrderPackageCode(String orderPackageCode, Long warehouseId);
+
+	void updateTransferStatus(String orderCode, Long warehouseId,Integer isTransfer);
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java

@@ -52,7 +52,6 @@ import com.logpm.warehouse.feign.IWarehouseTrayTypeClient;
 import com.logpm.warehouse.feign.IWarehouseUpdownTypeClient;
 import com.logpm.warehouse.feign.IWarehouseWaybillClient;
 import com.logpm.warehouse.vo.TrayTypeDataVO;
-import lombok.AllArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.apache.commons.lang.StringUtils;
 import org.jetbrains.annotations.NotNull;
@@ -66,7 +65,6 @@ import org.springblade.common.constant.loading.LoadScanSigningStatusConstant;
 import org.springblade.common.constant.loading.LoadingAbnormalAuditingStatusConstant;
 import org.springblade.common.constant.loading.LoadingIsInsertConstant;
 import org.springblade.common.constant.loading.LoadingStatusConstant;
-import org.springblade.common.constant.order.OrderReservationStatusConstant;
 import org.springblade.common.constant.order.OrderStatusConstant;
 import org.springblade.common.constant.orderpackage.*;
 import org.springblade.common.constant.printTemplate.PrintTemplateStatusConstant;
@@ -6068,6 +6066,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				map.put("出库时间", taskTime);
 				map.put("送货司机", dirverName + "/" + dirverPhone);
 				map.put("车牌号", carNumber);
+				map.put("备注", reservationEntity.getRemarks());
 
 				Long reservationId = reservationEntity.getId();//预约id
 				//通过预约id查询所有包件并按三级品类分组

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java

@@ -44,7 +44,6 @@ import com.logpm.warehouse.feign.IWarehouseUpdownGoodsClient;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.constant.DictBizConstant;
-import org.springblade.common.constant.RabbitConstant;
 import org.springblade.common.constant.order.OrderStockupStatusConstant;
 import org.springblade.common.utils.CommonUtil;
 import org.springblade.core.log.exception.ServiceException;
@@ -636,6 +635,11 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 		return baseMapper.selectByOrderPackageCode(orderPackageCode, warehouseId);
 	}
 
+	@Override
+	public void updateTransferStatus(String orderCode, Long warehouseId,Integer isTransfer) {
+		baseMapper.updateTransferStatus(orderCode,warehouseId,isTransfer);
+	}
+
 	/**
 	 * @param distributionParcelList 包件信息
 	 * @return

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/BillladingController.java

@@ -151,7 +151,7 @@ public class BillladingController {
 				return R.fail(405,"预计体积不能为空");
 			}
 
-			trunklineBillladingService.saveNew(billladingDTO,myCurrentWarehouse.getCode());
+			trunklineBillladingService.saveNew(billladingDTO,myCurrentWarehouse.getWarehouseCode());
 			return R.success("新增成功");
 		}catch (CustomerException e){
 			log.error(e.message,e);

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceMapper.xml

@@ -15,6 +15,7 @@
         select *
         from logpm_trunkline_advance lta
         where lta.is_deleted = 0
+          and lta.waybill_status = 0
           and lta.freeze_status = #{param.freezeStatus}
           <if test="param.warehouseId != null">
               and lta.warehouse_id = #{param.warehouseId}

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineWaybillPacakgeMapper.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.logpm.trunkline.mapper.TrunklineWaybillPackageMapper">
+
+
+</mapper>

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineWaybillPackageMapper.java

@@ -0,0 +1,12 @@
+package com.logpm.trunkline.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.logpm.trunkline.entity.TrunklineWaybillPackageEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TrunklineWaybillPackageMapper extends BaseMapper<TrunklineWaybillPackageEntity> {
+
+
+
+}

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineWaybillPackageService.java

@@ -0,0 +1,12 @@
+package com.logpm.trunkline.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.logpm.trunkline.entity.TrunklineWaybillPackageEntity;
+import com.logpm.trunkline.vo.TrunklineAdvanceDetailVO;
+import com.logpm.warehouse.entity.WarehouseWaybillEntity;
+
+import java.util.List;
+
+public interface ITrunklineWaybillPackageService extends IService<TrunklineWaybillPackageEntity> {
+	void saveList(List<TrunklineAdvanceDetailVO> list, WarehouseWaybillEntity waybillEntity);
+}

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java

@@ -64,6 +64,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 	private final IDistributionParcelListClient distributionParcelListClient;
 	private final IDistributionParcelNumberClient distributionParcelNumberClient;
 	private final IRegionFeign regionFeign;
+	private final ITrunklineWaybillPackageService trunklineWaybillPackageService;
 
 	@Override
 	public IPage<TrunklineAdvanceVO> advancePageList(AdvanceDTO advanceDTO) {
@@ -239,14 +240,16 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		if(StringUtil.isBlank(waybillNo)){
 			waybillNo = basicdataCodeClient.getCodeByType(CodeNumConstant.WAYBILL, warehouseCode, "");
 		}
+		Long departureWarehouseId = openOrderDTO.getDepartureWarehouseId();
+		Long destinationWarehouseId = openOrderDTO.getDestinationWarehouseId();
 
 		WarehouseWaybillEntity waybillEntity = new WarehouseWaybillEntity();
 		waybillEntity.setWaybillNo(waybillNo);
 		waybillEntity.setBrand(openOrderDTO.getBrand());
 		waybillEntity.setOrderNo(openOrderDTO.getOrderCode());
-		waybillEntity.setDepartureWarehouseId(openOrderDTO.getDepartureWarehouseId());
+		waybillEntity.setDepartureWarehouseId(departureWarehouseId);
 		waybillEntity.setDepartureWarehouseName(openOrderDTO.getDepartureWarehouseName());
-		waybillEntity.setDestinationWarehouseId(openOrderDTO.getDestinationWarehouseId());
+		waybillEntity.setDestinationWarehouseId(destinationWarehouseId);
 		waybillEntity.setDestinationWarehouseName(openOrderDTO.getDestinationWarehouseName());
 		waybillEntity.setDocumentMakingTime(CommonUtil.StringToDate(openOrderDTO.getOpenOrderDate()));
 		waybillEntity.setReceiptNum(openOrderDTO.getReceiptNum());
@@ -355,6 +358,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		//绑定订单和运单的关系
 		List<TrunklineAdvanceEntity> advanceEntityList = advanceService.findListByIds(advanceIds);
 		List<TrunklineWaybillOrderEntity> waybillOrderEntities = new ArrayList<>();
+		Set<String> orderCodes = new TreeSet<>();
 		for (TrunklineAdvanceEntity advanceEntity:advanceEntityList){
 			TrunklineWaybillOrderEntity waybillOrderEntity = new TrunklineWaybillOrderEntity();
 			waybillOrderEntity.setWarehouseId(warehouseId);
@@ -367,6 +371,10 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 			waybillOrderEntity.setHandleNumber(0);
 			waybillOrderEntities.add(waybillOrderEntity);
 
+
+			List<TrunklineAdvanceDetailVO> list = advanceDetailService.findList(advanceEntity.getId());
+			trunklineWaybillPackageService.saveList(list,waybillEntity);
+			orderCodes.add(advanceEntity.getOrderCode());
 			advanceEntity.setWaybillStatus("1");
 			advanceEntity.setWaybillNo(waybillEntity.getWaybillNo());
 		}
@@ -374,6 +382,16 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		//修改暂存单的状态为已开单
 		advanceService.updateBatchById(advanceEntityList);
 
+		Integer isTransfer = 1;
+		if(departureWarehouseId.equals(destinationWarehouseId)){
+			isTransfer = 0;
+		}
+
+		for (String orderCode : orderCodes) {
+			distributionParcelListClient.updateTransferStatus(orderCode,warehouseId,isTransfer);
+		}
+
+
 		//计算扫码入库的包件是否需要把运单和提货单挂上
 		List<BillladingPackageVO> billladingPackageList = advanceDetailService.findBillladingPackageByAdvanceIdsAnd(advanceIds);
 		List<TrunklineBillladingWaybillEntity> billladingWaybillEntities = new ArrayList<>();

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java

@@ -66,6 +66,12 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 			throw new CustomerException(405,"包件信息已存在");
 		}
 
+		TrunklineAdvanceEntity advanceEntity = getById(advanceId);
+		if(Objects.isNull(advanceEntity)){
+			log.warn("############saveOrderAndPackage: 暂存单信息不存在 advanceId={} warehouseId={}",advanceId,warehouseId);
+			throw new CustomerException(405,"暂存单信息不存在");
+		}
+
 		//2.查询订单信息
 		int total = baseMapper.getAllTotalNum(orderCode);
 
@@ -74,7 +80,7 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 		if(Objects.isNull(stockArticleEntity)){
 			log.info("#############saveOrderAndPackage: 订单信息为空，同步订单信息");
 			//订单信息为空
-			TrunklineAdvanceEntity advanceEntity = getById(advanceId);
+
 			stockArticleEntity = new DistributionStockArticleEntity();
 			stockArticleEntity.setOrderCode(orderCode);
 			stockArticleEntity.setServiceNumber(advanceEntity.getServiceNum());
@@ -164,6 +170,7 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 		DistributionParcelListEntity parcelList = new DistributionParcelListEntity();
 		parcelList.setWarehouse(warehouseEntity.getName());
 		parcelList.setWarehouseId(warehouseId);
+		parcelList.setWaybillNumber(advanceEntity.getWaybillNo());
 		parcelList.setConditions(1);
 		parcelList.setOrderPackageCode(advanceDetailEntity.getOrderPackageCode());
 		parcelList.setFirsts(advanceDetailEntity.getFirstPackName());
@@ -196,7 +203,7 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 
 		}
 		parcelList.setBrandName(advanceDetailEntity.getBrand());
-		parcelList.setOrderPackageStatus("20");
+		parcelList.setOrderPackageStatus("30");
 		parcelList.setOrderPackageFreezeStatus("10");
 		parcelList.setOrderPackageGroundingStatus("10");
 		parcelList.setOrderPackageStockupStatus("10");

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingServiceImpl.java

@@ -74,13 +74,15 @@ public class TrunklineBillladingServiceImpl extends BaseServiceImpl<TrunklineBil
 
 		Long warehouseId = billladingDTO.getWarehouseId();
 		String warehouseName = billladingDTO.getWarehouseName();
-		String billladingCode = basicdataCodeClient.getCodeByType(11, warehouseCode, null);
+		String billladingCode = basicdataCodeClient.getCodeByType(11, warehouseCode, "");
 
 		TrunklineBillladingEntity trunklineBillladingEntity = new TrunklineBillladingEntity();
 		BeanUtil.copy(billladingDTO,trunklineBillladingEntity);
 		trunklineBillladingEntity.setBillladingStatus("1");
 		trunklineBillladingEntity.setCreateUserName(AuthUtil.getUserName());
 		trunklineBillladingEntity.setBillladingCode(billladingCode);
+		trunklineBillladingEntity.setRealVolume(BigDecimal.ZERO);
+		trunklineBillladingEntity.setRealWeight(BigDecimal.ZERO);
 		save(trunklineBillladingEntity);
 		Long billladingId = trunklineBillladingEntity.getId();
 		//保存线路节点

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingWaybillServiceImpl.java

@@ -74,11 +74,24 @@ public class TrunklineBillladingWaybillServiceImpl extends BaseServiceImpl<Trunk
 
 		BigDecimal price = BigDecimal.ZERO;
 		if("1".equals(chargeType)){
+			if(realVolume.compareTo(BigDecimal.ZERO) > 0){
 				price = totalFee.divide(new BigDecimal(realNum),2,BigDecimal.ROUND_UP);
+			}else{
+				price = BigDecimal.ZERO;
+			}
+
 		}else if ("2".equals(chargeType)){
+			if(realVolume.compareTo(BigDecimal.ZERO) > 0){
 				price = totalFee.divide(realWeight,4,BigDecimal.ROUND_UP);
+			}else{
+				price = BigDecimal.ZERO;
+			}
 		}else if("3".equals(chargeType)){
+			if(realVolume.compareTo(BigDecimal.ZERO) > 0){
 				price = totalFee.divide(realVolume,4,BigDecimal.ROUND_UP);
+			}else{
+				price = BigDecimal.ZERO;
+			}
 		}
 
 		QueryWrapper<TrunklineBillladingWaybillEntity> queryWrapper = new QueryWrapper<>();

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineWaybillPackageServiceImpl.java

@@ -0,0 +1,42 @@
+package com.logpm.trunkline.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.logpm.trunkline.entity.TrunklineWaybillPackageEntity;
+import com.logpm.trunkline.mapper.TrunklineWaybillPackageMapper;
+import com.logpm.trunkline.service.ITrunklineWaybillPackageService;
+import com.logpm.trunkline.vo.TrunklineAdvanceDetailVO;
+import com.logpm.warehouse.entity.WarehouseWaybillEntity;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Slf4j
+@Service
+@AllArgsConstructor
+public class TrunklineWaybillPackageServiceImpl extends ServiceImpl<TrunklineWaybillPackageMapper,TrunklineWaybillPackageEntity> implements ITrunklineWaybillPackageService {
+	@Override
+	public void saveList(List<TrunklineAdvanceDetailVO> list, WarehouseWaybillEntity waybillEntity) {
+		List<TrunklineWaybillPackageEntity> ls = new ArrayList<>();
+		for (TrunklineAdvanceDetailVO trunklineAdvanceDetailVO : list) {
+			Long advanceDetailId = trunklineAdvanceDetailVO.getId();
+			Long advanceId = trunklineAdvanceDetailVO.getAdvanceId();
+			String orderCode = trunklineAdvanceDetailVO.getOrderCode();
+			String orderPackageCode = trunklineAdvanceDetailVO.getOrderPackageCode();
+			Long waybillId = waybillEntity.getId();
+			String waybillNo = waybillEntity.getWaybillNo();
+			TrunklineWaybillPackageEntity waybillPackageEntity = new TrunklineWaybillPackageEntity();
+			waybillPackageEntity.setWaybillId(waybillId);
+			waybillPackageEntity.setWaybillNo(waybillNo);
+			waybillPackageEntity.setOrderCode(orderCode);
+			waybillPackageEntity.setAdvanceId(advanceId);
+			waybillPackageEntity.setAdvanceDetailId(advanceDetailId);
+			waybillPackageEntity.setOrderPackageCode(orderPackageCode);
+			waybillPackageEntity.setIsSignfor(0);
+			ls.add(waybillPackageEntity);
+		}
+		saveBatch(ls);
+	}
+}