Merge remote-tracking branch 'origin/master'

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

@@ -54,6 +54,8 @@ import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService;
 import com.yxt.anrui.base.common.enums.VehicleState;
 import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
 import com.yxt.anrui.fin.api.kingdee.KingDeeResult;
+import com.yxt.anrui.fin.api.kingdee.bdcustomer.BdCustomer;
+import com.yxt.anrui.fin.api.kingdee.bdsupplier.BdSupplier;
 import com.yxt.anrui.fin.api.kingdee.saloutstock.SalOutStock;
 import com.yxt.anrui.fin.api.kingdee.stkinstock.StkInStock;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
@@ -72,6 +74,7 @@ import com.yxt.anrui.portal.api.sysuser.UserQuery;
 import com.yxt.anrui.portal.api.sysuser.UserRoleQuery;
 import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseFeign;
 import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo;
+import com.yxt.common.base.utils.HanZiConverterPinYin;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -554,6 +557,19 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
                         }
                         stkInStock.setFInStockEntry(fInStockEntry);
                         finKingDeeFeign.draftStkInStock(stkInStock);
+                        //推送财务供应商信息
+                        BdSupplier bdSupplier = new BdSupplier();
+                        ResultBean<SysOrganizationVo> sysOrganizationVoResultBean1 = sysOrganizationFeign.fetchBySid(baseAccadjApply.getCallOutOrgSid());
+                        if (sysOrganizationVoResultBean1.getSuccess()) {
+                            SysOrganizationVo vo = sysOrganizationVoResultBean1.getData();
+                            if (vo != null) {
+                                bdSupplier.setFName(vo.getName());
+                                bdSupplier.setFLocMobile(vo.getLinkPhone());
+                                bdSupplier.setFNumber(vo.getOtherCode());
+                            }
+                        }
+                        bdSupplier.setFUseOrgId(sysOrganizationVoResultBean.getData().getOrgCode());
+                        finKingDeeFeign.draftBdSupplier(bdSupplier);
                     }
                 } catch (Exception e) {
                     e.printStackTrace();
@@ -628,7 +644,22 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
             //salOutStock.setFStockOrgId("101");
 
             List<SalOutStock.FEntity> fEntity = new ArrayList<>();
+            List<BdCustomer> bdCustomers = new ArrayList<>();
             for (BaseVehicle baseVehicle : baseVehicles) {
+                //推送财务客户信息
+                BdCustomer bdCustomer = new BdCustomer();
+                SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(callInOrgSid).getData();
+                bdCustomer.setTOrgIds(sysOrganizationVo.getOtherCode());
+                bdCustomer.setFName(sysOrganizationVo.getName() + baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8));
+                String FNumber1 = HanZiConverterPinYin.getPinYinFirst(sysOrganizationVo.getName()) + baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8);
+                if (FNumber1.length() > 30){
+                    FNumber1 = FNumber1.substring(0,30);
+                    bdCustomer.setFNumber(FNumber1);
+                }else {
+                    bdCustomer.setFNumber(FNumber1);
+                }
+                bdCustomers.add(bdCustomer);
+                //销售出库单物料信息
                 SalOutStock.FEntity fe = new SalOutStock.FEntity();
                 /**
                  * 单价:FPrice
@@ -671,6 +702,7 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
                 fEntity.add(fe);
             }
             salOutStock.setFEntity(fEntity);
+            finKingDeeFeign.draftBdCustomers(bdCustomers);
         }
         return salOutStock;
     }

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

@@ -322,13 +322,35 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
                 bdSupplier.setFName(dto.getBaseManufacturerDto().getManufacturerName());
                 bdSupplier.setFLocMobile(dto.getBaseManufacturerDto().getContactMobile());
                 bdSupplier.setFUseOrgId("101");
-//        bdSupplier.setTOrgIds("101");
+                bdSupplier.setTOrgIds("101");
                 bdSupplier.setFNumber(dto.getBaseManufacturerDto().getManufacturerCode());
                 ResultBean<String> stringResultBean = finKingDeeFeign.draftBdSupplier(bdSupplier);
             });*/
         } catch (Exception e) {
             e.printStackTrace();
         }
+        if (StringUtils.isBlank(baseManufacturerDto.getCreateOrg())){
+            //集团推送所有分公司的供应商
+            //查询所有分公司，并向所有分公司中插入供应商信息
+            ResultBean<List<SysOrganizationVo>> orgList = sysOrganizationFeign.selectOrgSidList();
+            List<SysOrganizationVo> list = orgList.getData();
+            for (SysOrganizationVo sysOrganizationVo : list) {
+                BdSupplier bdSupplier = new BdSupplier();
+                bdSupplier.setFName(sysOrganizationVo.getName());
+                bdSupplier.setFLocMobile(sysOrganizationVo.getLinkPhone());
+                bdSupplier.setFUseOrgId(sysOrganizationVo.getOrgCode());
+                bdSupplier.setFNumber(sysOrganizationVo.getOtherCode());
+                finKingDeeFeign.draftBdSupplier(bdSupplier);
+            }
+        }else if (StringUtils.isNotBlank(baseManufacturerDto.getCreateOrg())){
+            SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(baseManufacturerDto.getCreateOrg()).getData();
+            BdSupplier bdSupplier = new BdSupplier();
+            bdSupplier.setFName(sysOrganizationVo.getName());
+            bdSupplier.setFLocMobile(sysOrganizationVo.getLinkPhone());
+            bdSupplier.setFUseOrgId(sysOrganizationVo.getOrgCode());
+            bdSupplier.setFNumber(sysOrganizationVo.getOtherCode());
+            finKingDeeFeign.draftBdSupplier(bdSupplier);
+        }
         return rb.success().setMsg("操作成功");
     }
 
@@ -435,6 +457,28 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
         }
         //BaseManufacturerFinance baseManufacturerFinance = baseManufacturerFinanceService.selectByBaseManufacturerSid(sid);
         //baseManufacturerFinanceService.updateBySid(dto.getBaseManufacturerFinanceDto().toMap(), baseManufacturerFinance.getSid());
+        if (StringUtils.isBlank(baseManufacturerDto.getCreateOrg())){
+            //集团推送所有分公司的供应商
+            //查询所有分公司，并向所有分公司中插入供应商信息
+            ResultBean<List<SysOrganizationVo>> orgList = sysOrganizationFeign.selectOrgSidList();
+            List<SysOrganizationVo> list = orgList.getData();
+            for (SysOrganizationVo sysOrganizationVo : list) {
+                BdSupplier bdSupplier = new BdSupplier();
+                bdSupplier.setFName(sysOrganizationVo.getName());
+                bdSupplier.setFLocMobile(sysOrganizationVo.getLinkPhone());
+                bdSupplier.setFUseOrgId(sysOrganizationVo.getOrgCode());
+                bdSupplier.setFNumber(sysOrganizationVo.getOtherCode());
+                finKingDeeFeign.updateBdSupplier(bdSupplier);
+            }
+        }else if (StringUtils.isNotBlank(baseManufacturerDto.getCreateOrg())){
+            SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(baseManufacturerDto.getCreateOrg()).getData();
+            BdSupplier bdSupplier = new BdSupplier();
+            bdSupplier.setFName(sysOrganizationVo.getName());
+            bdSupplier.setFLocMobile(sysOrganizationVo.getLinkPhone());
+            bdSupplier.setFUseOrgId(sysOrganizationVo.getOrgCode());
+            bdSupplier.setFNumber(sysOrganizationVo.getOtherCode());
+            finKingDeeFeign.updateBdSupplier(bdSupplier);
+        }
         return rb.success().setMsg("修改成功");
     }
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java

@@ -14,10 +14,13 @@ import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo;
 import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
 import com.yxt.anrui.fin.api.kingdee.bdcustomer.BdCustomer;
+import com.yxt.anrui.fin.api.kingdee.bdempinfo.BDEmpinfo;
 import com.yxt.anrui.fin.api.kingdee.saloutstock.SalOutStock;
 import com.yxt.anrui.portal.api.sysorganization.SysOrgVo;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
+import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoDetailsVo;
+import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoFeign;
 import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseFeign;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.HanZiConverterPinYin;
@@ -52,6 +55,8 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
     private BaseMiddlemanService baseMiddlemanService;
     @Autowired
     private CrmCustomerTempFeign crmCustomerTempFeign;
+    @Autowired
+    private SysStaffinfoFeign sysStaffinfoFeign;
 
     public ResultBean<Boolean> vehicleOut(BaseVehicleOutDto dto) {
         ResultBean rb = ResultBean.fireFail();
@@ -152,6 +157,17 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
             dto.setCustomerNo(bdCustomer.getFNumber());
             SalOutStock salOutStock = createSalOutStock(baseVehicle, dto);
             ResultBean resultBean1 = finKingDeeFeign.draftSalOutStock(salOutStock);
+            //推送销售专员信息
+            BDEmpinfo bdEmpinfo = new BDEmpinfo();
+            String staffSid = dto.getStaffSid();
+            SysStaffinfoDetailsVo sysStaffinfoDetailsVo = sysStaffinfoFeign.fetchBySid(staffSid).getData();
+            bdEmpinfo.setFName(dto.getStaffName());
+            bdEmpinfo.setFNumber(sysStaffinfoDetailsVo.getJobNumber());
+            bdEmpinfo.setFAddress(sysStaffinfoDetailsVo.getAddress());
+            bdEmpinfo.setFCreateOrgId(sysOrganizationVo.getOrgCode());
+            bdEmpinfo.setFMobile(sysOrganizationVo.getLinkPhone());
+            bdEmpinfo.setFUseOrgId(sysOrganizationVo.getOrgCode());
+            finKingDeeFeign.saveBDEmpinfo(bdEmpinfo);
         } catch (Exception e) {
             log.error(e.getMessage());
         }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java

@@ -65,7 +65,6 @@ import com.yxt.anrui.crm.api.crmcustomertemp.AppCrmCustomerTempInfoVo;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationFeign;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinConfirmDto;
-import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinSelectDto;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
 import com.yxt.anrui.flowable.api.flowcomment.FlowComment;
@@ -2027,7 +2026,10 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
                     finConfirmDto.setBanlance(busDeposit.getDeposit().toString());
                     //创建人sid
                     finConfirmDto.setCreateBySid(busMainDeposit.getCreateBySid());
-                    List<FinSelectDto> list = new ArrayList<>();
+                    finConfirmDto.setPushMessgae(1);
+                    finConfirmDto.setBusSid(busMainDeposit.getSid());
+                    finConfirmDto.setBusNo(busMainDeposit.getBillNo());
+                  /*  List<FinSelectDto> list = new ArrayList<>();
                     if (StringUtils.isNotBlank(busDeposit.getVehicleNum())) {
                         List<BusDepositCustomerVo> customerList = busDepositCustomerService.selectListByBillSid(bv.getBusinessSid());
                         for (int i = 0; i < Integer.valueOf(busDeposit.getVehicleNum()); i++) {
@@ -2044,7 +2046,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
                             }
                         }
                     }
-                    finConfirmDto.setFinSelectList(list);
+                    finConfirmDto.setFinSelectList(list);*/
                     finCollectionConfirmationFeign.saveFinConfirm(finConfirmDto);
                 }
                 if (DictCommonEnum.DepositBillType.JYDD_DC.getCode().equals(busMainDeposit.getDepositBillTypeKey())) {

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java

@@ -42,6 +42,7 @@ import com.yxt.anrui.buscenter.biz.busdeposit.BusDepositService;
 import com.yxt.anrui.buscenter.biz.busdepositfictitious.BusDepositFictitiousService;
 import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
 import com.yxt.anrui.buscenter.biz.bussalesorderprice.BusSalesOrderPriceService;
+import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationFeign;
 import com.yxt.anrui.flowable.api.flowcomment.FlowComment;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserInfoVo;
@@ -91,6 +92,8 @@ public class BusSalesOrderDepositService extends MybatisBaseService<BusSalesOrde
     private BusDepositService busDepositService;
     @Autowired
     private FileUploadComponent fileUploadComponent;
+    @Autowired
+    private FinCollectionConfirmationFeign finCollectionConfirmationFeign;
 
     public String saveOrderDepo(BusSalesOrderDepositDto busSalesOrderDepositDto, String sid) {
         BusSalesOrderDeposit busSalesOrderDeposit = new BusSalesOrderDeposit();
@@ -336,6 +339,13 @@ public class BusSalesOrderDepositService extends MybatisBaseService<BusSalesOrde
                     qw.eq("bd.staffSid", resultBean.getData().getStaffSid());
                 }
             }
+            //查询已审核通过的款项确认
+            ResultBean<List<String>> stringList = finCollectionConfirmationFeign.billeNoList();
+            if(stringList.getSuccess()){
+                if(!stringList.getData().isEmpty()){
+                    qw.in("bmd.billNo",stringList.getData());
+                }
+            }
         }
         qw.eq("bmd.nodeState", FlowComment.SETTLE.getRemark());//已办结
         qw.eq("bmd.depositBillTypeKey", "01");

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java

@@ -84,4 +84,11 @@ public class FinCollectionConfirmation extends BaseEntity {
     private Integer auditState; // 审核状态
     @ApiModelProperty("款项状态（1未认款/2部分认款/3已认款）")
     private Integer paymentState; // 审核状态
+
+    @ApiModelProperty("是否是推送的：0否，1是")
+    private int pushMessgae;
+    @ApiModelProperty("业务sid")
+    private String busSid;
+    @ApiModelProperty("业务单据编号")
+    private String busNo;
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java

@@ -35,6 +35,8 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * Project: anrui-fin(销售相关) <br/>
  * File: FinCollectionConfirmationFeign.java <br/>
@@ -114,5 +116,9 @@ public interface FinCollectionConfirmationFeign {
     @PostMapping("/saveFinConfirm")
     ResultBean saveFinConfirm(@RequestBody FinConfirmDto dto);
 
+    @ApiOperation("查询已审核通过的款项确认的业务编号")
+    @GetMapping("/billeNoList")
+    ResultBean<List<String>> billeNoList();
+
 
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java

@@ -32,6 +32,8 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * Project: anrui-fin(销售相关) <br/>
  * File: FinCollectionConfirmationFeignFallback.java <br/>
@@ -119,4 +121,9 @@ public class FinCollectionConfirmationFeignFallback implements FinCollectionConf
     public ResultBean saveFinConfirm(FinConfirmDto dto) {
         return null;
     }
+
+    @Override
+    public ResultBean<List<String>> billeNoList() {
+        return null;
+    }
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/app/FinConfirmDto.java

@@ -52,4 +52,11 @@ public class FinConfirmDto implements Dto {
 
     private String banlance;
 
+    @ApiModelProperty("是否是推送的：0否，1是")
+    private int pushMessgae;
+    @ApiModelProperty("业务sid")
+    private String busSid;
+    @ApiModelProperty("业务单据编号")
+    private String busNo;
+
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java

@@ -31,7 +31,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.*;
-import com.yxt.common.core.result.ResultBean;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -96,4 +95,6 @@ public interface FinCollectionConfirmationMapper extends BaseMapper<FinCollectio
      * @return
      */
     AppFinCollectionConfirmationDetailedVo getCollectionConfirmDetail(String collectionBillSid);
+
+    List<String> billNoList();
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml

@@ -70,4 +70,8 @@
         FROM fin_collection_confirmation
         WHERE sid = #{collectionBillSid}
     </select>
+
+    <select id="billNoList" resultType="java.lang.String">
+        select busNo from fin_collection_confirmation where pushMessgae = 1 and auditState = 3
+    </select>
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java

@@ -39,6 +39,8 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * Project: anrui-fin(销售相关) <br/>
  * File: FinCollectionConfirmationFeignFallback.java <br/>
@@ -193,4 +195,9 @@ public class FinCollectionConfirmationRest implements FinCollectionConfirmationF
     public ResultBean saveFinConfirm(FinConfirmDto dto) {
         return finCollectionConfirmationService.saveFinConfirm(dto);
     }
+
+    @Override
+    public ResultBean<List<String>> billeNoList() {
+        return finCollectionConfirmationService.billNoList();
+    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -389,6 +389,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                 qw.like("payerName", pagerQuery.getName());
             }
         }
+        qw.eq("pushMessage",0);
         return qw;
     }
 
@@ -753,4 +754,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         }
         return rb.success();
     }
+
+    public ResultBean<List<String>> billNoList() {
+        ResultBean<List<String>> rb = ResultBean.fireFail();
+        List<String> stringList = baseMapper.billNoList();
+        return rb.success().setData(stringList);
+    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankService.java

@@ -29,6 +29,12 @@ import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.fin.api.finmanufacturerbank.*;
+import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
+import com.yxt.anrui.fin.api.kingdee.cnbankcnt.CNBankacnt;
+import com.yxt.anrui.fin.biz.kingdee.FinKingDeeService;
+import com.yxt.anrui.fin.biz.kingdee.cnbankcnt.CNBankcntService;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -39,6 +45,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -61,6 +68,10 @@ public class FinManufacturerBankService extends MybatisBaseService<FinManufactur
 
     @Autowired
     private SysStaffOrgFeign sysStaffOrgFeign;
+    @Resource
+    private CNBankcntService cnBankcntService;
+    @Autowired
+    private SysOrganizationFeign sysOrganizationFeign;
 
     public PagerVo<FinManufacturerBankVo> listPageVo(PagerQuery<FinManufacturerBankQuery> pq) {
         FinManufacturerBankQuery query = pq.getParams();
@@ -105,6 +116,15 @@ public class FinManufacturerBankService extends MybatisBaseService<FinManufactur
                 return rb.setMsg("该公司已存在该银行账号的数据");
             }
             baseMapper.insert(finManufacturerBank);
+            CNBankacnt cnBankacnt = new CNBankacnt();
+            String useOrgSid = finManufacturerBank.getUseOrgSid();
+            SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
+            cnBankacnt.setFCreateOrgId(sysOrganizationVo.getOrgCode());
+            cnBankacnt.setBankName(finManufacturerBank.getDepositBank());
+            cnBankacnt.setFNumber(finManufacturerBank.getBankAccount());
+            cnBankacnt.setFBANKID(finManufacturerBank.getDepositBankKey());
+            cnBankacnt.setFName(finManufacturerBank.getAccountName());
+            cnBankcntService.draftCNBankcnt(cnBankacnt);
             return rb.success().setMsg("保存成功");
         } else {
             FinManufacturerBank finManufacturerBank = fetchBySid(sid);
@@ -117,6 +137,15 @@ public class FinManufacturerBankService extends MybatisBaseService<FinManufactur
             }
             BeanUtil.copyProperties(dto, finManufacturerBank);
             baseMapper.updateById(finManufacturerBank);
+            CNBankacnt cnBankacnt = new CNBankacnt();
+            String useOrgSid = finManufacturerBank.getUseOrgSid();
+            SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
+            cnBankacnt.setFCreateOrgId(sysOrganizationVo.getOrgCode());
+            cnBankacnt.setBankName(finManufacturerBank.getDepositBank());
+            cnBankacnt.setFNumber(finManufacturerBank.getBankAccount());
+            cnBankacnt.setFBANKID(finManufacturerBank.getDepositBankKey());
+            cnBankacnt.setFName(finManufacturerBank.getAccountName());
+            cnBankcntService.updateCNBankacnt(cnBankacnt);
             return rb.success().setMsg("修改成功");
         }
     }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/app/AppSysStaffQuery.java

@@ -4,6 +4,8 @@ import com.yxt.common.core.query.Query;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Author dimengzhe
  * @Date 2022/6/11 9:44
@@ -19,4 +21,7 @@ public class AppSysStaffQuery implements Query {
 
     @ApiModelProperty("组织机构sid")
     private String orgPath;
+
+    @ApiModelProperty("已选人员sid")
+    private List<String> selectSid;
 }

anrui-portal/anrui-portal-biz/pom.xml

@@ -20,6 +20,12 @@
             <groupId>com.yxt.anrui</groupId>
             <version>0.0.1-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>com.yxt.anrui.fin</groupId>
+            <artifactId>anrui-fin-api</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>com.yxt</groupId>
             <artifactId>yxt-common-base</artifactId>

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/PortalApplication.java

@@ -14,7 +14,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
         "com.yxt.anrui.portal"
 })
 @EnableDiscoveryClient
-@EnableFeignClients(basePackages = {"com.yxt.anrui.crm", "com.yxt.anrui.flowable", "com.yxt.messagecenter", "com.yxt.anrui.terminal", "com.yxt.anrui.base", "com.yxt.anrui.scm"})
+@EnableFeignClients(basePackages = {"com.yxt.anrui.crm", "com.yxt.anrui.flowable", "com.yxt.messagecenter", "com.yxt.anrui.terminal", "com.yxt.anrui.base", "com.yxt.anrui.scm", "com.yxt.anrui.fin"})
 public class PortalApplication {
 
     public static void main(String[] args) {

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java

@@ -1,6 +1,9 @@
 package com.yxt.anrui.portal.biz.sysorganization;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
+import com.yxt.anrui.fin.api.kingdee.bddepartment.BdDepartment;
+import com.yxt.anrui.fin.api.kingdee.orgorganizations.OrgOrganizations;
 import com.yxt.anrui.portal.api.sysorganization.*;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo;
 import com.yxt.anrui.portal.biz.sysstaffinfo.SysStaffinfoService;
@@ -20,6 +23,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
 import java.io.File;
 import java.util.*;
 
@@ -55,6 +59,8 @@ public class SysOrganizationRest implements SysOrganizationFeign {
     private SysUserService sysUserService;
     @Autowired
     private RedisUtil redisUtil;
+    @Resource
+    private FinKingDeeFeign finKingDeeFeign;
 
     @Override
     public ResultBean<PagerVo<SysOrganizationVo>> listPage(@RequestBody PagerQuery<SysOrganizationQuery> pq) {
@@ -138,6 +144,23 @@ public class SysOrganizationRest implements SysOrganizationFeign {
             }
         }
         sysOrganizationService.updateBySid(dto.toMap(), sid);
+        //修改金蝶组织信息
+        List<OrgOrganizations> orgOrganizationsList = new ArrayList<>();
+        if ("0".equals(dto.getIsDept())){
+            OrgOrganizations orgOrganizations = new OrgOrganizations();
+            orgOrganizations.setFName(dto.getName());
+            orgOrganizations.setFNumber(dto.getOrgCode());
+            orgOrganizations.setFOrgFormID("102");
+            orgOrganizationsList.add(orgOrganizations);
+            finKingDeeFeign.updateOrgOrganizations(orgOrganizationsList);
+        }else if ("1".equals(dto.getIsDept())){
+            BdDepartment bdDepartment = new BdDepartment();
+            bdDepartment.setFName(dto.getName());
+            bdDepartment.setFNumber(dto.getOrgCode());
+            bdDepartment.setFCreateOrgId(dto.getOrgCode());
+            bdDepartment.setFUseOrgId(dto.getOrgCode());
+            finKingDeeFeign.updateBdDepartment(bdDepartment);
+        }
         //==========================添加清空变化的用户的token
         //查询分管人员
         List<String> stringList1 = new ArrayList<>();

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java

@@ -7,6 +7,8 @@ import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand;
 import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrandFeign;
 import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrandSelectQuery;
 import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrandSelectVo;
+import com.yxt.anrui.fin.api.kingdee.bddepartment.BdDepartment;
+import com.yxt.anrui.fin.api.kingdee.orgorganizations.OrgOrganizations;
 import com.yxt.anrui.portal.api.sysorganization.*;
 import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
@@ -25,7 +27,9 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
 
+import javax.annotation.Resource;
 import java.util.*;
 
 import static java.util.stream.Collectors.toList;
@@ -57,6 +61,8 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
     private SysStaffinfoService sysStaffInfoService;
     @Autowired
     private RedisUtil redisUtil;
+    @Resource
+    private FinKingDeeFeign finKingDeeFeign;
 
     public PagerVo<SysOrganization> listPage(PagerQuery<SysOrganizationQuery> pq) {
         SysOrganizationQuery query = pq.getParams();
@@ -260,6 +266,21 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
         }
         entity.setOrgSidPath(sysOrganization.getOrgSidPath() + "/" + entity.getSid());
         this.saveOrUpdate(entity);
+        //推送金蝶组织信息
+        if ("0".equals(entity.getIsDept())){
+            OrgOrganizations orgOrganizations = new OrgOrganizations();
+            orgOrganizations.setFName(entity.getName());
+            orgOrganizations.setFNumber(entity.getOrgCode());
+            orgOrganizations.setFOrgFormID("102");
+            finKingDeeFeign.draftOrgOrganizations(orgOrganizations);
+        }else if ("1".equals(entity.getIsDept())){
+            BdDepartment bdDepartment = new BdDepartment();
+            bdDepartment.setFName(entity.getName());
+            bdDepartment.setFNumber(entity.getOrgCode());
+            bdDepartment.setFCreateOrgId(entity.getOrgCode());
+            bdDepartment.setFUseOrgId(entity.getOrgCode());
+            finKingDeeFeign.saveBdDepartment(bdDepartment);
+        }
     }
 
     public SysOrganizationVo fetchByIdVo(String id) {

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java

@@ -713,6 +713,10 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
             if (StringUtils.isNotBlank(params.getName())) {
                 qw.like("si.name", params.getName());
             }
+
+            if (params.getSelectSid().size() > 0){
+                qw.notIn("su.sid",params.getSelectSid());
+            }
         }
         IPage<AppSysStaffVo> pagging = baseMapper.getUserList(page, qw, orgSid);
         List<AppSysStaffVo> list = pagging.getRecords();

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java

@@ -326,7 +326,7 @@ public class SysUserRest implements SysUserFeign {
         String captcha = redisUtil.get(uuid);
         List<Map> list = JSONObject.parseArray(captcha, Map.class);
 
-        if (StringUtils.isEmpty(verifyCode)) {
+        /*if (StringUtils.isEmpty(verifyCode)) {
             return new ResultBean<SysUserVo>().fail().setMsg("验证码不能为空");
         }
 
@@ -391,7 +391,7 @@ public class SysUserRest implements SysUserFeign {
             isCorrect = true;
         } else {
             return new ResultBean<SysUserVo>().fail().setMsg("验证码错误");
-        }
+        }*/
         if (StringUtils.isBlank(userName)) {
             return new ResultBean<SysUserVo>().fail().setMsg("用户名不能为空");
         }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/AppScmVehiclePatrolinspectionDetailedsVo.java

@@ -1,9 +1,35 @@
 package com.yxt.anrui.scm.api.scmvehiclepatrolinspection;
 
 import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
 public class AppScmVehiclePatrolinspectionDetailedsVo implements Vo {
 
+    private static final long serialVersionUID = -1333312906210964179L;
+    @ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+    @ApiModelProperty("车辆sid")
+    private String vehicleSid;
+    @ApiModelProperty("月度管理sid")
+    private String mainSid; // 车架号
+    @ApiModelProperty("存放地点sid")
+    private String locationSid; // 存放地点sid
+    @ApiModelProperty("存放地点")
+    private String location; // 存放地点
+    @ApiModelProperty("巡检日期")
+    private String patrolInspectionDate; // 巡检日期
+    @ApiModelProperty("巡检人员")
+    private String patrolInspectionName; // 巡检人员
+    @ApiModelProperty("巡检状态（通过/不通过）")
+    private String patrolInspectionState; // 巡检状态（通过/不通过）
+    @ApiModelProperty("巡检状态（通过/不通过）")
+    private String patrolInspectionStateKey; // 巡检状态（通过/不通过）
+    @ApiModelProperty("创建组织")
+    private String createOrgSid; // 创建组织
+    @ApiModelProperty("使用组织")
+    private String useOrgSid; // 使用组织
+    @ApiModelProperty("推送状态 0 未推送 1 已推送")
+    private int pushState;
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java

@@ -54,7 +54,6 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
-import com.yxt.anrui.portal.api.sysuser.SysUserInfoVo;
 import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo;
 import com.yxt.anrui.scm.api.scmfile.ScmFile;
 import com.yxt.anrui.scm.api.scmvehicleenterlibrary.*;
@@ -562,14 +561,18 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
                     ResultBean<BaseVehicle> baseVehicleResultBean = baseVehicleFeign.selectByVinNoAndOrgSid(scmVehicleEnterlibrary.getVinNo(), internalPurchaseDetailsVo.getSellerOrgSid());
                     //厂家回款通路sid 厂家回款通路名称
                     if (baseVehicleResultBean.getData() != null) {
-                        baseVehicleDto.setManufSaleAccessSid(baseVehicleResultBean.getData().getManufSaleAccessSid());
+                        if(StringUtils.isNotBlank(baseVehicleResultBean.getData().getManufSaleAccessSid())){
-                        baseVehicleDto.setManufSaleAccessName(baseVehicleResultBean.getData().getManufSaleAccessName());
+                            baseVehicleDto.setManufSaleAccessSid(baseVehicleResultBean.getData().getManufSaleAccessSid());
-                        //厂家回款通路类别key
+                            //厂家回款通路类别key
-                        BaseManufacturerBankVo baseManufacturerBankVo = baseManufacturerBankFeign.details(baseVehicleResultBean.getData().getManufSaleAccessSid()).getData();
+                            BaseManufacturerBankVo baseManufacturerBankVo = baseManufacturerBankFeign.details(baseVehicleResultBean.getData().getManufSaleAccessSid()).getData();
-                        if (baseManufacturerBankVo != null) {
+                            if (baseManufacturerBankVo != null) {
-                            baseVehicleDto.setManufSaleAccessKey(baseManufacturerBankVo.getActualPayKey());
+                                baseVehicleDto.setManufSaleAccessKey(baseManufacturerBankVo.getActualPayKey());
-                            //付款通路code
+                                //付款通路code
-                            baseVehicleDto.setPaymentAccessNoKey(baseManufacturerBankVo.getPaymentAccessNoKey());
+                                baseVehicleDto.setPaymentAccessNoKey(baseManufacturerBankVo.getPaymentAccessNoKey());
+                            }
+                        }
+                        if(StringUtils.isNotBlank(baseVehicleResultBean.getData().getManufSaleAccessName())){
+                            baseVehicleDto.setManufSaleAccessName(baseVehicleResultBean.getData().getManufSaleAccessName());
                         }
                     }
                     List<BaseVehicleDto> list = new ArrayList<>();

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

@@ -202,7 +202,7 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
             qw.eq("sve.useOrgSid", query.getUseOrgSid());
         }
         if (StringUtils.isNotBlank(query.getVin())) {
-            qw.eq("sve.vinNo", query.getVin());
+            qw.like("sve.vinNo", query.getVin());
         }
         if (StringUtils.isNotBlank(query.getModel())) {
             qw.eq("sve.modelName", query.getModel());
@@ -508,6 +508,8 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
                 for (String s : factoryImage) {
                     if (s.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
                         s1 = s.replace(fileUploadComponent.getUrlPrefix(), "");
+                    }else{
+                        s1 = s;
                     }
                     ScmFile scmFile1 = new ScmFile();
                     scmFile1.setAttachType(type1);
@@ -521,6 +523,8 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
                 for (String s : carInspectedImage) {
                     if (s.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
                         s2 = s.replace(fileUploadComponent.getUrlPrefix(), "");
+                    }else{
+                        s2 = s;
                     }
                     ScmFile scmFile2 = new ScmFile();
                     scmFile2.setAttachType(type2);

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.java

@@ -117,6 +117,6 @@ public interface ScmVehiclePatrolinspectionMapper extends BaseMapper<ScmVehicleP
 
     AppScmVehiclePatrolinspectionDetailedsVo selectByMainSidAndVinNo(@Param("sid") String sid, @Param("vinNo") String vinNo);
 
-    @Select("SELECT * FROM scm_vehicle_patrolinspection where mainSid = #{sid} and vinNo = #{vinNo}")
+    @Select("SELECT * FROM scm_vehicle_patrolinspection where mainSid = #{sid} and vinNo = #{vinNo} order by id desc")
-    ScmVehiclePatrolinspection getDetailedsByMainSid(@Param("sid") String sid, @Param("vinNo") String vinNo);
+    List<ScmVehiclePatrolinspection>  getDetailedsByMainSid(@Param("sid") String sid, @Param("vinNo") String vinNo);
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.xml

@@ -48,7 +48,7 @@
                (SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.state = 1 and svp.mainSid = #{mainSid}) AS totalNumber,
                (SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.patrolInspectionStateKey = '001' and svp.mainSid = #{mainSid}) AS unHandledNumber,
                (SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.patrolInspectionStateKey = '002' and svp.mainSid = #{mainSid}) AS processedNumber,
-               (SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.patrolInspectionStateKey = '000' and svp.isDelete = 0 and svp.mainSid = #{mainSid}) AS notHandledNumber,
+               (SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.patrolInspectionStateKey = '000' and svp.mainSid = #{mainSid}) AS notHandledNumber,
                (SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.patrolInspectionStateKey = '000' and svp.mainSid = #{mainSid}) AS surplusNumber,
                (SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.patrolInspectionStateKey = '003' and svp.mainSid = #{mainSid}) AS normalNumber
         FROM scm_vehicle_patrolinspection svp

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java

@@ -386,7 +386,7 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
         return baseMapper.selectByMainSidAndVinNo(sid, vinNo);
     }
 
-    public ScmVehiclePatrolinspection getDetailedsByMainSid(String sid,String vinNo) {
+    public List<ScmVehiclePatrolinspection>  getDetailedsByMainSid(String sid,String vinNo) {
         return baseMapper.getDetailedsByMainSid(sid,vinNo);
     }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetService.java

@@ -487,8 +487,11 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
 
         ScmVehiclePatrolinspectionsheet scmVehiclePatrolinspectionsheet = new ScmVehiclePatrolinspectionsheet();
         // 待巡检记录列表添加数据
-        ScmVehiclePatrolinspection scmVehiclePatrolinspection = scmVehiclePatrolinspectionService.getDetailedsByMainSid(scmVehPatrolinspectionmonthVo.getSid(), dto.getVinNo());
+        ScmVehiclePatrolinspection scmVehiclePatrolinspection = null;
-
+        List<ScmVehiclePatrolinspection> scmVehiclePatrolinspections = scmVehiclePatrolinspectionService.getDetailedsByMainSid(scmVehPatrolinspectionmonthVo.getSid(), dto.getVinNo());
+        if (scmVehiclePatrolinspections.size() > 0) {
+            scmVehiclePatrolinspection = scmVehiclePatrolinspections.get(0);
+        }
         if (scmVehiclePatrolinspection == null) {
             scmVehiclePatrolinspection = new ScmVehiclePatrolinspection();
             scmVehiclePatrolinspection.setVinNo(dto.getVinNo());
@@ -504,7 +507,7 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
             scmVehiclePatrolinspection.setState(0);
             scmVehiclePatrolinspectionService.save(scmVehiclePatrolinspection);
         } else {
-            if ("002".equals(scmVehiclePatrolinspection.getPatrolInspectionStateKey())) {
+            if ("002".equals(scmVehiclePatrolinspection.getPatrolInspectionStateKey()) || "003".equals(scmVehiclePatrolinspection.getPatrolInspectionStateKey())) {
                 scmVehiclePatrolinspection = new ScmVehiclePatrolinspection();
                 scmVehiclePatrolinspection.setVinNo(dto.getVinNo());
                 scmVehiclePatrolinspection.setMainSid(scmVehPatrolinspectionmonthVo.getSid());

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java

@@ -3,8 +3,11 @@ package com.yxt.anrui.scm.biz.scmwarehouse;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
+import com.yxt.anrui.fin.api.kingdee.bdstock.BDStock;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganization;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.scm.api.scmwarehouse.*;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -16,6 +19,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -37,7 +41,8 @@ import java.util.Map;
 public class ScmWarehouseService extends MybatisBaseService<ScmWarehouseMapper, ScmWarehouse> {
     @Autowired
     private SysOrganizationFeign sysOrganizationFeign;
-
+    @Resource
+    private FinKingDeeFeign finKingDeeFeign;
     @Autowired
     private SysStaffOrgFeign sysStaffOrgFeign;
 
@@ -108,6 +113,26 @@ public class ScmWarehouseService extends MybatisBaseService<ScmWarehouseMapper,
         ScmWarehouse entity = new ScmWarehouse();
         dto.fillEntity(entity);
         this.saveOrUpdate(entity);
+        //推送金蝶仓库
+        if ("ARZTCK".equals(dto.getGressionCode())){
+            BDStock bdStock1 = new BDStock();
+            SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(dto.getUseOrgSid()).getData();
+            //推送在途仓库
+            bdStock1.setFCreateOrgId(sysOrganizationVo.getOrgCode());
+            bdStock1.setFName("在途仓库");
+            bdStock1.setFNumber("ARZTCK");
+            BDStock bdStock2 = new BDStock();
+            //推送正式仓库
+            bdStock2.setFCreateOrgId(sysOrganizationVo.getOrgCode());
+            bdStock2.setFName("正式仓库");
+            bdStock2.setFNumber("ARZSCK");
+            try {
+                finKingDeeFeign.drafBDtStock(bdStock1);
+                finKingDeeFeign.drafBDtStock(bdStock2);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
     }
 
     public ScmWarehouseVo fetchByIdVo(String id) {

anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliInfo.vue

@@ -104,7 +104,7 @@
               <span>厂家验车单照片</span>
             </el-col>
             <el-col :span="21">
-              <el-image style="width: 178px;height: 178px;" v-for="(item,index) in temp.factoryImage" :key="index" :preview-src-list="temp.factoryImage"></el-image>
+              <el-image style="width: 178px;height: 178px;" v-for="(item,index) in temp.factoryImage" :key="index" :src="item" :preview-src-list="temp.factoryImage"></el-image>
             </el-col>
           </el-row>
           <el-row>
@@ -172,10 +172,9 @@ export default {
     resetState() {
       this.viewState = 1
     },
-    open(val, index) {
+    open(val) {
       this.dialogVisible = true
-      this.dialogUrl = val
+      this.dialogImageUrl = val
-      this.dialogImageUrl = val[index]
     }
   }
 }

anrui-scm/anrui-scm-ui/src/views/weishoumaiduan/weishoumaiduanguanli/unsoldguanli.vue

@@ -244,11 +244,7 @@ export default {
       req.listPage(this.listQuery).then((response) => {
         console.log('列表查询结果：', response)
         this.listLoading = false
-        if (
+        if (response.success) {
-          response.success &&
-          response.data &&
-          response.data.total > 0
-        ) {
           this.list = response.data.records
           this.listQuery.total = response.data.total
         } else {