Merge branch 'pre-production'

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/dto/UpdatePackageDTO.java

@@ -0,0 +1,17 @@
+package com.logpm.distribution.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class UpdatePackageDTO implements Serializable {
+
+	private List<String> orderPackageCodes;
+
+	private Long warehouseId;
+
+	private String packageStatus;
+
+}

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

@@ -19,6 +19,7 @@ package com.logpm.distribution.feign;
 import com.alibaba.fastjson.JSONObject;
 import com.logpm.distribution.dto.FindParamterDTO;
 import com.logpm.distribution.dto.OrderPackageDTO;
+import com.logpm.distribution.dto.UpdatePackageDTO;
 import com.logpm.distribution.entity.DistributionParcelListEntity;
 import com.logpm.distribution.vo.DistributionParcelListVO;
 import com.logpm.distribution.vo.UpdateOrderDTO;
@@ -193,7 +194,7 @@ public interface IDistributionParcelListClient {
 	List<DistributionParcelListEntity> findAllStockListByOrderPackageCode(String orderPackageCode);
 
 	@PostMapping(API_PREFIX + "/updatePackageStatus")
-	void updatePackageStatus(@RequestParam List<String> orderPackageCodes, @RequestParam Long warehouseId, @RequestParam String packageStatus);
+	void updatePackageStatus(@RequestBody UpdatePackageDTO updatePackageDTO);
 
 	@PostMapping(API_PREFIX + "/updateList")
 	void updateList(@RequestBody List<DistributionParcelListEntity> updateParcelList);

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionLoadscanAbnormalController.java

@@ -94,7 +94,7 @@ public class DistributionLoadscanAbnormalController extends BladeController {
 	/**
 	 * 异常记录
 	 */
-	@GetMapping("/page")
+	@GetMapping("/pageList")
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "分页", notes = "传入distributionLoadscanAbnormal")
 	public R pageList(DistributionLoadscanAbnormalDTO distributionLoadscanAbnormal, Query query) {

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

@@ -27,6 +27,7 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.logpm.distribution.dto.FindParamterDTO;
 import com.logpm.distribution.dto.OrderPackageDTO;
+import com.logpm.distribution.dto.UpdatePackageDTO;
 import com.logpm.distribution.entity.DistributionParcelListEntity;
 import com.logpm.distribution.entity.DistributionParcelNumberEntity;
 import com.logpm.distribution.entity.DistributionStockArticleEntity;
@@ -376,12 +377,20 @@ public class DistributionParcelListClient implements IDistributionParcelListClie
 	}
 
 	@Override
-	public void updatePackageStatus(List<String> orderPackageCodes, Long warehouseId, String packageStatus) {
+	public void updatePackageStatus(UpdatePackageDTO updatePackageDTO) {
+
+		List<String> orderPackageCodes = updatePackageDTO.getOrderPackageCodes();
+		Long warehouseId = updatePackageDTO.getWarehouseId();
+		String packageStatus = updatePackageDTO.getPackageStatus();
+
 		distributionParcelListService.updatePackageStatus(orderPackageCodes, warehouseId, packageStatus);
 
-		List<DistributionParcelListEntity> list = distributionParcelListService.findListByOrderPackageCode(orderPackageCodes, warehouseId);
+
+//		List<DistributionParcelListEntity> list = distributionParcelListService.findListByOrderPackageCode(orderPackageCodes, warehouseId);
+		List<String> orderCodesByOrderPackageCodes = distributionParcelListService.findOrderCodesByOrderPackageCodes(orderPackageCodes, warehouseId);
+
 		//把list中的orderCode放入一个set
-		Set<String> orderCodeSet = list.stream().map(DistributionParcelListEntity::getOrderCode).collect(Collectors.toSet());
+		Set<String> orderCodeSet = new HashSet<>(orderCodesByOrderPackageCodes);
 		orderCodeSet.forEach(orderCode -> {
 			distributionStockArticleService.updateOrderInfo(orderCode, warehouseId);
 		});

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

@@ -310,7 +310,7 @@ public interface DistributionParcelListMapper extends BaseMapper<DistributionPar
 
     List<String> findOrderCodeByWaybillId(@Param("waybillId") Long waybillId);
 
-	void clearWaybillInfoByParceListIds(@Param("parceListIds") List<Long> parceListIds);
+	void clearWaybillInfoByParceListIds(@Param("parcelListIds") List<Long> parceListIds);
 
     Map<String, Object> findOrderInfoByOrderPackageCode(@Param("orderPackageCode") String orderPackageCode, @Param("warehouseId") Long warehouseId);
 

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

@@ -1701,9 +1701,7 @@
 
     <update id="updatePackageStatus">
         update logpm_distribution_parcel_list ldpl
-        set ldpl.order_package_status = #{packageStatus}
-        where exists(
-        select 1 from (
+        join (
         <foreach collection="orderPackageCodes" index="ind" item="item">
             <if test="ind == 0">
                 select #{item} pid
@@ -1713,8 +1711,10 @@
                 select #{item} pid
             </if>
         </foreach>
-        ) packageCodes where packageCodes.pid = ldpl.order_package_code)
-        and ldpl.warehouse_id = #{warehouseId}
+        ) t on t.pid = ldpl.order_package_code
+        set ldpl.order_package_status = #{packageStatus}
+        where ldpl.warehouse_id = #{warehouseId}
+
     </update>
 
     <select id="findListByOrderPackageCode" resultType="com.logpm.distribution.entity.DistributionParcelListEntity">

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

@@ -546,7 +546,7 @@
         ldsa.stockup_status, ldsa.reservation_status, ldsa.order_status, ldsa.grounding_status,
         ldsa.order_receive_status,
         ldsa.freeze_status, ldsa.notification, ldsa.fee, ldsa.rate, ldsa.advance_id, ldsa.waybill_id,
-        ldsa.waybill_number waybillNumber,
+        ldpl.waybill_number
         ldsa.consignee_unit, ldsa.collect_fee, ldsa.storage_fee, ldsa.consignee_person, ldsa.consignee_address,
         ldsa.consignee_mobile, ldsa.warehouse_entry_time_end,
         ldsa.sorting_quantity, ldsa.delivery_quantity, ldsa.transfer_quantity,

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

@@ -1437,6 +1437,7 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
         return orderInfoByOrderPackageCode;
 	}
 
+	@Transactional()
 	@Override
 	public void updateEntityByOpenOrderByAdvanceIds(UpdateOrderDTO updateOrderDTO) {
 		Long waybillId = updateOrderDTO.getWaybillId();

blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/service/impl/DeliveryNoteServiceImpl.java

@@ -259,7 +259,7 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl<DeliveryNoteMapper,
 					// 一级品类名称
 					if (StrUtil.isNotEmpty(categoryVO.getTypea())) {
 						advanceDetailEntity.setFirstPackName(categoryVO.getTypea());
-						advanceDetailEntity.setMaterialName(categoryVO.getTypea());
+						// advanceDetailEntity.setMaterialName(categoryVO.getTypea());
 					}
 					// 二级品类名称
 					if (StrUtil.isNotEmpty(categoryVO.getTypeb())) {

blade-service/logpm-factory-data/logpm-factory-data-mwh/src/main/java/com/logpm/factorydata/mwh/service/impl/DeliveryNoteServiceImpl.java

@@ -1,6 +1,5 @@
 package com.logpm.factorydata.mwh.service.impl;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
@@ -14,7 +13,6 @@ import com.logpm.factorydata.base.vo.FactoryWarehouseBindVO;
 import com.logpm.factorydata.enums.BrandEnums;
 import com.logpm.factorydata.feign.IFactoryDataClient;
 import com.logpm.factorydata.mwh.entity.DeliveryNoteEntity;
-import com.logpm.factorydata.mwh.entity.PackageInfoEntity;
 import com.logpm.factorydata.mwh.mapper.DeliveryNoteMapper;
 import com.logpm.factorydata.mwh.service.DeliveryNoteService;
 import com.logpm.factorydata.mwh.vo.DeliveryNoteVO;
@@ -134,7 +132,7 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl<DeliveryNoteMapper,
 					advanceDetailEntity.setSecondPackName(name);
 					//三级品类名称
 					advanceDetailEntity.setThirdPackName(name);
-					advanceDetailEntity.setMaterialName("");
+					// advanceDetailEntity.setMaterialName("");
 					advanceDetailEntity.setSiteName("");
 					advanceDetailEntity.setSiteCode("");
 					advanceDetailEntity.setQuantity(1);

blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/service/impl/DeliveryNoteServiceImpl.java

@@ -192,7 +192,7 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl<DeliveryNoteMapper,
 				advanceDetailEntity.setSecondPackName(orderPackageDTO.getMaterialCategory());
 				// 三级品类名称
 				advanceDetailEntity.setThirdPackName(orderPackageDTO.getMaterialCategory());
-				advanceDetailEntity.setMaterialName(orderPackageDTO.getMaterialCategory());
+				// advanceDetailEntity.setMaterialName(orderPackageDTO.getMaterialCategory());
 
 				advanceDetailEntity.setSiteName("");
 				advanceDetailEntity.setSiteCode("");

blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/service/impl/DeliveryNoteServiceImpl.java

@@ -196,7 +196,7 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl<DeliveryNoteMapper,
 				advanceDetailEntity.setSecondPackName(orderPackageDTO.getPlDepart());
 				// 三级品类名称
 				advanceDetailEntity.setThirdPackName(orderPackageDTO.getPlDepart());
-				advanceDetailEntity.setMaterialName(orderPackageDTO.getPlDepart());
+				// advanceDetailEntity.setMaterialName(orderPackageDTO.getPlDepart());
 				advanceDetailEntity.setSiteName("");
 				advanceDetailEntity.setSiteCode("");
 				advanceDetailEntity.setQuantity(1);

blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/service/impl/ReceiptServiceImpl.java

@@ -177,6 +177,8 @@ public class ReceiptServiceImpl extends BaseServiceImpl<ReceiptMapper, ZbReceipt
 				advanceDetailEntity.setSystemType("线上");
 				advanceDetailEntity.setFirstPackName(orderPackageDTO.getPackageTypeName());
 				advanceDetailEntity.setFirstPackCode(orderPackageDTO.getPackageType());
+				advanceDetailEntity.setSecondPackName(orderPackageDTO.getPackageTypeName());//二级品类名称
+				advanceDetailEntity.setThirdPackName(orderPackageDTO.getPackageTypeName());//三级品类名称
 				// 获取映射志邦映射品类信息
 				ZbCategoryContrastEntity zbCategoryContrastEntity = buildZbCategoryContrastEntityCache(orderPackageDTO.getPackageClass());
 				if (zbCategoryContrastEntity != null) {
@@ -185,10 +187,10 @@ public class ReceiptServiceImpl extends BaseServiceImpl<ReceiptMapper, ZbReceipt
 					advanceDetailEntity.setThirdPackName(zbCategoryContrastEntity.getThirdName());//三级品类名称
 					advanceDetailEntity.setThirdPackCode(zbCategoryContrastEntity.getThirdCode());//三级品类
 				} else {
-					advanceDetailEntity.setSecondPackName(StringUtil.isBlank(orderPackageDTO.getPackageClass()) ? "" : orderPackageDTO.getPackageClass());//二级品类名称
-					advanceDetailEntity.setSecondPackCode("");//二级品类
-					advanceDetailEntity.setThirdPackName(StringUtil.isBlank(orderPackageDTO.getPackageClass()) ? "" : orderPackageDTO.getPackageClass());//三级品类名称
-					advanceDetailEntity.setThirdPackCode("");//三级品类
+					// advanceDetailEntity.setSecondPackName(StringUtil.isBlank(orderPackageDTO.getPackageClass()) ? "" : orderPackageDTO.getPackageClass());//二级品类名称
+					// advanceDetailEntity.setSecondPackCode("");//二级品类
+					// advanceDetailEntity.setThirdPackName(StringUtil.isBlank(orderPackageDTO.getPackageClass()) ? "" : orderPackageDTO.getPackageClass());//三级品类名称
+					// advanceDetailEntity.setThirdPackCode("");//三级品类
 				}
 				advanceDetailEntity.setSiteName("");
 				advanceDetailEntity.setSiteCode("");

blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java

@@ -437,7 +437,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 				// 三级品类名称
 				advanceDetailEntity.setThirdPackName(StringUtil.isBlank(panPackageInfo.getThirdPackName()) ? "" : panPackageInfo.getThirdPackName());
 				advanceDetailEntity.setThirdPackCode(StringUtil.isBlank(panPackageInfo.getThirdPackCode()) ? "" : panPackageInfo.getThirdPackCode());
-				advanceDetailEntity.setMaterialName(StringUtil.isBlank(panPackageInfo.getFirstPackName()) ? "" : panPackageInfo.getFirstPackName());
+				// advanceDetailEntity.setMaterialName(StringUtil.isBlank(panPackageInfo.getFirstPackName()) ? "" : panPackageInfo.getFirstPackName());
 				advanceDetailEntity.setSiteName(PanFactoryEnum.getMes(panPackageInfo.getPlantId()));
 				advanceDetailEntity.setSiteCode("");
 				// advanceDetailEntity.setQuantity(Objects.isNull(panPackageInfo.getProductNum()) ? 1 : panPackageInfo.getProductNum());
@@ -709,9 +709,9 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 				advanceDetailEntity.setFirstPackCode("");
 				advanceDetailEntity.setSecondPackName(mtPackageInfo.getColor());//二级品类名称
 				advanceDetailEntity.setSecondPackCode("");//二级品类
-				advanceDetailEntity.setThirdPackName(mtPackageInfo.getBigType());//三级品类名称
+				advanceDetailEntity.setThirdPackName(mtPackageInfo.getColor());//三级品类名称
 				advanceDetailEntity.setThirdPackCode("");//三级品类
-				advanceDetailEntity.setMaterialName(mtPackageInfo.getBigType());
+				// advanceDetailEntity.setMaterialName(mtPackageInfo.getBigType());
 				advanceDetailEntity.setSiteName("");
 				advanceDetailEntity.setSiteCode("");
 				String planQty = "1";

blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/FactoryXxlJob.java

@@ -521,7 +521,7 @@ public class FactoryXxlJob {
 						// 三级品类名称
 						advanceDetailEntity.setThirdPackName(PackagesTypeEnum.getMes(gpd.getLx()));
 						advanceDetailEntity.setThirdPackCode(gpd.getLx());
-						advanceDetailEntity.setMaterialName(PackagesTypeEnum.getMes(gpd.getLx()));
+						// advanceDetailEntity.setMaterialName(PackagesTypeEnum.getMes(gpd.getLx()));
 						advanceDetailEntity.setSiteName(siteName);
 						advanceDetailEntity.setSiteCode("");
 						advanceDetailEntity.setQuantity(1);

blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncOrderInfoToPlatform.java

@@ -39,6 +39,7 @@ import org.springblade.core.tool.utils.StringUtil;
 import org.springframework.stereotype.Component;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 同步老系统订单信息到新系统
@@ -959,4 +960,30 @@ public class SyncOrderInfoToPlatform {
 	}
 
 
+	@XxlJob("dealPackageStatus")
+	public ReturnT<String>  dealPackageStatus(String param) {
+		log.info("############dealPackageStatus: 处理包件状态为出库   开始");
+
+		if(StringUtil.isBlank(param)){
+			log.warn("###########dealPackageStatus: 仓库id为空");
+			throw new CustomerException(405,"仓库id为空");
+		}
+
+		Long warehouseId = Long.parseLong(param);
+
+		List<JSONObject> ls = warehouseMappingDataService.findAllOrderPackage();
+
+		List<String> orderPackageCodes = ls.stream().map(l -> l.getStr("orderPackageCode")).collect(Collectors.toList());
+
+
+		syncOrderInfoService.updatePackageStatusList(orderPackageCodes,warehouseId,"60");
+
+
+		log.info("############dealPackageStatus: 处理包件状态为出库  完成");
+
+		return ReturnT.SUCCESS;
+	}
+
+
+
 }

blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.java

@@ -146,5 +146,7 @@ public interface WarehouseMappingDataMapper {
 	void updateParcelListWaybillInfo(@Param("orderCodes") List<String> orderCodes, @Param("waybillId") Long waybillId, @Param("waybillNo") String waybillNo, @Param("departureWarehouseId") Long departureWarehouseId, @Param("departureWarehouseName") String departureWarehouseName, @Param("destinationWarehouseId") Long destinationWarehouseId, @Param("destinationWarehouseName") String destinationWarehouseName);
 
 	void updateRepairParcelListWaybillById(@Param("id") Integer id, @Param("status") int status);
+
+    void updatePackageStatusList(@Param("orderPackageCodes") List<String> orderPackageCodes, @Param("warehouseId") Long warehouseId, @Param("packageStatus") String packageStatus);
 }
 

blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.xml

@@ -487,4 +487,21 @@
     </update>
 
 
+    <update id="updatePackageStatusList" >
+        update logpm_distribution_parcel_list ldpl
+        join (
+        <foreach collection="orderPackageCodes" index="ind" item="item">
+            <if test="ind == 0">
+                select #{item} pid
+            </if>
+            <if test="ind != 0">
+                union all
+                select #{item} pid
+            </if>
+        </foreach>
+        ) t on t.pid = ldpl.order_package_code
+        set ldpl.order_package_status = #{packageStatus}
+        where ldpl.warehouse_id = #{warehouseId}
+    </update>
+
 </mapper>

blade-service/logpm-patch/src/main/java/com/logpm/patch/service/ISyncOrderInfoService.java

@@ -32,4 +32,6 @@ public interface ISyncOrderInfoService {
 	void clearOrderPackageDownAndDelTray(String orderPackageCode, Long warehouseId);
 
 	void syncWaybillInfo(String waybillNo);
+
+    void updatePackageStatusList(List<String> orderPackageCodes, Long warehouseId, String number);
 }

blade-service/logpm-patch/src/main/java/com/logpm/patch/service/IWarehouseMappingDataService.java

@@ -127,4 +127,6 @@ public interface IWarehouseMappingDataService {
 	void updateParcelListWaybillInfo(List<String> orderCodes, Long waybillId, String waybillNo, Long departureWarehouseId, String departureWarehouseName, Long destinationWarehouseId, String destinationWarehouseName);
 
 	void updateRepairParcelListWaybillById(Integer id, int status);
+
+	void updatePackageStatusList(List<String> orderPackageCodes, Long warehouseId, String packageStatus);
 }

blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java

@@ -1,11 +1,13 @@
 package com.logpm.patch.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.nacos.shaded.com.google.common.collect.Lists;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.logpm.basic.entity.BasicMaterialEntity;
 import com.logpm.basic.feign.IBasicMaterialClient;
 import com.logpm.basicdata.entity.*;
 import com.logpm.basicdata.feign.*;
+import com.logpm.distribution.dto.UpdatePackageDTO;
 import com.logpm.distribution.entity.DistributionParcelListEntity;
 import com.logpm.distribution.entity.DistributionParcelNumberEntity;
 import com.logpm.distribution.entity.DistributionStockArticleEntity;
@@ -387,6 +389,20 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService {
 
 	}
 
+	@Override
+	public void updatePackageStatusList(List<String> orderPackageCodes, Long warehouseId, String number) {
+		//把orderPackageCodes 每1000条进行分组
+		List<List<String>> partition = Lists.partition(orderPackageCodes, 1000);
+		partition.forEach(list -> {
+			UpdatePackageDTO updatePackageDTO = new UpdatePackageDTO();
+			updatePackageDTO.setOrderPackageCodes(list);
+			updatePackageDTO.setWarehouseId(warehouseId);
+			updatePackageDTO.setPackageStatus(number);
+			distributionParcelListClient.updatePackageStatus(updatePackageDTO);
+		});
+
+	}
+
 
 	@Transactional(rollbackFor = Exception.class)
 	@Override

blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/WarehouseMappingDataServiceImpl.java

@@ -305,4 +305,10 @@ public class WarehouseMappingDataServiceImpl implements IWarehouseMappingDataSer
 	public void updateRepairParcelListWaybillById(Integer id, int status) {
 		warehouseMappingDataMapper.updateRepairParcelListWaybillById(id,status);
 	}
+
+	@Override
+	public void updatePackageStatusList(List<String> orderPackageCodes, Long warehouseId, String packageStatus) {
+
+		warehouseMappingDataMapper.updatePackageStatusList(orderPackageCodes,warehouseId,packageStatus);
+	}
 }

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

@@ -3960,12 +3960,15 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 
 			//判断是否做了配送
 			List<String> orderCodes = distributionParcelListClient.findOrderCodeByWaybillId(waybillId);
-			List<Long> reservationIds = reservationStockarticleClient.findReservationIdsByOrderCodes(orderCodes);
-			if(CollUtil.isNotEmpty(reservationIds)){
-				log.warn("##############abolishWaybill: {}运单已经做了配送计划",waybillNo);
-				throw new CustomerException(405,waybillNo+"运单已经做了配送计划");
+			if(CollUtil.isNotEmpty(orderCodes)){
+				List<Long> reservationIds = reservationStockarticleClient.findReservationIdsByOrderCodes(orderCodes);
+				if(CollUtil.isNotEmpty(reservationIds)){
+					log.warn("##############abolishWaybill: {}运单已经做了配送计划",waybillNo);
+					throw new CustomerException(405,waybillNo+"运单已经做了配送计划");
+				}
 			}
 
+
 			//TODO 还需要加上生成了预存单的无法进行作废
 			Integer status = orderInfoClient.findCreateRencilitionOrderStatus(waybillId);
 			if(status == 1){

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

@@ -279,7 +279,7 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 		Long materialId = advanceDetailEntity.getMaterialId();
 		String materialCode = advanceDetailEntity.getMaterialCode();
 		String materialName = advanceDetailEntity.getMaterialName();
-		if(Objects.isNull(materialId)){
+		if(Objects.isNull(materialId) && StringUtil.isNotBlank(materialCode) && StringUtil.isNotBlank(materialName)){
 			BasicMaterialEntity materialEntity = basicMaterialClient.findEntityByCodeAndName(materialCode,materialName);
 			if(!Objects.isNull(materialEntity)){
 				parcelList.setMaterialId(materialEntity.getId());
@@ -644,7 +644,7 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 			Long materialId = advanceDetailEntity.getMaterialId();
 			String materialCode = advanceDetailEntity.getMaterialCode();
 			String materialName = advanceDetailEntity.getMaterialName();
-			if(Objects.isNull(materialId)){
+			if(Objects.isNull(materialId) && StringUtil.isNotBlank(materialCode) && StringUtil.isNotBlank(materialName)){
 				BasicMaterialEntity materialEntity = basicMaterialClient.findEntityByCodeAndName(materialCode,materialName);
 				if(!Objects.isNull(materialEntity)){
 					parcelList.setMaterialId(materialEntity.getId());
@@ -975,7 +975,7 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 						String materialCode = advanceDetailEntity.getMaterialCode();
 						String materialName = advanceDetailEntity.getMaterialName();
 						if(Objects.isNull(materialId)){
-							if(StringUtil.isNotBlank(materialCode)&& StringUtil.isNotBlank(materialName)){
+							if(StringUtil.isNotBlank(materialCode)&&StringUtil.isNotBlank(materialCode) && StringUtil.isNotBlank(materialName)){
 								BasicMaterialEntity materialEntity = basicMaterialClient.findEntityByCodeAndName(materialCode,materialName);
 								if(!Objects.isNull(materialEntity)){
 									parcelList.setMaterialId(materialEntity.getId());

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

@@ -1,6 +1,7 @@
 package com.logpm.trunkline.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.exceptions.ExceptionUtil;
 import cn.hutool.core.util.IdUtil;
@@ -9,6 +10,7 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.alibaba.nacos.shaded.com.google.common.collect.Lists;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -23,6 +25,7 @@ import com.logpm.basicdata.feign.IBasicdataDriverArteryClient;
 import com.logpm.basicdata.feign.IBasicdataTrayClient;
 import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
 import com.logpm.distribution.dto.FindParamterDTO;
+import com.logpm.distribution.dto.UpdatePackageDTO;
 import com.logpm.distribution.entity.DistributionParcelListEntity;
 import com.logpm.distribution.entity.DistributionParcelNumberEntity;
 import com.logpm.distribution.entity.DistributionStockArticleEntity;
@@ -37,61 +40,11 @@ import com.logpm.factorydata.util.FactoryDataMessageSender;
 import com.logpm.factorydata.vo.NodePushMsg;
 import com.logpm.factorydata.vo.PushData;
 import com.logpm.trunkline.bean.Resp;
-import com.logpm.trunkline.dto.BatchUnloadDTO;
-import com.logpm.trunkline.dto.InComingDTO;
-import com.logpm.trunkline.dto.LoadCarsDTO;
-import com.logpm.trunkline.dto.LoadScanBrandDTO;
-import com.logpm.trunkline.dto.LoadingPackageDTO;
-import com.logpm.trunkline.dto.LoadingZeroDTO;
-import com.logpm.trunkline.dto.OrderStatusDTO;
-import com.logpm.trunkline.dto.ProductInfoDTO;
-import com.logpm.trunkline.dto.TrunklineCarsLoadDTO;
-import com.logpm.trunkline.dto.TrunklineCarsLoadLineDTO;
-import com.logpm.trunkline.dto.TrunklineCarsOrderDTO;
-import com.logpm.trunkline.dto.UnloadPackageDTO;
-import com.logpm.trunkline.dto.UnloadZeroDTO;
-import com.logpm.trunkline.dto.WaybillLogDTO;
-import com.logpm.trunkline.dto.ZeroPackageDTO;
-import com.logpm.trunkline.entity.TrunklineAdvanceDetailEntity;
-import com.logpm.trunkline.entity.TrunklineCarsLoadContractEntity;
-import com.logpm.trunkline.entity.TrunklineCarsLoadEntity;
-import com.logpm.trunkline.entity.TrunklineCarsLoadFinanceEntity;
-import com.logpm.trunkline.entity.TrunklineCarsLoadLineEntity;
-import com.logpm.trunkline.entity.TrunklineCarsLoadLinePhotoEntity;
-import com.logpm.trunkline.entity.TrunklineCarsLoadLogEntity;
-import com.logpm.trunkline.entity.TrunklineCarsLoadScanEntity;
-import com.logpm.trunkline.entity.TrunklineCarsOrderEntity;
-import com.logpm.trunkline.entity.TrunklineCarsUnloadLogEntity;
-import com.logpm.trunkline.entity.TrunklineCostShareRecordEntity;
-import com.logpm.trunkline.entity.TrunklineLoadSignOrderEntity;
-import com.logpm.trunkline.entity.TrunklineLoadSignPhotoEntity;
-import com.logpm.trunkline.entity.TrunklineScanZeroDetailEntity;
-import com.logpm.trunkline.entity.TrunklineWaybillOrderEntity;
+import com.logpm.trunkline.dto.*;
+import com.logpm.trunkline.entity.*;
 import com.logpm.trunkline.feign.ITrunklinePackageTrackLogClient;
 import com.logpm.trunkline.mapper.TrunklineCarsLoadMapper;
-import com.logpm.trunkline.service.ICarsLoadAsyncService;
-import com.logpm.trunkline.service.IInComingService;
-import com.logpm.trunkline.service.IOpenOrderAsyncService;
-import com.logpm.trunkline.service.IPackageTrackLogAsyncService;
-import com.logpm.trunkline.service.ITrunklineAdvanceDetailService;
-import com.logpm.trunkline.service.ITrunklineCarsLoadContractService;
-import com.logpm.trunkline.service.ITrunklineCarsLoadFinanceService;
-import com.logpm.trunkline.service.ITrunklineCarsLoadLinePhotoService;
-import com.logpm.trunkline.service.ITrunklineCarsLoadLineService;
-import com.logpm.trunkline.service.ITrunklineCarsLoadLogService;
-import com.logpm.trunkline.service.ITrunklineCarsLoadScanService;
-import com.logpm.trunkline.service.ITrunklineCarsLoadService;
-import com.logpm.trunkline.service.ITrunklineCarsLoadingLogService;
-import com.logpm.trunkline.service.ITrunklineCarsOrderService;
-import com.logpm.trunkline.service.ITrunklineCarsSignLogService;
-import com.logpm.trunkline.service.ITrunklineCarsUnloadLogService;
-import com.logpm.trunkline.service.ITrunklineCostShareRecordService;
-import com.logpm.trunkline.service.ITrunklineLoadSignOrderService;
-import com.logpm.trunkline.service.ITrunklineLoadSignPhotoService;
-import com.logpm.trunkline.service.ITrunklineScanZeroDetailService;
-import com.logpm.trunkline.service.ITrunklineWaybillOrderService;
-import com.logpm.trunkline.service.ITrunklineWaybillPackageService;
-import com.logpm.trunkline.service.ITrunklineWaybillTrackService;
+import com.logpm.trunkline.service.*;
 import com.logpm.trunkline.vo.*;
 import com.logpm.warehouse.entity.WarehousePackageTrackLogEntity;
 import com.logpm.warehouse.entity.WarehouseTrayTypeEntity;
@@ -106,11 +59,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springblade.common.annotations.RepeatSubmit;
-import org.springblade.common.constant.CodeNumConstant;
-import org.springblade.common.constant.DictBizConstant;
-import org.springblade.common.constant.IncomingTypeEnum;
-import org.springblade.common.constant.RabbitConstant;
-import org.springblade.common.constant.WorkNodeEnums;
+import org.springblade.common.constant.*;
 import org.springblade.common.constant.carsload.CarsLoadLogTypeConstant;
 import org.springblade.common.exception.CustomerException;
 import org.springblade.common.utils.CommonUtil;
@@ -130,18 +79,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
-import java.util.TreeSet;
+import java.util.*;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -7041,6 +6979,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		return R.success("更新成功");
 	}
 
+	@Transactional(rollbackFor = Exception.class)
 	@Override
 	public R manualLoading(LoadCarsDTO loadCarsDTO, String remark) {
 		Long loadId = loadCarsDTO.getLoadId();
@@ -7218,7 +7157,20 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			}
 		});
 
-		distributionParcelListClient.updatePackageStatus(orderPackageCodes, warehouseId, "60");
+		try{
+
+			List<List<String>> partition = Lists.partition(orderPackageCodes, 500);
+			partition.forEach(list -> {
+				UpdatePackageDTO updatePackageDTO = new UpdatePackageDTO();
+				updatePackageDTO.setOrderPackageCodes(list);
+				updatePackageDTO.setWarehouseId(warehouseId);
+				updatePackageDTO.setPackageStatus("60");
+				distributionParcelListClient.updatePackageStatus(updatePackageDTO);
+			});
+		}catch (Exception e){
+			log.error("更新状态失败",e);
+			throw new CustomerException("更新状态失败");
+		}
 
 		trunklineCarsLoadScanService.saveBatch(addCarsLoadScanList);
 
@@ -7339,6 +7291,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		}
 	}
 
+	@Transactional(rollbackFor = Exception.class)
 	@Override
 	public R signLoadScanByIds(List<Long> loadScanIds, Long warehouseId) {
 
@@ -7399,7 +7352,15 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		updateById(carsLoadEntity);
 
 		//包件签收状态修改
-		distributionParcelListClient.updatePackageStatus(orderPackageCodes, warehouseId, "70");
+		//把orderPackageCodes每500条拆分
+		List<List<String>> partition = ListUtil.partition(orderPackageCodes, 500);
+		partition.forEach(list -> {
+			UpdatePackageDTO updatePackageDTO = new UpdatePackageDTO();
+			updatePackageDTO.setOrderPackageCodes(list);
+			updatePackageDTO.setWarehouseId(warehouseId);
+			updatePackageDTO.setPackageStatus("70");
+			distributionParcelListClient.updatePackageStatus(updatePackageDTO);
+		});
 
 		waybillPackageService.updatePackageStatus(orderPackageCodes, WorkNodeEnums.SIGN_TRIPARTITE_TRANSFER_DEPART.getCode(),warehouseId, null);