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

sckw-common/sckw-common-core/src/main/java/com/sckw/core/common/enums/enums/DictEnum.java

@@ -20,6 +20,24 @@ public enum DictEnum {
     TRADE_TYPE_0("trade_type", "0", "预付款"),
     TRADE_TYPE_1("trade_type", "1", "货到付款"),
     TRADE_TYPE_2("trade_type", "2", "线下付款"),
+    PICKUP_TYPE_0("pickup_type", "0", "供应配送"),
+    PICKUP_TYPE_1("pickup_type", "1", "采方自提"),
+    DELIVERY_TYPE_0("delivery_type", "0", "签发交付"),
+    DELIVERY_TYPE_1("delivery_type", "1", "签收交付"),
+    TORDER_SOURCE_0("tOrder_source", "0", "采购下单"),
+    TORDER_SOURCE_1("tOrder_source", "1", "销售代客下单"),
+    TORDER_STATUS_0("tOrder_status", "0", "已保存"),
+    TORDER_STATUS_1("tOrder_status", "1", "待受理"),
+    TORDER_STATUS_2("tOrder_status", "2", "已退回"),
+    TORDER_STATUS_3("tOrder_status", "3", "待签约"),
+    TORDER_STATUS_4("tOrder_status", "4", "执行中"),
+    TORDER_STATUS_5("tOrder_status", "5", "已完结"),
+    TORDER_STATUS_6("tOrder_status", "6", "已对账"),
+    TORDER_STATUS_7("tOrder_status", "7", "已结算"),
+    TORDER_ADDRESS_TYPE_0("tOrder_address_type", "0", "装货地址"),
+    TORDER_ADDRESS_TYPE_1("tOrder_address_type", "1", "卸货地址"),
+    TORDER_UNIT_TYPE_1("tOrder_unit_type", "1", "销售单位"),
+    TORDER_UNIT_TYPE_2("tOrder_unit_type", "2", "采购单位"),
     ADDRESS_TYPE_0("address_type", "0", "矿山"),
     INDUSTRY_TYPE_0("industry_type", "0", "砂石"),
     CLASSIFICATION_TYPE_0("classification_type", "0", "石料"),

sckw-common/sckw-common-core/src/main/java/com/sckw/core/common/enums/enums/DictTypeEnum.java

@@ -14,6 +14,12 @@ public enum DictTypeEnum {
     INTEGRAL_TYPE("integral_type", "积分类型"),
     PRICE_TYPE("price_type", "运价方式"),
     TRADE_TYPE("trade_type", "交易方式"),
+    PICKUP_TYPE("pickup_type", "提货方式"),
+    DELIVERY_TYPE("delivery_type", "交付类型"),
+    TORDER_SOURCE("tOrder_source", "交易订单来源"),
+    TORDER_STATUS("tOrder_status", "交易订单状态"),
+    TORDER_ADDRESS_TYPE("tOrder_address_type", "交易订单地址类型"),
+    TORDER_UNIT_TYPE("tOrder_unit_type", "交易订单单位类型"),
     ADDRESS_TYPE("address_type", "地址类型"),
     INDUSTRY_TYPE("industry_type", "行业类型"),
     CLASSIFICATION_TYPE("classification_type", "分类类型"),

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/KwoTradeOrder.java

@@ -45,17 +45,17 @@ public class KwoTradeOrder extends BaseModel {
     /**
      * 交易方式(预付款、货到付款）
      */
-    private Long trading;
+    private String trading;
 
     /**
      * 提货方式（采方自提、供应配送）
      */
-    private Long pickupType;
+    private String pickupType;
 
     /**
      * 交付类型（签发交付、签收交付）
      */
-    private Long deliveryType;
+    private String deliveryType;
 
     /**
      * 开始日期
@@ -80,6 +80,6 @@ public class KwoTradeOrder extends BaseModel {
     /**
      * 订单创建来源类型（采购下单/销售代客下单）
      */
-    private Integer source;
+    private String source;
 
 }

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/KwoTradeOrderAddress.java

@@ -32,7 +32,7 @@ public class KwoTradeOrderAddress extends BaseModel {
     /**
      * 地址类型（1装货地址、2卸货地址）
      */
-    private Integer addressType;
+    private String addressType;
 
     /**
      * 地址名称
@@ -42,7 +42,7 @@ public class KwoTradeOrderAddress extends BaseModel {
     /**
      * 地址类型
      */
-    private Long type;
+    private String type;
 
     /**
      * 联系人姓名

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/KwpTransportDemand.java

@@ -49,7 +49,7 @@ public class KwpTransportDemand extends BaseModel {
     /**
      * 交易方式(预付款、货到付款、线下付款）
      */
-    private Long trading;
+    private String trading;
 
     /**
      * 运需单价（元）

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/KwpWantBuy.java

@@ -49,7 +49,7 @@ public class KwpWantBuy extends BaseModel {
     /**
      * 交易方式(预付款、货到付款、线下付款）
      */
-    private Integer trading;
+    private String trading;
 
     /**
      * 求购单价（元）

sckw-modules/sckw-product/src/main/java/com/sckw/product/controller/KwpGoodsController.java

@@ -3,6 +3,7 @@ package com.sckw.product.controller;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.product.model.vo.req.*;
 import com.sckw.product.service.KwpGoodsService;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.MediaType;
 import org.springframework.validation.annotation.Validated;
@@ -106,8 +107,8 @@ public class KwpGoodsController {
      * @return: com.sckw.core.web.response.HttpResult
      */
     @PostMapping(value = "/export", produces = MediaType.APPLICATION_JSON_VALUE)
-    public void export(@RequestBody ExportGoodsListParam params) {
-        kwpGoodsService.export(params);
+    public void export(@RequestBody ExportGoodsListParam params, HttpServletResponse response) {
+        kwpGoodsService.export(params,response);
     }
 
 

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/GoodsListExport.java

@@ -1,6 +1,7 @@
 package com.sckw.product.model;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.sckw.excel.annotation.ExcelContext;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -11,6 +12,7 @@ import lombok.experimental.Accessors;
  */
 @Data
 @Accessors(chain = true)
+@ExcelContext(sheetName = "商品列表信息",fileName = "商品列表信息")
 public class GoodsListExport {
 
     @ExcelProperty(value = "上架状态", index = 0)

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

@@ -17,7 +17,7 @@ import com.sckw.core.utils.CollectionUtils;
 import com.sckw.core.utils.StringUtils;
 import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.excel.utils.DateUtil;
-import com.sckw.excel.utils.EasyExcelUtil;
+import com.sckw.excel.utils.ExcelUtil;
 import com.sckw.product.dao.KwpGoodsMapper;
 import com.sckw.product.enums.GoodsStatusEnum;
 import com.sckw.product.model.*;
@@ -27,13 +27,13 @@ import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.model.dto.res.EntCacheResDto;
 import com.sckw.system.api.model.dto.res.SysAreaCacheResDto;
 import com.sckw.system.api.model.dto.res.UserCacheResDto;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.io.IOException;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -408,7 +408,7 @@ public class KwpGoodsService {
                 List<Long> entIds = entList.stream().map(EntCacheResDto::getId).toList();
                 if (CollectionUtils.isEmpty(entIds)) {
                     wrapper.like(KwpGoods::getName, params.getKeywords());
-                }else {
+                } else {
                     wrapper.and(e -> e.in(KwpGoods::getSupplyEntId, entIds).or().like(KwpGoods::getName, params.getKeywords()));
                 }
             }
@@ -458,7 +458,7 @@ public class KwpGoodsService {
      * @Param params:
      * @return: void
      */
-    public void export(ExportGoodsListParam params) {
+    public void export(ExportGoodsListParam params, HttpServletResponse response) {
         PageResult pageResult = select(BeanUtils.copyProperties(params, SelectGoodsListParam.class), false);
         List<GoodsList> goodsLists = pageResult.getList();
         List<GoodsListExport> list = new ArrayList<>();
@@ -471,8 +471,8 @@ public class KwpGoodsService {
             list.add(export);
         });
         try {
-            EasyExcelUtil.writeSingleExcel("商品列表信息", "sheet1", list, GoodsListExport.class);
-        } catch (IOException e) {
+            ExcelUtil.download(response, GoodsListExport.class, list);
+        } catch (Exception e) {
             throw new BusinessException("导出商品列表异常", e.getMessage());
         }
     }
@@ -564,7 +564,7 @@ public class KwpGoodsService {
             List<Long> entIds = entList.stream().map(EntCacheResDto::getId).toList();
             if (CollectionUtils.isNotEmpty(entIds)) {
                 wrapper.and(e -> e.in(KwpGoods::getSupplyEntId, entIds).or().like(KwpGoods::getName, params.getKeywords()));
-            }else {
+            } else {
                 wrapper.like(KwpGoods::getName, params.getKeywords());
             }
         }

sckw-modules/sckw-report/src/main/java/com/sckw/report/controller/KwTransportController.java

@@ -74,14 +74,14 @@ public class KwTransportController {
      * @return
      */
     @RequestMapping(value = "/export", method = RequestMethod.GET)
-    public HttpResult export(ConsignOrderQuery query) {
+    public HttpResult export(@Validated @RequestBody ConsignOrderQuery query) {
         HttpServletResponse response = RequestHolder.getResponse();
         List<ConsignOrderVo> list = transportService.export(query);
         if (!org.springframework.util.CollectionUtils.isEmpty(list)) {
             ExcelUtil.download(response, ConsignOrderVo.class, list);
             return null;
         }
-        return HttpResult.error("没有可导出的数据");
+        return HttpResult.ok("没有可导出的数据");
     }
 
 }

sckw-modules/sckw-report/src/main/java/com/sckw/report/service/KwTransportService.java

@@ -70,19 +70,26 @@ public class KwTransportService {
         Criteria c3 = new Criteria();
         Criteria c4 = new Criteria();
         Criteria c5 = new Criteria();
-        Pattern pattern = Pattern.compile("^.*" + query.getKeywords() + ".*$", Pattern.CASE_INSENSITIVE);
-        c1 = Criteria.where("firmName").regex(pattern);
-        c2 = Criteria.where("carrierFirmName").regex(pattern);
-        c3 = Criteria.where("checkFirmName").regex(pattern);
-        c4 = Criteria.where("tOrderNo").regex(pattern);
-        c5 = Criteria.where("lOrderNo").regex(pattern);
-        criteria.orOperator(c1, c2, c3, c4, c5);
+        if (StringUtils.isNotBlank(query.getKeywords())) {
+            Pattern pattern = Pattern.compile("^.*" + query.getKeywords() + ".*$", Pattern.CASE_INSENSITIVE);
+            c1 = Criteria.where("firmName").regex(pattern);
+            c2 = Criteria.where("carrierFirmName").regex(pattern);
+            c3 = Criteria.where("checkFirmName").regex(pattern);
+            c4 = Criteria.where("tOrderNo").regex(pattern);
+            c5 = Criteria.where("lOrderNo").regex(pattern);
+            criteria.orOperator(c1, c2, c3, c4, c5);
+        }
+
         Query query1 = new Query(criteria);
+        //in查询
+        if (CollectionUtils.isNotEmpty(query.getIds())) {
+            query1.addCriteria(Criteria.where("lOrderId").in(query.getIds()));
+        }
         // 12. 总记录数
         long total = mongoTemplate.count(query1, SckwLogisticsOrder.class);
         // 10. 分页
         query1.with(PageRequest.of(query.getPage() - 1, query.getPageSize(),
-                // 11. 排序
+                // 11. 排序list = {ArrayList@27436}  size = 3returnList = {ArrayList@27393}  size = 3
                 Sort.by(Sort.Order.desc("createTime"))));
         // 执行查询
         List<SckwLogisticsOrder> list = mongoTemplate.find(query1, SckwLogisticsOrder.class);
@@ -116,28 +123,24 @@ public class KwTransportService {
             criteria.andOperator(Criteria.where("createTime").gte(param.getStartDateTime()), Criteria.where("createTime")
                     .lte(param.getEndDateTime()));
         }
+        if (CollectionUtils.isNotEmpty(param.getIds())) {
+            criteria = Criteria.where("lOrderId").in(param.getIds());
+        }
         //多条件模糊查询
         Criteria c1 = new Criteria();
         Criteria c2 = new Criteria();
         Criteria c3 = new Criteria();
         Criteria c4 = new Criteria();
         Criteria c5 = new Criteria();
-        Pattern pattern = Pattern.compile("^.*" + param.getKeywords() + ".*$", Pattern.CASE_INSENSITIVE);
-        c1 = Criteria.where("firmName").regex(pattern);
-        c2 = Criteria.where("carrierFirmName").regex(pattern);
-        c3 = Criteria.where("checkFirmName").regex(pattern);
-        c4 = Criteria.where("tOrderNo").regex(pattern);
-        c5 = Criteria.where("lOrderNo").regex(pattern);
-        criteria.orOperator(c1, c2, c3, c4, c5);
-//        if (StringUtils.isNotBlank(param.getKeywords() )) {
-//            criteria.and("firmName").regex(Pattern.compile("^.*" + param.getKeywords()  + ".*$", Pattern.CASE_INSENSITIVE));
-//            criteria.and("carrierFirmName").regex(Pattern.compile("^.*" + param.getKeywords()  + ".*$", Pattern.CASE_INSENSITIVE));
-//            criteria.and("checkFirmName").regex(Pattern.compile("^.*" + param.getKeywords()  + ".*$", Pattern.CASE_INSENSITIVE));
-//            criteria.and("tOrderNo").regex(Pattern.compile("^.*" + param.getKeywords()  + ".*$", Pattern.CASE_INSENSITIVE));
-//            criteria.and("tOrderNo").regex(Pattern.compile("^.*" + param.getKeywords()  + ".*$", Pattern.CASE_INSENSITIVE));
-//            criteria.and("lOrderNo").regex(Pattern.compile("^.*" + param.getKeywords()  + ".*$", Pattern.CASE_INSENSITIVE));
-//
-//        }
+        if (StringUtils.isNotBlank(param.getKeywords())) {
+            Pattern pattern = Pattern.compile("^.*" + param.getKeywords() + ".*$", Pattern.CASE_INSENSITIVE);
+            c1 = Criteria.where("firmName").regex(pattern);
+            c2 = Criteria.where("carrierFirmName").regex(pattern);
+            c3 = Criteria.where("checkFirmName").regex(pattern);
+            c4 = Criteria.where("tOrderNo").regex(pattern);
+            c5 = Criteria.where("lOrderNo").regex(pattern);
+            criteria.orOperator(c1, c2, c3, c4, c5);
+        }
         Aggregation aggregation = Aggregation.newAggregation(
                 Aggregation.match(criteria),
                 Aggregation.group("status").count().as("total"),
@@ -177,20 +180,19 @@ public class KwTransportService {
         Criteria c3 = new Criteria();
         Criteria c4 = new Criteria();
         Criteria c5 = new Criteria();
-        Pattern pattern = Pattern.compile("^.*" + query.getKeywords() + ".*$", Pattern.CASE_INSENSITIVE);
-        c1 = Criteria.where("firmName").regex(pattern);
-        c2 = Criteria.where("carrierFirmName").regex(pattern);
-        c3 = Criteria.where("checkFirmName").regex(pattern);
-        c4 = Criteria.where("tOrderNo").regex(pattern);
-        c5 = Criteria.where("lOrderNo").regex(pattern);
-        criteria.orOperator(c1, c2, c3, c4, c5);
+        if (StringUtils.isNotBlank(query.getKeywords())) {
+            Pattern pattern = Pattern.compile("^.*" + query.getKeywords() + ".*$", Pattern.CASE_INSENSITIVE);
+            c1 = Criteria.where("firmName").regex(pattern);
+            c2 = Criteria.where("carrierFirmName").regex(pattern);
+            c3 = Criteria.where("checkFirmName").regex(pattern);
+            c4 = Criteria.where("tOrderNo").regex(pattern);
+            c5 = Criteria.where("lOrderNo").regex(pattern);
+            criteria.orOperator(c1, c2, c3, c4, c5);
+        }
         Query query1 = new Query(criteria);
-        // 12. 总记录数
-        long total = mongoTemplate.count(query1, SckwLogisticsOrder.class);
-        // 10. 分页
-        query1.with(PageRequest.of(query.getPage() - 1, query.getPageSize(),
-                // 11. 排序
-                Sort.by(Sort.Order.desc("createTime"))));
+        if (CollectionUtils.isNotEmpty(query.getIds())) {
+            query1.addCriteria(Criteria.where("lOrderId").in(query.getIds()));
+        }
         // 执行查询
         List<SckwLogisticsOrder> list = mongoTemplate.find(query1, SckwLogisticsOrder.class);
 //        PageResult build = PageResult.build(query.getPage(), query.getPageSize(), total, list);
@@ -240,6 +242,10 @@ public class KwTransportService {
             vo.setStatus(logisticsOrder.getStatus());
             vo.setUnloadAddress(logisticsOrder.getUnloadDetailAddress());
             vo.setWOrderNo(logisticsOrder.getWOrderNo());
+            vo.setCreateTime(logisticsOrder.getCreateTime() == null ?
+                    null : DateUtil.getDateTime(logisticsOrder.getCreateTime()));
+            vo.setUpdateTime(logisticsOrder.getUpdateTime() == null ?
+                    null : DateUtil.getDateTime(logisticsOrder.getUpdateTime()));
             returnList.add(vo);
         }
     }

sckw-modules/sckw-report/src/main/java/com/sckw/report/service/param/ConsignOrderQuery.java

@@ -5,6 +5,7 @@ import lombok.Data;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @author lfdc
@@ -14,6 +15,7 @@ import java.io.Serializable;
 @Data
 @Accessors(chain = true)
 public class ConsignOrderQuery extends PageRequest implements Serializable {
+    private List<Long> ids;
     /**
      * 计费方式
      */

sckw-modules/sckw-report/src/main/java/com/sckw/report/service/vo/ConsignOrderVo.java

@@ -1,6 +1,8 @@
 package com.sckw.report.service.vo;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.sckw.core.model.page.PageResult;
+import com.sckw.excel.annotation.ExcelContext;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -11,30 +13,37 @@ import java.io.Serializable;
  * @date 2023-07-07 09:07:06
  */
 @Data
+@ExcelContext(fileName = "托运订单列表", sheetName = "托运订单列表")
 public class ConsignOrderVo extends PageResult implements Serializable {
     /**
      * 结算周期
      */
+    @ExcelProperty(value = "结算周期")
     private String accountsCycle;
     /**
      * 发起人
      */
+    @ExcelProperty(value = "发起人")
     private String appointor;
     /**
      * 计费方式
      */
+    @ExcelProperty(value = "计费方式")
     private String billingMode;
     /**
      * 承运单位
      */
+    @ExcelProperty(value = "承运单位")
     private String carrierCompany;
     /**
      * 承运联系人
      */
+    @ExcelProperty(value = "承运联系人")
     private String carrierContacts;
     /**
      * 承运订单
      */
+    @ExcelProperty(value = "承运订单")
     private String carrierOrder;
     /**
      * 承运联系电话
@@ -136,4 +145,6 @@ public class ConsignOrderVo extends PageResult implements Serializable {
      * 关联承运订单号
      */
     private String wOrderNo;
+    private String createTime;
+    private String updateTime;
 }

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

@@ -198,7 +198,7 @@ public class LogisticsConsignmentService {
         logisticsOrder.setUpdateByName(LoginUserHolder.getUserName());
         logisticsOrder.setUpdateTime(new Date());
         logisticsOrder.setGoodsPriceUnit(bo.getGoodsPriceUnit());
-        logisticsOrder.setContractName(new Date() + bo.getContractName());
+        logisticsOrder.setContractName(bo.getContractName());
         logisticsOrder.setBillingMode(bo.getBillingMode());
         //rabbitMq业务汇总数据发送/消费对象
         SckwBusSum busSum = new SckwBusSum();

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/dubbo/TransportDubboServiceImpl.java

@@ -1,10 +1,16 @@
 package com.sckw.transport.service.dubbo;
 
+import com.sckw.transport.api.dubbo.TransportDubboService;
+import org.apache.dubbo.config.annotation.DubboService;
+import org.springframework.stereotype.Service;
+
 /**
  * @author lfdc
  * @description 运输服务dubbo接口
  * @date 2023-07-11 14:07:28
  */
-public class TransportDubboServiceImpl implements TransportDubboService{
+@Service
+@DubboService(group = "design", version = "2.0.0")
+public class TransportDubboServiceImpl implements TransportDubboService {
 
 }