Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManufacturerBankFeign.java

@@ -55,4 +55,8 @@ public interface BaseManufacturerBankFeign {
     @ApiOperation("付款申请获取厂家销售通路")
     @GetMapping("/payList")
     ResultBean<List<BaseManPayVo>> payList();
+
+    @ApiOperation("根据厂商开户行sid查询开户行信息")
+    @GetMapping("/details/{sid}")
+    public ResultBean<BaseManufacturerBankVo> details(@PathVariable("sid") String sid);
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManufacturerBankFeignFallback.java

@@ -40,4 +40,9 @@ public class BaseManufacturerBankFeignFallback implements BaseManufacturerBankFe
     public ResultBean<List<BaseManPayVo>> payList() {
         return null;
     }
+
+    @Override
+    public ResultBean<BaseManufacturerBankVo> details(String sid) {
+        return null;
+    }
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDetailsVo.java

@@ -26,9 +26,7 @@
 package com.yxt.anrui.base.api.baseoutsourcingapplication;
 
 
-import com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicleDto;
 import com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicleVo;
-import com.yxt.anrui.base.api.commonappendix.CommonAppendix;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModel;
@@ -126,8 +124,8 @@ public class BaseOutsourcingApplicationDetailsVo implements Vo {
     private CommonAppendixVo contract; // 备注
     @ApiModelProperty("外采车辆列表")
     private List<BaseOutsourcingApplicationVehicleVo> baseOutsourcingApplicationVehicleVos; // 外采车辆列表
-    @ApiModelProperty("供应商sid")
-    private String supplierSid;
+  /*  @ApiModelProperty("供应商sid")
+    private String supplierSid;*/
 
     private String createBySid;
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.java

@@ -69,4 +69,6 @@ public interface BaseManufacturerBankMapper extends BaseMapper<BaseManufacturerB
     List<BaseManPayVo> payList(@Param("supplierTypeValue") String supplierTypeValue, @Param("code") String code);
 
     String fetchByMainSidAndManufSaleAccessName(@Param("manufacturerSid") String manufacturerSid,@Param("manufSaleAccessName") String manufSaleAccessName);
+
+    BaseManufacturerBankVo details(String sid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml

@@ -53,22 +53,22 @@
         <!--银行代码-->
         bmb.swiftCode,
         bmb.remarks,
-        /*厂家销售通路*/
+            /*厂家销售通路*/
         bmb.actualPay,
         bmb.actualPayKey,
         bmb.paymentAccessNoKey,
         bmb.paymentAccessNoValue
         FROM base_manufacturer_bank bmb
         WHERE bmb.manufacturerSid = #{sid}
-        AND bmb.isDelete = 0
+          AND bmb.isDelete = 0
     </select>
 
     <select id="selectByApplySid" resultType="com.yxt.anrui.base.api.busvehicleapply.BusApplyVo">
         select bmb.bankAccount num, bmb.accountName name
         from base_manufacturer_bank bmb
-                     left join base_manufacturer bm on bm.sid = bmb.manufacturerSid
-                     left join base_vehicle_brand bvb on bvb.manufacturerSid = bm.sid
-                     left join base_vehicle_model bvm on bvm.carBrand = bvb.sid
+                 left join base_manufacturer bm on bm.sid = bmb.manufacturerSid
+                 left join base_vehicle_brand bvb on bvb.manufacturerSid = bm.sid
+                 left join base_vehicle_model bvm on bvm.carBrand = bvb.sid
         where bvm.sid = #{modelSid}
           and bmb.dueBankValue = '订金账户'
           and bmb.isDelete = 0
@@ -81,7 +81,7 @@
                bmb.bankAccount,
                bmb.sid actualPaySid
         from base_manufacturer_bank bmb
-                     left join base_manufacturer bm on bmb.manufacturerSid = bm.sid
+                 left join base_manufacturer bm on bmb.manufacturerSid = bm.sid
         where bmb.isDelete = 0
           and bm.isDelete = 0
           AND bm.supplierTypeValue = #{supplierTypeValue}
@@ -91,7 +91,7 @@
     <select id="selectBankByApplySid" resultType="com.yxt.anrui.base.api.busvehicleapply.BusApplyVo">
         select bm.manufacturerCode code, bmb.bankAccount num, bmb.accountName name
         from base_manufacturer bm
-                     left join base_manufacturer_bank bmb on bm.manBankSid = bmb.sid
+                 left join base_manufacturer_bank bmb on bm.manBankSid = bmb.sid
         where bm.createOrg = #{createOrgSid}
           and dueBankValue = '订金账户'
           and bmb.isDelete = 0
@@ -103,7 +103,7 @@
                bmb.depositBank,
                bmb.bankAccount
         from base_manufacturer_bank bmb
-                     left join base_manufacturer bm on bmb.manufacturerSid = bm.sid
+                 left join base_manufacturer bm on bmb.manufacturerSid = bm.sid
         where bmb.isDelete = 0
           and bm.isDelete = 0
           AND bm.supplierTypeValue = #{supplierTypeValue}
@@ -116,4 +116,37 @@
         WHERE manufacturerSid = #{manufacturerSid}
           AND actualPay = #{manufSaleAccessName}
     </select>
+
+    <select id="details" resultType="com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankVo">
+        SELECT bmb.sid,
+        <!--账户名称-->
+        bmb.accountName,
+        <!--银行账号-->
+        bmb.bankAccount,
+        <!--银行网点-->
+        bmb.bankingOutlets,
+        <!--国家-->
+        bmb.country,
+        <!--币种-->
+        bmb.currency,
+        <!--开户银行-->
+        bmb.depositBank,
+        <!--账户类型key-->
+        bmb.dueBankKey,
+        <!--账户类型value-->
+        bmb.dueBankValue,
+        <!--开户行地址-->
+        bmb.bankAddress,
+        bmb.paymentLines,
+        <!--银行代码-->
+        bmb.swiftCode,
+        bmb.remarks,
+        bmb.actualPay,
+        bmb.actualPayKey,
+        bmb.paymentAccessNoKey,
+        bmb.paymentAccessNoValue
+        FROM base_manufacturer_bank bmb
+        WHERE bmb.sid = #{sid}
+          AND bmb.isDelete = 0
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankRest.java

@@ -92,5 +92,12 @@ public class BaseManufacturerBankRest implements BaseManufacturerBankFeign {
         return rb.success().setData(voList);
     }
 
+    @Override
+    public ResultBean<BaseManufacturerBankVo> details(String sid) {
+        ResultBean<BaseManufacturerBankVo> rb = ResultBean.fireFail();
+        BaseManufacturerBankVo baseManufacturerBankVo = baseManufacturerBankService.details(sid);
+        return rb.success().setData(baseManufacturerBankVo);
+    }
+
 
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankService.java

@@ -86,4 +86,8 @@ public class BaseManufacturerBankService extends MybatisBaseService<BaseManufact
     public String fetchByMainSidAndManufSaleAccessName(String manufacturerSid, String manufSaleAccessName) {
         return baseMapper.fetchByMainSidAndManufSaleAccessName(manufacturerSid,manufSaleAccessName);
     }
+
+    public BaseManufacturerBankVo details(String sid) {
+        return baseMapper.details(sid);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java

@@ -230,11 +230,18 @@ public class BaseVehicleRest implements BaseVehicleFeign {
         int count = baseVehicleService.selectCountByVinNo(vinNo);
         ResultBean<BaseVehicleVo> baseVehicleVoResultBean = baseVehicleService.selVehicleByVinNo(vinNo);
         BaseVehicleVo data = baseVehicleVoResultBean.getData();
-        BaseManufacturerSidVo baseManufacturerSidVo = baseManufacturerService.getManufacturerSidAndSupplierSid(dto.getCarBrandSid(), dto.getUseOrgSid()).getData();
+        //根据品牌查询厂商
+        BaseVehicleBrand baseVehicleBrand = baseVehicleBrandService.fetchBySid(dto.getCarBrandSid());
+        if (baseVehicleBrand != null) {
+            dto.setManufacturerSid(baseVehicleBrand.getManufacturerSid());
+            //ToDo:外采的后续需要从页面上获取经销商的sid
+            dto.setSupplierSid(baseVehicleBrand.getManufacturerSid());
+        }
+        /*BaseManufacturerSidVo baseManufacturerSidVo = baseManufacturerService.getManufacturerSidAndSupplierSid(dto.getCarBrandSid(), dto.getUseOrgSid()).getData();
         if (baseManufacturerSidVo != null) {
             dto.setManufacturerSid(baseManufacturerSidVo.getManufacturerSid());
             dto.setSupplierSid(baseManufacturerSidVo.getSupplierSid());
-        }
+        }*/
         buildVehicle(dto);
         if (count > 0) {
             ResultBean resultBean = update(dto, data.getSid());
@@ -286,7 +293,7 @@ public class BaseVehicleRest implements BaseVehicleFeign {
         return rb.success().setData(baseVehicle.getSid()).setMsg("保存成功");
     }
 
-    public void buildVehicle(BaseVehicleDto dto){
+    public void buildVehicle(BaseVehicleDto dto) {
         //分公司code
         SysOrganizationVo sysOrganizationVo1 = sysOrganizationFeign.fetchBySid(dto.getCreateOrgSid()).getData();
         dto.setOrgCode(sysOrganizationVo1.getOrgCode());
@@ -308,7 +315,7 @@ public class BaseVehicleRest implements BaseVehicleFeign {
         BaseManufacturer baseManufacturer = baseManufacturerService.fetchBySid(dto.getManufacturerSid());
         dto.setManufacturerCode(baseManufacturer.getManufacturerCode());
         //供应商code
-        //SysOrganizationVo sysOrganizationVo2 = sysOrganizationFeign.fetchBySid(dto.getSupplierSid()).getData();
+        baseManufacturer = baseManufacturerService.fetchBySid(dto.getSupplierSid());
         dto.setSupplierCode(baseManufacturer.getManufacturerCode());
     }
 
@@ -885,7 +892,7 @@ public class BaseVehicleRest implements BaseVehicleFeign {
      */
     @Override
     public ResultBean<List<AppVinsDetailsVo>> getVins(String modelSid, String configSid, String userSid) {
-        List<AppVinsDetailsVo> vo = baseVehicleService.getVins(modelSid, configSid, userSid,"");
+        List<AppVinsDetailsVo> vo = baseVehicleService.getVins(modelSid, configSid, userSid, "");
         return new ResultBean<List<AppVinsDetailsVo>>().success().setData(vo);
     }
 
@@ -895,7 +902,7 @@ public class BaseVehicleRest implements BaseVehicleFeign {
         String configSid = vinQuery.getConfigSid();
         String userSid = vinQuery.getUserSid();
         String orgPath = vinQuery.getOrgPath();
-        List<AppVinsDetailsVo> vo = baseVehicleService.getVins(modelSid, configSid, userSid,orgPath);
+        List<AppVinsDetailsVo> vo = baseVehicleService.getVins(modelSid, configSid, userSid, orgPath);
         return new ResultBean<List<AppVinsDetailsVo>>().success().setData(vo);
     }
 

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/KingDeeConfig.java

@@ -12,23 +12,44 @@ public class KingDeeConfig {
     /**
      * 登录金蝶的账户信息 2022010测试
      */
-    public static String acctID = "61dce6601125a0";
+  /*  public static String acctID = "61dce6601125a0";*/
     /**
-     * 登录金蝶的账户信息
+     * 登录金蝶的账户信息 正式系统 正式系统 正式系统 正式系统 正式系统 正式系统 正式系统 正式系统 正式系统 正式系统
      */
-    public static String userName = "信息部2";
+    public static String acctID = "5e84c526016ed7";
     /**
-     * 登录金蝶的账户信息
+     * 登录金蝶的账户信息 2022010测试的
      */
-    public static String password = "123321";
+    //public static String userName = "信息部2";
     /**
      * 登录金蝶的账户信息
      */
-    public static String userName_administrator = "administrator";
+    //public static String password = "123321";
     /**
-     * 登录金蝶的账户信息
+     * 登录金蝶的账户信息 2022010测试
+     */
+    //public static String userName_administrator = "administrator";
+    /**
+     * 登录金蝶的账户信息 2022010测试
+     */
+    //public static String password_administrator = "ANrui123456.";
+
+    /**
+     * 登录金蝶的账户信息 正式系统正式系统正式系统正式系统正式系统 正式系统 正式系统 正式系统 正式系统
+     */
+    public static String userName = "信息部";
+    /**
+     * 登录金蝶的账户信息 正式系统正式系统正式系统正式系统正式系统 正式系统 正式系统 正式系统 正式系统
+     */
+    public static String password = "ywzx0750";
+    /**
+     * 登录金蝶的账户信息 正式系统 正式系统 正式系统 正式系统
+     */
+    public static String userName_administrator = "Administrator";
+    /**
+     * 登录金蝶的账户信息 正式系统 正式系统 正式系统 正式系统
      */
-    public static String password_administrator = "ANrui123456.";
+    public static String password_administrator = "hebei@anrui202108.";
     /**
      * 登录金蝶的账户信息
      */

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/data_model.json

@@ -20,7 +20,7 @@
   "SubHeadEntity": {
     "FErpClsID": "1",
     "FCategoryID": {
-      "FNumber": "CHLB01_SYS"
+      "FNumber": "@KD_FCategoryID"
     },
     "FTaxType": {
       "FNumber": "WLDSFL01_SYS"

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java

@@ -538,8 +538,8 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
                 .taskAssigneeLike("%" + userSid + "%");
         
         if(StringUtils.isNotBlank(orgPath)){
-            taskQuery
-                    .taskVariableValueLike("orgPath", "%"+orgPath+"%");
+            /*taskQuery
+                    .taskVariableValueLike("orgPath", "%"+orgPath+"%");*/
         }
         long num = taskQuery.count();
         return new ResultBean<Integer>().success().setData(Integer.parseInt(String.valueOf(num)));
@@ -1871,7 +1871,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
                 .includeProcessVariables()
                 ;
         if(StringUtils.isNotBlank(orgPath)){
-              or.taskVariableValueLike("orgPath",  "%" + orgPath + "%");
+             /* or.taskVariableValueLike("orgPath",  "%" + orgPath + "%");*/
         }
                 or.taskAssigneeLike("%" + userSid + "%")
                 .orderByTaskCreateTime().desc();

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java

@@ -475,13 +475,13 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
             taskParam.setSqlOperationSymbol(SQLOperationSymbol.LIKE);
             taskParamList.add(taskParam);
         }
-        if (StringUtils.isNotBlank(orgPath)) {//切换机构
+      /*  if (StringUtils.isNotBlank(orgPath)) {//切换机构
             BusinessTaskParam taskParam = new BusinessTaskParam();
             taskParam.setField(BusinessVariables.ORGPATH);
             taskParam.setSqlOperationSymbol(SQLOperationSymbol.NONE);
             taskParam.setValue(orgPath);
             taskParamList.add(taskParam);
-        }
+        }*/
         taskQuery.setFields(taskParamList);
         taskQueryPagerQuery.setParams(taskQuery);
         ResultBean<Page<FlowTaskDto>> resultBean = flowTaskFeign.businessTodoListForApp(userSid, taskQueryPagerQuery);

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerAllVo;
-import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerDetailsVo;
 import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerFeign;
 import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankFeign;
 import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankVo;
@@ -20,7 +19,6 @@ import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign;
 import com.yxt.anrui.base.api.busvehicleorder.ActualAndOrgDeptVo;
 import com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderFeign;
-import com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderVo;
 import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum;
 import com.yxt.anrui.base.common.enums.ManPurOrderType;
 import com.yxt.anrui.base.common.enums.OperVehicleState;
@@ -537,10 +535,18 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
             //厂家销售通路
             baseVehicleDto.setManufSaleAccessName(aaodd.getActualPay());
             //厂家回款通路类别key
-            BaseManufacturerBankVo baseManufacturerBankVo = baseManufacturerBankFeign.selectDetails(aaodd.getActualSid()).getData();
-            baseVehicleDto.setManufSaleAccessKey(baseManufacturerBankVo.getActualPayKey());
-            //付款通路code
-            baseVehicleDto.setPaymentAccessNoKey(baseManufacturerBankVo.getPaymentAccessNoKey());
+            ResultBean<BaseManufacturerBankVo> baseManufacturerBankVoResultBean = baseManufacturerBankFeign.details(aaodd.getActualSid());
+            if(baseManufacturerBankVoResultBean.getSuccess()){
+                BaseManufacturerBankVo baseManufacturerBankVo = baseManufacturerBankVoResultBean.getData();
+                if(baseManufacturerBankVo != null){
+                    baseVehicleDto.setManufSaleAccessKey(baseManufacturerBankVo.getActualPayKey());
+                    //付款通路code
+                    baseVehicleDto.setPaymentAccessNoKey(baseManufacturerBankVo.getPaymentAccessNoKey());
+                }
+            }
+           /* BaseManufacturerBankVo baseManufacturerBankVo = baseManufacturerBankFeign.selectDetails(aaodd.getActualSid()).getData();
+            baseVehicleDto.setManufSaleAccessKey(baseManufacturerBankVo.getActualPayKey());*/
+
             baseVehicleDto.setEngineNo(s.getEngineNo());
             baseVehicleDto.setVinNo(s.getVinNo());
             baseVehicleDto.setModelSid(booad.getModelSid());

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java

@@ -645,7 +645,11 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
                         int price = Integer.valueOf(outsourcingApplicationDetailsVo.getPurchasePrice());//采购价格
                         Integer num = outsourcingApplicationDetailsVo.getNum();//采购数量
                         int deposit = Integer.valueOf(outsourcingApplicationDetailsVo.getDeposit());//订金
-                        finPaymentrecordDto.setCost(price - deposit / num);//付款金额
+                        if(deposit>0){
+                            finPaymentrecordDto.setCost(price - deposit / num);//付款金额
+                        }else{
+                            finPaymentrecordDto.setCost(price);//付款金额
+                        }
                         finPaymentrecordDto.setBusSid(scmVehicleExamine.getBusinessSid());//外采申请sid
                         BaseManufacturerAllVo baseManufacturerAllVo = baseManufacturerFeign.details(outsourcingApplicationDetailsVo.getPurchasingUnitSid()).getData();
                         if (baseManufacturerAllVo != null) {