Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
yxt_djz 3 years ago
parent
commit
1a99ab8e32
  1. 16
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufaQuery.java
  2. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerDto.java
  3. 6
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerVo.java
  4. 3
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml
  5. 20
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java
  6. 55
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java
  7. 2
      anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanliAdd.vue
  8. 10
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finaccountnum/finaccountnum.vue
  9. 6
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
  10. 5
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java
  11. 5
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java
  12. 2
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java
  13. 9
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml
  14. 7
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java
  15. 4
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java
  16. 3
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java
  17. 2
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.java
  18. 14
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetService.java
  19. 6
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthService.java
  20. 2
      anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue
  21. 2
      anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanInfo.vue
  22. 2
      anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanDaiBanInfo.vue
  23. 2
      anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue
  24. 2
      anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanYiBanInfo.vue
  25. 2
      anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/chexingbyconfiguration.vue

16
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufaQuery.java

@ -0,0 +1,16 @@
package com.yxt.anrui.base.api.basemanufacturer;
import com.yxt.common.core.query.Query;
import lombok.Data;
/**
* @Author dimengzhe
* @Date 2022/10/11 15:48
* @Description
*/
@Data
public class BaseManufaQuery implements Query {
private static final long serialVersionUID = 4223191922440246912L;
private String orgSid;
}

4
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerDto.java

@ -121,6 +121,6 @@ public class BaseManufacturerDto implements Dto {
@ApiModelProperty(value = "使用组织名称")
private String useOrgName;
@ApiModelProperty(value = "厂商开户行sid")
private String manBankSid;
/* @ApiModelProperty(value = "厂商开户行sid")
private String manBankSid;*/
}

6
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerVo.java

@ -1,6 +1,7 @@
package com.yxt.anrui.base.api.basemanufacturer;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -38,4 +39,9 @@ public class BaseManufacturerVo implements Vo {
private String contactMobile;
@ApiModelProperty(value = "供应商分类Value")
private String supplierTypeValue;
@JsonIgnore
@ApiModelProperty("供应商编码")
private String manufacturerCode;
@ApiModelProperty("是否允许编辑:true允许,false不允许")
private Boolean isShow;
}

3
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml

@ -16,7 +16,8 @@
bm.contactName,
<!--厂商分类-->
bm.supplierTypeValue,
bm.createOrgName
bm.createOrgName,
bm.manufacturerCode
FROM base_manufacturer bm
${ew.customSqlSegment}
</select>

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

@ -6,6 +6,7 @@ import com.yxt.anrui.base.biz.basemanufacturerbank.BaseManufacturerBankService;
import com.yxt.anrui.base.biz.basemanufacturerfinance.BaseManufacturerFinanceService;
import com.yxt.common.base.utils.ExportExcelUtils;
import com.yxt.common.base.utils.PagerUtil;
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;
@ -18,6 +19,7 @@ import javax.servlet.http.HttpServletResponse;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Map;
@ -63,6 +65,20 @@ public class BaseManufacturerRest implements BaseManufacturerFeign {
ResultBean<PagerVo<BaseManufacturerVo>> rb = ResultBean.fireFail();
IPage<BaseManufacturerVo> page = baseManufacturerService.gysPagerList(pagerQuery);
PagerVo<BaseManufacturerVo> pv = new PagerVo<>();
List<BaseManufacturerVo> records = page.getRecords();
records.removeAll(Collections.singleton(null));
if (!records.isEmpty()) {
for (BaseManufacturerVo baseManufacturerVo : records) {
String code = baseManufacturerVo.getManufacturerCode();
if (StringUtils.isNotBlank(code)) {
baseManufacturerVo.setIsShow(false);
} else {
baseManufacturerVo.setIsShow(true);
}
}
}
PagerVo<BaseManufacturerVo> pv1 = PagerUtil.pageToVo(page, pv);
return rb.success().setData(pv1);
}
@ -79,7 +95,7 @@ public class BaseManufacturerRest implements BaseManufacturerFeign {
@Override
public ResultBean update(BaseManufacturerAllDto dto, String sid) {
return baseManufacturerService.updateAll(dto,sid);
return baseManufacturerService.updateAll(dto, sid);
}
@Override
@ -107,7 +123,7 @@ public class BaseManufacturerRest implements BaseManufacturerFeign {
}
@Override
public ResultBean<List<Map<String,String>>> wcgysNamesDown(String orgSid) {
public ResultBean<List<Map<String, String>>> wcgysNamesDown(String orgSid) {
return baseManufacturerService.wcgysNamesDown(orgSid);
}

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

@ -3,6 +3,7 @@ package com.yxt.anrui.base.biz.basemanufacturer;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import com.yxt.anrui.base.api.basemanufacturer.*;
import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBank;
import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankDto;
@ -16,12 +17,14 @@ import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService;
import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
import com.yxt.anrui.fin.api.kingdee.bdsupplier.BdSupplier;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.base.utils.StringUtils;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import org.apache.tomcat.util.threads.ThreadPoolExecutor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -30,6 +33,7 @@ import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.*;
/**
* Project: anrui-base(安瑞基础信息模块) <br/>
@ -93,7 +97,6 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
}
}
qw.eq("bm.isDelete", 0);
qw.ne("bm.supplierType", 0001);
qw.eq("bm.createOrg", params.getCreateOrgSid());
return baseMapper.pagerList(page, qw);
}
@ -288,13 +291,44 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
return resultBean2;
}
}
BdSupplier bdSupplier = new BdSupplier();
bdSupplier.setFName(dto.getBaseManufacturerDto().getManufacturerName());
bdSupplier.setFLocMobile(dto.getBaseManufacturerDto().getContactMobile());
bdSupplier.setFUseOrgId("101");
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build();
ExecutorService pool = new ThreadPoolExecutor(2, 100,
0L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
String finalSid = sid;
Future future1 = pool.submit(() -> {
//查询所有分公司,并向所有分公司中插入供应商信息
ResultBean<List<SysOrganizationVo>> orgList = sysOrganizationFeign.selectOrgSidList();
List<SysOrganizationVo> list = orgList.getData();
if (!list.isEmpty()) {
for (SysOrganizationVo s : list) {
BaseManufacturer baseManufacturer = new BaseManufacturer();
BeanUtil.copyProperties(baseManufacturerDto, baseManufacturer, "sid", "manufacturerCode");
baseManufacturer.setManBankSid(finalSid);
baseManufacturer.setCreateOrg(s.getSid());
baseManufacturer.setUseOrg(s.getSid());
baseManufacturer.setCreateOrgName(s.getName());
baseManufacturer.setUseOrgName(s.getName());
insert(baseManufacturer);
}
}
});
Future future2 = pool.submit(() -> {
//金蝶推送
BdSupplier bdSupplier = new BdSupplier();
bdSupplier.setFName(dto.getBaseManufacturerDto().getManufacturerName());
bdSupplier.setFLocMobile(dto.getBaseManufacturerDto().getContactMobile());
bdSupplier.setFUseOrgId("101");
// bdSupplier.setTOrgIds("101");
bdSupplier.setFNumber(dto.getBaseManufacturerDto().getManufacturerCode());
ResultBean<String> stringResultBean = finKingDeeFeign.draftBdSupplier(bdSupplier);
bdSupplier.setFNumber(dto.getBaseManufacturerDto().getManufacturerCode());
ResultBean<String> stringResultBean = finKingDeeFeign.draftBdSupplier(bdSupplier);
});
} catch (Exception e) {
e.printStackTrace();
}
return rb.success().setMsg("操作成功");
}
@ -361,13 +395,16 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
ResultBean rb = ResultBean.fireFail();
BaseManufacturer baseManufacturer = fetchBySid(sid);
if (baseManufacturer == null) {
return rb.setMsg("该厂商信息不存在");
return rb.setMsg("该信息不存在");
}
BaseManufacturerAllVo baseManufacturerAllVo = new BaseManufacturerAllVo();
BaseManufacturerDetailsVo baseManufacturerDetailsVo = selectDetailsBySid(sid);
baseManufacturerAllVo.setBaseManufacturerDto(baseManufacturerDetailsVo);
if (StringUtils.isNotBlank(baseManufacturer.getManBankSid())) {//原厂商sid
sid = baseManufacturer.getManBankSid();
}
List<BaseManufacturerBankVo> baseManufacturerBankVo = baseManufacturerBankService.selectDetails(sid);
BaseManufacturerFinanceVo baseManufacturerFinanceVo = baseManufacturerFinanceService.selectDetails(sid);
baseManufacturerAllVo.setBaseManufacturerDto(baseManufacturerDetailsVo);
baseManufacturerAllVo.setBaseManufacturerBankDto(baseManufacturerBankVo);
baseManufacturerAllVo.setBaseManufacturerFinanceDto(baseManufacturerFinanceVo);
return rb.success().setData(baseManufacturerAllVo);

2
anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanliAdd.vue

@ -50,7 +50,7 @@
<el-col :span="8">
<el-form-item prop="supplierType">
<el-select v-model="temp.supplierType" class="addinputw" placeholder="" @change="getSupplierType">
<el-option v-for="item in supplierType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey" :disabled="item.dictValue === '挂车厂' || item.dictValue === '上装厂' || item.dictValue === '外采供应商'"/>
<el-option v-for="item in supplierType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey" :disabled="item.dictValue === '挂车厂' || item.dictValue === '上装厂' || item.dictValue === '外采供应商' || item.dictValue === '分公司'"/>
</el-select>
</el-form-item>
</el-col>

10
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finaccountnum/finaccountnum.vue

@ -1,7 +1,7 @@
<template>
<div class="app-container">
<div v-show="viewState == 1">
<button-bar view-title=" 公司开户账号管理" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
<button-bar view-title=" 公司银行账号管理" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
<div class="main-content">
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
@ -27,7 +27,7 @@
</div>
</div>
<div class="listtop">
<div class="tit">公司开户账号列表</div>
<div class="tit">公司银行账号列表</div>
<!-- 翻页分页 -->
<pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
</div>
@ -41,10 +41,10 @@
<el-button size="mini" type="primary" @click="handleCheck(row)">查看</el-button>
</template>
</el-table-column>
<el-table-column prop="dueBankValue" width="140px" label="账户类型" align="center"/>
<el-table-column prop="dueBankValue" width="140" label="账户类型" align="center"/>
<el-table-column prop="depositBank" label="开户银行" align="center"/>
<el-table-column prop="bankAccount" width="270px" label="银行账号" align="center"/>
<el-table-column prop="accountName" label="账名称" align="center"/>
<el-table-column prop="bankAccount" width="270" label="银行账号" align="center"/>
<el-table-column prop="accountName" label="账名称" align="center"/>
</el-table>
</div>
<div class="pages">

6
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java

@ -194,7 +194,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
//采购组织
//根据使用组织查询采购组织的编码
ResultBean<SysOrganizationVo> resultBean = sysOrganizationFeign.fetchBySid(finPaymentrecord.getCreateOrgSid());
if (!resultBean.getSuccess()) {
if (resultBean.getSuccess()) {
SysOrganizationVo vo = resultBean.getData();
if (vo != null) {
apPayBill.setFPURCHASEORGID(vo.getOrgCode());
@ -211,9 +211,9 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
}
// apPayBill.setFPURCHASEDEPTID("05.04");
//应付类别默认005定金
if ("排产".equals(finPaymentrecord.getCostTitleValue())) {
if ("排产".equals(finPaymentrecord.getCostTypeValue())) {
apPayBill.setF_PAEZ_AssistantKey("005");
apPayBill.setF_PAEZ_AssistantType("定金");
apPayBill.setF_PAEZ_AssistantType("payCostType");
}
List<ApPayBill.FPAYBILLENTRY> FPAYBILLENTRYs = new ArrayList<>();
if (finPaymentrecord.getCost() != null

5
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java

@ -149,4 +149,9 @@ public interface SysOrganizationFeign {
@ResponseBody
@ApiOperation("查询分公司下的销售支持部")
ResultBean<SysOrganizationVo> selectByPSid(@RequestParam("sid") String sid, @RequestParam("name") String name);
@GetMapping("/selectOrgSidList")
@ResponseBody
@ApiOperation("所有分公司sid")
ResultBean<List<SysOrganizationVo>> selectOrgSidList();
}

5
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java

@ -152,4 +152,9 @@ public class SysOrganizationFeignFallback implements SysOrganizationFeign {
public ResultBean<SysOrganizationVo> selectByPSid(String sid, String name) {
return null;
}
@Override
public ResultBean<List<SysOrganizationVo>> selectOrgSidList() {
return null;
}
}

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

@ -111,4 +111,6 @@ public interface SysOrganizationMapper extends BaseMapper<SysOrganization> {
List<SysOrgStaffVo> selectByOrgDeptSid(String orgDeptSid);
SysOrganizationVo selectByPSid(@Param("sid") String sid, @Param("name") String name);
List<SysOrganizationVo> selectOrgSidList();
}

9
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml

@ -195,6 +195,13 @@
</select>
<select id="selectByPSid" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo">
select * from sys_organization where psid = #{sid} and name = #{name}
select *
from sys_organization
where psid = #{sid}
and name = #{name}
</select>
<select id="selectOrgSidList" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo">
select sid,name from sys_organization so where so.isDept = 0
</select>
</mapper>

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

@ -371,4 +371,11 @@ public class SysOrganizationRest implements SysOrganizationFeign {
public ResultBean<SysOrganizationVo> selectByPSid(String sid, String name) {
return sysOrganizationService.selectByPSid(sid,name);
}
@Override
public ResultBean<List<SysOrganizationVo>> selectOrgSidList() {
ResultBean<List<SysOrganizationVo>> rb = ResultBean.fireFail();
List<SysOrganizationVo> stringList = sysOrganizationService.selectOrgSidList();
return rb.success().setData(stringList);
}
}

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

@ -513,4 +513,8 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
SysOrganizationVo vo = baseMapper.selectByPSid(sid,name);
return rb.success().setData(vo);
}
public List<SysOrganizationVo> selectOrgSidList() {
return baseMapper.selectOrgSidList();
}
}

3
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java

@ -367,6 +367,9 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
String inventoryName = dto.getInventoryName();
String inventoryStateKey = dto.getInventoryStateKey();
String remarks = dto.getRemarks();
if (StringUtils.isBlank(inventoryStateKey)){
return rb.setMsg("请选择盘库状态");
}
if ("002".equals(inventoryStateKey) && StringUtils.isBlank(remarks)) {
return rb.setMsg("备注请填写盘损原因");
}

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

@ -66,7 +66,7 @@ public interface ScmVehiclePatrolinspectionMapper extends BaseMapper<ScmVehicleP
List<ScmVehiclePatrolinspectionVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmVehiclePatrolinspection> qw);
@Select("select * from scm_vehicle_patrolinspection where useOrgSid = #{useOrgSid} ")
@Select("select * from scm_vehicle_patrolinspection where useOrgSid = #{useOrgSid} AND id IN ( SELECT max( id ) id FROM scm_vehicle_patrolinspection GROUP BY vinNo ORDER BY id DESC )")
List<ScmVehiclePatrolinspectionVo> selectListVo(@Param("useOrgSid") String useOrgSid);
/**

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

@ -229,18 +229,6 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
public AppScmVehiclePatroVo getInspectionInfo(String recordSid) {
String type1 = "06"; // 巡检相关照片
AppScmVehiclePatroVo vo = baseMapper.getInspectionInfo(recordSid);
// if (StringUtils.isNotBlank(vo.getLiableName())) {
// List<AppLiableListVo> list = new ArrayList<>();
// List<String> splitName = Arrays.asList(vo.getLiableName().split(","));
// List<String> splitSid = Arrays.asList(vo.getLiableSid().split(","));
// for (int i = 0; i < splitName.size(); i++) {
// AppLiableListVo v = new AppLiableListVo();
// v.setLiableName(splitName.get(i));
// v.setLiableSid(splitSid.get(i));
// list.add(v);
// }
// vo.setLiableList(list);
// }
List<String> images = new ArrayList<>();
List<ScmFile> scmFiles1 = scmFileService.selectByLinkSid(vo.getSid(), type1);
if (scmFiles1.size() > 0) {
@ -534,7 +522,7 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
messageDto.setApp_type("2");
messageDto.setModuleSid("98ff0724-5df4-4fc7-ab6d-3996e7706acd");
JSONObject json = new JSONObject();
json.put("recordSid", appPatrolinspectionDto.getMainSid());
json.put("sid", appPatrolinspectionDto.getMainSid());
messageDto.setArgs_json(json.toJSONString());
String msgSid = (String) messageFeign.saveOrUpdateAppMessage(messageDto).getData();
String msgTypeSid = messageDto.getMsgTypeSid();

6
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthService.java

@ -189,6 +189,7 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService<ScmVe
SysStaffOrg sysStaffOrg = sysStaffOrgFeign.getOrgByStaffSid(sysUserVo.getStaffSid()).getData();
List<String> vinNoList = new ArrayList<>();
List<String> mainList = new ArrayList<>();
//所有巡检记录
List<ScmVehiclePatrolinspectionVo> patrolinspectionVos = scmVehiclePatrolinspectionService.selectListAll(useOrgSid);
List<AppScmInventoryRecordsVo> list = new ArrayList<>();
if (patrolinspectionVos.size() > 0) {
@ -198,11 +199,14 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService<ScmVe
if (scmVehPatrolinspectionmonth.getState() == 0) { // 无生成 无法新生成记录
return rb.setMsg("上次巡检记录未生成报告,请先生成再操作!");
}
//问题未解决
if ("001".equals(patrolinspectionVo.getPatrolInspectionStateKey())) {
String vinNo = patrolinspectionVo.getVinNo();
String sid = patrolinspectionVo.getSid();
vinNoList.add(vinNo);
mainList.add(sid);
if (vinNoList.contains(vinNo)){
mainList.add(sid);
}
}
if ("000".equals(patrolinspectionVo.getPatrolInspectionStateKey())) {
scmVehiclePatrolinspectionService.updateState(patrolinspectionVo.getSid());

2
anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue

@ -127,7 +127,7 @@
<span>{{ scope.row.saleGuPrice }}</span>
</template>
</el-table-column>
<el-table-column label="厂家销售通路" align="center" width="200">
<el-table-column label="厂家回款通路" align="center" width="200">
<template slot-scope="scope">
<el-select v-model="scope.row.actualPay" placeholder="请选择" @change="changeActualPay($event, scope.row)" clearable>
<el-option v-for="item in actualPay_list" :key="item.sid" :label="item.name" :value="item.name"></el-option>

2
anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanInfo.vue

@ -100,7 +100,7 @@
<span>{{ scope.row.saleGuPrice }}</span>
</template>
</el-table-column>
<el-table-column label="厂家销售通路" align="center" width="200">
<el-table-column label="厂家回款通路" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.actualPay }}</span>
</template>

2
anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanDaiBanInfo.vue

@ -102,7 +102,7 @@
<span>{{ scope.row.saleGuPrice }}</span>
</template>
</el-table-column>
<el-table-column label="厂家销售通路" align="center" width="200">
<el-table-column label="厂家回款通路" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.actualPay }}</span>
</template>

2
anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue

@ -126,7 +126,7 @@
<span>{{ scope.row.saleGuPrice }}</span>
</template>
</el-table-column>
<el-table-column label="厂家销售通路" align="center" width="200">
<el-table-column label="厂家回款通路" align="center" width="200">
<template slot-scope="scope">
<el-select v-model="scope.row.actualPay" placeholder="请选择" @change="changeActualPay($event, scope.row)" clearable>
<el-option v-for="item in actualPay_list" :key="item.sid" :label="item.name" :value="item.name"></el-option>

2
anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanYiBanInfo.vue

@ -100,7 +100,7 @@
<span>{{ scope.row.saleGuPrice }}</span>
</template>
</el-table-column>
<el-table-column label="厂家销售通路" align="center" width="200">
<el-table-column label="厂家回款通路" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.actualPay }}</span>
</template>

2
anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/chexingbyconfiguration.vue

@ -30,7 +30,7 @@
<el-table :key="tableKey" ref="multipleTable" v-loading="listLoading" :data="list" border style="width: 100%" @selection-change="handleSelectionChange">
<el-table-column width="50px" type="selection" align="center"/>
<el-table-column width="80px" label="编号" type="index" :index="indexMethod" align="center"/>
<el-table-column label="车型" align="center" width="250">
<el-table-column label="品牌" align="center" width="250">
<template slot-scope="scope">
<span>{{ scope.row.brandName }}</span>
</template>

Loading…
Cancel
Save