旧件入库移动端数量

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexEnum.java

@@ -58,6 +58,7 @@ public class AppIndexEnum {
         SPSJ("781ce38b-b003-4efd-accf-fbee0ca33091", "商品上架"),
         PJJS("37905444-5454-4b08-897d-6c2c089c317d", "配件接收"),
         SPPD("a16641b1-e34e-4c80-9163-7eed9893c3c5", "商品盘点"),
+        JJRK("85c75cdf-4023-41f5-8d2a-ef20bec4c51f", "旧件入库"),
         ;
 
         /**

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexService.java

@@ -258,6 +258,12 @@ public class AppIndexService {
                     String num = wmsInventoryCheckbillFeign.getToDoNum(wmsToDoNumQuery).getData();
                     appIndexNumVo.setNum(num);
                 }
+                //旧件入库
+                if (AppIndexEnum.AppMenu.JJRK.getRemarks().equals(menu.getTitle())) {
+                    asToDoNumQuery.setMenuSid(menu.getSid());
+                    String num = asBusrepairBillFeign.getToDoNum3(asToDoNumQuery).getData();
+                    appIndexNumVo.setNum(num);
+                }
                 list.add(appIndexNumVo);
             }
         }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/fegin/as/AsBusrepairBillFeign.java

@@ -25,4 +25,9 @@ public interface AsBusrepairBillFeign {
     @GetMapping("/getToDoNum2")
     @ResponseBody
     ResultBean<String> getToDoNum2(@SpringQueryMap AsToDoNumQuery asToDoNumQuery);
+
+    @ApiOperation("手机端-查询本分公司下代办数量:切换机构")
+    @GetMapping("/getToDoNum3")
+    @ResponseBody
+    ResultBean<String> getToDoNum3(@SpringQueryMap AsToDoNumQuery asToDoNumQuery);
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/fegin/as/AsToDoNumQuery.java

@@ -9,4 +9,6 @@ public class AsToDoNumQuery {
     private String userSid;
     @ApiModelProperty("组织机构sid")
     private String orgPath;
+
+    private String menuSid;
 }

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/app/AsToDoNumQuery.java

@@ -9,4 +9,6 @@ public class AsToDoNumQuery {
     private String userSid;
     @ApiModelProperty("组织机构sid")
     private String orgPath;
+
+    private String menuSid;
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.java

@@ -87,4 +87,6 @@ public interface AsBusrepairBillMapper extends BaseMapper<AsBusrepairBill> {
     int getToDoNum2(@Param("useOrgSid") String useOrgSid);
 
     int selOldIsInInventoryCount(@Param("sid") String sid);
+
+    int getToDoNum3(@Param(Constants.WRAPPER)QueryWrapper<AsBusrepairBill> qw);
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml

@@ -1060,5 +1060,24 @@
           AND (d.oldIsInInventory != 1 OR d.oldIsInInventory IS NULL OR d.oldIsInInventory = '')
     </select>
 
+    <select id="getToDoNum3" resultType="java.lang.Integer">
+        SELECT
+        count(a.sid) as count
+        FROM
+        as_busrepair_bill a
+        LEFT JOIN as_busrepair_bill_vech av ON a.sid = av.billSid
+        LEFT JOIN as_busrepair_inventorybill ib ON a.sid = ib.sourceBillSid
+        LEFT JOIN as_busrepair_inventorybill_detail id ON ib.sid = id.billSid
+        LEFT JOIN yxt_wms.wms_old_register wor ON a.billNo = wor.billNo
+        LEFT JOIN anrui_portal.sys_organization AS s ON a.deptSid = s.sid
+        <where>
+            ${ew.sqlSegment}
+            AND (a.nodeCode = 3 OR a.nodeCode = 5) AND (id.oldIsInInventory = 0 OR id.oldIsInInventory = '' OR
+            id.oldIsInInventory IS NULL)
+        </where>
+        GROUP BY
+        a.sid
+    </select>
+
 
 </mapper>

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java

@@ -332,6 +332,13 @@ public class AsBusrepairBillRest {
         return asBusrepairBillService.getToDoNum2(asToDoNumQuery);
     }
 
+    @ApiOperation("手机端-查询本分公司下代办数量:切换机构")
+    @GetMapping("/getToDoNum2")
+    @ResponseBody
+    ResultBean<String> getToDoNum3(@SpringQueryMap AsToDoNumQuery asToDoNumQuery) {
+        return asBusrepairBillService.getToDoNum3(asToDoNumQuery);
+    }
+
     @PostMapping("/submitList2")
     @ApiOperation("维修确认提交")
     ResultBean submitList2(@RequestBody GoodsReceiveSubmit query) {

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java

@@ -3051,5 +3051,43 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
     }
 
 
-
+    public ResultBean<String> getToDoNum3(AsToDoNumQuery asToDoNumQuery) {
+        ResultBean<String>  rb = ResultBean.fireFail();
+        QueryWrapper<AsBusrepairBill> qw = new QueryWrapper<>();
+        //========================================数据授权开始
+        if (StringUtils.isNotBlank(asToDoNumQuery.getMenuSid())) {
+            PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+            privilegeQuery.setOrgPath(asToDoNumQuery.getOrgPath());
+            privilegeQuery.setMenuSid(asToDoNumQuery.getMenuSid());
+            privilegeQuery.setUserSid(asToDoNumQuery.getUserSid());
+            ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
+            if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
+                //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+                String orgSidPath = asToDoNumQuery.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", asToDoNumQuery.getUserSid());
+                }
+            }
+        }
+        int count = baseMapper.getToDoNum3(qw);
+        return rb.success().setData(String.valueOf(count));
+    }
 }