Merge remote-tracking branch 'origin/master'

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanSolutionsDetailsssVo.java

@@ -165,4 +165,8 @@ public class LoanSolutionsDetailsssVo {
 
     @ApiModelProperty("实际首付比例")
     private String downPayAmountsRatio;
+    @ApiModelProperty("实际贴息")
+    private String actualDiscount;
+    @ApiModelProperty("其他融实际贴息")
+    private String otherActualDiscount;
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java

@@ -1161,7 +1161,8 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
             for (LoanBePadsincereVeh v : records) {
                 LoanRepaymentPlanDetails planDetails = loanRepaymentPlanDetailsService.selOneByBankNoAndBusVinSid(v.getBankContractNo(), v.getSaleVehSid());
                 if (null != planDetails) {
-                    String bankName = loanRepaymentPlanDetailsService.getBankNameByMainOrOtherPolicy(planDetails);
+//                    String bankName = loanRepaymentPlanDetailsService.getBankNameByMainOrOtherPolicy(planDetails);
+                    String bankName = planDetails.getBankName();
                     String orgCode = "";
                     LoanRepaymentSchedule schedule = loanRepaymentScheduleService.fetchBySid(planDetails.getScheduleSid());
                     if (null != schedule) {

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyService.java

@@ -882,8 +882,9 @@ public class LoanBuckleApplyService extends MybatisBaseService<LoanBuckleApplyMa
                             voucherDetail.setSceneCode("02");
                         }
                     }
-                    String bankName = loanRepaymentPlanDetailsService.getBankNameByMainOrOtherPolicy(planDetails);
+//                    String bankName = loanRepaymentPlanDetailsService.getBankNameByMainOrOtherPolicy(planDetails);
-                    if (StringUtils.isNotBlank(bankName)) {
+                    if (StringUtils.isNotBlank(planDetails.getBankName())) {
+                        String bankName = planDetails.getBankName();
                         voucherDetail.setBankName(bankName);
                     }
                     String useOrgSid = planDetails.getUseOrgSid();

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

@@ -3262,6 +3262,8 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                                     page = "1";
                                 } else if (c == 2) {
                                     page = "2";
+                                } else if (c == 0){
+                                    page = "3";
                                 }
                                 if (pdfList.size() > (num - 1) * 3) {
                                     LoanVoucherPdf a = pdfList.get((num - 1) * 3);

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyService.java

@@ -875,9 +875,9 @@ public class LoanTransferPaymentApplyService extends MybatisBaseService<LoanTran
                         } else {
                             voucherDetail.setSceneCode(SceneCodeEnum.TRANSFER_VOUCHER1.getCode());
                         }
-                        String bankName = loanRepaymentPlanDetailsService.getBankNameByMainOrOtherPolicy(planDetails);
+//                        String bankName = loanRepaymentPlanDetailsService.getBankNameByMainOrOtherPolicy(planDetails);
-                        if (StringUtils.isNotBlank(bankName)) {
+                        if (StringUtils.isNotBlank(planDetails.getBankName())) {
-                            voucherDetail.setBankName(bankName);
+                            voucherDetail.setBankName(planDetails.getBankName());
                         }
                         String useOrgSid = planDetails.getUseOrgSid();
                         SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();

yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackage/AsServicePackageService.java

@@ -339,13 +339,6 @@ public class AsServicePackageService extends MybatisBaseService<AsServicePackage
     public PagerVo<GoodsListVo> selGoodsInfo(PagerQuery<PackageGoodsQuery> pq) {
         PagerQuery<WmsInventoryPackageQuery> query = new PagerQuery<>();
         BeanUtil.copyProperties(pq, query);
-        PackageGoodsQuery params = pq.getParams();
-//        ResultBean<String> orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(params.getOrgPath());
-//        if (orgSidByPath.getSuccess()) {
-//            String useOrgSid = orgSidByPath.getData();
-//            WmsGoodsPackageQuery queryParams = query.getParams();
-//            queryParams.setUseOrgSid(useOrgSid);
-//        }
         ResultBean<PagerVo<WmsInventoryPackageVo>> voResultBean = wmsInventoryFeign.getPackageGoodsVo(query);
         PagerVo<GoodsListVo> vo = new PagerVo<>();
         if (voResultBean.getSuccess()) {

yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsInventory/WmsInventoryFeign.java

@@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 )
 public interface WmsInventoryFeign {
 
-    @ApiOperation("查询分公司下所有的商品信息")
+    @ApiOperation("查询部门下所有的商品信息")
     @PostMapping("/getPackageGoodsVo")
     public ResultBean<PagerVo<WmsInventoryPackageVo>> getPackageGoodsVo(@RequestBody PagerQuery<WmsInventoryPackageQuery> pq);
 }

yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsInventory/WmsInventoryPackageQuery.java

@@ -11,7 +11,7 @@ import lombok.Data;
  */
 @Data
 public class WmsInventoryPackageQuery implements Query {
-    private String useOrgSid;
+    private String orgPath;
     @ApiModelProperty("商品名称")
     private String goodsName; // 商品名称
     @ApiModelProperty("零件号")

yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRest.java

@@ -119,7 +119,7 @@ public class WmsInventoryRest {
         return rb.success().setData(pv);
     }
 
-    @ApiOperation("查询分公司下所有的商品信息")
+    @ApiOperation("查询部门下所有的商品信息")
     @PostMapping("/getPackageGoodsVo")
     public ResultBean<PagerVo<WmsInventoryPackageVo>> getPackageGoodsVo(@RequestBody PagerQuery<WmsInventoryPackageQuery> pq) {
         return wmsInventoryService.getPackageGoodsVo(pq);

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryPackageQuery.java

@@ -11,7 +11,7 @@ import lombok.Data;
  */
 @Data
 public class WmsInventoryPackageQuery implements Query {
-    private String useOrgSid;
+    private String orgPath;
     @ApiModelProperty("商品名称")
     private String goodsName; // 商品名称
     @ApiModelProperty("零件号")

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java

@@ -14,6 +14,7 @@ import com.yxt.wms.biz.inventory.wmsinventorybill.WmsInventoryBill;
 import com.yxt.wms.biz.inventory.wmsinventorybill.WmsInventoryBillService;
 import com.yxt.wms.feign.base.basegoodssku.BaseGoodsSkuDetailsVo;
 import com.yxt.wms.feign.base.basegoodssku.BaseGoodsSkuFeign;
+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 org.springframework.beans.factory.annotation.Autowired;
@@ -36,7 +37,8 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
     private BaseGoodsSkuFeign baseGoodsSkuFeign;
     @Autowired
     private SysStaffOrgFeign sysStaffOrgFeign;
-
+    @Autowired
+    private SysOrganizationFeign sysOrganizationFeign;
     public PagerVo<WmsInventoryVo> listPage(PagerQuery<WmsInventoryQuery> pq) {
         WmsInventoryQuery query = pq.getParams();
         QueryWrapper<WmsInventory> qw = new QueryWrapper<>();
@@ -316,7 +318,20 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
         if (StringUtils.isNotBlank(query.getWarehouseArea())) {
             qw.like("v.warehouseArea", query.getWarehouseArea());
         }
-        qw.eq("1", "1");
+        String orgPath = query.getOrgPath();
+        String useOrgSid = "";
+        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();
+            }
+            qw.eq("v.useOrgSid",useOrgSid);
+        }
         IPage<WmsInventory> page = PagerUtil.queryToPage(pq);
         IPage<WmsInventoryPackageVo> pagging = baseMapper.getPackageGoodsVo(page, qw);
         List<WmsInventoryPackageVo> records = pagging.getRecords();