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

sckw-modules/sckw-fleet/src/main/resources/mapper/KwfTruckReportMapper.xml

@@ -43,13 +43,13 @@
             <choose>
                 <when test="entIds != null and entIds != '' and entIds.size() > 0">
                     or (
-                        trr.truck_id in (select truck_id from kwf_truck_ent where del_flag = 0 and ent_id in
+                        trr.truck_id in (select id from kwf_truck where del_flag = 0 and ent_id in
                         <foreach collection="entIds" item="id" open="(" close=")" separator=",">
                             #{id,jdbcType=BIGINT}
                         </foreach>
                         )
                         or
-                        trr.driver_id in (select driver_id from kwf_driver_ent where del_flag = 0 and ent_id in
+                        trr.driver_id in (select id from kwf_driver where del_flag = 0 and ent_id in
                         <foreach collection="entIds" item="id" open="(" close=")" separator=",">
                             #{id,jdbcType=BIGINT}
                         </foreach>
@@ -128,13 +128,13 @@
             <choose>
                 <when test="entIds != null and entIds != '' and entIds.size() > 0">
                     or (
-                        trr.truck_id in (select truck_id from kwf_truck_ent where del_flag = 0 and ent_id in
+                        trr.truck_id in (select id from kwf_truck where del_flag = 0 and ent_id in
                         <foreach collection="entIds" item="id" open="(" close=")" separator=",">
                             #{id,jdbcType=BIGINT}
                         </foreach>
                         )
                         or
-                        trr.driver_id in (select driver_id from kwf_driver_ent where del_flag = 0 and ent_id in
+                        trr.driver_id in (select id from kwf_driver where del_flag = 0 and ent_id in
                         <foreach collection="entIds" item="id" open="(" close=")" separator=",">
                             #{id,jdbcType=BIGINT}
                         </foreach>

sckw-modules/sckw-message/src/main/java/com/sckw/message/model/vo/res/UserCenterMsgVO.java

@@ -59,7 +59,7 @@ public class UserCenterMsgVO implements Serializable {
     /**
      * 创建时间
      */
-    @JsonFormat(pattern="HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
 }

sckw-modules/sckw-order/src/main/java/com/sckw/order/serivce/KwoTradeOrderService.java

@@ -432,7 +432,11 @@ public class KwoTradeOrderService {
         BigDecimal amount = param.getAmount();
         String trading = param.getTrading();
         BigDecimal price = param.getPrice();
-        if (!isAcceptanceOrder) {
+        KwpGoods goods = goodsInfoService.getGoodsById(param.getGoodsId());
+        if (Objects.isNull(goods) || Objects.equals(goods.getDelFlag(), Global.YES) ) {
+            throw new BusinessException("商品不存在！");
+        }
+        if (Boolean.FALSE.equals(isAcceptanceOrder)) {
             if (price.compareTo(amount.multiply(param.getUnitPrice())) != 0) {
                 throw new BusinessException("订单总金额不等于商品单价*订单总量！");
             }
@@ -447,13 +451,9 @@ public class KwoTradeOrderService {
             if (CollectionUtils.isEmpty(entCooperate)) {
                 throw new BusinessException("供采双方企业无合作关系！");
             }
-        }
-        KwpGoods goods = goodsInfoService.getGoodsById(param.getGoodsId());
-        if (Objects.isNull(goods) || Objects.equals(goods.getDelFlag(), Global.YES) || !Objects.equals(goods.getStatus(), 1)) {
-            throw new BusinessException("商品不存在或已下架！");
-        }
-        if (goods.getAmount().compareTo(amount) < 0) {
-            throw new BusinessException("商品库存不足，请联系供应方！");
+            if (goods.getAmount().compareTo(amount) < 0) {
+                throw new BusinessException("商品库存不足，请联系供应方！");
+            }
         }
         //支付方式预付款校验
         if (trading.startsWith("1")) {

sckw-modules/sckw-order/src/main/resources/mapper/KwoWantBuyMapper.xml

@@ -57,11 +57,19 @@
 <!--                #{item,jdbcType=VARCHAR}-->
 <!--            </foreach>-->
             <!-- 使用 AND 条件 -->
-            and (
-            <foreach collection="wantBuyReq.tradings" item="item" separator=" and ">
-                kt.trading = #{item,jdbcType=VARCHAR}
+<!--            and (-->
+<!--            <foreach collection="wantBuyReq.tradings" item="item" separator=" and ">-->
+<!--                kt.trading = #{item,jdbcType=VARCHAR}-->
+<!--            </foreach>-->
+<!--            )-->
+            <foreach collection="wantBuyReq.tradings" item="value" separator="">
+                AND EXISTS (
+                SELECT 1
+                FROM kwo_want_buy_trading kt2
+                WHERE kt2.want_buy_id = kb.id
+                AND kt2.trading = #{value}
+                )
             </foreach>
-            )
         </if>
         <if test="wantBuyReq.wantBuyIds != null and wantBuyReq.wantBuyIds.size() > 0">
             and kb.id in

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/vo/req/AddGoodsDraftParam.java

@@ -2,12 +2,12 @@ package com.sckw.product.model.vo.req;
 
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
-import org.apache.logging.log4j.core.config.plugins.validation.constraints.NotBlank;
 import org.hibernate.validator.constraints.Length;
 import org.hibernate.validator.constraints.Range;
 

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/vo/req/AddGoodsParam.java

@@ -1,14 +1,10 @@
 package com.sckw.product.model.vo.req;
 
 import jakarta.validation.Valid;
-import jakarta.validation.constraints.DecimalMin;
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Size;
+import jakarta.validation.constraints.*;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
-import org.apache.logging.log4j.core.config.plugins.validation.constraints.NotBlank;
 import org.hibernate.validator.constraints.Length;
 import org.hibernate.validator.constraints.Range;
 
@@ -46,7 +42,6 @@ public class AddGoodsParam {
     /**
      * 规格尺寸
      */
-    @NotBlank(message = "规格尺寸不能为空")
     @Length(max = 20, message = "规格尺寸最多支持20字")
     private String spec;
 

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/vo/req/AddressInfo.java

@@ -1,11 +1,11 @@
 package com.sckw.product.model.vo.req;
 
+import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Pattern;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
-import org.apache.logging.log4j.core.config.plugins.validation.constraints.NotBlank;
 import org.hibernate.validator.constraints.Length;
 
 /**

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/vo/req/GoodsImages.java

@@ -1,10 +1,11 @@
 package com.sckw.product.model.vo.req;
 
+import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
-import org.apache.logging.log4j.core.config.plugins.validation.constraints.NotBlank;
+
 
 /**
  * @desc: 商品图片

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/vo/req/UpdateGoodsParam.java

@@ -2,12 +2,12 @@ package com.sckw.product.model.vo.req;
 
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
-import org.apache.logging.log4j.core.config.plugins.validation.constraints.NotBlank;
 import org.hibernate.validator.constraints.Length;
 import org.hibernate.validator.constraints.Range;
 

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

@@ -316,7 +316,7 @@ public class KwpGoodsService {
      */
     @Transactional(rollbackFor = Exception.class)
     public void update(UpdateGoodsParam param) {
-        if (nameDuplicationJudgment(param.getName(), param.getSupplyEntId(), param.getId())) {
+        if (Boolean.TRUE.equals(nameDuplicationJudgment(param.getName(), param.getSupplyEntId(), param.getId()))) {
             throw new BusinessException("已存在相同商品名称！");
         }
         KwpGoods goods = getGoodsById(param.getId());
@@ -428,9 +428,6 @@ public class KwpGoodsService {
         if (StringUtils.isBlank(param.getUnit())) {
             return "计量单位不能为空！";
         }
-        if (StringUtils.isBlank(param.getSpec())) {
-            return "规格尺寸不能为空！";
-        }
         if (Objects.isNull(param.getAmount())) {
             return "库存数量不能为空！";
         }

sckw-modules/sckw-system/src/main/java/com/sckw/system/model/vo/req/ForgetPasswordReqVo.java

@@ -1,8 +1,7 @@
 package com.sckw.system.model.vo.req;
 
-import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
-import org.apache.logging.log4j.core.config.plugins.validation.constraints.NotBlank;
 
 import java.io.Serial;
 import java.io.Serializable;

sckw-modules/sckw-system/src/main/java/com/sckw/system/model/vo/req/UpdatePasswordReqVo.java

@@ -1,8 +1,8 @@
 package com.sckw.system.model.vo.req;
 
+import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
-import org.apache.logging.log4j.core.config.plugins.validation.constraints.NotBlank;
 
 import java.io.Serial;
 import java.io.Serializable;

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

@@ -137,6 +137,24 @@ public class LogisticsConsignmentController {
         }
     }
 
+    /**
+     * 采购/销售订单-完成车次统计
+     *
+     * @param tradeOrderId
+     * @return
+     */
+    @Validated
+    @RequestMapping(value = "/statisticsWaybillCount", method = RequestMethod.GET)
+    public HttpResult statisticsWaybillCount(@NotBlank(message = "单据号不能为空") @RequestParam("tradeOrderId")  String tradeOrderId) {
+        log.info("采购/销售订单-完成车次统计 传递参数信息:{}", tradeOrderId);
+        try {
+            return HttpResult.ok(logisticsConsignmentService.statisticsWaybillCount(tradeOrderId));
+        } catch (Exception e) {
+            log.error("采购/销售订单-完成车次统计 error :{}", e.getMessage(), e);
+            return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
+        }
+    }
+
     /**
      * 采购订单-托运订单列表-订单完结-数据查询
      *

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

@@ -236,17 +236,17 @@ public class LogisticsConsignmentService {
 
         checkUnit.setUnitType(1);
         checkUnit.setFirmName(bo.getCheckCompany());
-        checkUnit.setEntId(Long.parseLong(bo.getCheckCompanyId()));
-        checkUnit.setTopEntId(checkentMap == null ? null : checkentMap.getId());
-        checkUnit.setContactsId(Long.parseLong(bo.getCheckContactsId()));
+        checkUnit.setEntId(Long.parseLong(bo.getConsignCompanyId()));
+        checkUnit.setTopEntId(consignentMap == null ? null : consignentMap.getId());
+        checkUnit.setContactsId(Long.parseLong(bo.getConsignContactsId()));
 
         //承运单位
         KwtLogisticsOrderUnit carriageUnit = new KwtLogisticsOrderUnit();
         carriageUnit.setUnitType(2);
         carriageUnit.setFirmName(bo.getConsignCompany());
-        carriageUnit.setEntId(Long.parseLong(bo.getConsignCompanyId()));
-        carriageUnit.setTopEntId(consignentMap == null ? null : consignentMap.getId());
-        carriageUnit.setContactsId(Long.parseLong(bo.getConsignContactsId()));
+        carriageUnit.setEntId(Long.parseLong(bo.getCheckCompanyId()));
+        carriageUnit.setTopEntId(checkentMap == null ? null : checkentMap.getId());
+        carriageUnit.setContactsId(Long.parseLong(bo.getCheckContactsId()));
 
 //        commonService.initIatingLogisticsConsignment(checkUnit, carriageUnit, lOrderNo, LoginUserHolder.getUserId(), LoginUserHolder.getEntId());
         commonService.newSendLogisticsOrderToMessage(checkUnit, carriageUnit, lOrderNo, LoginUserHolder.getUserId(), LoginUserHolder.getEntId(),
@@ -2111,5 +2111,26 @@ public class LogisticsConsignmentService {
         return HttpResult.ok();
     }
 
-
+    /**
+     * 采购/销售订单-完成车次统计
+     *
+     * @param tradeOrderId 贸易订单id
+     * @return
+     */
+    public Long statisticsWaybillCount(String tradeOrderId) {
+        Long count = 0L;
+        List<KwtLogisticsOrder> orderList = kwtLogisticsOrderMapper.selectList(new LambdaQueryWrapper<KwtLogisticsOrder>()
+                .eq(KwtLogisticsOrder::getTOrderId, tradeOrderId).eq(KwtLogisticsOrder::getDelFlag, NumberConstant.ZERO));
+        if (org.springframework.util.CollectionUtils.isEmpty(orderList)) {
+            return count;
+        }
+        List<Long> longList = orderList.stream().map(KwtLogisticsOrder::getId).collect(Collectors.toList());
+        if (org.springframework.util.CollectionUtils.isEmpty(longList)) {
+            return count;
+        }
+        count = waybillOrderMapper.selectCount(new LambdaQueryWrapper<KwtWaybillOrder>()
+                .eq(KwtWaybillOrder::getStatus, CarWaybillEnum.APPROVAL_PASS.getCode())
+                .in(KwtWaybillOrder::getLOrderId, longList));
+        return count;
+    }
 }

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

@@ -121,8 +121,16 @@ public class WaybillManagementService {
             wayBillDetailDTO.setEndTime(info.getEndTime());
             wayBillDetailDTO.setCreateBy(info.getCreateByName());
             wayBillDetailDTO.setGoodsName(info.getGoodsName());
-            wayBillDetailDTO.setLoadDetailAddress(info.getLoadCityName().concat(info.getLoadDetailAddress()));
-            wayBillDetailDTO.setUnloadDetailAddress(info.getUnloadCityName().concat(info.getUnloadDetailAddress()));
+            if (info.getLoadDetailAddress().contains(info.getLoadCityName())){
+                wayBillDetailDTO.setLoadDetailAddress(info.getLoadDetailAddress());
+            }else {
+                wayBillDetailDTO.setLoadDetailAddress(info.getLoadCityName().concat(info.getLoadDetailAddress()));
+            }
+            if (info.getUnloadDetailAddress().contains(info.getUnloadCityName())){
+                wayBillDetailDTO.setUnloadDetailAddress(info.getUnloadDetailAddress());
+            }else {
+                wayBillDetailDTO.setUnloadDetailAddress(info.getUnloadCityName().concat(info.getUnloadDetailAddress()));
+            }
             wayBillDetailDTO.setLoadName(info.getLoadName());
             wayBillDetailDTO.setUnloadName(info.getUnloadName());
             wayBillDetailDTO.setCarrierFirmName(info.getCarrierFirmName());