修改bug

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

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

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

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

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

@@ -16,6 +16,7 @@
  */
 package com.logpm.distribution.feign;
 
+import com.logpm.distribution.dto.OrderPackageDTO;
 import com.logpm.distribution.entity.DistributionParcelListEntity;
 import com.logpm.distribution.vo.DistributionParcelListVO;
 import org.springblade.common.constant.ModuleNameConstant;
@@ -70,7 +71,8 @@ public interface IDistributionParcelListClient {
 	@GetMapping(API_PREFIX+"/findByPacketBarCodeAndWarehouseId")
 	DistributionParcelListEntity findByPacketBarCodeAndWarehouseId(@RequestParam String unitNo,@RequestParam Long warehouseId);
 
-	List<DistributionParcelListEntity> findByPacketBarCodesAndWarehouseId(List<String> unitNos, Long warehouseId);
+	@PostMapping(API_PREFIX+"/findByPacketBarCodesAndWarehouseId")
+	List<DistributionParcelListEntity> findByPacketBarCodesAndWarehouseId(@RequestBody OrderPackageDTO orderPackageDTO);
 
 	@PostMapping(API_PREFIX+"/addBatch")
 	boolean addBatch(@RequestBody List<DistributionParcelListEntity> parcelListEntityList);

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

@@ -18,6 +18,7 @@ package com.logpm.distribution.feign;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.distribution.dto.OrderPackageDTO;
 import com.logpm.distribution.entity.DistributionStockArticleEntity;
 import com.logpm.distribution.vo.UpDownStockupAreaVO;
 import org.springblade.common.constant.ModuleNameConstant;
@@ -133,8 +134,8 @@ public interface IDistributionStockArticleClient {
 
 	@GetMapping(API_PREFIX + "/updateOrderInfo")
     void updateOrderInfo(@RequestParam String orderCode, @RequestParam Long warehouseId);
-
-	void updateOrdersInfo(List<String> orderCodes, Long warehouseId);
+	@PostMapping(API_PREFIX + "/updateOrdersInfo")
+	void updateOrdersInfo(@RequestBody OrderPackageDTO orderPackageDTO);
 
 	@GetMapping(API_PREFIX + "/findZeroListByWarehouseId")
 	IPage<JSONObject> findZeroListByWarehouseId(@RequestParam Long warehouseId, @RequestParam Integer pageNum, @RequestParam Integer pageSize);

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

@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.logpm.distribution.dto.OrderPackageDTO;
 import com.logpm.distribution.entity.DistributionParcelListEntity;
 import com.logpm.distribution.entity.DistributionStockArticleEntity;
 import com.logpm.distribution.service.IDistributionParcelListService;
@@ -33,10 +34,7 @@ import org.springblade.core.mp.support.BladePage;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.*;
@@ -111,12 +109,12 @@ public class DistributionParcelListClient implements IDistributionParcelListClie
 		return distributionParcelListService.getOne(queryWrapper);
 	}
 
-
+	@PostMapping(API_PREFIX+"/findByPacketBarCodesAndWarehouseId")
 	@Override
-	public List<DistributionParcelListEntity> findByPacketBarCodesAndWarehouseId(List<String> unitNos, Long warehouseId) {
+	public List<DistributionParcelListEntity> findByPacketBarCodesAndWarehouseId( OrderPackageDTO orderPackageDTO) {
 		QueryWrapper<DistributionParcelListEntity> queryWrapper = new QueryWrapper<>();
-		queryWrapper.in("order_package_code",unitNos)
-			.eq("warehouse_id",warehouseId);
+		queryWrapper.in("order_package_code",orderPackageDTO.getStrings())
+			.eq("warehouse_id",orderPackageDTO.getWarehouseId());
 		return distributionParcelListService.list(queryWrapper);
 	}
 

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

@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.logpm.distribution.dto.OrderPackageDTO;
 import com.logpm.distribution.entity.DistributionParcelListEntity;
 import com.logpm.distribution.entity.DistributionStockArticleEntity;
 import com.logpm.distribution.service.IDistributionParcelListService;
@@ -34,6 +35,7 @@ import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
@@ -272,10 +274,11 @@ public class DistributionStockArticleClient implements IDistributionStockArticle
 	public void updateOrderInfo(String orderCode, Long warehouseId) {
 		distributionStockArticleService.updateOrderInfo(orderCode,warehouseId);
 	}
-
+	@PostMapping(API_PREFIX + "/updateOrdersInfo")
 	@Override
-	public void updateOrdersInfo(List<String> orderCodes, Long warehouseId) {
-		distributionStockArticleService.updateOrdersInfo(orderCodes,warehouseId);
+	public void updateOrdersInfo( OrderPackageDTO orderPackageDTO) {
+
+		distributionStockArticleService.updateOrdersInfo(orderPackageDTO.getStrings(),orderPackageDTO.getWarehouseId());
 	}
 
 	@Override

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

@@ -969,35 +969,6 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 		}
 		baseMapper.updateStockByTrayTypeId(stockTotalNum,stockNum,trayTypeId);
 
-//		if("1".equals(type)){
-//			TatolNumVO tatolNumVO = warehouseTrayGoodsService.getTotalNumberAndNum(trayTypeId,warehouseId);
-//			if(!Objects.isNull(tatolNumVO)){
-//				Integer orderTotalNum = tatolNumVO.getOrderTotalNum();
-//				Integer enterNum = tatolNumVO.getEnterNum();
-//				baseMapper.updateNumByTrayTypeId(orderTotalNum,enterNum,trayTypeId);
-//			}
-//		}else if("2".equals(type)){
-//			TatolNumVO tatolNumVO = warehouseTrayGoodsService.getZeroTotalNumAndNum(trayTypeId,warehouseId);
-//			if(!Objects.isNull(tatolNumVO)){
-//				Integer orderTotalNum = tatolNumVO.getOrderTotalNum();
-//				Integer enterNum = tatolNumVO.getEnterNum();
-//				baseMapper.updateNumByTrayTypeId(orderTotalNum,enterNum,trayTypeId);
-//			}
-//		}else if("3".equals(type)){
-//			TatolNumVO tatolNumVO = warehouseTrayGoodsService.getStockTotalNumAndNum(trayTypeId,warehouseId);
-//			if(!Objects.isNull(tatolNumVO)){
-//				Integer orderTotalNum = tatolNumVO.getOrderTotalNum();
-//				Integer enterNum = tatolNumVO.getEnterNum();
-//				baseMapper.updateStockByTrayTypeId(orderTotalNum,enterNum,trayTypeId);
-//			}
-//		}else if("4".equals(type)){
-//			TatolNumVO tatolNumVO = warehouseTrayGoodsService.getStockTotalNumAndNum(trayTypeId,warehouseId);
-//			if(!Objects.isNull(tatolNumVO)){
-//				Integer orderTotalNum = tatolNumVO.getOrderTotalNum();
-//				Integer enterNum = tatolNumVO.getEnterNum();
-//				baseMapper.updateStockByTrayTypeId(orderTotalNum,enterNum,trayTypeId);
-//			}
-//		}
 
 	}
 

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.logpm.basicdata.entity.*;
 import com.logpm.basicdata.feign.*;
+import com.logpm.distribution.dto.OrderPackageDTO;
 import com.logpm.distribution.entity.DistributionParcelListEntity;
 import com.logpm.distribution.entity.DistributionStockArticleEntity;
 import com.logpm.distribution.entity.DistributionStockListEntity;
@@ -1596,7 +1597,10 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 			.collect(Collectors.toList());
 
 
-		List<DistributionParcelListEntity> parcelListEntitys = distributionParcelListClient.findByPacketBarCodesAndWarehouseId(barcodeList, warehouseId);
+		OrderPackageDTO orderPackageDTO = new OrderPackageDTO();
+		orderPackageDTO.setWarehouseId(warehouseId);
+		orderPackageDTO.setStrings(barcodeList);
+		List<DistributionParcelListEntity> parcelListEntitys = distributionParcelListClient.findByPacketBarCodesAndWarehouseId(orderPackageDTO);
 
 
 		for (UpShelfPackageDTO upShelfPackageDTO : upShelfPackageList) {
@@ -1671,7 +1675,11 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 //			distributionStockArticleClient.updateOrderInfo(orderCode, warehouseId);
 //		}
 		List<String> orders = new ArrayList<>(orderSet);
-		distributionStockArticleClient.updateOrdersInfo(orders,warehouseId);
+
+		OrderPackageDTO orderPackageDTO1 = new OrderPackageDTO();
+		orderPackageDTO1.setWarehouseId(warehouseId);
+		orderPackageDTO1.setStrings(orders);
+		distributionStockArticleClient.updateOrdersInfo(orderPackageDTO1);
 
 		return Resp.scanSuccess("下架成功", "成功下架" + num + "件");
 	}