采购/销售/承运/托运-撤销托运根据原型新增字段补充

sckw-common/sckw-common-core/src/main/java/com/sckw/core/model/vo/BaseList.java

@@ -2,6 +2,7 @@ package com.sckw.core.model.vo;
 
 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
+import org.hibernate.validator.constraints.Length;
 
 /**
  * @author lfdc
@@ -19,5 +20,6 @@ public class BaseList {
     /**
      * 备注
      */
+    @Length(max = 200,message = "备注长度错误最大长度:{max}")
     private String remark;
 }

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

@@ -190,7 +190,7 @@ public class LogisticsConsignmentController {
     /**
      * 销售订单-托运订单列表-销售订单id
      *
-     * @param ids 销售订单id
+     * @param query 订单查询
      * @return
      */
     @RequestMapping(value = "/sellLogisticsOrder", method = RequestMethod.POST)
@@ -225,7 +225,7 @@ public class LogisticsConsignmentController {
     /**
      * 销售订单-车辆列表-销售订单id
      *
-     * @param ids 销售订单ids
+     * @param orderQuery 销售订单ids
      * @return
      */
     @RequestMapping(value = "/sellLogisticsCar", method = RequestMethod.POST)
@@ -242,7 +242,7 @@ public class LogisticsConsignmentController {
     /**
      * 销售订单-托运订单列表-撤销托运
      *
-     * @param ids 物流订单id
+     * @param baseList 物流订单id
      * @return
      */
     @RequestMapping(value = "/sellCancelConsign", method = RequestMethod.POST)

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/dto/CancelOrderDTO.java

@@ -3,6 +3,7 @@ package com.sckw.transport.model.dto;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
+import org.hibernate.validator.constraints.Length;
 
 /**
  * @author lfdc
@@ -25,4 +26,11 @@ public class CancelOrderDTO {
     @JsonProperty("type")
     @NotNull(message = "单据类型不能为空")
     private String type;
+
+    /**
+     * 备注
+     */
+    @JsonProperty("remark")
+    @Length(max = 200,message = "备注长度错误最大长度:{max}")
+    private String remark;
 }

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

@@ -1,16 +0,0 @@
-package com.sckw.transport.service;
-
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-/**
- * @author lfdc
- * @description 承运物流service
- * @date 2023-06-26 16:06:12
- */
-@Slf4j
-@Service
-public class AcceptCarriageLogisticsService {
-
-
-}

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

@@ -910,7 +910,7 @@ public class LogisticsConsignmentService {
      *
      * @param ids
      */
-    private void cancelConsignBySellOrder(List<String> ids, String remark, List<JSONObject> list) {
+    public void cancelConsignBySellOrder(List<String> ids, String remark, List<JSONObject> list) {
         ids.forEach(s -> {
             JSONObject jsonObject = new JSONObject();
             jsonObject.put("id", s);
@@ -990,7 +990,7 @@ public class LogisticsConsignmentService {
      *
      * @param ids
      */
-    private void cancelConsignByOrder(List<String> ids, String remark, List<JSONObject> list) {
+    public void cancelConsignByOrder(List<String> ids, String remark, List<JSONObject> list) {
         ids.forEach(s -> {
             /**当前单据作废
              * 托运数量回归溯源
@@ -1015,9 +1015,9 @@ public class LogisticsConsignmentService {
                 param.setUpdateByName(LoginUserHolder.getUserName());
                 HttpResult httpResult = tradeOrderInfoService.createOrCancelLogisticsOrder(param);
                 if (HttpStatus.SUCCESS_CODE == httpResult.getCode()) {
-                    kwtLogisticsOrder.setDelFlag(NumberConstant.ONE);
-                    kwtLogisticsOrder.setUpdateTime(new Date());
-                    kwtLogisticsOrder.setUpdateBy(LoginUserHolder.getUserId());
+//                    kwtLogisticsOrder.setDelFlag(NumberConstant.ONE);
+//                    kwtLogisticsOrder.setUpdateTime(new Date());
+//                    kwtLogisticsOrder.setUpdateBy(LoginUserHolder.getUserId());
                     kwtLogisticsOrderMapper.update(null, new LambdaUpdateWrapper<KwtLogisticsOrder>()
                             .eq(KwtLogisticsOrder::getId, kwtLogisticsOrder.getId())
                             .set(KwtLogisticsOrder::getStatus, LogisticsOrderEnum.CANCEL_ORDER.getCode())

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

@@ -11,6 +11,7 @@ import com.sckw.core.common.enums.enums.DictTypeEnum;
 import com.sckw.core.model.enums.LogisticsOrderEnum;
 import com.sckw.core.model.page.PageResult;
 import com.sckw.core.utils.CollectionUtils;
+import com.sckw.core.utils.IdWorker;
 import com.sckw.core.utils.StringUtils;
 import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.context.LoginUserHolder;
@@ -210,7 +211,7 @@ public class TransportCommonService {
         HttpResult result = new HttpResult();
         KwtLogisticsOrder logisticsOrder = logisticsOrderMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrder>()
                         .eq(KwtLogisticsOrder::getId, orderDto.getId())
-                       /* .eq(KwtLogisticsOrder::getLOrderNo, orderDto.getOrderNo())*/
+                /* .eq(KwtLogisticsOrder::getLOrderNo, orderDto.getOrderNo())*/
                 /**.eq(KwtLogisticsOrder::getEntId, LoginUserHolder.getEntId())*/);
         if (logisticsOrder == null) {
             result.setCode(HttpStatus.GLOBAL_EXCEPTION_CODE);
@@ -241,6 +242,7 @@ public class TransportCommonService {
                     .set(KwtLogisticsOrder::getStatus, LogisticsOrderEnum.CANCEL_ORDER.getCode())
                     .set(KwtLogisticsOrder::getUpdateBy, LoginUserHolder.getUserId())
                     .set(KwtLogisticsOrder::getUpdateTime, new Date()));
+            updateOrderTrack(logisticsOrder.getId(),orderDto.getRemark(),LogisticsOrderEnum.CANCEL_ORDER);
             //mongodb更新
             SckwLogisticsOrder order = new SckwLogisticsOrder();
             order.set_id(logisticsOrder.getId());
@@ -248,6 +250,7 @@ public class TransportCommonService {
             order.setStatus(LogisticsOrderEnum.CANCEL_ORDER.getStatus());
             order.setUpdateTime(new Date());
             order.setUpdateByName(LoginUserHolder.getUserName());
+            order.setUpdateBy(LoginUserHolder.getUserId());
             SckwBusSum busSum = new SckwBusSum();
             //业务汇总类型
             busSum.setBusSumType(BusinessTypeEnum.LOGISTICS_ORDER_TYPE.getName());
@@ -276,19 +279,23 @@ public class TransportCommonService {
                     .set(KwtLogisticsOrder::getSubcontractAmount, add)
                     .set(KwtLogisticsOrder::getUpdateBy, LoginUserHolder.getUserId())
                     .set(KwtLogisticsOrder::getUpdateTime, new Date()));
-            /**下游订单进行删除*/
+//            updateOrderTrack(logisticsOrder.getId(),orderDto.getRemark(),LogisticsOrderEnum.CANCEL_ORDER);
+            /**下游订单进行状态改变*/
             logisticsOrderMapper.update(null, new LambdaUpdateWrapper<KwtLogisticsOrder>()
                     .eq(KwtLogisticsOrder::getId, logisticsOrder.getId())
                     .set(KwtLogisticsOrder::getStatus, LogisticsOrderEnum.CANCEL_ORDER.getCode())
                     .set(KwtLogisticsOrder::getUpdateBy, LoginUserHolder.getUserId())
                     .set(KwtLogisticsOrder::getUpdateTime, new Date()));
+            updateOrderTrack(logisticsOrder.getId(),orderDto.getRemark(),LogisticsOrderEnum.CANCEL_ORDER);
             /**mongodb更新*/
+            //父级
             SckwLogisticsOrder sckwLogisticsOrder = new SckwLogisticsOrder();
-            sckwLogisticsOrder.set_id(logisticsOrder.getId());
-            sckwLogisticsOrder.setLOrderId(logisticsOrder.getId());
-            sckwLogisticsOrder.setStatus(LogisticsOrderEnum.CANCEL_ORDER.getStatus());
+            sckwLogisticsOrder.set_id(order.getId());
+            sckwLogisticsOrder.setLOrderId(order.getId());
+            sckwLogisticsOrder.setSubcontractAmount(add);
             sckwLogisticsOrder.setUpdateTime(new Date());
             sckwLogisticsOrder.setUpdateByName(LoginUserHolder.getUserName());
+            sckwLogisticsOrder.setUpdateBy(LoginUserHolder.getUserId());
             SckwBusSum busSum = new SckwBusSum();
             //业务汇总类型
             busSum.setBusSumType(BusinessTypeEnum.LOGISTICS_ORDER_TYPE.getName());
@@ -296,6 +303,7 @@ public class TransportCommonService {
             busSum.setMethod(NumberConstant.TWO);
             //业务汇总数据对象
             busSum.setObject(sckwLogisticsOrder);
+            //当前级
             streamBridge.send("sckw-busSum", JSON.toJSONString(busSum));
             SckwLogisticsOrder logisticsOrder1 = new SckwLogisticsOrder();
             logisticsOrder1.set_id(logisticsOrder.getId());
@@ -303,6 +311,7 @@ public class TransportCommonService {
             logisticsOrder1.setStatus(LogisticsOrderEnum.CANCEL_ORDER.getStatus());
             logisticsOrder1.setUpdateTime(new Date());
             logisticsOrder1.setUpdateByName(LoginUserHolder.getUserName());
+            sckwLogisticsOrder.setUpdateBy(LoginUserHolder.getUserId());
             SckwBusSum busSum1 = new SckwBusSum();
             //业务汇总类型
             busSum1.setBusSumType(BusinessTypeEnum.LOGISTICS_ORDER_TYPE.getName());
@@ -315,6 +324,37 @@ public class TransportCommonService {
         return result;
     }
 
+    /**
+     * 根据物流订单修改物流状态表
+     * @param id
+     * @param remark
+     * @param logisticsOrderEnum
+     */
+    private void updateOrderTrack(Long id,String remark,LogisticsOrderEnum logisticsOrderEnum) {
+        KwtLogisticsOrderTrack orderTrack = logisticsOrderTrackMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderTrack>()
+                .eq(KwtLogisticsOrderTrack::getLOrderId, id)
+                .eq(KwtLogisticsOrderTrack::getStatus, logisticsOrderEnum.getCode())
+        );
+        if (orderTrack == null) {
+            KwtLogisticsOrderTrack track = new KwtLogisticsOrderTrack();
+            track.setId(new IdWorker(NumberConstant.ONE).nextId());
+            track.setLOrderId(id);
+            track.setRemark(remark);
+            track.setStatus(LogisticsOrderEnum.CANCEL_ORDER.getCode());
+            track.setCreateBy(LoginUserHolder.getUserId());
+            track.setCreateTime(new Date());
+            track.setUpdateBy(LoginUserHolder.getUserId());
+            track.setUpdateTime(new Date());
+            logisticsOrderTrackMapper.insert(track);
+        } else {
+            orderTrack.setRemark(remark);
+            orderTrack.setStatus(LogisticsOrderEnum.CANCEL_ORDER.getCode());
+            orderTrack.setUpdateBy(LoginUserHolder.getUserId());
+            orderTrack.setUpdateTime(new Date());
+            logisticsOrderTrackMapper.updateById(orderTrack);
+        }
+    }
+
     /**
      * 对账管理-运费收款对账界面查询接口
      *