From df2abee84042db58fc49c1e7fb80603ee5fc53f5 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Mon, 2 Sep 2024 14:46:45 +0800
Subject: [PATCH] 1

---
 .../AppInventoryCheckbillFeign.java           |  4 ++
 .../asbusrepairbill/AsBusrepairPageQuery.java | 12 +++-
 .../asbusrepairbill/AsBusrepairPageVo.java    |  5 --
 .../asbusrepairbill/AsBusrepairBillMapper.xml | 33 ++++++-----
 .../AsBusrepairBillService.java               | 57 +++++++++++++++++--
 .../WmsInventoryCheckbill.java                |  4 ++
 .../WmsInventoryCheckbillDetailsVo.java       |  4 ++
 .../WmsInventoryCheckbillDto.java             |  4 ++
 .../WmsInventoryCheckbillService.java         |  2 -
 .../WmsInventoryCheckbillDetail.java          |  4 --
 .../WmsInventoryCheckbillDetailDetailsVo.java |  4 --
 .../WmsInventoryCheckbillDetailDto.java       |  4 --
 .../WmsInventoryCheckbillDetailMapper.xml     | 12 +---
 .../WmsInventoryCheckbillReportSumVo.java     |  4 --
 14 files changed, 96 insertions(+), 57 deletions(-)

diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/AppInventoryCheckbillFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/AppInventoryCheckbillFeign.java
index 3ee0823170..300489f937 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/AppInventoryCheckbillFeign.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/AppInventoryCheckbillFeign.java
@@ -61,4 +61,8 @@ public interface AppInventoryCheckbillFeign {
     @ApiOperation("查看盘点报告")
     @GetMapping("/viewReport")
     public ResultBean<AppInventoryCheckbillReportDetailsVo> viewReport(@RequestParam("sid") String sid);
+
+    @ApiOperation("查看旧件盘点报告")
+    @GetMapping("/viewReportOld")
+    public ResultBean<AppInventoryCheckbillReportDetailsVo> viewReportOld(@RequestParam("sid") String sid);
 }
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairPageQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairPageQuery.java
index 2195d76170..bb76ca01e8 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairPageQuery.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairPageQuery.java
@@ -1,6 +1,7 @@
 package com.yxt.anrui.as.api.asbusrepairbill;
 
 import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -13,13 +14,18 @@ public class AsBusrepairPageQuery implements Query {
 
     //维修工单编号
     private String billNo;
-
     //工单创建开始时间
     private String createTimeStart;
-
     //工单创建结束时间
     private String createTimeEnd;
-
+    //客户名称
+    private String customerName;
     //车牌号
     private String vehMark;
+    //车架号
+    private String vinNo;
+
+    private String userSid;
+    private String orgPath;
+    private String menuUrl;
 }
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairPageVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairPageVo.java
index e2a03d55b2..9e7e0a4c7f 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairPageVo.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairPageVo.java
@@ -14,15 +14,10 @@ import java.util.List;
 public class AsBusrepairPageVo {
 
     private String sid;
-
-    //维修工单sid
-    private String billSid;
     //维修工单编号
     private String billNo;
     //工单创建日期
     private String billTime;
-    //客户sid
-    private String customerSid;
     //客户名称
     private String customerName;
     //车牌号
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml
index b9d2a0c9d2..7f15de9ec1 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml
@@ -61,23 +61,22 @@
     </select>
 
     <select id="pageBillList" resultType="com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairPageVo">
-        select b.sid,
-               a.nodeName as taskName,
-               a.sid as billSid,
-               a.billNo,
-               a.billType,
-               DATE_FORMAT(a.createTime, '%Y-%m-%d') as billTime,
-               a.customerSid,
-               a.customerName,
-               a.mobile,
-               b.vinNo,
-               b.vehMark,
-               DATE_FORMAT(a.entryTime, '%Y-%m-%d')  as entryTime,
-               wor.shortss,
-               wor.photos as photoss
-        from as_busrepair_bill a
-                 LEFT JOIN as_busrepair_bill_vech AS b on a.sid = b.billSid
-                 LEFT JOIN yxt_wms.wms_old_register wor on a.billNo = wor.billNo
+        SELECT
+        wor.sid,
+        a.nodeName AS taskName,
+        wor.billNo,
+        DATE_FORMAT(a.createTime, '%Y-%m-%d') AS billTime,
+        wor.customerName,
+        wor.vinNo,
+        wor.vehMark,
+        wor.shortss,
+        wor.photos AS photoss
+        FROM
+        yxt_wms.wms_old_register wor
+        LEFT JOIN as_busrepair_bill a
+        ON a.billNo = wor.billNo
+        LEFT JOIN anrui_portal.sys_organization AS s
+        ON a.deptSid = s.sid
         <where>
             ${ew.sqlSegment}
         </where>
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java
index c6e85d9bda..0625d3ead9 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java
@@ -1238,18 +1238,65 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
         AsBusrepairPageQuery query = pagerQuery.getParams();
         QueryWrapper<AsBusrepairBill> qw = new QueryWrapper<>();
         //ToDo:添加查询条件
+        //========================================数据授权开始
+        if (StringUtils.isNotBlank(query.getMenuUrl())) {
+            PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+            privilegeQuery.setOrgPath(query.getOrgPath());
+            privilegeQuery.setMenuUrl(query.getMenuUrl());
+            privilegeQuery.setUserSid(query.getUserSid());
+            ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
+            if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
+                //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+                String orgSidPath = query.getOrgPath();
+                orgSidPath = orgSidPath + "/";
+                int i1 = orgSidPath.indexOf("/");
+                int i2 = orgSidPath.indexOf("/", i1 + 1);
+                int i3 = orgSidPath.indexOf("/", i2 + 1);
+                int i4 = orgSidPath.indexOf("/", i3 + 1);
+                String orgLevelKey = defaultIdReltBean.getData();
+                if ("1".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i1);
+                    qw.like("s.orgSidPath", orgSidPath);
+                } else if ("2".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i2);
+                    qw.like("s.orgSidPath", orgSidPath);
+                } else if ("3".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i3);
+                    qw.like("s.orgSidPath", orgSidPath);
+                } else if ("4".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i4);
+                    qw.like("s.orgSidPath", orgSidPath);
+                } else if ("5".equals(orgLevelKey)) {
+                    qw.eq("wor.createBySid", query.getUserSid());
+                } else {
+                    PagerVo<AsBusrepairPageVo> p = new PagerVo<>();
+                    return p;
+                }
+            } else {
+                PagerVo<AsBusrepairPageVo> p = new PagerVo<>();
+                return p;
+            }
+        }
         //维修工单编号
         if (StringUtils.isNotBlank(query.getBillNo())) {
-            qw.like("a.billNo", query.getBillNo());
+            qw.like("wor.billNo", query.getBillNo());
+        }
+        //客户
+        if (StringUtils.isNotBlank(query.getCustomerName())) {
+            qw.like("wor.customerName", query.getCustomerName());
+        }
+        //车牌号
+        if (StringUtils.isNotBlank(query.getVehMark())) {
+            qw.like("wor.vehMark", query.getVehMark());
+        }
+        //车架号
+        if (StringUtils.isNotBlank(query.getVinNo())) {
+            qw.like("wor.vinNo", query.getVinNo());
         }
         //单据日期开始时间-单据日期结束时间
         qw.apply(StringUtils.isNotBlank(query.getCreateTimeStart()), "date_format (a.createTime,'%Y-%m-%d') >= date_format('" + query.getCreateTimeStart() + "','%Y-%m-%d')").
                 apply(StringUtils.isNotBlank(query.getCreateTimeEnd()), "date_format (a.createTime,'%Y-%m-%d') <= date_format('" + query.getCreateTimeEnd() + "','%Y-%m-%d')"
                 );
-        //车牌号
-        if (StringUtils.isNotBlank(query.getVehMark())) {
-            qw.like("b.vehMark", query.getVehMark());
-        }
         qw.eq("a.nodeCode", 3);
         IPage<AsBusrepairBill> page = PagerUtil.queryToPage(pagerQuery);
         IPage<AsBusrepairPageVo> pagging = baseMapper.pageBillList(page, qw);
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbill.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbill.java
index c5349d3193..c525f56ac3 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbill.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbill.java
@@ -70,6 +70,10 @@ public class WmsInventoryCheckbill extends BaseEntity {
     private String warehouseTypeKey;
     @ApiModelProperty("仓库类型value")
     private String warehouseTypeValue;
+    @ApiModelProperty("虚拟件数量")
+    private BigDecimal vrCount;
+    @ApiModelProperty("未入库数量")
+    private BigDecimal notInCount;
     @ApiModelProperty("监盘人sid")
     private String superviseSid; // 监盘人sid
     @ApiModelProperty("监盘人姓名")
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillDetailsVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillDetailsVo.java
index 418005122b..294d83bd25 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillDetailsVo.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillDetailsVo.java
@@ -78,6 +78,10 @@ public class WmsInventoryCheckbillDetailsVo implements Vo {
     private String warehouseTypeKey;
     @ApiModelProperty("仓库类型value")
     private String warehouseTypeValue;
+    @ApiModelProperty("虚拟件数量")
+    private BigDecimal vrCount;
+    @ApiModelProperty("未入库数量")
+    private BigDecimal notInCount;
     @ApiModelProperty("监盘人sid")
     private String superviseSid; // 监盘人sid
     @ApiModelProperty("监盘人姓名")
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillDto.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillDto.java
index f38c843acf..477006c05d 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillDto.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillDto.java
@@ -78,6 +78,10 @@ public class WmsInventoryCheckbillDto implements Dto {
     private String warehouseTypeKey;
     @ApiModelProperty("仓库类型value")
     private String warehouseTypeValue;
+    @ApiModelProperty("虚拟件数量")
+    private BigDecimal vrCount;
+    @ApiModelProperty("未入库数量")
+    private BigDecimal notInCount;
     @ApiModelProperty("监盘人sid")
     private String superviseSid; // 监盘人sid
     @ApiModelProperty("监盘人姓名")
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java
index 7763979d0a..dbc723d244 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java
@@ -431,8 +431,6 @@ public class WmsInventoryCheckbillService extends MybatisBaseService<WmsInventor
             wmsInventoryCheckbillReportDetailsVo.setPkMoney(totalSum.getPkMoney());
             wmsInventoryCheckbillReportDetailsVo.setPsNum(totalSum.getPsNum());
             wmsInventoryCheckbillReportDetailsVo.setPsMoney(totalSum.getPsMoney());
-            wmsInventoryCheckbillReportDetailsVo.setVirtualNum(totalSum.getVirtualNum());
-            wmsInventoryCheckbillReportDetailsVo.setUnInStorageNum(totalSum.getUnInStorageNum());
         }
         //仓库盘点情况
         List<WmsInventoryCheckbillReportSumVo> ware = wmsInventoryCheckbillDetailService.reportSum(sid, "ware");
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetail.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetail.java
index de9319b475..431ee35df7 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetail.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetail.java
@@ -98,10 +98,6 @@ public class WmsInventoryCheckbillDetail extends BaseEntity {
     private BigDecimal loseCount;
     @ApiModelProperty("盘损数量")
     private BigDecimal lossCount; // 盘损数量
-    @ApiModelProperty("虚拟件数量")
-    private BigDecimal vrCount;
-    @ApiModelProperty("未入库数量")
-    private BigDecimal notInCount;
     @ApiModelProperty("供应商sid")
     private String supplierSid;
     @ApiModelProperty("供应商名称")
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailDetailsVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailDetailsVo.java
index 8f7ee717fc..fe8e1ba640 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailDetailsVo.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailDetailsVo.java
@@ -101,10 +101,6 @@ public class WmsInventoryCheckbillDetailDetailsVo implements Vo {
     private BigDecimal loseCount;
     @ApiModelProperty("盘损数量")
     private BigDecimal lossCount; // 盘损数量
-    @ApiModelProperty("虚拟件数量")
-    private BigDecimal virtualNum;
-    @ApiModelProperty("未入库数量")
-    private BigDecimal unInStorageNum;
     @ApiModelProperty("供应商sid")
     private String supplierSid;
     @ApiModelProperty("供应商名称")
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailDto.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailDto.java
index 8ba699c3a7..34302e2bf4 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailDto.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailDto.java
@@ -101,10 +101,6 @@ public class WmsInventoryCheckbillDetailDto implements Dto {
     private BigDecimal loseCount;
     @ApiModelProperty("盘损数量")
     private BigDecimal lossCount; // 盘损数量
-    @ApiModelProperty("虚拟件数量")
-    private BigDecimal virtualNum;
-    @ApiModelProperty("未入库数量")
-    private BigDecimal unInStorageNum;
     @ApiModelProperty("供应商sid")
     private String supplierSid;
     @ApiModelProperty("供应商名称")
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.xml
index 0a6b422981..6a4c0f2267 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.xml
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.xml
@@ -30,9 +30,7 @@
 				IFNULL(SUM(wicd.loseCount),0) AS pkNum,
 				IFNULL(SUM(wicd.loseCount * cost),0) AS pkMoney,
 				IFNULL(SUM(lossCount),0) AS psNum,
-				IFNULL(SUM(lossCount * cost),0) AS psMoney,
-				IFNULL(SUM(vrCount),0) AS virtualNum,
-				IFNULL(SUM(notInCount),0) AS unInStorageNum
+				IFNULL(SUM(lossCount * cost),0) AS psMoney
 		FROM
 				wms_inventory_checkbill_detail AS wicd
 		WHERE wicd.billSid = #{billSid}
@@ -52,9 +50,7 @@
 				IFNULL(SUM(wicd.loseCount),0) AS pkNum,
 				IFNULL(SUM(wicd.loseCount * cost),0) AS pkMoney,
 				IFNULL(SUM(lossCount),0) AS psNum,
-				IFNULL(SUM(lossCount * cost),0) AS psMoney,
-				IFNULL(SUM(vrCount),0) AS virtualNum,
-				IFNULL(SUM(notInCount),0) AS unInStorageNum
+				IFNULL(SUM(lossCount * cost),0) AS psMoney
 		FROM
 				wms_inventory_checkbill_detail AS wicd
 		WHERE wicd.billSid = #{billSid}
@@ -78,9 +74,7 @@
 				IFNULL(SUM(wicd.loseCount),0) AS pkNum,
 				IFNULL(SUM(wicd.loseCount * cost),0) AS pkMoney,
 				IFNULL(SUM(lossCount),0) AS psNum,
-				IFNULL(SUM(lossCount * cost),0) AS psMoney,
-				IFNULL(SUM(vrCount),0) AS virtualNum,
-				IFNULL(SUM(notInCount),0) AS unInStorageNum
+				IFNULL(SUM(lossCount * cost),0) AS psMoney
 		FROM
 				wms_inventory_checkbill_detail AS wicd
 		WHERE wicd.billSid = #{billSid}
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbillreport/WmsInventoryCheckbillReportSumVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbillreport/WmsInventoryCheckbillReportSumVo.java
index b019778ec6..0e59561e95 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbillreport/WmsInventoryCheckbillReportSumVo.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbillreport/WmsInventoryCheckbillReportSumVo.java
@@ -82,8 +82,4 @@ public class WmsInventoryCheckbillReportSumVo implements Vo {
     private BigDecimal psNum;
     @ApiModelProperty("盘损金额")
     private BigDecimal psMoney;
-    @ApiModelProperty("虚拟件数量")
-    private BigDecimal virtualNum;
-    @ApiModelProperty("未入库数量")
-    private BigDecimal unInStorageNum;
 }
\ No newline at end of file