fix: 修复自提扫描签收数据库超时的问题

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

@@ -54,6 +54,12 @@ public class OldSystemDataPushConfig {
 		// 南充仓
 		warehourseIds.add("41");
 
+		// 达州仓
+		warehourseIds.add("36");
+
+		// 阳春仓
+		warehourseIds.add("150");
+
 	}
 
 

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

@@ -151,11 +151,11 @@ public class BasicdataTrayServiceImpl extends BaseServiceImpl<BasicdataTrayMappe
 	@Override
 	public IPage<BasicdataTrayVO> selectTrayList(IPage<Object> page, Map<String, Object> basicdataTray) {
 		IPage<BasicdataTrayVO> trayList= trayMapper.selectTrayList(page,basicdataTray);
-		for (int i = 0; i < trayList.getRecords().size(); i++) {
+//		for (int i = 0; i < trayList.getRecords().size(); i++) {
-			if(ObjectUtils.isNotNull(trayList.getRecords().get(i).getTrayType())){
+//			if(ObjectUtils.isNotNull(trayList.getRecords().get(i).getTrayType())){
-				trayList.getRecords().get(i).setTrayTypeString(DictBizCache.getValue(DictBizConstant.PALLET_ORDER_TYPE, trayList.getRecords().get(i).getTrayType()));
+//				trayList.getRecords().get(i).setTrayTypeString(DictBizCache.getValue(DictBizConstant.PALLET_ORDER_TYPE, trayList.getRecords().get(i).getTrayType()));
-			}
+//			}
-		}
+//		}
 		return trayList;
 	}
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionBillLadingAppController.java

@@ -20,6 +20,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
+import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
 import com.logpm.distribution.bean.Resp;
 import com.logpm.distribution.dto.app.BillLadingAppDTO;
 import com.logpm.distribution.entity.DistributionBillLadingScanEntity;
@@ -27,6 +29,7 @@ import com.logpm.distribution.service.IDistributionBillLadingScanService;
 import com.logpm.distribution.service.IDistrilbutionBillLadingService;
 import com.logpm.distribution.vo.DistrilbutionBillLadingAppVO;
 import com.logpm.distribution.vo.app.DistrilbutionAppBillLadingOrderMainVO;
+import com.logpm.warehouse.feign.IWarehouseUpdownTypeClient;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -39,6 +42,7 @@ import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
@@ -54,6 +58,7 @@ import java.util.Map;
 @Log4j2
 @RestController
 @AllArgsConstructor
+
 @RequestMapping("/app/billLading")
 @Api(value = "自提", tags = "自提信息表接口")
 public class DistributionBillLadingAppController extends BladeController {
@@ -62,9 +67,10 @@ public class DistributionBillLadingAppController extends BladeController {
 	private final IDistrilbutionBillLadingService distrilbutionBillLadingService;
 
 	private final IDistributionBillLadingScanService distributionBillLadingScanService;
-	/**
+
-	 * 自提信息表 分页列表
+	private final IWarehouseUpdownTypeClient warehouseUpdownTypeClient;
-	 */
+
+	private final IBasicdataWarehouseClient basicdataWarehouseClient;
 	@ResponseBody
 	@PostMapping("/pageList")
 	@ApiOperationSupport(order = 1)
@@ -128,6 +134,20 @@ public class DistributionBillLadingAppController extends BladeController {
 	})
 	public Resp getScan(@ApiIgnore @RequestParam Map<String, Object> distrilbutionBillLading){
 		Resp scan = distrilbutionBillLadingService.getScan(distrilbutionBillLading);
+
+		//获取传入类型
+		String type =distrilbutionBillLading.get("type").toString();
+		if(scan.getCode()==200){
+			if("2".equals(type)){
+				BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
+				String coding = distrilbutionBillLading.get("coding").toString();
+				warehouseUpdownTypeClient.downPackageOrDelTray(coding, myCurrentWarehouse.getId(),"签收下架解托");
+			}else if("1".equals(type)){
+				//todo 这里需要增加对备货库存品的下架逻辑  但是备货是会进行下架的
+				log.warn("库存品下架的逻辑");
+			}
+		}
+
 		return scan;
 	}
 

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

@@ -2269,22 +2269,6 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 		boolean apj = false;
 		if (!list.isEmpty()) {
 			//查询包件数量
-//			list.forEach(i -> {
-//				List<DistributionParcelListEntity> list1 = distributionParcelListService.list(Wrappers.<DistributionParcelListEntity>query().lambda()
-//					.eq(DistributionParcelListEntity::getStockArticleId, i.getStockArticleId())
-//					.isNotNull(DistributionParcelListEntity::getOrderPackageCode)
-//				);
-//				//查询扫码数量
-//				List<DistributionBillLadingScanEntity> list2 = distributionBillLadingScanMapper.selectList(Wrappers.<DistributionBillLadingScanEntity>query().lambda()
-//					.eq(DistributionBillLadingScanEntity::getBillLadingId, billLadingId)
-//					.eq(DistributionBillLadingScanEntity::getStockArticleId, i.getStockArticleId())
-//				);
-//				pack.set(pack.get() + list1.size());
-//				packys.set(packys.get() + list2.size());
-//
-//			});
-
-			//查询包件数量
 			List<DistributionStockPackageVO> distributionStockPackageVOS = distrilbutionBillStockService.listPackageSelf(billLadingId);
 			int size = distributionStockPackageVOS.size(); //包件数量
 			pack.set(pack.get() + size);
@@ -2311,7 +2295,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 		AtomicReference<Integer> kcq = new AtomicReference<>(0); // 库存全部数量
 		AtomicReference<Integer> kcs = new AtomicReference<>(0); // 库存以扫数量
 		boolean kc = false;
-		if (list1.size() > 0) {
+		if (!list1.isEmpty()) {
 			list1.forEach(i -> {
 				//查询以扫数量
 				List<DistributionBillLadingScanEntity> list2 = distributionBillLadingScanMapper.selectList(Wrappers.<DistributionBillLadingScanEntity>query().lambda()

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

@@ -2611,11 +2611,11 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 							distributionBillLadingScan.setQuantity(1);
 							distributionBillLadingScan.setBillLadingId(Long.parseLong((String) billLadingId));
 							//包件解脱
-							try {
+//							try {
-								warehouseUpdownTypeClient.downPackageOrDelTray((String) coding, myCurrentWarehouse.getId(),"签收下架解托");
+//								warehouseUpdownTypeClient.downPackageOrDelTray((String) coding, myCurrentWarehouse.getId(),"签收下架解托");
-							} catch (Exception e) {
+//							} catch (Exception e) {
-								log.info("自提签收包件解托报错：" + e.getMessage());
+//								log.info("自提签收包件解托报错：" + e.getMessage());
-							}
+//							}
 
 						}
 					});