Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml

@@ -290,7 +290,7 @@
         bv.sid busVinSid,
         bv.borrowName loanName,
         bv.borrowerSid loanSid,
-        IF(fi.VIN IS NULL,'0','1') AS isKp
+        IF(bo.contractNo = fi.contractNo,IF(fi.VIN IS NULL,'0','1'),'0') AS isKp
         FROM
         bus_sales_order bo
         LEFT JOIN bus_sales_order_vehicle bv ON bo.sid = bv.salesOrderSid
@@ -549,7 +549,7 @@
     <select id="vinLists3" resultType="com.yxt.anrui.buscenter.api.busdelivered.AppVinListVo">
         select bv.linkSid vinSid,bv.sid busVinSid,RIGHT(bv.linkNo, 8) as vin,bv.borrowerSid loanSid,bv.borrowName loanName,
         IF(bo.payTypeKey = '2',true,false) AS appendSameSelected,
-        IF(bo.payTypeKey = '1','',IF(fi.VIN IS NULL,'未开票','开票')) AS appendText,
+        IF(bo.payTypeKey = '1','',IF(bo.contractNo = fi.contractNo,IF(fi.VIN IS NULL,'未开票','开票'),'未开票')) AS appendText,
         IF(bo.payTypeKey = '2','贷款业务，不能同时选择已开票和未开票的车辆！','') AS appendSelectedNotice
         FROM
         bus_sales_order bo
@@ -569,7 +569,7 @@
         union all
         select bv.linkSid vinSid,bv.sid busVinSid,RIGHT(bv.linkNo, 8) as vin,bv.borrowerSid loanSid,bv.borrowName loanName,
         IF(bo.payTypeKey = '2',TRUE,FALSE) AS appendSameSelected,
-        IF(bo.payTypeKey = '1','',IF(fi.VIN IS NULL,'未开票','开票')) AS appendText,
+        IF(bo.payTypeKey = '1','',IF(bo.contractNo = fi.contractNo,IF(fi.VIN IS NULL,'未开票','开票'),'未开票')) AS appendText,
         IF(bo.payTypeKey = '2','贷款业务，不能同时选择已开票和未开票的车辆！','') AS appendSelectedNotice
         FROM
         bus_sales_order bo

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml

@@ -130,12 +130,12 @@
         select name companyInvoicingName, sid companyInvoicingSid, purchaseSystemSid, purchaseSystemName
         from fin_company_invoicing
         where useOrgSid = #{useOrgSid}
-          and length(purchaseSystemSid) > 0
+          and length(purchaseSystemSid) > 0 and isDelete = 0
     </select>
 
     <select id="getAppInvoicingList" resultType="com.yxt.anrui.fin.api.fincompanyinvoicing.AppCompanyInvoicingVo">
         select name dictValue,sid as id,purchaseSystemSid,purchaseSystemName from fin_company_invoicing where useOrgSid
-        = #{useOrgSid} and length(purchaseSystemSid)>0
+        = #{useOrgSid} and length(purchaseSystemSid)>0 and isDelete = 0
         <if test="search != null and search != ''">
             and name like concat('%',#{search},'%')
         </if>

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/UpdateTimeByBankName.java

@@ -0,0 +1,15 @@
+package com.yxt.anrui.riskcenter.api.loanrepaymenthistory;
+
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/5/17 15:17
+ */
+@Data
+public class UpdateTimeByBankName {
+
+    private String updateDate;
+    private String bankName;
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java

@@ -451,19 +451,19 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
         printConfirmDto.setSalesOrderVehicles(salesOrderVehicles);
         List<File> filesList = new ArrayList<>();
         //贷款车辆买卖合同
-        List<String> dkclmmhts = dkclmmht(printConfirmDto, conSetUpKey);
+        /*List<String> dkclmmhts = dkclmmht(printConfirmDto, conSetUpKey);
         //生成车辆融资协议
         List<String> clrzxyUrls = generateCLRZXY(printConfirmDto, conSetUpKey);
         //生成还款协议
         List<String> hkxyUrls = hkxy(printConfirmDto, conSetUpKey);
         //代管车辆委托书
-        List<String> dgclwtsUrls = dgclwts(printConfirmDto, conSetUpKey);
+        List<String> dgclwtsUrls = dgclwts(printConfirmDto, conSetUpKey);*/
         //判断是否为高低开
         BusSalesOrderPrice data = busSalesOrderFeign.selectByContractNoOne(printConfirmDto.getContractNo()).getData();
         //查询金融方案
         SolutionsDetailsVo solutionsDetailsVo = loanSolutionsService.selectDetails(busSalesOrder.getSid()).getData();
         //判断是否为高低开，若是则生成开票申请书
-        List<String> kpsqsUrls = new ArrayList<>();
+       /* List<String> kpsqsUrls = new ArrayList<>();
         if (!data.getSingleFinalPrice().equals(solutionsDetailsVo.getMainVehicleAmount())) {
             //开票申请书
             kpsqsUrls = kpsqs(printConfirmDto, conSetUpKey);
@@ -477,11 +477,11 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
         //接收车辆确认书
         List<String> jsclqrsUrls = jsclqrs(printConfirmDto, conSetUpKey);
         //接收车辆委托书
-        List<String> jsclwtsUrls = jsclwts(printConfirmDto, conSetUpKey);
+        List<String> jsclwtsUrls = jsclwts(printConfirmDto, conSetUpKey);*/
         //销售订单上装信息
         List<BusSalesOrderMakeupDetailsVo> busSalesOrderMakeupDetailsVoList = busSalesOrderMakeupFeign.selectTopByOrderSid(busSalesOrder.getSid()).getData();
         //查询金融方案中挂车信息
-        List<String> cljszcghtUrls = new ArrayList<>();
+        /*List<String> cljszcghtUrls = new ArrayList<>();
         if ((busSalesOrderMakeupDetailsVoList != null && busSalesOrderMakeupDetailsVoList.size() > 0) || solutionsDetailsVo.isTrailerAmountCb()){
             //生成车辆及上装采购合同
             cljszcghtUrls = cljszcght(printConfirmDto, conSetUpKey);
@@ -550,7 +550,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
                 File file = new File(docPdfComponent.getUploadTemplateUrl() + gsgddwdbjyUrl);
                 filesList.add(file);
             }
-        }
+        }*/
         //合并pdf文件
         if (filesList.size() > 0) {
             String dateStr = DateUtil.format(new Date(), "yyyyMMdd");

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.java

@@ -79,4 +79,6 @@ public interface LoanRepaymentHistoryMapper extends BaseMapper<LoanRepaymentHist
     List<PreTransferPaymentExportVo> preTransferPaymentExcel(@Param(Constants.WRAPPER) QueryWrapper<LoanRepaymentHistory> qw);
 
     List<TransferedPaymentExportVo> transferedPaymentExcel(@Param(Constants.WRAPPER)QueryWrapper<LoanRepaymentHistory> qw);
+
+    List<UpdateTimeByBankName> selUpdateTimeByBankName(@Param("histories") List<String> histories);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml

@@ -518,6 +518,28 @@
             #{histories}
         </foreach>
     </select>
+    <select id="selUpdateTimeByBankName"
+            resultType="com.yxt.anrui.riskcenter.api.loanrepaymenthistory.UpdateTimeByBankName">
+        SELECT
+        MAX(a.actualDate) as updateDate,
+        a.bankName
+        FROM
+        (SELECT
+        h.*,
+        p.bankName
+        FROM
+        loan_repayment_history AS h
+        LEFT JOIN loan_repayment_plan_details AS p ON h.planDetailSid = p.sid
+        WHERE
+        h.returnWayKey = '01'
+        AND h.updateState = '1'
+        AND h.sid IN
+        <foreach collection="histories" item="histories" index="index" open="(" close=")" separator=",">
+            #{histories}
+        </foreach>
+        ) AS a
+        GROUP BY a.bankName
+    </select>
     <select id="selPlanDetailsByBank"
             resultType="com.yxt.anrui.riskcenter.api.loanrepaymenthistory.NoImportVo">
         SELECT DISTINCT *
@@ -561,45 +583,33 @@
           AND a.useOrgSid = #{useOrgSid}
     </select>
     <select id="selNotRuleForBuckSids" resultType="java.lang.String">
-        SELECT DISTINCT
+        SELECT DISTINCT b.sid
-        b.sid
+        FROM (
-        FROM
+                 SELECT his.*,
-        (
-        SELECT
-        his.*,
                         a.*
-        FROM
+                 FROM loan_repayment_history AS his
-        loan_repayment_history AS his
                           LEFT JOIN loan_repayment_plan_details as p ON his.planDetailSid = p.sid
                           LEFT JOIN (
-        SELECT
+                     SELECT h.planDetailSid               AS ppp,
-        h.planDetailSid AS ppp,
                             IFNULL(SUM(h.actualMoney), 0) AS sumActualMoney
-        FROM
+                     FROM loan_repayment_history AS h
-        loan_repayment_history AS h
+                     WHERE buckleKey != '002'
-        WHERE
-        buckleKey != '002'
         AND buckleKey != '003'
         AND updateState = 1
                      GROUP BY
                          h.planDetailSid
                  ) a ON his.planDetailSid = a.ppp
-        WHERE
+                 WHERE his.buckleKey != '002'
-        his.buckleKey != '002'
         AND his.buckleKey != '003'
         AND his.updateState = 1
         AND p.useOrgSid = #{useOrgSid}
              ) AS b
-        WHERE
+        WHERE sumActualMoney &lt;= 0
-        sumActualMoney &lt;= 0
     </select>
     <select id="selPayStateByPlanSid" resultType="java.lang.String">
-        SELECT
+        SELECT h.payState
-            h.payState
+        FROM loan_repayment_history AS h
-        FROM
+        WHERE h.planDetailSid = #{key}
-            loan_repayment_history AS h
-        WHERE
-            h.planDetailSid = #{key}
           AND h.buckleKey != '002'
         AND h.buckleKey != '003'
         AND h.updateState = 1
@@ -608,37 +618,28 @@
             LIMIT 1
     </select>
     <select id="selSidsForBuckle" resultType="java.lang.String">
-        SELECT DISTINCT
+        SELECT DISTINCT b.sid
-            b.sid
+        FROM (
-        FROM
+                 SELECT his.*,
-            (
-                SELECT
-                    his.*,
                         a.*
-                FROM
+                 FROM loan_repayment_history AS his
-                    loan_repayment_history AS his
                           LEFT JOIN loan_repayment_plan_details as p ON his.planDetailSid = p.sid
                           LEFT JOIN (
-                        SELECT
+                     SELECT h.planDetailSid               AS ppp,
-                            h.planDetailSid AS ppp,
                             IFNULL(SUM(h.actualMoney), 0) AS sumActualMoney
-                        FROM
+                     FROM loan_repayment_history AS h
-                            loan_repayment_history AS h
+                     WHERE buckleKey != '002'
-                        WHERE
-                            buckleKey != '002'
         AND buckleKey != '003'
         AND updateState = 1
                      GROUP BY
                          h.planDetailSid
                  ) a ON his.planDetailSid = a.ppp
-                WHERE
+                 WHERE his.buckleKey != '002'
-                    his.buckleKey != '002'
         AND his.buckleKey != '003'
         AND his.updateState = 1
         AND p.useOrgSid = #{useOrgSid}
              ) AS b
-        WHERE
+        WHERE sumActualMoney = 0
-            sumActualMoney = 0
     </select>
     <select id="exportStatisticsExcel"
             resultType="com.yxt.anrui.riskcenter.api.loanrepaymenthistory.export.RecordCountVo">
@@ -884,4 +885,5 @@
         </where>
     </select>
 
+
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java

@@ -748,18 +748,41 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
                     baseMapper.updateById(repaymentHistory);
                 }
             }
-            Map<String, String> map = new HashMap<>();
+//            Map<String, String> map = new HashMap<>();
-            if (!bankContractNos.isEmpty()) {
+//            if (!bankContractNos.isEmpty()) {
-                for (String bankContractNo : bankContractNos) {
+//                for (String bankContractNo : bankContractNos) {
-                    String updateTime = baseMapper.getMaxUpdateTimeByBankContractNo(bankContractNo);
+//                    String updateTime = baseMapper.getMaxUpdateTimeByBankContractNo(bankContractNo);
-                    if (StringUtils.isNotBlank(updateTime)) {
+//                    if (StringUtils.isNotBlank(updateTime)) {
-                        map.put(bankContractNo, updateTime);
+//                        map.put(bankContractNo, updateTime);
-                    }
+//                    }
-                }
+//                }
-            }
+//            }
-            if (!map.isEmpty()) {
+//            if (!map.isEmpty()) {
-                for (Map.Entry<String, String> entry : map.entrySet()) {
+//                for (Map.Entry<String, String> entry : map.entrySet()) {
-                    String updateTime = entry.getValue();
+//                    String updateTime = entry.getValue();
+//                    try {
+//                        Date u = sdf.parse(updateTime);
+//                        Date today = new Date();
+//                        String f = sdf.format(today);
+//                        Date date = sdf.parse(f);
+//                        if (u.compareTo(date) >= 0) {
+//                            Calendar cal_1 = Calendar.getInstance();// 使用默认时区和语言环境获得一个日历
+//                            cal_1.setTime(date);
+//                            cal_1.add(Calendar.DAY_OF_MONTH, -1);
+//                            u = cal_1.getTime();
+//                        }
+//                        int i = loanRepaymentPlanDetailsService.updateTime(entry.getKey(), u, useOrgSid);
+//                    } catch (ParseException e) {
+//                        e.printStackTrace();
+//                    }
+//                }
+//            }
+            //获取资方最大实还日期
+            List<UpdateTimeByBankName> bankNames = baseMapper.selUpdateTimeByBankName(histories);
+            if (!bankNames.isEmpty()) {
+                for (UpdateTimeByBankName updateTimeByBankName : bankNames) {
+                    String updateTime = updateTimeByBankName.getUpdateDate();
+                    String bankName = updateTimeByBankName.getBankName();
                     try {
                         Date u = sdf.parse(updateTime);
                         Date today = new Date();
@@ -771,7 +794,7 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
                             cal_1.add(Calendar.DAY_OF_MONTH, -1);
                             u = cal_1.getTime();
                         }
-                        int i = loanRepaymentPlanDetailsService.updateTime(entry.getKey(), u, useOrgSid);
+                        int i = loanRepaymentPlanDetailsService.updateTimeByBankName(bankName, u, useOrgSid);
                     } catch (ParseException e) {
                         e.printStackTrace();
                     }
@@ -842,6 +865,36 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
         return rb.success();
     }
 
+    public ResultBean noImportUpdate(NoImportQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        ResultBean<String> orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath());
+        if (orgSidByPath.getSuccess()) {
+            String useOrgSid = orgSidByPath.getData();
+            List<NoImportVo> voList = baseMapper.selPlanDetailsByBank(query.getBankSid(), useOrgSid);
+            if (!voList.isEmpty()) {
+                List<String> stringList =
+                        voList.stream().map(NoImportVo::getSid).collect(Collectors.toList());
+                LocalDate localDate = LocalDate.now().minusDays(1);
+                String formatDate = localDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+                int i = baseMapper.updateTimeByPlanSids(stringList, formatDate);
+            }
+            //判断当期是否逾期
+            List<HistoryOverDueVo> overDueVoList = loanRepaymentPlanDetailsService.overDueVoList(useOrgSid);
+            if (!overDueVoList.isEmpty()) {
+                List<String> planSids = new ArrayList<>();
+                overDueVoList.stream().forEach(v -> {
+                    if (v.getOverdueState().equals("0")) {
+                        planSids.add(v.getPlanSid());
+                    }
+                });
+                if (!planSids.isEmpty()) {
+                    int i = loanRepaymentPlanDetailsService.updateOverDueState(planSids);
+                }
+            }
+        }
+        return rb.success();
+    }
+
     private void pushLateVoucher(String pushUseOrgSid) {
         List<LoanPlanDetailsVoForLateVoucher> records = loanRepaymentPlanDetailsService.selListForLateVoucher(pushUseOrgSid);
         List<String> planSids = new ArrayList<>();
@@ -1669,35 +1722,7 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
         return records;
     }
 
-    public ResultBean noImportUpdate(NoImportQuery query) {
+
-        ResultBean rb = ResultBean.fireFail();
-        ResultBean<String> orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath());
-        if (orgSidByPath.getSuccess()) {
-            String useOrgSid = orgSidByPath.getData();
-            List<NoImportVo> voList = baseMapper.selPlanDetailsByBank(query.getBankSid(), useOrgSid);
-            if (!voList.isEmpty()) {
-                List<String> stringList =
-                        voList.stream().map(NoImportVo::getSid).collect(Collectors.toList());
-                LocalDate localDate = LocalDate.now().minusDays(1);
-                String formatDate = localDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
-                int i = baseMapper.updateTimeByPlanSids(stringList, formatDate);
-            }
-            //判断当期是否逾期
-            List<HistoryOverDueVo> overDueVoList = loanRepaymentPlanDetailsService.overDueVoList(useOrgSid);
-            if (!overDueVoList.isEmpty()) {
-                List<String> planSids = new ArrayList<>();
-                overDueVoList.stream().forEach(v -> {
-                    if (v.getOverdueState().equals("0")) {
-                        planSids.add(v.getPlanSid());
-                    }
-                });
-                if (!planSids.isEmpty()) {
-                    int i = loanRepaymentPlanDetailsService.updateOverDueState(planSids);
-                }
-            }
-        }
-        return rb.success();
-    }
 
     public List<RecordCountVo> exportStatisticsExcel(RepaymentStatisticsQuery pagerQuery) {
         QueryWrapper<LoanRepaymentHistory> qw = new QueryWrapper<>();

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.java

@@ -34,6 +34,8 @@ public interface LoanRepaymentPlanDetailsMapper extends BaseMapper<LoanRepayment
 
     int updateTime(@Param("bankContractNo")String bankContractNo,@Param("updateTime") Date updateTime,@Param("useOrgSid") String useOrgSid);
 
+    int updateTimeByBankName(@Param("bankName")String bankName,@Param("updateTime") Date updateTime,@Param("useOrgSid") String useOrgSid);
+
     List<HistoryOverDueVo> overDueVoList(@Param("useOrgSid") String useOrgSid);
 
     int updateOverDueState(@Param("planSids") List<String> planSids);
@@ -81,4 +83,6 @@ public interface LoanRepaymentPlanDetailsMapper extends BaseMapper<LoanRepayment
     LoanRepaymentPlanDetails fetchMainBankByBusVinSid(@Param("busVinSid") String busVinSid);
 
     String fetchCwDeptCodeByBusVinSid(@Param("busVinSid") String busVinSid);
+
+
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml

@@ -7,6 +7,12 @@
         WHERE bankContractNo = #{bankContractNo}
           and useOrgSid = #{useOrgSid};
     </update>
+    <update id="updateTimeByBankName">
+        UPDATE loan_repayment_plan_details
+        SET updateTime = #{updateTime}
+        WHERE bankName = #{bankName}
+          and useOrgSid = #{useOrgSid};
+    </update>
     <update id="updateOverDueState">
         update loan_repayment_plan_details
         set overdue = 0
@@ -531,6 +537,7 @@
           AND period = #{period}
     </update>
 
+
     <select id="selVehSidAndPeriod"
             resultType="com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanMoneyVo">
         SELECT lrpd.sid,

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java

@@ -323,4 +323,8 @@ public class LoanRepaymentPlanDetailsService extends MybatisBaseService<LoanRepa
     public String fetchCwDeptCodeByBusVinSid(String busVinSid) {
         return baseMapper.fetchCwDeptCodeByBusVinSid(busVinSid);
     }
+
+    public int updateTimeByBankName(String bankName, Date updateTime, String useOrgSid) {
+        return baseMapper.updateTimeByBankName(bankName, updateTime, useOrgSid);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java

@@ -1971,6 +1971,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
             }
         }
         if (StringUtils.isNotBlank(scheduleSid)) {
+            pushScheduleVoucher3(scheduleSid);
             try {
                 ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
                         .setNameFormat("demo-pool-%d").build();
@@ -2082,9 +2083,9 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                     }
                 });
 //                //推送还款计划总凭证
-                Future future2 = pool.submit(() -> {
+//                Future future2 = pool.submit(() -> {
-                    pushScheduleVoucher3(schedule);
+//                    pushScheduleVoucher3(schedule);
-                });
+//                });
                 //设置消贷合同是否生成还款计划状态
                 Future future3 = pool.submit(() -> {
                     SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -2388,7 +2389,8 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
         }
     }
 
-    public void pushScheduleVoucher3(LoanRepaymentSchedule schedule) {
+    public void pushScheduleVoucher3(String sid) {
+        LoanRepaymentSchedule schedule = fetchBySid(sid);
         String salesOrderSid = schedule.getSalesOrderSid();
         BusSalesOrder salesOrder = busSalesOrderFeign.fetchBySid(salesOrderSid).getData();
         String loanContractSid = schedule.getLoanContractSid();

yxt-as-ui/src/api/goods/brand.js

@@ -18,8 +18,11 @@ export default {
   getAllBrand: function(params) {
     return request({
       url: '/yxtbase/apiadmin/base/basegoodsbrand/listAll',
-      method: 'get',
+     method: 'post',
      data: params,
+     headers: {
+       'Content-Type': 'application/json'
+     }
     })
   },
 

yxt-as-ui/src/api/goods/category.js

@@ -18,8 +18,11 @@ export default {
   getAllType: function(params) {
     return request({
       url: '/yxtbase/apiadmin/base/basegoodstype/listAll',
-      method: 'get',
+     method: 'post',
      data: params,
+     headers: {
+       'Content-Type': 'application/json'
+     }
     })
   },
 

yxt-as-ui/src/api/goods/factory.js

@@ -18,8 +18,11 @@ export default {
   getAllFacturer: function(params) {
     return request({
       url: '/yxtbase/apiadmin/base/basemanufacturer/listAll',
-      method: 'get',
+     method: 'post',
      data: params,
+     headers: {
+       'Content-Type': 'application/json'
+     }
     })
   },
 

yxt-as-ui/src/api/goods/unit.js

@@ -18,8 +18,11 @@ export default {
   getAllUnit: function(params) {
     return request({
       url: '/yxtbase/apiadmin/base/basegoodsunit/listAll',
-      method: 'get',
+    method: 'post',
     data: params,
+    headers: {
+      'Content-Type': 'application/json'
+    }
     })
   },
 

yxt-as-ui/src/api/warehouse/warehouse.js

@@ -18,7 +18,7 @@ export default {
   getAllWarehouse: function(params) {
     return request({
       url: '/wms/apiadmin/base/wmswarehouseinfo/listAll',
-      method: 'get',
+      method: 'post',
       data: params,
       headers: {
         'Content-Type': 'application/json'

yxt-as-ui/src/api/warehouse/warehouseArea.js

@@ -18,7 +18,7 @@ export default {
   getAllWarehousearea: function(params) {
     return request({
       url: '/wms/apiadmin/base/wmswarehousearea/listAll',
-      method: 'get',
+     method: 'post',
      data: params,
      headers: {
        'Content-Type': 'application/json'

yxt-as-ui/src/api/warehouse/warehouseAreaType.js

@@ -19,7 +19,7 @@ export default {
   getAllWarehouseareatype: function(params) {
     return request({
       url: '/wms/apiadmin/base/wmswarehouseareatype/listAll',
-      method: 'get',
+      method: 'post',
       data: params,
       headers: {
         'Content-Type': 'application/json'

yxt-as-ui/src/views/warehouse/warehouseArea/index.vue

@@ -56,8 +56,8 @@
             </el-table-column> -->
             <el-table-column label="是否可用" align="center" width="140">
               <template slot-scope="scope">
-                <el-switch v-model="scope.row.usageStatus" active-text="是" inactive-text="否" active-value="0"
+                <el-switch v-model="scope.row.isEnable" active-text="是" inactive-text="否" active-value="1"
-                  inactive-value="1" @change="enableChange(scope.row.sid,scope.row.usageStatus)" />
+                  inactive-value="0" @change="enableChange(scope.row.sid,scope.row.isEnable)" />
               </template>
             </el-table-column>
             <el-table-column prop="areaName" label="库区名称" align="center" />

yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupService.java

@@ -43,6 +43,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -83,11 +84,34 @@ public class AsServiceGroupService extends MybatisBaseService<AsServiceGroupMapp
 	public void saveOrUpdateDto(AsServiceGroupDto dto){
         String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
+			String deptName = "";
+			String deptSid = "";
+			String createOrgSid = "";
 			String orgPath = dto.getOrgPath();
-			String createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+			if (StringUtils.isNotBlank(orgPath)) {
-			SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(createOrgSid).getData();
+				List<String> split = Arrays.asList(orgPath.split("/"));
+				if (split.size() > 1) {
+					//获取本级sid获取本级部门信息
+					SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(split.size() - 2)).getData();
+					SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData();
+					deptName = sysOrganization.getName() + "/" + sysOrganization1.getName();
+					deptName = sysOrganization1.getName();
+					deptSid = sysOrganization1.getSid();
+				} else {
+					SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData();
+					deptName = sysOrganization.getName();
+					deptName = sysOrganization.getName();
+					deptSid = sysOrganization.getSid();
+				}
+				dto.setUseOrgSid(deptSid);
+				createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+				//创建组织使用组织
+				ResultBean<SysOrganizationVo> organizationResultBean = sysOrganizationFeign.fetchBySid(createOrgSid);
+				if (organizationResultBean.getData() != null) {
 					dto.setCreateOrgSid(createOrgSid);
-			dto.setCreateOrgName(sysOrganizationVo.getName());
+					dto.setCreateOrgName(organizationResultBean.getData().getName());
+				}
+			}
             this.insertByDto(dto);
             return;
         }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceSubjectService.java

@@ -31,6 +31,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.as.feign.portal.sysstafforg.SysStaffOrgFeign;
+import com.yxt.common.core.result.ResultBean;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -45,6 +46,9 @@ import com.yxt.anrui.as.api.asservicesubject.AsServiceSubjectDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Arrays;
+import java.util.List;
+
 /**
  * Project: yxt-as(售后服务) <br/>
  * File: AsServiceSubjectService.java <br/>
@@ -83,12 +87,34 @@ public class AsServiceSubjectService extends MybatisBaseService<AsServiceSubject
 	public void saveOrUpdateDto(AsServiceSubjectDto dto){
         String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
+			String deptName = "";
+			String deptSid = "";
+			String createOrgSid = "";
 			String orgPath = dto.getOrgPath();
-			String createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+			if (StringUtils.isNotBlank(orgPath)) {
-			SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(createOrgSid).getData();
+				List<String> split = Arrays.asList(orgPath.split("/"));
+				if (split.size() > 1) {
+					//获取本级sid获取本级部门信息
+					SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(split.size() - 2)).getData();
+					SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData();
+					deptName = sysOrganization.getName() + "/" + sysOrganization1.getName();
+					deptName = sysOrganization1.getName();
+					deptSid = sysOrganization1.getSid();
+				} else {
+					SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData();
+					deptName = sysOrganization.getName();
+					deptName = sysOrganization.getName();
+					deptSid = sysOrganization.getSid();
+				}
+				dto.setUseOrgSid(deptSid);
+				createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+				//创建组织使用组织
+				ResultBean<SysOrganizationVo> organizationResultBean = sysOrganizationFeign.fetchBySid(createOrgSid);
+				if (organizationResultBean.getData() != null) {
 					dto.setCreateOrgSid(createOrgSid);
-			dto.setCreateOrgName(sysOrganizationVo.getName());
+					dto.setCreateOrgName(organizationResultBean.getData().getName());
-			dto.setUseOrgSid(createOrgSid);
+				}
+			}
             this.insertByDto(dto);
             return; 
         } 

yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicetype/AsServiceTypeService.java

@@ -31,6 +31,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.as.feign.portal.sysstafforg.SysStaffOrgFeign;
+import com.yxt.common.core.result.ResultBean;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -45,6 +46,9 @@ import com.yxt.anrui.as.api.asservicetype.AsServiceTypeDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Arrays;
+import java.util.List;
+
 /**
  * Project: yxt-as(售后服务) <br/>
  * File: AsServiceTypeService.java <br/>
@@ -83,12 +87,34 @@ public class AsServiceTypeService extends MybatisBaseService<AsServiceTypeMapper
     public void saveOrUpdateDto(AsServiceTypeDto dto) {
         String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
+            String deptName = "";
+            String deptSid = "";
+            String createOrgSid = "";
             String orgPath = dto.getOrgPath();
-            String createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+            if (StringUtils.isNotBlank(orgPath)) {
-            SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(createOrgSid).getData();
+                List<String> split = Arrays.asList(orgPath.split("/"));
-            dto.setUseOrgSid(createOrgSid);
+                if (split.size() > 1) {
+                    //获取本级sid获取本级部门信息
+                    SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(split.size() - 2)).getData();
+                    SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData();
+                    deptName = sysOrganization.getName() + "/" + sysOrganization1.getName();
+                    deptName = sysOrganization1.getName();
+                    deptSid = sysOrganization1.getSid();
+                } else {
+                    SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData();
+                    deptName = sysOrganization.getName();
+                    deptName = sysOrganization.getName();
+                    deptSid = sysOrganization.getSid();
+                }
+                dto.setUseOrgSid(deptSid);
+                createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+                //创建组织使用组织
+                ResultBean<SysOrganizationVo> organizationResultBean = sysOrganizationFeign.fetchBySid(createOrgSid);
+                if (organizationResultBean.getData() != null) {
                     dto.setCreateOrgSid(createOrgSid);
-            dto.setCreateOrgName(sysOrganizationVo.getName());
+                    dto.setCreateOrgName(organizationResultBean.getData().getName());
+                }
+            }
             this.insertByDto(dto);
             return;
         }

yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsBrandRest.java

@@ -1,6 +1,7 @@
 package com.yxt.base.apiadmin.base;
 
 import com.yxt.base.biz.base.basebrandinfo.*;
+import com.yxt.base.utils.OrgPathQuery;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -29,9 +30,9 @@ public class BaseGoodsBrandRest {
         return baseBrandInfoService.listPage(pq);
     }
     @ApiOperation("查询所有的品牌")
-    @GetMapping("/listAll")
+    @PostMapping("/listAll")
-    public ResultBean<List<BaseBrandInfo>> listAll() {
+    public ResultBean<List<BaseBrandInfo>> listAll(@RequestBody OrgPathQuery query) {
-        return baseBrandInfoService.listAll();
+        return baseBrandInfoService.listAll(query);
     }
     @ApiOperation("保存修改")
     @PostMapping("/saveOrUpdate")

yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsTypeRest.java

@@ -1,6 +1,7 @@
 package com.yxt.base.apiadmin.base;
 
 import com.yxt.base.biz.base.basegoodstype.*;
+import com.yxt.base.utils.OrgPathQuery;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -29,9 +30,9 @@ public class BaseGoodsTypeRest {
         return baseGoodsTypeService.listPage(pq);
     }
     @ApiOperation("查询所有的类别")
-    @GetMapping("/listAll")
+    @PostMapping("/listAll")
-    public ResultBean<List<BaseGoodsType>> listAll() {
+    public ResultBean<List<BaseGoodsType>> listAll(@RequestBody OrgPathQuery query) {
-        return baseGoodsTypeService.listAll();
+        return baseGoodsTypeService.listAll(query);
     }
 
     @ApiOperation("保存修改")

yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsUnitRest.java

@@ -1,6 +1,7 @@
 package com.yxt.base.apiadmin.base;
 
 import com.yxt.base.biz.base.basegoodsunit.*;
+import com.yxt.base.utils.OrgPathQuery;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -29,9 +30,9 @@ public class BaseGoodsUnitRest {
         return baseGoodsUnitService.listPage(pq);
     }
     @ApiOperation("查询所有的类别")
-    @GetMapping("/listAll")
+    @PostMapping("/listAll")
-    public ResultBean<List<BaseGoodsUnit>> listAll() {
+    public ResultBean<List<BaseGoodsUnit>> listAll(@RequestBody OrgPathQuery query) {
-        return baseGoodsUnitService.listAll();
+        return baseGoodsUnitService.listAll(query);
     }
 
     @ApiOperation("保存修改")

yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseManufacturerRest.java

@@ -1,6 +1,7 @@
 package com.yxt.base.apiadmin.base;
 
 import com.yxt.base.biz.base.basemanufacturer.*;
+import com.yxt.base.utils.OrgPathQuery;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -30,9 +31,9 @@ public class BaseManufacturerRest {
     }
 
     @ApiOperation("查询所有的厂家")
-    @GetMapping("/listAll")
+    @PostMapping("/listAll")
-    public ResultBean<List<BaseManufacturer>> listAll() {
+    public ResultBean<List<BaseManufacturer>> listAll(@RequestBody OrgPathQuery query) {
-        return baseManufacturerService.listAll();
+        return baseManufacturerService.listAll(query);
     }
 
     @ApiOperation("保存修改")

yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoService.java

@@ -10,6 +10,7 @@ import com.yxt.base.feign.portal.sysorganization.SysOrganizationFeign;
 import com.yxt.base.feign.portal.sysorganization.SysOrganizationVo;
 import com.yxt.base.feign.portal.sysstafforg.SysStaffOrgFeign;
 import com.yxt.base.feign.portal.sysuser.SysUserFeign;
+import com.yxt.base.utils.OrgPathQuery;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -19,6 +20,7 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.text.SimpleDateFormat;
 import java.util.Arrays;
@@ -99,9 +101,22 @@ public class BaseBrandInfoService extends MybatisBaseService<BaseBrandInfoMapper
 //        }
         return rb.success().setData(p);
     }
-    public ResultBean<List<BaseBrandInfo>> listAll() {
+    public ResultBean<List<BaseBrandInfo>> listAll(@RequestBody OrgPathQuery query) {
     ResultBean rb = ResultBean.fireFail();
-    List<BaseBrandInfo> pagging = baseMapper.selectList(new QueryWrapper<BaseBrandInfo>().eq("isEnable",1).ne("isDelete","1"));
+        String useOrgSid = "";
+        String orgPath = query.getOrgPath();
+        if (StringUtils.isNotBlank(orgPath)) {
+            List<String> split = Arrays.asList(orgPath.split("/"));
+            if (split.size() > 1) {
+                //获取本级sid获取本级部门信息
+                SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData();
+                useOrgSid = sysOrganization1.getSid();
+            } else {
+                SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData();
+                useOrgSid = sysOrganization.getSid();
+            }
+        }
+    List<BaseBrandInfo> pagging = baseMapper.selectList(new QueryWrapper<BaseBrandInfo>().eq("isEnable",1).ne("isDelete","1").eq("useOrgSid",useOrgSid));
     return rb.success().setData(pagging);
 }
     public ResultBean<String> saveOrUpdate(BaseBrandInfoDto dto) {

yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeService.java

@@ -11,6 +11,7 @@ import com.yxt.base.feign.portal.sysorganization.SysOrganizationFeign;
 import com.yxt.base.feign.portal.sysorganization.SysOrganizationVo;
 import com.yxt.base.feign.portal.sysstafforg.SysStaffOrgFeign;
 import com.yxt.base.feign.portal.sysuser.SysUserFeign;
+import com.yxt.base.utils.OrgPathQuery;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.base.utils.StringUtils;
@@ -19,6 +20,7 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.text.SimpleDateFormat;
 import java.util.Arrays;
@@ -110,10 +112,25 @@ public class BaseGoodsTypeService extends MybatisBaseService<BaseGoodsTypeMapper
         }
         return rb.success().setData(p);
     }
-    public ResultBean<List<BaseGoodsType>> listAll() {
+    public ResultBean<List<BaseGoodsType>> listAll(OrgPathQuery query) {
         ResultBean rb = ResultBean.fireFail();
+        String useOrgSid = "";
+        String orgPath = query.getOrgPath();
+        if (StringUtils.isNotBlank(orgPath)) {
+            List<String> split = Arrays.asList(orgPath.split("/"));
+            if (split.size() > 1) {
+                //获取本级sid获取本级部门信息
+                SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData();
+                useOrgSid = sysOrganization1.getSid();
+            } else {
+                SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData();
+                useOrgSid = sysOrganization.getSid();
+            }
+        }
         List<BaseGoodsType> pagging = baseMapper.selectList(new QueryWrapper<BaseGoodsType>().eq("isEnable",1)
-                .ne("isDelete","1"));
+                .ne("isDelete","1")
+                .eq("useOrgSid",useOrgSid)
+        );
         return rb.success().setData(pagging);
     }
 

yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsunit/BaseGoodsUnitService.java

@@ -11,6 +11,7 @@ import com.yxt.base.feign.portal.sysorganization.SysOrganizationFeign;
 import com.yxt.base.feign.portal.sysorganization.SysOrganizationVo;
 import com.yxt.base.feign.portal.sysstafforg.SysStaffOrgFeign;
 import com.yxt.base.feign.portal.sysuser.SysUserFeign;
+import com.yxt.base.utils.OrgPathQuery;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.base.utils.StringUtils;
@@ -19,6 +20,7 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.text.SimpleDateFormat;
 import java.util.Arrays;
@@ -89,9 +91,25 @@ public class BaseGoodsUnitService extends MybatisBaseService<BaseGoodsUnitMapper
         PagerVo<BaseGoodsUnitVo> p = PagerUtil.pageToVo(pagging, null);
         List<BaseGoodsUnitVo> records = pagging.getRecords();
         return rb.success().setData(p);
-    }    public ResultBean<List<BaseGoodsUnit>> listAll() {
+    }    public ResultBean<List<BaseGoodsUnit>> listAll(OrgPathQuery query) {
         ResultBean rb = ResultBean.fireFail();
-        List<BaseGoodsUnit> pagging = baseMapper.selectList(new QueryWrapper<BaseGoodsUnit>().eq("isEnable",1));
+        String useOrgSid = "";
+        String orgPath = query.getOrgPath();
+        if (StringUtils.isNotBlank(orgPath)) {
+            List<String> split = Arrays.asList(orgPath.split("/"));
+            if (split.size() > 1) {
+                //获取本级sid获取本级部门信息
+                SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData();
+                useOrgSid = sysOrganization1.getSid();
+            } else {
+                SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData();
+                useOrgSid = sysOrganization.getSid();
+            }
+        }
+        List<BaseGoodsUnit> pagging = baseMapper.selectList(new QueryWrapper<BaseGoodsUnit>().eq("isEnable",1)
+                .ne("isDelete","1")
+                .eq("useOrgSid",useOrgSid)
+        );
         return rb.success().setData(pagging);
     }
 

yxt-base-biz/src/main/java/com/yxt/base/biz/base/basemanufacturer/BaseManufacturerService.java

@@ -11,6 +11,7 @@ import com.yxt.base.feign.portal.sysorganization.SysOrganizationFeign;
 import com.yxt.base.feign.portal.sysorganization.SysOrganizationVo;
 import com.yxt.base.feign.portal.sysstafforg.SysStaffOrgFeign;
 import com.yxt.base.feign.portal.sysuser.SysUserFeign;
+import com.yxt.base.utils.OrgPathQuery;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.base.utils.StringUtils;
@@ -19,6 +20,7 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.text.SimpleDateFormat;
 import java.util.Arrays;
@@ -91,10 +93,25 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
         List<BaseManufacturerVo> records = pagging.getRecords();
         return rb.success().setData(p);
     }
-    public ResultBean<List<BaseManufacturer>> listAll() {
+    public ResultBean<List<BaseManufacturer>> listAll(OrgPathQuery query) {
         ResultBean rb = ResultBean.fireFail();
+        String useOrgSid = "";
+        String orgPath = query.getOrgPath();
+        if (StringUtils.isNotBlank(orgPath)) {
+            List<String> split = Arrays.asList(orgPath.split("/"));
+            if (split.size() > 1) {
+                //获取本级sid获取本级部门信息
+                SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData();
+                useOrgSid = sysOrganization1.getSid();
+            } else {
+                SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData();
+                useOrgSid = sysOrganization.getSid();
+            }
+        }
         List<BaseManufacturer> pagging = baseMapper.selectList(new QueryWrapper<BaseManufacturer>().eq("isEnable",1)
-                .ne("isDelete","1"));
+                .ne("isDelete","1")
+                .eq("useOrgSid",useOrgSid)
+        );
         return rb.success().setData(pagging);
     }
 

yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfoDto.java

@@ -118,6 +118,8 @@ public class BaseSupplierInfoDto implements Dto {
     private String createOrgName; // 创建组织名称
 	@ApiModelProperty("创建组织sid")
     private String createOrgSid; // 创建组织sid
+    @ApiModelProperty("组织全路径")
+    private String orgPath;
     @ApiModelProperty("开户行信息")
     private List<BaseSupplierBankDto> baseSupplierBankList = new ArrayList<>();
 }

yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfoService.java

@@ -33,6 +33,7 @@ import com.yxt.base.biz.base.basesupplierBank.BaseSupplierBankDetailsVo;
 import com.yxt.base.biz.base.basesupplierBank.BaseSupplierBankDto;
 import com.yxt.base.biz.base.basesupplierBank.BaseSupplierBankService;
 import com.yxt.base.feign.portal.sysorganization.SysOrganizationFeign;
+import com.yxt.base.feign.portal.sysorganization.SysOrganizationVo;
 import com.yxt.base.feign.portal.sysstafforg.SysStaffOrgFeign;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -43,6 +44,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -98,6 +100,34 @@ public class BaseSupplierInfoService extends MybatisBaseService<BaseSupplierInfo
         String dtoSid = dto.getSid();
 		List<BaseSupplierBankDto> baseSupplierBankDtoList = dto.getBaseSupplierBankList();
 		if (StringUtils.isBlank(dtoSid)) {
+			String deptName = "";
+			String deptSid = "";
+			String createOrgSid = "";
+			String orgPath = dto.getOrgPath();
+			if (StringUtils.isNotBlank(orgPath)) {
+				List<String> split = Arrays.asList(orgPath.split("/"));
+				if (split.size() > 1) {
+					//获取本级sid获取本级部门信息
+					SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(split.size() - 2)).getData();
+					SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData();
+					deptName = sysOrganization.getName() + "/" + sysOrganization1.getName();
+					deptName = sysOrganization1.getName();
+					deptSid = sysOrganization1.getSid();
+				} else {
+					SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData();
+					deptName = sysOrganization.getName();
+					deptName = sysOrganization.getName();
+					deptSid = sysOrganization.getSid();
+				}
+				dto.setUseOrgSid(deptSid);
+				createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+				//创建组织使用组织
+				ResultBean<SysOrganizationVo> organizationResultBean = sysOrganizationFeign.fetchBySid(createOrgSid);
+				if (organizationResultBean.getData() != null) {
+					dto.setCreateOrgSid(createOrgSid);
+					dto.setCreateOrgName(organizationResultBean.getData().getName());
+				}
+			}
 			String sid = this.insertByDto(dto);
 			for (BaseSupplierBankDto baseSupplierBankDto : baseSupplierBankDtoList) {
 				baseSupplierBankDto.setSupplierSid(sid);

yxt-base-biz/src/main/java/com/yxt/base/utils/OrgPathQuery.java

@@ -0,0 +1,13 @@
+package com.yxt.base.utils;
+
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/5/17 14:15
+ */
+@Data
+public class OrgPathQuery {
+    private String orgPath;
+}

yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchaseBillRest.java

@@ -94,9 +94,7 @@ public class PmsPurchaseBillRest {
 	@ApiOperation("根据sid批量删除")
     @DeleteMapping("/delBySids")
     public ResultBean delBySids(@RequestBody String[] sids){
-		ResultBean rb = ResultBean.fireFail();
+		return pmsPurchaseBillService.delAll(sids);
-		pmsPurchaseBillService.delAll(sids);
-		return rb.success();
 	}
 
 	@ApiOperation("根据SID获取一条记录")

yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchasebackBillRest.java

@@ -87,9 +87,7 @@ public class PmsPurchasebackBillRest {
 	@ApiOperation("根据sid批量删除")
     @DeleteMapping("/delBySids")
     public ResultBean delBySids(@RequestBody String[] sids){
-		ResultBean rb = ResultBean.fireFail();
+		return pmsPurchasebackBillService.delAll(sids);
-		pmsPurchasebackBillService.delAll(sids);
-		return rb.success();
 	}
 
 	@ApiOperation("根据SID获取一条记录")

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillMapper.java

@@ -63,4 +63,6 @@ public interface PmsPurchasebackBillMapper extends BaseMapper<PmsPurchasebackBil
     int checkNodeStateBySourceBillSid(String sourceBillSid);
 
 	BigDecimal checkPayableAmountBySourceBillSid(String sourceBillSid);
+
+	int selectBySid(String join);
 }

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillMapper.xml

@@ -72,4 +72,11 @@
 		ORDER BY createTime DESC
 				LIMIT 1
 	</select>
+
+	<select id="selectBySid" resultType="int">
+		SELECT COUNT(*)
+		FROM pms_purchaseback_bill
+		WHERE nodeState != '待提交'
+		  and find_in_set(sid, #{list})
+	</select>
 </mapper>

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillService.java

@@ -140,6 +140,7 @@ public class PmsPurchasebackBillService extends MybatisBaseService<PmsPurchaseba
 		qw.apply(StringUtils.isNotEmpty(finishStartTime), "date_format (ppb.finishTime,'%Y-%m-%d') >= date_format('" + finishStartTime + "','%Y-%m-%d')").
 				apply(StringUtils.isNotEmpty(finishEndTime), "date_format (ppb.finishTime,'%Y-%m-%d') <= date_format('" + finishEndTime + "','%Y-%m-%d')"
 				);
+		qw.orderByDesc("ppb.createTime");
 		qw.groupBy("ppb.sid");
 		IPage<PmsPurchasebackBill> page = PagerUtil.queryToPage(pq);
 		IPage<PmsPurchasebackBillVo> pagging = baseMapper.selectPageVo(page, qw);
@@ -225,11 +226,18 @@ public class PmsPurchasebackBillService extends MybatisBaseService<PmsPurchaseba
 		return vo;
 	}
 
-	public void delAll(String[] sids) {
+	public ResultBean delAll(String[] sids) {
+		ResultBean rb = ResultBean.fireFail();
+		//查询该sid中是否有流程不是待提交的
+		int count = baseMapper.selectBySid(StringUtils.join(sids, ","));
+		if (count > 0) {
+			return rb.setMsg("删除的数据中包含已提交或已办结审批的数据，删除失败");
+		}
 		delBySids(sids);
 		for (String sid : sids) {
 			pmsPurchasebackDetailService.delByMainSid(sid);
 		}
+		return rb.success();
 	}
 
 	public ResultBean submit(SubmitPmsPurchasebackBillDto dto) {

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillMapper.java

@@ -61,4 +61,6 @@ public interface PmsPurchaseBillMapper extends BaseMapper<PmsPurchaseBill> {
     String selectNum(String billNo);
 
     int updateFlowFiled(Map<String, Object> map);
+
+    int selectBySid(String join);
 }

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillMapper.xml

@@ -86,4 +86,11 @@
 		</if>
 		WHERE sid=#{sid}
 	</update>
+
+	<select id="selectBySid" resultType="int">
+		SELECT COUNT(*)
+		FROM pms_purchase_bill
+		WHERE nodeState != '待提交'
+		  and find_in_set(sid, #{list})
+	</select>
 </mapper>

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java

@@ -157,6 +157,7 @@ public class PmsPurchaseBillService extends MybatisBaseService<PmsPurchaseBillMa
         qw.apply(StringUtils.isNotEmpty(finishStartTime), "date_format (ppb.finishTime,'%Y-%m-%d') >= date_format('" + finishStartTime + "','%Y-%m-%d')").
                 apply(StringUtils.isNotEmpty(finishEndTime), "date_format (ppb.finishTime,'%Y-%m-%d') <= date_format('" + finishEndTime + "','%Y-%m-%d')"
                 );
+        qw.orderByDesc("ppb.createTime");
         qw.groupBy("ppb.sid");
         IPage<PmsPurchaseBill> page = PagerUtil.queryToPage(pq);
         IPage<PmsPurchaseBillVo> pagging = baseMapper.selectPageVo(page, qw);
@@ -307,13 +308,20 @@ public class PmsPurchaseBillService extends MybatisBaseService<PmsPurchaseBillMa
         return vo;
     }
 
-    public void delAll(String[] sids) {
+    public ResultBean delAll(String[] sids) {
+        ResultBean rb = ResultBean.fireFail();
+        //查询该sid中是否有流程不是待提交的
+        int count = baseMapper.selectBySid(StringUtils.join(sids, ","));
+        if (count > 0) {
+            return rb.setMsg("删除的数据中包含已提交或已办结审批的数据，删除失败");
+        }
         delBySids(sids);
         for (String sid : sids) {
             pmsPurchaseBillDetailService.delByMainSid(sid);
             pmsPurchasePayService.delByMainSid(sid);
             pmsPurchaseBillInvoiceService.delByMainSid(sid);
         }
+        return rb.success();
     }
 
     public ResultBean submit(SubmitPmsPurchaseBillDto dto) {

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoDto.java

@@ -117,6 +117,8 @@ public class PmsSupplierInfoDto implements Dto {
     private String createOrgName; // 创建组织名称
 	@ApiModelProperty("创建组织sid")
     private String createOrgSid; // 创建组织sid
+    @ApiModelProperty("组织全路径")
+    private String orgPath;
     @ApiModelProperty("开户行信息")
     private List<PmsSupplierBankDto> pmsSupplierBankList = new ArrayList<>();
 }

yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseAreaRest.java

@@ -4,6 +4,7 @@ import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import com.yxt.wms.biz.base.wmswarehousearea.*;
+import com.yxt.wms.utils.OrgPathQuery;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,9 +30,9 @@ public class WmsWarehouseAreaRest {
         return wmsWarehouseAreaService.listPage(pq);
     }
     @ApiOperation("查询所有的库区")
-    @GetMapping("/listAll")
+    @PostMapping("/listAll")
-    public ResultBean<WmsWarehouseAreaVo> listAll() {
+    public ResultBean<List<WmsWarehouseArea>> listAll(@RequestBody OrgPathQuery query) {
-        return wmsWarehouseAreaService.getAllType();
+        return wmsWarehouseAreaService.getAllType(query);
     }
 
     @ApiOperation("保存修改")

yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseAreaTypeRest.java

@@ -3,15 +3,15 @@ package com.yxt.wms.apiadmin.base;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.wms.biz.base.wmswarehouseareatype.WmsWarehouseAreaTypeDto;
+import com.yxt.wms.biz.base.wmswarehouseareatype.*;
-import com.yxt.wms.biz.base.wmswarehouseareatype.WmsWarehouseAreaTypeQuery;
+import com.yxt.wms.utils.OrgPathQuery;
-import com.yxt.wms.biz.base.wmswarehouseareatype.WmsWarehouseAreaTypeService;
-import com.yxt.wms.biz.base.wmswarehouseareatype.WmsWarehouseAreaTypeVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * @author wangpengfei
  * @date 2024/3/18 14:57
@@ -30,9 +30,9 @@ public class WmsWarehouseAreaTypeRest {
         return wmsWarehouseAreaTypeService.listPage(pq);
     }
     @ApiOperation("查询所有的")
-    @GetMapping("/listAll")
+    @PostMapping("/listAll")
-    public ResultBean<WmsWarehouseAreaTypeVo> listAll() {
+    public ResultBean<List<WmsWarehouseAreaType>> listAll(@RequestBody OrgPathQuery query) {
-        return wmsWarehouseAreaTypeService.listAll();
+        return wmsWarehouseAreaTypeService.listAll(query);
     }
 
     @ApiOperation("保存修改")

yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseInfoRest.java

@@ -5,6 +5,7 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseAreaAllVo;
 import com.yxt.wms.biz.base.wmswarehouseinfo.*;
+import com.yxt.wms.utils.OrgPathQuery;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,9 +31,9 @@ public class WmsWarehouseInfoRest {
         return wmsWarehouseService.listPage(pq);
     }
     @ApiOperation("查询所有的仓库")
-    @GetMapping("/listAll")
+    @PostMapping("/listAll")
-    public ResultBean<WmsWarehouseInfoVo> listAll() {
+    public ResultBean<List<WmsWarehouseInfo>> listAll(@RequestBody OrgPathQuery query) {
-        return wmsWarehouseService.listAll();
+        return wmsWarehouseService.listAll(query);
     }
 
     @ApiOperation("保存修改")

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaMapper.java

@@ -19,10 +19,12 @@ public interface WmsWarehouseAreaMapper extends BaseMapper<WmsWarehouseArea> {
     IPage<WmsWarehouseAreaVo> listPage(IPage<WmsWarehouseArea> page, @Param(Constants.WRAPPER) QueryWrapper<WmsWarehouseArea> qw);
     WmsWarehouseAreaVo initialization (@Param("sid") String sid);
     int updateBySidIsDelete(List<String> list);
-    @Select("select * from wms_warehouse_area where warehouseSid = #{ckSid}")
+    @Select("select * from wms_warehouse_area where warehouseSid = #{ckSid} and isDelete = 0 and isEnable = 1")
     List<WmsWarehouseAreaAllVo> selectAll(String ckSid);
 
     WmsWarehouseArea checkForInsert(@Param("areaCode")String areaCode, @Param("warehouseSid")String warehouseSid);
 
     WmsWarehouseArea checkForUpdate(@Param("areaCode")String areaCode,@Param("warehouseSid") String warehouseSid, @Param("sid")String sid);
+
+    List<WmsWarehouseArea> listAll(@Param("useOrgSid") String useOrgSid);
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaMapper.xml

@@ -16,8 +16,10 @@
         </where>
     </select>
     <select id="initialization" resultType="com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseAreaVo">
-        select
+        select a.*,
-        a.*,a.createBySid as userSid,b.warehouseName as warehouseName,c.warehouseAreaTypeName as areaTypeName
+               a.createBySid           as userSid,
+               b.warehouseName         as warehouseName,
+               c.warehouseAreaTypeName as areaTypeName
         from wms_warehouse_area a
                  left join wms_warehouse_info b on b.sid = a.warehouseSid
                  left join wms_warehouse_area_type c on c.sid = a.areaTypeSid
@@ -25,10 +27,26 @@
         where a.sid = #{sid}
     </select>
     <select id="checkForInsert" resultType="com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseArea">
-        select * from wms_warehouse_area where areaCode =#{areaCode} and warehouseSid =#{warehouseSid} and isDelete=0
+        select *
+        from wms_warehouse_area
+        where areaCode = #{areaCode}
+          and warehouseSid = #{warehouseSid}
+          and isDelete = 0
     </select>
     <select id="checkForUpdate" resultType="com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseArea">
-        select * from wms_warehouse_area where areaCode =#{areaCode} and warehouseSid =#{warehouseSid} and sid !=#{sid} and isDelete=0
+        select *
+        from wms_warehouse_area
+        where areaCode = #{areaCode}
+          and warehouseSid = #{warehouseSid}
+          and sid !=#{sid}
+          and isDelete=0
+    </select>
+    <select id="listAll" resultType="com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseArea">
+        select a.*
+        from wms_warehouse_area a
+                 left join wms_warehouse_info b on b.sid = a.warehouseSid
+        where b.useOrgSid = #{useOrgSid}
+          and a.isDelete = 0
     </select>
     <update id="updateBySidIsDelete">
         UPDATE wms_warehouse_area

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaService.java

@@ -10,12 +10,17 @@ import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.base.wmswarehouseinfo.WmsWarehouseInfo;
 import com.yxt.wms.biz.base.wmswarehouseinfo.WmsWarehouseInfoVo;
 import com.yxt.wms.feign.portal.privilege.PrivilegeQuery;
+import com.yxt.wms.feign.portal.sysorganization.SysOrganizationFeign;
+import com.yxt.wms.feign.portal.sysorganization.SysOrganizationVo;
 import com.yxt.wms.feign.portal.sysuser.SysUserFeign;
+import com.yxt.wms.utils.OrgPathQuery;
 import lombok.experimental.Accessors;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.Arrays;
 import java.util.Date;
@@ -30,6 +35,8 @@ import java.util.stream.Collectors;
 public class WmsWarehouseAreaService extends MybatisBaseService<WmsWarehouseAreaMapper, WmsWarehouseArea> {
     @Autowired
     private SysUserFeign sysUserFeign;
+    @Autowired
+    private SysOrganizationFeign sysOrganizationFeign;
 
     public ResultBean<PagerVo<WmsWarehouseAreaVo>> listPage(PagerQuery<WmsWarehouseAreaQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
@@ -91,11 +98,23 @@ public class WmsWarehouseAreaService extends MybatisBaseService<WmsWarehouseArea
         return rb.success().setData(p);
     }
 
-    public ResultBean<WmsWarehouseAreaVo> getAllType() {
+    public ResultBean<List<WmsWarehouseArea>> getAllType(OrgPathQuery query) {
         ResultBean rb = ResultBean.fireFail();
-        List<WmsWarehouseArea> pagging = baseMapper.selectList(new QueryWrapper<WmsWarehouseArea>().eq("isEnable", 1)
+        String useOrgSid = "";
-                .ne("isDelete", "1"));
+        String orgPath = query.getOrgPath();
-        return rb.success().setData(pagging);
+        if (StringUtils.isNotBlank(orgPath)) {
+            List<String> split = Arrays.asList(orgPath.split("/"));
+            if (split.size() > 1) {
+                //获取本级sid获取本级部门信息
+                SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData();
+                useOrgSid = sysOrganization1.getSid();
+            } else {
+                SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData();
+                useOrgSid = sysOrganization.getSid();
+            }
+        }
+        List<WmsWarehouseArea> list = baseMapper.listAll(useOrgSid);
+        return rb.success().setData(list);
     }
 
     public ResultBean<String> saveOrUpdate(WmsWarehouseAreaDto dto) {
@@ -121,6 +140,7 @@ public class WmsWarehouseAreaService extends MybatisBaseService<WmsWarehouseArea
             BeanUtil.copyProperties(dto, wmsWarehouseArea, "id", "sid");
             wmsWarehouseArea.setCreateTime(new DateTime());
             wmsWarehouseArea.setCreateBySid(dto.getUserSid());
+            wmsWarehouseArea.setIsEnable(1);
             baseMapper.insert(wmsWarehouseArea);
         }
         return rb.success().setMsg("成功");

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaTypeMapper.java

@@ -23,4 +23,6 @@ public interface WmsWarehouseAreaTypeMapper extends BaseMapper<WmsWarehouseAreaT
     WmsWarehouseAreaType checkCode(@Param("warehouseAreaTypeName")String warehouseAreaTypeName, @Param("deptSid") String deptSid);
 
     WmsWarehouseAreaType checkCodeForUpdate(@Param("warehouseAreaTypeName")String warehouseAreaTypeName, @Param("deptSid")String useOrgSid, @Param("sid")String sid);
+
+    List<WmsWarehouseAreaType> listAll(@Param("useOrgSid")String useOrgSid);
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaTypeMapper.xml

@@ -23,7 +23,8 @@
         select *
         from wms_warehouse_area_type
         where warehouseAreaTypeName = #{warehouseAreaTypeName}
-          and useOrgSid = #{deptSid} and isDelete=0
+          and useOrgSid = #{deptSid}
+          and isDelete = 0
     </select>
     <select id="checkCodeForUpdate"
             resultType="com.yxt.wms.biz.base.wmswarehouseareatype.WmsWarehouseAreaType">
@@ -31,7 +32,14 @@
         from wms_warehouse_area_type
         where warehouseAreaTypeName = #{warehouseAreaTypeName}
           and useOrgSid = #{deptSid}
-        and sid != #{sid} and isDelete=0
+          and sid != #{sid}
+          and isDelete=0
+    </select>
+    <select id="listAll" resultType="com.yxt.wms.biz.base.wmswarehouseareatype.WmsWarehouseAreaType">
+        select a.*
+        from wms_warehouse_area_type a
+        where a.useOrgSid = #{useOrgSid}
+          and a.isDelete = 0
     </select>
     <update id="updateBySidIsDelete">
         UPDATE wms_warehouse_area_type

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaTypeService.java

@@ -10,6 +10,7 @@ import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseArea;
 import com.yxt.wms.biz.base.wmswarehouseinfo.WmsWarehouseInfo;
 import com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRackVo;
 import com.yxt.wms.feign.portal.privilege.PrivilegeQuery;
@@ -17,8 +18,10 @@ import com.yxt.wms.feign.portal.sysorganization.SysOrganizationFeign;
 import com.yxt.wms.feign.portal.sysorganization.SysOrganizationVo;
 import com.yxt.wms.feign.portal.sysstafforg.SysStaffOrgFeign;
 import com.yxt.wms.feign.portal.sysuser.SysUserFeign;
+import com.yxt.wms.utils.OrgPathQuery;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.Arrays;
 import java.util.Date;
@@ -87,11 +90,23 @@ public class WmsWarehouseAreaTypeService extends MybatisBaseService<WmsWarehouse
         List<WmsWarehouseAreaTypeVo> records = pagging.getRecords();
         return rb.success().setData(p);
     }
-    public ResultBean<WmsWarehouseAreaTypeVo> listAll() {
+    public ResultBean<List<WmsWarehouseAreaType>> listAll(@RequestBody OrgPathQuery query) {
         ResultBean rb = ResultBean.fireFail();
-        List<WmsWarehouseAreaType> pagging = baseMapper.selectList(new QueryWrapper<WmsWarehouseAreaType>().eq("isEnable",1)
+        String useOrgSid = "";
-                .ne("isDelete","1"));
+        String orgPath = query.getOrgPath();
-        return rb.success().setData(pagging);
+        if (StringUtils.isNotBlank(orgPath)) {
+            List<String> split = Arrays.asList(orgPath.split("/"));
+            if (split.size() > 1) {
+                //获取本级sid获取本级部门信息
+                SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData();
+                useOrgSid = sysOrganization1.getSid();
+            } else {
+                SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData();
+                useOrgSid = sysOrganization.getSid();
+            }
+        }
+        List<WmsWarehouseAreaType> list = baseMapper.listAll(useOrgSid);
+        return rb.success().setData(list);
     }
 
     public ResultBean<String> saveOrUpdate(WmsWarehouseAreaTypeDto dto) {

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoMapper.java

@@ -21,10 +21,14 @@ public interface WmsWarehouseInfoMapper extends BaseMapper<WmsWarehouseInfo> {
     IPage<WmsWarehouseInfoVo> listPage(IPage<WmsWarehouseInfo> page, @Param(Constants.WRAPPER) QueryWrapper<WmsWarehouseInfo> qw);
 
     int updateBySidIsDelete(List<String> list);
+
     @Select("select * from wms_warehouse_info")
     List<WmsWarehouseAreaAllVo> selectAll();
 
     WmsWarehouseInfo checkCode(@Param("warehouseCode") String warehouseCode, @Param("useOrgSid") String useOrgSid);
 
     WmsWarehouseInfo checkCodeForUpdate(@Param("warehouseCode") String warehouseCode, @Param("useOrgSid") String useOrgSid, @Param("sid") String sid);
+
+    @Select("select * from wms_warehouse_info where useOrgSid =#{useOrgSid} and isDelete = 0 and usageStatus = '1' ")
+    List<WmsWarehouseInfo> listAll(@Param("useOrgSid") String useOrgSid);
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoService.java

@@ -19,6 +19,7 @@ import com.yxt.wms.feign.portal.sysorganization.SysOrganizationFeign;
 import com.yxt.wms.feign.portal.sysorganization.SysOrganizationVo;
 import com.yxt.wms.feign.portal.sysstafforg.SysStaffOrgFeign;
 import com.yxt.wms.feign.portal.sysuser.SysUserFeign;
+import com.yxt.wms.utils.OrgPathQuery;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -44,6 +45,7 @@ public class WmsWarehouseInfoService extends MybatisBaseService<WmsWarehouseInfo
     private SysOrganizationFeign sysOrganizationFeign;
     @Autowired
     private SysStaffOrgFeign sysStaffOrgFeign;
+
     public ResultBean<PagerVo<WmsWarehouseInfoVo>> listPage(PagerQuery<WmsWarehouseInfoQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
         WmsWarehouseInfoQuery query = pq.getParams();
@@ -100,10 +102,24 @@ public class WmsWarehouseInfoService extends MybatisBaseService<WmsWarehouseInfo
         List<WmsWarehouseInfoVo> records = pagging.getRecords();
         return rb.success().setData(p);
     }
-    public ResultBean<WmsWarehouseInfoVo> listAll() {
+
+    public ResultBean<List<WmsWarehouseInfo>> listAll(OrgPathQuery query) {
         ResultBean rb = ResultBean.fireFail();
-        List<WmsWarehouseInfo> pagging = baseMapper.selectList(new QueryWrapper<WmsWarehouseInfo>().eq("isEnable",1));
+        String useOrgSid = "";
-        return rb.success().setData(pagging);
+        String orgPath = query.getOrgPath();
+        if (StringUtils.isNotBlank(orgPath)) {
+            List<String> split = Arrays.asList(orgPath.split("/"));
+            if (split.size() > 1) {
+                //获取本级sid获取本级部门信息
+                SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData();
+                useOrgSid = sysOrganization1.getSid();
+            } else {
+                SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData();
+                useOrgSid = sysOrganization.getSid();
+            }
+        }
+        List<WmsWarehouseInfo> list = baseMapper.listAll(useOrgSid);
+        return rb.success().setData(list);
     }
 
     public ResultBean<String> saveOrUpdate(WmsWarehouseInfoDto dto) {
@@ -195,7 +211,6 @@ public class WmsWarehouseInfoService extends MybatisBaseService<WmsWarehouseInfo
     }
 
 
-
     public ResultBean delete(String sid) {
         ResultBean rb = ResultBean.fireFail();
         WmsWarehouseInfo wmsWarehouse = fetchBySid(sid);
@@ -208,15 +223,12 @@ public class WmsWarehouseInfoService extends MybatisBaseService<WmsWarehouseInfo
     public void delAll(String[] sids) {
         int count = baseMapper.updateBySidIsDelete(Arrays.stream(sids).collect(Collectors.toList()));
     }
+
     public ResultBean updateIsEnable(String sid, String isEnable) {
         ResultBean rb = ResultBean.fireFail();
         WmsWarehouseInfo wmsWarehouse = fetchBySid(sid);
         if (null != wmsWarehouse) {
-            if (isEnable.equals("1")) {
             wmsWarehouse.setUsageStatus(isEnable);
-            } else if (isEnable.equals("2")) {
-                wmsWarehouse.setUsageStatus("0");
-            }
             baseMapper.updateById(wmsWarehouse);
         }
         return rb.success().setMsg("成功");

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java

@@ -112,7 +112,6 @@ public class WmsShelfBillService extends MybatisBaseService<WmsShelfBillMapper,
 
         }
         saveWmsInventory(sid);
-        //新增出入库记录
 
         return rb.success().setData(sid);
     }

yxt-wms-biz/src/main/java/com/yxt/wms/utils/OrgPathQuery.java

@@ -0,0 +1,13 @@
+package com.yxt.wms.utils;
+
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/5/17 14:15
+ */
+@Data
+public class OrgPathQuery {
+    private String orgPath;
+}