Merge branch 'pre-production'

blade-service/logpm-aftersales/src/main/resources/application-prod.yml

@@ -1,6 +1,6 @@
 #服务器端口
 server:
-  port: 8900
+  port: 8799
 
 #数据源配置
 #spring:

blade-service/logpm-aftersales/src/main/resources/application-test.yml

@@ -1,6 +1,6 @@
 #服务器端口
 server:
-  port: 6000
+  port: 8799
 
 #数据源配置
 #spring:

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

@@ -6,8 +6,10 @@ import com.logpm.distribution.vo.app.DistributionMerchantStockListVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
+import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.SpringUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -17,17 +19,17 @@ import java.util.List;
 
 @RestController
 @RequestMapping("/app/stocklist")
-@AllArgsConstructor
 @Api(value = "商家查看库存品", tags = "商家查看库存品")
-public class DistributionStockListPDAController {
+public class DistributionStockListPdaController extends BladeController {
 
 
+	@Autowired
+	private  IDistributionStockListService distributionStockListService;
 
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "PDA查询库存品列表", notes = "DistributionStockListVO")
-	private R<List<DistributionMerchantStockListVO>> getMerchantStockList(@RequestParam String  materielCode){
+	public R<List<DistributionMerchantStockListVO>> getMerchantStockList(@RequestParam String  materielCode){
-		IDistributionStockListService distributionStockListService = SpringUtil.getBean(IDistributionStockListService.class);
 		List<DistributionMerchantStockListVO> stockListEntityList =distributionStockListService.getMerchantStockList(materielCode);
 		return R.data(stockListEntityList);
 	}

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

@@ -1164,7 +1164,14 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl<Distributi
 	@Override
 	public List<DistributionMerchantStockListVO> getMerchantStockList(String materielCode) {
 		BladeUser user = AuthUtil.getUser();
-		List<DistributionStockListEntity> stockListEntities = baseMapper.getMerchantStockList(user.getTenantId(), materielCode);
+
+		LambdaQueryWrapper<DistributionStockListEntity> queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.eq(DistributionStockListEntity::getCargoNumber, materielCode);
+		List<DistributionStockListEntity> stockListEntities = list(queryWrapper);
+
+//		List<DistributionStockListEntity> stockListEntities = baseMapper.getMerchantStockList(user.getTenantId(), materielCode);
+
+
 		List<DistributionMerchantStockListVO> distributionMerchantStockListVOS = new ArrayList<>();
 		if (Func.isNotEmpty(stockListEntities)) {
 			for (DistributionStockListEntity stockListEntity : stockListEntities) {

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWarehousingEntryController.java

@@ -118,8 +118,8 @@ public class WarehouseWarehousingEntryController extends BladeController {
 
 		Map<String, Object> queryMap =  (Map) request.get("query");
 		Query query = new Query();
-		query.setSize((Integer) queryMap.get("size"));
+		query.setSize((Integer) queryMap.get("pageSize"));
-		query.setCurrent((Integer) queryMap.get("current"));
+		query.setCurrent((Integer) queryMap.get("currentPage"));
 
 
 		QueryWrapper<WarehouseWarehousingEntryEntity> queryWrapper = Condition.getQueryWrapper(warehouseWarehousingEntry, WarehouseWarehousingEntryEntity.class);