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

sckw-common/sckw-common-core/src/main/java/com/sckw/core/filter/RequestCheckFilter.java

@@ -172,4 +172,9 @@ public class RequestCheckFilter implements Filter {
     private boolean checkMenu(String clientType, Long userId, String url) {
         return RedissonUtils.contains(Global.REDIS_SYS_MENU_PREFIX + clientType + Global.COLON + userId, url);
     }
+
+    public static void main(String[] args) {
+        Map<String, Object> tokenMap = EncryUtil.descryV2(Global.PRI_KEY, "dade5058e78847ca5672263c5b821fc09d06083611ab0f6d076af88f082f05384838b3714729e48088c6fc1d1c09763e85e35675a20ac9df50e443b92e1c18e06f9951c7d6a2905a79b889f8617ab143fc97350b5c68f0512f7c18dbf2e49eaf");
+        System.out.println(tokenMap);
+    }
 }

sckw-common/sckw-common-excel/src/main/java/com/sckw/excel/utils/ExcelUtil.java

@@ -109,7 +109,10 @@ public class ExcelUtil {
         response.setContentType("application/vnd.ms-excel");
         response.setCharacterEncoding("UTF-8");
         response.setHeader("Access-Control-Expose-Headers", "Content-disposition");
+        //下面 浏览器下载正常，但是postman下载文件名称乱码
         response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
+        //下面这是用postman测名称正常，换到浏览器会多了filename_=utf-8等字样。。）
+//        response.setHeader("Content-disposition", "attachment;filename=" + URLEncoder.encode(fileName, "UTF-8")+ ".xlsx" + ";filename*=utf-8''" + URLEncoder.encode(fileName, "UTF-8")+ ".xlsx");
     }
 
     private static void buildResponse(HttpServletResponse response, Exception e) {

sckw-modules/sckw-report/pom.xml

@@ -87,6 +87,12 @@
             <version>1.0.0</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.sckw</groupId>
+            <artifactId>sckw-fleet-api</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+
 
         <!--junit-->
         <dependency>

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsUserService.java

@@ -1,13 +1,10 @@
 package com.sckw.system.service;
 
-import com.alibaba.fastjson.JSON;
-import com.sckw.core.annotation.RepeatSubmit;
 import com.sckw.core.common.enums.enums.DictEnum;
 import com.sckw.core.exception.SystemException;
 import com.sckw.core.model.constant.Global;
 import com.sckw.core.model.enums.ApprovalEnum;
 import com.sckw.core.model.enums.SystemTypeEnum;
-import com.sckw.core.model.page.PageResult;
 import com.sckw.core.utils.*;
 import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.context.LoginUserHolder;
@@ -19,7 +16,6 @@ import com.sckw.system.api.model.dto.req.UpdatePasswordReqDto;
 import com.sckw.system.api.model.dto.res.AreaTreeFrontResDto;
 import com.sckw.system.api.model.dto.res.KwsUserResDto;
 import com.sckw.system.api.model.dto.res.RegisterResDto;
-import com.sckw.system.api.model.dto.res.SysDictResDto;
 import com.sckw.system.dao.*;
 import com.sckw.system.dubbo.RemoteSystemServiceImpl;
 import com.sckw.system.model.*;
@@ -612,7 +608,10 @@ public class KwsUserService {
     }
 
     public List<AreaTreeFrontResDto> test(List<Integer> list) {
-        System.out.println(JSON.toJSONString(LoginUserHolder.authUserIdList()));
+
+
+        List<Long> longs = LoginUserHolder.getAuthUserIdList();
+
 //        PageResult pageResult = remoteUserService.queryEntInfoByCityCodeAndEntTypesWithPage(null, Collections.singletonList(1), 1, 10);
         return null;
     }

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

@@ -1363,7 +1363,7 @@ public class AcceptCarriageOrderService {
             });
         }
         /**是否是一级订单,是->推送至贸易,否,数据推送至物流订单上级*/
-        if (logisticsOrder.getPid() == null) {
+        if (logisticsOrder.getPid() != null) {
             //数据推送至贸易订单
             CompleteLogisticsOrderParam tradeOrder = new CompleteLogisticsOrderParam();
             //获取实际装货量-实际卸货量
@@ -1385,10 +1385,11 @@ public class AcceptCarriageOrderService {
             tradeOrder.setActualUnloadAmount(map.get("totalUnloadAmount"));
             tradeOrder.setUpdateBy(LoginUserHolder.getUserId());
             tradeOrder.setUpdateByName(LoginUserHolder.getUserName());
+            log.info("承运订单-分包托运-手动完结订单请求参数:{}",JSONObject.toJSONString(tradeOrder));
             HttpResult httpResult = tradeOrderInfoService.completeLogisticsOrder(tradeOrder);
             if (httpResult.getCode() != HttpStatus.SUCCESS_CODE) {
-                log.info("贸易订单手动完结订单异常,传递信息:{},返回信息:{}", JSONObject.toJSONString(tradeOrder), JSONObject.toJSONString(httpResult));
-                throw new BusinessException("单据完结出现错误！");
+                log.info("承运订单-分包托运-手动完结订单异常,传递信息:{},返回信息:{}", JSONObject.toJSONString(tradeOrder), JSONObject.toJSONString(httpResult));
+                throw new BusinessException("单据完结出现错误！"+httpResult.getMsg());
             }
         }
 

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

@@ -810,7 +810,7 @@ public class ConsignOrderService {
             });
         }
         /**是否是一级订单,是->推送至贸易,否,数据推送至物流订单上级*/
-        if (logisticsOrder.getPid() == null) {
+        if (logisticsOrder.getPid() != null) {
             //数据推送至贸易订单
             CompleteLogisticsOrderParam tradeOrder = new CompleteLogisticsOrderParam();
             //获取实际装货量-实际卸货量
@@ -832,10 +832,11 @@ public class ConsignOrderService {
             tradeOrder.setActualUnloadAmount(map.get("totalUnloadAmount"));
             tradeOrder.setUpdateBy(LoginUserHolder.getUserId());
             tradeOrder.setUpdateByName(LoginUserHolder.getUserName());
+            log.info("托运订单手动完结请求参数:{}", JSONObject.toJSONString(tradeOrder));
             HttpResult httpResult = tradeOrderInfoService.completeLogisticsOrder(tradeOrder);
             if (httpResult.getCode() != HttpStatus.SUCCESS_CODE) {
                 log.info("贸易订单手动完结订单异常,传递信息:{},返回信息:{}", JSONObject.toJSONString(tradeOrder), JSONObject.toJSONString(httpResult));
-                throw new BusinessException("单据完结出现错误！");
+                throw new BusinessException("单据完结出现错误！" + httpResult.getMsg());
             }
         }
 

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

@@ -1236,10 +1236,11 @@ public class LogisticsConsignmentService {
         tradeOrder.setActualUnloadAmount(map.get("totalUnloadAmount"));
         tradeOrder.setUpdateBy(LoginUserHolder.getUserId());
         tradeOrder.setUpdateByName(LoginUserHolder.getUserName());
+        log.info("采购订单手动完结订单请求参数:{}",JSONObject.toJSONString(tradeOrder));
         HttpResult httpResult = tradeOrderInfoService.completeLogisticsOrder(tradeOrder);
         if (httpResult.getCode() != HttpStatus.SUCCESS_CODE) {
-            log.info("贸易订单手动完结订单异常,传递信息:{},返回信息:{}", JSONObject.toJSONString(tradeOrder), JSONObject.toJSONString(httpResult));
-            throw new BusinessException("单据完结出现错误！");
+            log.info("贸易订单-采购订单/销售订单-手动完结订单异常,传递信息:{},返回信息:{}", JSONObject.toJSONString(tradeOrder), JSONObject.toJSONString(httpResult));
+            throw new BusinessException("单据完结出现错误！" + httpResult.getMsg());
         }
         //todo 直接订单完结-不递归操作
 //

sckw-modules/sckw-transport/src/main/resources/mapper/KwtLogisticsOrderMapper.xml

@@ -848,6 +848,12 @@
             a.del_flag = 0
             <if test="type == 1">
                 and (d.top_ent_id = #{entId} or d.ent_id = #{entId})
+<!--                AND (-->
+<!--                a.ent_id = 156382319450525696-->
+<!--                AND a.create_by IN ( 156382319433748480 ))-->
+<!--                OR (-->
+<!--                ( d.top_ent_id = 156382319450525696 OR d.ent_id = 156382319450525696 )-->
+<!--                AND d.contacts_id IN ( 156382319433748480, 156382319433748480 ))-->
             </if>
             <if test="type == 2">
                 and (e.top_ent_id = #{entId} or e.ent_id = #{entId})