Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java

@@ -675,10 +675,19 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
     public ResultBean InitiatorToAnswer(BusinessVariables bv) {
         ResultBean rb = ResultBean.fireFail();
         BaseAccadjApply baseAccadjApply = fetchBySid(bv.getBusinessSid());
+        Boolean i = false;
+        Map<String, Object> map = new HashMap<>();
+        Map<String, Object> formVariables = bv.getFormVariables();
+        if (formVariables == null) {
+            map.put("isAdj", i);
+            bv.setFormVariables(map);
+        } else {
+            formVariables.put("isAdj", i);
+        }
         if (baseAccadjApply.getAccadjTypeValue().equals("调入")) {
             String callOutOrgSid = baseAccadjApply.getCallOutOrgSid();
             List<String> purchaseSids = baseAccadjApplyeVehService.fetchByMainSid(baseAccadjApply.getSid());
-            Boolean i = false;
+
             for (String s : purchaseSids) {
                 BaseInternalPurchaseVehicle baseInternalPurchaseVehicle = baseInternalPurchaseVehicleService.fetchBySid(s);
                 String witPinMoney = baseInternalPurchaseVehicle.getWitPinMoney();
@@ -688,14 +697,7 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
                     break;
                 }
             }
-            Map<String, Object> map = new HashMap<>();
+
-            Map<String, Object> formVariables = bv.getFormVariables();
-            if (formVariables == null) {
-                map.put("isAdj", i);
-                bv.setFormVariables(map);
-            } else {
-                formVariables.put("isAdj", i);
-            }
             ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
             //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
             List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());

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

@@ -5,6 +5,7 @@ import com.yxt.anrui.fin.api.kingdee.KingDeeBillUrl;
 import com.yxt.anrui.fin.api.kingdee.KingDeeResult;
 import com.yxt.anrui.fin.api.kingdee.paezcllx.PaezCllx;
 import com.yxt.anrui.fin.biz.kingdee.FinKingDeeService;
+import com.yxt.anrui.fin.biz.kingdee.KingDeeConfig;
 import com.yxt.anrui.fin.biz.kingdee.bank.BDBankService;
 import com.yxt.common.core.result.ResultBean;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -51,7 +52,7 @@ public class PaezCllxService extends FinKingDeeService {
 
             String submitKD = getSubmitKD(resultBean.getData(),KingDeeBillId.PAEZ_CLLX.getID());
             ResultBean<String> resultBean1 = accessKingDeeInterface(KingDeeBillId.PAEZ_CLLX.getID(),
-                    submitKD,KingDeeBillUrl.SUBMIT_URL.getURL());
+                    submitKD, KingDeeConfig.userName_administrator,KingDeeConfig.password_administrator ,KingDeeBillUrl.SUBMIT_URL.getURL());
             if(!resultBean1.getSuccess()){
                 log.info("车辆类型提交失败!");
                 return rb.setMsg("车辆类型提交失败!");

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

@@ -33,6 +33,7 @@ public class StkTransferDirectService extends FinKingDeeService {
             Map<String,String> map_fEntityModel_= object2Map(stkTransferDirect);
             List<StkTransferDirect.FBillEntry> fBillEntry = stkTransferDirect.getFBillEntry();
             for (StkTransferDirect.FBillEntry f: fBillEntry){
+                f.setFDestStockId("ARZSCK");//调入仓库 默认为：分公司正式仓库 每隔分公司都有这个编码的仓库。
                 //单据查看的json模板
                 String getKDForNumbers = getGetKDForNumbers(KingDeeBillId.BD_MATERIAL.getID(), f.getFMaterialId());
                 ResultBean<String> kingDataInfoByNumber = accessKingDeeInterface(KingDeeBillId.BD_MATERIAL.getID(), getKDForNumbers,

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineSubmitDto.java

@@ -57,4 +57,7 @@ public class AppScmVehicleExamineSubmitDto implements Dto {
     @ApiModelProperty("发动机号")
     private String engineNo;
 
+    @ApiModelProperty("机构sid")
+    private String orgPath;
+
 }

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

@@ -29,9 +29,6 @@ import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturer;
-import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerAllVo;
-import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerFeign;
 import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationDetailsVo;
 import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationFeign;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleDto;
@@ -118,9 +115,6 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
     @Autowired
     private AppSubsetVersionFeign appSubsetVersionFeign;
 
-    @Autowired
-    BaseManufacturerFeign baseManufacturerFeign;
-
 
     private QueryWrapper<ScmVehicleExamine> createQueryWrapper(ScmVehicleExamineQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -178,7 +172,7 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
      */
     public IPage<ScmVehicleExaminePageVo> selectCarInspectedList(PagerQuery<ScmVehicleExaminePageQuery> pagerQuery) {
         IPage<ScmVehicleExaminePageQuery> page = PagerUtil.queryToPage(pagerQuery);
-        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData();
+        String useOrgSid = sysOrganizationFeign.getUseOrgByUserSid(pagerQuery.getParams().getUserSid()).getData().getSid();
         pagerQuery.getParams().setUseOrgSid(useOrgSid);
         QueryWrapper<ScmVehicleExaminePageVo> qw = carInspectedQueryWrapper(pagerQuery.getParams());
         IPage<ScmVehicleExaminePageVo> iPage = baseMapper.selectCarInspectedList(page, qw);
@@ -561,10 +555,19 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
         if (StringUtils.isBlank(dto.getInboundDate())) {
             return rb.setMsg("厂家入库日期不能为空");
         }
+        String orgPath = dto.getOrgPath();
+        String orgName = "";
+        if(StringUtils.isBlank(orgPath)){
+            orgPath = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
+        }
+        ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(orgPath);
+        if(sysOrganizationVoResultBean.getSuccess()){
+            SysOrganizationVo sysOrganizationVo = sysOrganizationVoResultBean.getData();
+            orgName = sysOrganizationVo.getName();
+        }
         String staffSid = sysUserFeign.getUserOrgInfoByUserSid(dto.getUserSid()).getData().getStaffSid();
         SysStaffinfoVo data = sysUserFeign.getSysUserByMobile(staffSid).getData();
-        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
+//        SysOrganizationVo data1 = sysOrganizationFeign.getUseOrgByUserSid(dto.getUserSid()).getData();
-        SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
         String s1 = "";
         String s2 = "";
         String type1 = "01"; //厂家验车照片
@@ -614,8 +617,8 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
                     carWarehousingDto.setInspection(scmVehicleExamine.getInspection());
                     carWarehousingDto.setInboundFactoryDate(scmVehicleExamine.getInboundDate());
                     carWarehousingDto.setInboundState("1");
-                    carWarehousingDto.setUseOrgSid(useOrgSid);
+                    carWarehousingDto.setUseOrgSid(orgPath);
-                    carWarehousingDto.setUseOrgName(sysOrganizationVo.getName());
+                    carWarehousingDto.setUseOrgName(orgName);
                     scmVehicleEnterlibraryService.saveCarWarehousing(carWarehousingDto);
                     //如果订单为外采订单向待付款列表推送数据
                     if (ManPurOrderType.ManOrderType.WC_ORDER.getCode().equals(scmVehicleExamine.getPurchaseTypeKey())) {
@@ -636,16 +639,12 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
                         Integer num = outsourcingApplicationDetailsVo.getNum();
                         finPaymentrecordDto.setCost(price * num - Integer.valueOf(outsourcingApplicationDetailsVo.getDeposit()));
                         finPaymentrecordDto.setBusSid("");
-                        BaseManufacturerAllVo baseManufacturerAllVo = baseManufacturerFeign.details(outsourcingApplicationDetailsVo.getSupplierSid()).getData();
-                        if (baseManufacturerAllVo != null) {
-                            finPaymentrecordDto.setPayCode(baseManufacturerAllVo.getBaseManufacturerDto().getManufacturerCode());
-                        }
                         finPaymentrecordFeign.save(finPaymentrecordDto);
                     }
                     //车辆台账推送数据
                     BaseVehicleDto baseVehicleDto = new BaseVehicleDto();
                     baseVehicleDto.setVinNo(dto.getVin());
-                    baseVehicleDto.setUseOrgSid(useOrgSid);
+                    baseVehicleDto.setUseOrgSid(orgPath);
                     baseVehicleDto.setWarrantyCardNo(dto.getGuaranteeCardNo());//保修卡卡号
                     baseVehicleDto.setSpecialInstructions(dto.getModelDifferenceExplain());//特殊配置差异说明
                     List<BaseVehicleDto> list = new ArrayList();