Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.java

@@ -40,25 +40,9 @@ import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
-/**
- * Project: anrui-base(销售出库单) <br/>
- * File: BaseVehicleOutApplyMapper.java <br/>
- * Class: com.yxt.anrui.base.biz.basevehicleoutapply.BaseVehicleOutApplyMapper <br/>
- * Description: 车辆出库单. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2023-01-12 08:54:50 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Mapper
 public interface BaseVehicleOutApplyMapper extends BaseMapper<BaseVehicleOutApply> {
 
-	//@Update("update base_vehicle_out_apply set name=#{msg} where id=#{id}")
-	//IPage<BaseVehicleOutApplyVo> voPage(IPage<BaseVehicleOutApply> page, @Param(Constants.WRAPPER) QueryWrapper<BaseVehicleOutApply> qw);
-
 	IPage<BaseVehicleOutApplyVoNew> selectPageVo(IPage<BaseVehicleOutApply> page, @Param(Constants.WRAPPER) Wrapper<BaseVehicleOutApply> qw);
 
 	List<BaseVehicleOutApplyVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BaseVehicleOutApply> qw);

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.xml

@@ -5,20 +5,20 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyVoNew">
         SELECT
-        bvo.`sid`,
+        bvo.sid,
-        IF(bvo.`isDelete` = 1, '作废','正常') AS isDelete,
+        IF(bvo.isDelete = 1, '作废','正常') AS isDelete,
         bvo.vinSid,
         bvo.vinNo,
-        bvoa.`createOrgSid`,
+        bvoa.createOrgSid,
         bv.configName AS modelConfig,
         bv.insideCode,
-        bvoa.saleTypeValue AS `type`,
+        bvoa.saleTypeValue AS type,
         bvo.manPurOrderTypeValue,
-        bvoa.`saleDate`,
+        bvoa.saleDate,
-        bvo.`price`,
+        bvo.price,
-        bvoa.`orgName`,
+        bvoa.orgName,
-        bvoa.`staffName`,
+        bvoa.staffName,
-        bvoa.`contractNo` AS concatNo,
+        bvoa.contractNo AS concatNo,
         bvo.realityBuyCarPhone,
         bvo.realityBuyCarName,
         bvoa.customerName,
@@ -40,7 +40,7 @@
         FROM
         base_vehicle_out bvo
         LEFT JOIN base_vehicle_out_apply bvoa
-        ON bvoa.`sid` = bvo.`mainSid`
+        ON bvoa.sid = bvo.mainSid
         LEFT JOIN base_vehicle bv
         ON bv.sid = bvo.vinSid
         LEFT JOIN base_vehmodel_config bvc
@@ -66,7 +66,7 @@
         FROM
         base_vehicle_out bvo
         LEFT JOIN base_vehicle_out_apply bvoa
-        ON bvoa.`sid` = bvo.`mainSid`
+        ON bvoa.sid = bvo.mainSid
         LEFT JOIN base_vehicle bv
         ON bv.sid = bvo.vinSid
         LEFT JOIN base_vehmodel_config bvc
@@ -82,7 +82,7 @@
         SELECT
             date_format (o.createTime,'%Y-%m-%d') saleDate,
             a.customerSid,
-            s.`name` useOrgName,
+            s.name useOrgName,
             so.sid as orderSid
         FROM
             base_vehicle_out AS o

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml

@@ -49,7 +49,7 @@
                bd.contractNo                                  as contractId,
                bd.applyName,
                bd.name                                        as customerName,
-               DATE_FORMAT(bd.createTime, '%Y-%m-%d')         as `date`,
+               DATE_FORMAT(bd.createTime, '%Y-%m-%d')         as date,
                (select CONCAT_WS(',', group_concat(vinNo))
                 from bus_delivered_apply_details bss
                 where bss.applySid = bd.sid)                  as vinNo,
@@ -60,7 +60,7 @@
             <if test="name != null and name != ''">
                 and concat(IFNULL(bd.contractNo
                   , '')
-                  , ifnull(bd.`name`
+                  , ifnull(bd.name
                   , '')) LIKE concat('%'
                   , #{name}
                   , '%')
@@ -205,9 +205,10 @@
         SELECT COUNT(*)
         FROM bus_delivered_apply_details bdad
                      LEFT JOIN bus_delivered_apply bda
-                ON bdad.`applySid` = bda.`sid`
+                ON bdad.applySid = bda.sid
-        WHERE bdad.`vinSid` = #{vinSid}
+        WHERE bdad.vinSid = #{vinSid}
-          AND bda.`nodeState` = '已办结'
+          AND bda.nodeState = '已办结'
+          AND bda.typeState = 1
     </select>
     <select id="selCustomerByBusVinSid" resultType="java.lang.String">
         SELECT a.customerSid

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetail.java

@@ -33,19 +33,6 @@ import lombok.Data;
 
 import java.math.BigDecimal;
 
-/**
- * Project: yxt-wms(仓储) <br/>
- * File: WmsInventoryCheckbillDetail.java <br/>
- * Class: com.yxt.wms.api.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetail <br/>
- * Description: 库存盘点-明细. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-03-22 09:25:02 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Data
 @ApiModel(value = "库存盘点-明细", description = "库存盘点-明细")
 @TableName("wms_inventory_checkbill_detail")
@@ -86,8 +73,8 @@ public class WmsInventoryCheckbillDetail extends BaseEntity {
     private String warehouseArea; // 库区名称
     @ApiModelProperty("库位sid")
     private String warehouseRackSid; // 库位sid
-    @ApiModelProperty("库位名称")
+    @ApiModelProperty("库位编码")
-    private String warehouseRackName; // 库位名称
+    private String warehouseRackCode;
     @ApiModelProperty("库存数量")
     private BigDecimal bookCount; // 库存数量
     @ApiModelProperty("实盘数量")

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailDetailsVo.java

@@ -25,7 +25,6 @@
  *********************************************************/
 package com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail;
 
-
 import com.yxt.common.core.vo.Vo;
 
 import io.swagger.annotations.ApiModel;
@@ -36,19 +35,6 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * Project: yxt-wms(仓储) <br/>
- * File: WmsInventoryCheckbillDetailVo.java <br/>
- * Class: com.yxt.wms.api.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailVo <br/>
- * Description: 库存盘点-明细 视图数据对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-03-22 09:25:02 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Data
 @ApiModel(value = "库存盘点-明细 视图数据详情", description = "库存盘点-明细 视图数据详情")
 public class WmsInventoryCheckbillDetailDetailsVo implements Vo {
@@ -89,8 +75,8 @@ public class WmsInventoryCheckbillDetailDetailsVo implements Vo {
     private String warehouseArea; // 库区名称
     @ApiModelProperty("库位sid")
     private String warehouseRackSid; // 库位sid
-    @ApiModelProperty("库位名称")
+    @ApiModelProperty("库位编码")
-    private String warehouseRackName; // 库位名称
+    private String warehouseRackCode;
     @ApiModelProperty("库存数量")
     private BigDecimal bookCount; // 库存数量
     @ApiModelProperty("实盘数量")

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailDto.java

@@ -25,7 +25,6 @@
  *********************************************************/
 package com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail;
 
-
 import com.yxt.common.core.dto.Dto;
 
 import io.swagger.annotations.ApiModel;
@@ -36,19 +35,6 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * Project: yxt-wms(仓储) <br/>
- * File: WmsInventoryCheckbillDetailDto.java <br/>
- * Class: com.yxt.wms.api.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailDto <br/>
- * Description: 库存盘点-明细 数据传输对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-03-22 09:25:02 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Data
 @ApiModel(value = "库存盘点-明细 数据传输对象", description = "库存盘点-明细 数据传输对象")
 public class WmsInventoryCheckbillDetailDto implements Dto {
@@ -89,8 +75,8 @@ public class WmsInventoryCheckbillDetailDto implements Dto {
     private String warehouseArea; // 库区名称
     @ApiModelProperty("库位sid")
     private String warehouseRackSid; // 库位sid
-    @ApiModelProperty("库位名称")
+    @ApiModelProperty("库位编码")
-    private String warehouseRackName; // 库位名称
+    private String warehouseRackCode;
     @ApiModelProperty("库存数量")
     private BigDecimal bookCount; // 库存数量
     @ApiModelProperty("实盘数量")

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailGoodPageListVo.java

@@ -25,7 +25,6 @@
  *********************************************************/
 package com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail;
 
-
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -35,19 +34,6 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * Project: yxt-wms(仓储) <br/>
- * File: WmsInventoryCheckbillDetailVo.java <br/>
- * Class: com.yxt.wms.api.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailVo <br/>
- * Description: 库存盘点-明细 视图数据对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-03-22 09:25:02 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Data
 @ApiModel(value = "库存盘点-明细 视图数据详情", description = "库存盘点-明细 视图数据详情")
 public class WmsInventoryCheckbillDetailGoodPageListVo implements Vo {
@@ -64,8 +50,8 @@ public class WmsInventoryCheckbillDetailGoodPageListVo implements Vo {
     private String warehouseName;
     @ApiModelProperty("库区名称")
     private String warehouseArea;
-    @ApiModelProperty("库位名称")
+    @ApiModelProperty("库位编码")
-    private String warehouseRackName;
+    private String warehouseRackCode;
     @ApiModelProperty("区域名称")
     private String warehouseZoneName;
     @ApiModelProperty("单位")

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.java

@@ -38,19 +38,6 @@ import org.apache.ibatis.annotations.Param;
 import java.math.BigDecimal;
 import java.util.List;
 
-/**
- * Project: yxt-wms(仓储) <br/>
- * File: WmsInventoryCheckbillDetailMapper.java <br/>
- * Class: com.yxt.wms.biz.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailMapper <br/>
- * Description: 库存盘点-明细. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-03-22 09:25:02 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Mapper
 public interface WmsInventoryCheckbillDetailMapper extends BaseMapper<WmsInventoryCheckbillDetail> {
 

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.xml

@@ -162,7 +162,7 @@
                d.warehouseSid,
                d.warehouseName,
                d.warehouseRackSid,
-               d.warehouseRackName,
+               d.warehouseRackCode,
                d.loseCount       AS outStorageNum,
                w.cost            AS inStoragePrice
         FROM wms_inventory_checkbill_detail d

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailRackGoodPageListQuery.java

@@ -25,25 +25,11 @@
  *********************************************************/
 package com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail;
 
-
 import com.yxt.common.core.query.Query;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-/**
- * Project: yxt-wms(仓储) <br/>
- * File: WmsInventoryCheckbillDetailVo.java <br/>
- * Class: com.yxt.wms.api.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailVo <br/>
- * Description: 库存盘点-明细 视图数据对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-03-22 09:25:02 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Data
 @ApiModel(value = "库存盘点-明细 视图数据详情", description = "库存盘点-明细 视图数据详情")
 public class WmsInventoryCheckbillDetailRackGoodPageListQuery implements Query {

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailRackGoodPageListVo.java

@@ -52,8 +52,8 @@ public class WmsInventoryCheckbillDetailRackGoodPageListVo implements Vo {
     private String zoneName;
     @ApiModelProperty("库区名称")
     private String warehouseArea;
-    @ApiModelProperty("库位名称")
+    @ApiModelProperty("库位编码")
-    private String warehouseRackName;
+    private String warehouseRackCode;
     @ApiModelProperty("单位")
     private String unit;
     @ApiModelProperty("成本单价")

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailRackPageListQuery.java

@@ -40,13 +40,13 @@ public class WmsInventoryCheckbillDetailRackPageListQuery implements Query {
     @ApiModelProperty("盘点sid")
     private String billSid;
     @ApiModelProperty("仓库")
-    private String warehouseName; // 仓库sid
+    private String warehouseName;
-    @ApiModelProperty("区域sid")
+    @ApiModelProperty("区域")
     private String zoneName;
-    @ApiModelProperty("库区sid")
+    @ApiModelProperty("库区")
-    private String warehouseAreaName; // 库区sid
+    private String warehouseAreaName;
-    @ApiModelProperty("库位sid")
+    @ApiModelProperty("库位")
-    private String warehouseRackName; // 库位sid
+    private String warehouseRackCode;
 
     /*
      * 移动端查询条件

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailRackPageListVo.java

@@ -45,8 +45,8 @@ public class WmsInventoryCheckbillDetailRackPageListVo implements Vo {
     private String warehouseArea;
     @ApiModelProperty("库位sid")
     private String warehouseRackSid;
-    @ApiModelProperty("库位名称")
+    @ApiModelProperty("库位编码")
-    private String warehouseRackName;
+    private String warehouseRackCode;
     @ApiModelProperty("应盘数量")
     private BigDecimal bookCount;
     @ApiModelProperty("应盘金额")

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailService.java

@@ -51,19 +51,6 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * Project: yxt-wms(仓储) <br/>
- * File: WmsInventoryCheckbillDetailService.java <br/>
- * Class: com.yxt.wms.biz.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailService <br/>
- * Description: 库存盘点-明细 业务逻辑. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-03-22 09:25:02 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Service
 public class WmsInventoryCheckbillDetailService extends MybatisBaseService<WmsInventoryCheckbillDetailMapper, WmsInventoryCheckbillDetail> {
 
@@ -160,7 +147,7 @@ public class WmsInventoryCheckbillDetailService extends MybatisBaseService<WmsIn
         wmsInventoryCheckbillDetail.setWarehouseAreaSid(wmsWarehouseArea.getSid());
         wmsInventoryCheckbillDetail.setWarehouseArea(wmsWarehouseArea.getAreaName());
         wmsInventoryCheckbillDetail.setWarehouseRackSid(wmsWarehouseRack.getSid());
-        wmsInventoryCheckbillDetail.setWarehouseRackName(wmsWarehouseRack.getRackName());
+        wmsInventoryCheckbillDetail.setWarehouseRackCode(wmsWarehouseRack.getRackCode());
         wmsInventoryCheckbillDetail.setSupplierSid(dto.getProviderSid());
         wmsInventoryCheckbillDetail.setSupplierName(dto.getProvider());
         wmsInventoryCheckbillDetail.setBookCount(new BigDecimal("0"));

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitoutdetail/WmsInventoryProfitoutDetailDto.java

@@ -25,7 +25,6 @@
  *********************************************************/
 package com.yxt.wms.biz.inventory.wmsinventoryprofitoutdetail;
 
-
 import com.yxt.common.core.dto.Dto;
 
 import io.swagger.annotations.ApiModel;
@@ -34,19 +33,6 @@ import lombok.Data;
 
 import java.math.BigDecimal;
 
-/**
- * Project: yxt-wms(盘库) <br/>
- * File: WmsInventoryProfitoutDetailDto.java <br/>
- * Class: com.yxt.wms.api.wmsinventoryprofitoutdetail.WmsInventoryProfitoutDetailDto <br/>
- * Description: 盘亏出库-明细 数据传输对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-08-07 16:58:17 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Data
 @ApiModel(value = "盘亏出库-明细 数据传输对象", description = "盘亏出库-明细 数据传输对象")
 public class WmsInventoryProfitoutDetailDto implements Dto {
@@ -85,8 +71,8 @@ public class WmsInventoryProfitoutDetailDto implements Dto {
     private String warehouseName; // 仓库名称
     @ApiModelProperty("库位sid")
     private String warehouseRackSid; // 库位sid
-    @ApiModelProperty("库位名称")
+    @ApiModelProperty("库位编码")
-    private String warehouseRackName; // 库位名称
+    private String warehouseRackCode;
     @ApiModelProperty("出库数量")
     private BigDecimal outStorageNum; // 出库数量