1.更新包件触发订单更新逻辑

2.干线对应逻辑修改

blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java

@@ -8,7 +8,7 @@ public interface ModuleNameConstant {
 	/**
 	 * 如果不需要 ""
 	 */
-	public static final String DEVAUTH ="-tjj";
+	public static final String DEVAUTH ="";
 
 	/**
 	 * 工厂对接服务名称

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/BillladingDTO.java

@@ -14,6 +14,8 @@ public class BillladingDTO extends TrunklineBillladingEntity {
 	private Integer pageNum;
 	private Integer pageSize;
 
+	private List<String> waybillNos = new ArrayList<>();
+
 	private List<TrunklineBillladingLineVO> billladingLineList = new ArrayList<>();
 
 	private List<TrunklineBillladingWaybillVO> billladingWaybillList = new ArrayList<>();

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

@@ -52,6 +52,9 @@ public class TrunklineBillladingEntity extends TenantEntity {
 	/** 司机电话 */
 	@ApiModelProperty(name = "司机电话",notes = "")
 	private String driverPhone ;
+	/** 承运商id */
+	@ApiModelProperty(name = "承运商id",notes = "")
+	private Long carrierId ;
 	/** 承运商 */
 	@ApiModelProperty(name = "承运商",notes = "")
 	private String carrierName ;

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

@@ -29,7 +29,6 @@ import com.logpm.distribution.service.IDistributionStockArticleService;
 import com.logpm.distribution.vo.DistributionParcelListVO;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springblade.common.exception.CustomerException;
 import org.springblade.core.mp.support.BladePage;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
@@ -41,7 +40,6 @@ import springfox.documentation.annotations.ApiIgnore;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 
 /**
  * 在库订单包件清单 Feign实现类
@@ -158,16 +156,16 @@ public class DistributionParcelListClient implements IDistributionParcelListClie
 	@Override
 	public void updatePackageGroundingStatus(String orderPackageCode, String groundingStatus,Long warehouseId) {
 		distributionParcelListService.updateGroundingStatus(orderPackageCode,groundingStatus,warehouseId);
-		QueryWrapper<DistributionParcelListEntity> queryWrapper = new QueryWrapper<>();
-		queryWrapper.eq("order_package_code",orderPackageCode)
-			.eq("warehouse_id",warehouseId);
-		DistributionParcelListEntity parcelListEntity = distributionParcelListService.getOne(queryWrapper);
-		if(Objects.isNull(parcelListEntity)){
-			log.error("##################updatePackageGroundingStatus: 包件不存在 orderPackageCode={} warehouseId={}",orderPackageCode,warehouseId);
-			throw new CustomerException(405,"包件不存在");
-		}
-		String orderCode = parcelListEntity.getOrderCode();
-		distributionStockArticleService.updateOrderInfo(orderCode,warehouseId);
+//		QueryWrapper<DistributionParcelListEntity> queryWrapper = new QueryWrapper<>();
+//		queryWrapper.eq("order_package_code",orderPackageCode)
+//			.eq("warehouse_id",warehouseId);
+//		DistributionParcelListEntity parcelListEntity = distributionParcelListService.getOne(queryWrapper);
+//		if(Objects.isNull(parcelListEntity)){
+//			log.error("##################updatePackageGroundingStatus: 包件不存在 orderPackageCode={} warehouseId={}",orderPackageCode,warehouseId);
+//			throw new CustomerException(405,"包件不存在");
+//		}
+//		String orderCode = parcelListEntity.getOrderCode();
+//		distributionStockArticleService.updateOrderInfo(orderCode,warehouseId);
 	}
 
 	@Override

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

@@ -199,5 +199,4 @@ public class DistributionStockListClient implements IDistributionStockListClient
 	public void updeteSourceTypeById(String sourceType, Long stockListId) {
 		distributionStockListService.updeteSourceTypeById(sourceType,stockListId);
 	}
-
 }

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

@@ -410,12 +410,12 @@ public class BillladingController {
 			billladingDTO.setWarehouseId(myCurrentWarehouse.getId());
 			billladingDTO.setWarehouseName(myCurrentWarehouse.getName());
 
-			if(Objects.isNull(billladingId)){
-				log.warn(method+"提货单id不能为空 billladingId={}",billladingId);
-				return R.fail(405,"提货单id不能为空");
-			}
+//			if(Objects.isNull(billladingId)){
+//				log.warn(method+"提货单id不能为空 billladingId={}",billladingId);
+//				return R.fail(405,"提货单id不能为空");
+//			}
 
-			return trunklineBillladingService.findWaybillListNotBillladingId(billladingId);
+			return trunklineBillladingService.findWaybillListNotBillladingId(billladingDTO);
 		}catch (CustomerException e){
 			log.error(e.message,e);
 			return R.fail(e.code,e.message);

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

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.trunkline.dto.BillladingDTO;
 import com.logpm.trunkline.entity.TrunklineBillladingEntity;
 import com.logpm.trunkline.vo.TrunklineBillladingVO;
-import com.logpm.trunkline.vo.TrunklineBillladingWaybillVO;
 import com.logpm.warehouse.vo.WarehouseWaybillVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -19,5 +18,5 @@ public interface TrunklineBillladingMapper extends BaseMapper<TrunklineBillladin
 
 	IPage<TrunklineBillladingVO> pageInfoList(IPage<Object> page, @Param("param") BillladingDTO billladingDTO);
 
-    List<WarehouseWaybillVO> findWaybillListNotBillladingId(@Param("list") List<TrunklineBillladingWaybillVO> waybillInfoListByBillladingId);
+	IPage<WarehouseWaybillVO> findWaybillListNotBillladingId(IPage<Object> page,@Param("list") List<String> waybillNos);
 }

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

@@ -76,8 +76,9 @@
         from logpm_warehouse_waybill lww
         where lww.stock_count != total_count
         <if test="list != null and @org.apache.commons.collections4.CollectionUtils@isNotEmpty(list)">
+              and lww.waybill_no not in
             <foreach collection="list" item="item" open="(" separator="," close=")">
-                #{item.waybillNo}
+                #{item}
             </foreach>
         </if>
 

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

@@ -28,7 +28,7 @@ public interface ITrunklineBillladingService extends BaseService<TrunklineBillla
 
 	R updateBillladingWaybillNum(Long billladingId, List<BillladingWaybillDTO> billladingWaybillEnterList);
 
-	R findWaybillListNotBillladingId(Long billladingId);
+	R findWaybillListNotBillladingId(BillladingDTO billladingDTO);
 
 	R addWaybillToBillladingId(BillladingDTO billladingDTO);
 

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

@@ -444,18 +444,14 @@ public class TrunklineBillladingServiceImpl extends BaseServiceImpl<TrunklineBil
 	}
 
 	@Override
-	public R findWaybillListNotBillladingId(Long billladingId) {
+	public R findWaybillListNotBillladingId(BillladingDTO billladingDTO) {
 
-		TrunklineBillladingEntity trunklineBillladingEntity = baseMapper.selectById(billladingId);
-		if(Objects.isNull(trunklineBillladingEntity)){
-			log.warn("#############findWaybillListNotBillladingId: 提货单不存在 billladingId={}",billladingId);
-			return R.fail(405,"提货单不存在");
-		}
-
-		List<TrunklineBillladingWaybillVO> waybillInfoListByBillladingId = billladingWaybillService.findWaybillInfoListByBillladingId(billladingId);
-
-		List<WarehouseWaybillVO> ls =  baseMapper.findWaybillListNotBillladingId(waybillInfoListByBillladingId);
+		IPage<Object> page = new Page<>();
+		page.setCurrent(billladingDTO.getPageNum());
+		page.setSize(billladingDTO.getPageSize());
 
+		List<String> waybillNos = billladingDTO.getWaybillNos();
+		IPage<WarehouseWaybillVO> ls =  baseMapper.findWaybillListNotBillladingId(page,waybillNos);
 
 		return R.data(ls);
 	}

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java

@@ -1191,6 +1191,7 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 	@Override
 	public R downPackage(List<UpShelfPackageDTO> upShelfPackageList,Long warehouseId) {
 		int num = 0;
+		Set<String> orderSet = new TreeSet<>();
 		for (UpShelfPackageDTO upShelfPackageDTO:upShelfPackageList){
 			String orderPackageCode = upShelfPackageDTO.getOrderPackageCode();
 			//查询包件在哪个库位上
@@ -1206,6 +1207,7 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 			Long allocationId = updownGoodsEntity.getAllocationId();
 			DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode,warehouseId);
 			Integer quantity = parcelListEntity.getQuantity();
+			String orderCode = parcelListEntity.getOrderCode();
 			Long updownGoodsId = updownGoodsEntity.getId();
 			Long updownTypeId = updownGoodsEntity.getUpdownTypeId();
 			WarehouseUpdownTypeEntity updownTypeEntity = baseMapper.selectById(updownTypeId);
@@ -1232,10 +1234,16 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 			warehouseUpdownGoodsLogService.saveAllocationAndPackage(updownTypeEntity,parcelListEntity,"2",0,"包件下架:包件下架");
 			updatePackageGroundingStatus(orderPackageCode,"10",warehouseId);
 			updateUpdownTypeNum(updownTypeEntity);
-
+			orderSet.add(orderCode);
 			num = num + quantity;
 			warehouseGoodsAllocationClient.updateAllocationCache(allocationId.toString());
 		}
+
+		for (String orderCode : orderSet) {
+			distributionStockArticleClient.updateOrderInfo(orderCode,warehouseId);
+		}
+
+
 		return Resp.scanSuccess("下架成功","成功下架"+num+"件");
 	}
 
@@ -1243,6 +1251,7 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 	@Override
 	public R downPackageOrDelTray(List<UpShelfPackageDTO> upShelfPackageList,Long warehouseId) {
 		int num = 0;
+		Set<String> orderSet = new TreeSet<>();
 		for (UpShelfPackageDTO upShelfPackageDTO:upShelfPackageList){
 			String orderPackageCode = upShelfPackageDTO.getOrderPackageCode();
 			//查询包件在哪个库位上
@@ -1268,6 +1277,7 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 			Long allocationId = updownGoodsEntity.getAllocationId();
 			DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode,warehouseId);
 			Integer quantity = parcelListEntity.getQuantity();
+			String orderCode = parcelListEntity.getOrderCode();
 			Long updownGoodsId = updownGoodsEntity.getId();
 			Long updownTypeId = updownGoodsEntity.getUpdownTypeId();
 			WarehouseUpdownTypeEntity updownTypeEntity = baseMapper.selectById(updownTypeId);
@@ -1295,9 +1305,15 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 			updatePackageGroundingStatus(orderPackageCode,"10",warehouseId);
 			updateUpdownTypeNum(updownTypeEntity);
 
+			orderSet.add(orderCode);
 			num = num + quantity;
 			warehouseGoodsAllocationClient.updateAllocationCache(allocationId.toString());
 		}
+
+		for (String orderCode : orderSet) {
+			distributionStockArticleClient.updateOrderInfo(orderCode,warehouseId);
+		}
+
 		return Resp.scanSuccess("下架成功","成功下架"+num+"件");
 	}
 
@@ -1533,6 +1549,7 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 		//上架方式删除
 		removeById(updownTypeEntity.getId());
 		//修改状态
+		Set<String> setOrder = new TreeSet<>();
 		for (WarehouseUpdownGoodsEntity updownGoodsEntity:updownGoodsList){
 			String associationType = updownGoodsEntity.getAssociationType();
 			String associationValue = updownGoodsEntity.getAssociationValue();
@@ -1540,11 +1557,17 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 			if("1".equals(associationType)){
 				updateZeroOrderGroundingStatus(associationValue,warehouseId);
 			}else if("3".equals(associationType)){
+				DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(associationValue, warehouseId);
 				updatePackageGroundingStatus(associationValue,"10",warehouseId);
+				setOrder.add(parcelListEntity.getOrderCode());
 			}
 			allNum = allNum+num;
 		}
 
+		for (String orderCode : setOrder) {
+			distributionStockArticleClient.updateOrderInfo(orderCode,warehouseId);
+		}
+
 		//修改库位状态
 		basicdataGoodsAllocationClient.updateAllocationStatus(allocationId,"1");