Merge remote-tracking branch 'origin/dev_20251130' into dev_20251130

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/operateService/KwcContractLogisticsService.java

@@ -1628,7 +1628,7 @@ public class KwcContractLogisticsService {
         }
 
         if(org.apache.commons.collections4.CollectionUtils.isEmpty(contractIdList)
-                && !org.apache.commons.lang3.StringUtils.isAllBlank(req.getConsignCompanyId(),req.getCarriageCompanyId())){
+                && (!org.apache.commons.lang3.StringUtils.isAllBlank(req.getConsignCompanyId(),req.getCarriageCompanyId()) || Objects.nonNull(entId))){
             Map<Integer, List<KwcContractLogistics>> statusAndLogOrdersMap = new HashMap<>();
             List<ContractStatusCountResp.ContractStatusCount> statusCounts = statusEnums.stream()
                     .map(x -> getContractStatusCount(x, statusAndLogOrdersMap))

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/operateService/KwcContractTradeService.java

@@ -2030,7 +2030,7 @@ public class KwcContractTradeService {
             }
         }
         if (org.apache.commons.collections4.CollectionUtils.isEmpty(contractIds)
-                && !org.apache.commons.lang3.StringUtils.isAllBlank(req.getPurchaseEntId(), req.getSupplyEntId())) {
+                && (!org.apache.commons.lang3.StringUtils.isAllBlank(req.getPurchaseEntId(), req.getSupplyEntId()) || Objects.nonNull(entId))) {
             Map<Integer, List<KwcContractTrade>> statusAndLogOrdersMap = new HashMap<>();
             List<ContractStatusCountResp.ContractStatusCount> statusCounts = statusEnums.stream()
                     .map(x -> getContractStatusCount(x, statusAndLogOrdersMap))

sckw-modules/sckw-order/src/main/java/com/sckw/order/controller/KwoTradeOrderController.java

@@ -56,7 +56,7 @@ public class KwoTradeOrderController {
         TradeOrderPara tradeOrderPara = new TradeOrderPara();
         tradeOrderPara.setStartTime(LocalDateTimeUtil.parse(orderPara.getStartTime(), "yyyy-MM-dd HH:mm:ss"));
         tradeOrderPara.setEndTime(LocalDateTimeUtil.parse(orderPara.getEndTime(), "yyyy-MM-dd HH:mm:ss"));
-        orderPara.setUserId(orderPara.getUserId());
+        tradeOrderPara.setUserId(orderPara.getUserId());
         return HttpResult.ok("查询成功", kwoTradeOrderService.queryOrder(tradeOrderPara));
     }
 

sckw-modules/sckw-product/src/main/java/com/sckw/product/service/KwpGoodsService.java

@@ -1028,7 +1028,11 @@ public class KwpGoodsService {
             if (Objects.nonNull(params.getSign())) {//查询签约或未签约商品
                 List<Long> longs = tradeOrderInfoService.querySignGoods(LoginUserHolder.getEntId());
                 if (Objects.equals(params.getSign(), 1)) {
-                    wrapper.in(CollUtil.isNotEmpty(longs), KwpGoods::getId, longs);
+                    if (CollUtil.isNotEmpty(longs)) {
+                        wrapper.in(KwpGoods::getId, longs);
+                    } else {
+                        wrapper.eq(KwpGoods::getId, 0L);
+                    }
                 } else {
                     wrapper.notIn(CollUtil.isNotEmpty(longs), KwpGoods::getId, longs);
                 }
@@ -1455,7 +1459,7 @@ public class KwpGoodsService {
         if (org.apache.commons.collections4.CollectionUtils.isEmpty(goods)) {
             return new GoodsInfoResp();
         }
-        List<String> types = Arrays.asList(DictTypeEnum.PRODUCT_NAME_TYPE.getType(), DictTypeEnum.UNIT_TYPE.getType());
+        List<String> types = Arrays.asList(DictTypeEnum.PRODUCT_NAME_TYPE.getType(), DictTypeEnum.GOODS_SPEC.getType());
         //组装商品参数
         Map<String, Map<String, String>> finalValueAndDictResDtoMap = remoteSystemService.queryDictByType(types);
 
@@ -1473,8 +1477,9 @@ public class KwpGoodsService {
         goodsInfo.setGoodsId(x.getId());
 
         Map<String, String> productNameMap = valueAndDictResDtoMap.getOrDefault(DictTypeEnum.PRODUCT_NAME_TYPE.getType(), new HashMap<>());
-        String productType = productNameMap.get(x.getGoodsType());
-        goodsInfo.setGoodsName(x.getName() + "/" + productType + "/" + x.getSpec());
+        Map<String, String> goodsSpecMap = valueAndDictResDtoMap.getOrDefault(DictTypeEnum.GOODS_SPEC.getType(), new HashMap<>());
+        String productType = productNameMap.getOrDefault(x.getGoodsType(), "");
+        goodsInfo.setGoodsName(x.getName() + "/" + productType + "/" + goodsSpecMap.getOrDefault(x.getSpec(), ""));
 
         Map<String, String> unitMap = valueAndDictResDtoMap.getOrDefault(DictTypeEnum.UNIT_TYPE.getType(), new HashMap<>());
         goodsInfo.setAmountUnit(unitMap.get(x.getUnit()));
@@ -1508,8 +1513,8 @@ public class KwpGoodsService {
         List<EntCacheResDto> entList = remoteSystemService.queryEntCacheByIds(supplyEntIds);
         Map<Long, String> entMap = entList.stream().collect(Collectors.toMap(EntCacheResDto::getId, EntCacheResDto::getFirmName, (k1, k2) -> k1));
         Map<String, Map<String, String>> dict = remoteSystemService.queryDictByType(List.of(DictTypeEnum.PRODUCT_NAME_TYPE.getType(),
-                DictTypeEnum.UNIT_TYPE.getType(),DictTypeEnum.GOODS_SPEC.getType()));
-        Map<String, String> productNameMap, unitMap,goodsMap;
+                DictTypeEnum.UNIT_TYPE.getType(), DictTypeEnum.GOODS_SPEC.getType()));
+        Map<String, String> productNameMap, unitMap, goodsMap;
         if (CollectionUtils.isNotEmpty(dict)) {
             productNameMap = dict.get(DictTypeEnum.PRODUCT_NAME_TYPE.getType());
             unitMap = dict.get(DictTypeEnum.UNIT_TYPE.getType());

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/KwtLogisticsOrderController.java

@@ -217,7 +217,7 @@ public class KwtLogisticsOrderController {
         LogisticsOrderPara tradeOrderPara = new LogisticsOrderPara();
         tradeOrderPara.setStartTime(LocalDateTimeUtil.parse(orderPara.getStartTime(), "yyyy-MM-dd HH:mm:ss"));
         tradeOrderPara.setEndTime(LocalDateTimeUtil.parse(orderPara.getEndTime(), "yyyy-MM-dd HH:mm:ss"));
-        orderPara.setUserId(orderPara.getUserId());
+        tradeOrderPara.setUserId(orderPara.getUserId());
         return HttpResult.ok(logisticsConsignmentService.queryList(tradeOrderPara));
     }
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtWaybillOrderV1Service.java

@@ -2977,7 +2977,7 @@ public class KwtWaybillOrderV1Service {
         //物流订单号集合
         Set<Long> logOrderIds = getLogOrderIds(req);
         boolean b1 = !org.apache.commons.lang3.StringUtils.isAllBlank(req.getLogisticsOrderNo(), req.getGoodsName(),
-                req.getCarrierId(), req.getConsignorId(),req.getLogisticsOrderId()) || !Objects.nonNull(LoginUserHolder.getEntId());
+                req.getCarrierId(), req.getConsignorId(),req.getLogisticsOrderId()) || Objects.nonNull(LoginUserHolder.getEntId());
         if(org.apache.commons.collections4.CollectionUtils.isEmpty(logOrderIds) && b1){
             return PageDataResult.empty(req.getPageNum(), req.getPageSize());
         }