yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
God 2 years ago
parent
81f9e69308 7f09a35a5a
commit
1f0b9244e9
19 changed files with 471 additions and 3275 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 78
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
  2. 2
      anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles.ftl
  3. 1573
      anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles2.ftl
  4. 1575
      anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black2.ftl
  5. 8
      anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar.ftl
  6. 10
      anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar_black.ftl
  7. 19
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/SelectCustomerVo.java
  8. 221
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  9. 17
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java
  10. 49
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml
  11. 37
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java
  12. 3
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/arreceivebill/ArReceivebillCastToKingDeeBillFields.java
  13. 2
      anrui-scm/anrui-scm-ui/src/views/gongyingshang/gongyingshangAdd.vue
  14. 32
      anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue
  15. 18
      anrui-scm/anrui-scm-ui/src/views/shangzhuang/shangzhuangtaizhangguanli/shangzhuangtaizhangAdd.vue
  16. 8
      anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue
  17. 8
      anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue
  18. 38
      anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue
  19. 2
      anrui-system-ui/src/views/userManage/userManageList.vue

78
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
View File

@ -759,19 +759,15 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
}*/ }*/
private String genCarSaleContract(PrintConfirmDto dto, Map<String, Object> map, AppOrderDetailsVo appOrderDetailsVo) { private String genCarSaleContract(PrintConfirmDto dto, Map<String, Object> map, AppOrderDetailsVo appOrderDetailsVo) {
String ftl = ""; String ftl = "";
if ("现车".equals(appOrderDetailsVo.getOrderType())) {
//获取模板
ftl = "existingvehicles";
} else {
//获取模板
ftl = "orderacar";
}
AppOrderPriceInfoVo priceInfo = appOrderDetailsVo.getPriceInfo(); AppOrderPriceInfoVo priceInfo = appOrderDetailsVo.getPriceInfo();
//查询台数 //查询台数
String num = priceInfo.getNumber(); String num = priceInfo.getNumber();
//单台成交价 //单台成交价
String transactionPrice = priceInfo.getSingleFinalPrice(); String transactionPrice = priceInfo.getSingleFinalPrice();
String remarks = ""; String remarks = "";
if ("现车".equals(appOrderDetailsVo.getOrderType())) {
//获取模板
ftl = "existingvehicles";
AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo(); AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo();
List<String> stringList = orderModelInfoVo.getVinList(); List<String> stringList = orderModelInfoVo.getVinList();
if (stringList.size() > 0) { if (stringList.size() > 0) {
@ -779,6 +775,11 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
} else { } else {
remarks = "主车" + num + "台，单台成交价：" + transactionPrice + "元。"; remarks = "主车" + num + "台，单台成交价：" + transactionPrice + "元。";
} }
} else {
//获取模板
ftl = "orderacar";
remarks = "主车" + num + "台，单台成交价：" + transactionPrice + "元。";
}
map.put("remarks", remarks); map.put("remarks", remarks);
InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + ftl + ".ftl"); InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + ftl + ".ftl");
@ -801,19 +802,15 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
private String genCarSaleContract2(PrintConfirmDto dto, Map<String, Object> map, AppOrderDetailsVo appOrderDetailsVo) { private String genCarSaleContract2(PrintConfirmDto dto, Map<String, Object> map, AppOrderDetailsVo appOrderDetailsVo) {
String ftl = ""; String ftl = "";
if ("现车".equals(appOrderDetailsVo.getOrderType())) {
//获取模板
ftl = "existingvehicles2";
} else {
//获取模板
ftl = "orderacar";
}
AppOrderPriceInfoVo priceInfo = appOrderDetailsVo.getPriceInfo(); AppOrderPriceInfoVo priceInfo = appOrderDetailsVo.getPriceInfo();
//查询台数 //查询台数
String num = priceInfo.getNumber(); String num = priceInfo.getNumber();
//单台成交价 //单台成交价
String transactionPrice = priceInfo.getSingleFinalPrice(); String transactionPrice = priceInfo.getSingleFinalPrice();
String remarks = ""; String remarks = "";
if ("现车".equals(appOrderDetailsVo.getOrderType())) {
//获取模板
ftl = "existingvehicles";
AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo(); AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo();
List<String> stringList = orderModelInfoVo.getVinList(); List<String> stringList = orderModelInfoVo.getVinList();
if (stringList.size() > 0) { if (stringList.size() > 0) {
@ -821,6 +818,11 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
} else { } else {
remarks = "主车" + num + "台，单台成交价：" + transactionPrice + "元。"; remarks = "主车" + num + "台，单台成交价：" + transactionPrice + "元。";
} }
} else {
//获取模板
ftl = "orderacar";
remarks = "主车" + num + "台，单台成交价：" + transactionPrice + "元。";
}
map.put("remarks", remarks); map.put("remarks", remarks);
InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + ftl + ".ftl"); InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + ftl + ".ftl");
@ -879,19 +881,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
AppOrderPriceInfoVo priceInfo = appOrderDetailsVo.getPriceInfo(); AppOrderPriceInfoVo priceInfo = appOrderDetailsVo.getPriceInfo();
//查询台数 //查询台数
String num = priceInfo.getNumber(); String num = priceInfo.getNumber();
//单台成交价
String transactionPrice = priceInfo.getSingleFinalPrice();
String remarks = ""; String remarks = "";
AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo();
List<String> stringList = orderModelInfoVo.getVinList();
if ("1".equals(dto.getDiscountKey())) {
if (stringList.size() > 0) {
remarks = "主车" + num + "台，单台成交价： 元。车架号：" + String.join("、", stringList);
} else {
remarks = "主车" + num + "台，单台成交价： 元。";
}
map.put("remarks", remarks);
}
String ftl = ""; String ftl = "";
// 涉及高低开票的，需要打印两套合同，一套按照成交价打印（记账用），一套为价格空白的合同（开票用） // 涉及高低开票的，需要打印两套合同，一套按照成交价打印（记账用），一套为价格空白的合同（开票用）
if ("1".equals(dto.getDiscountKey())) { if ("1".equals(dto.getDiscountKey())) {
@ -899,10 +889,19 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
if ("现车".equals(appOrderDetailsVo.getOrderType())) { if ("现车".equals(appOrderDetailsVo.getOrderType())) {
//获取模板 //获取模板
ftl = "existingvehicles_black"; ftl = "existingvehicles_black";
AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo();
List<String> stringList = orderModelInfoVo.getVinList();
if (stringList.size() > 0) {
remarks = "主车" + num + "台，单台成交价： 元。车架号：" + String.join("、", stringList);
} else {
remarks = "主车" + num + "台，单台成交价： 元。";
}
} else { } else {
// 订车获取模板 // 订车获取模板
ftl = "orderacar_black"; ftl = "orderacar_black";
remarks = "主车" + num + "台，单台成交价： 元。";
} }
map.put("remarks", remarks);
InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + ftl + ".ftl"); InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + ftl + ".ftl");
//生成word文件名 //生成word文件名
String targetPath = docPdfComponent.getUploadTemplateUrl(); String targetPath = docPdfComponent.getUploadTemplateUrl();
@ -931,30 +930,27 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
AppOrderPriceInfoVo priceInfo = appOrderDetailsVo.getPriceInfo(); AppOrderPriceInfoVo priceInfo = appOrderDetailsVo.getPriceInfo();
//查询台数 //查询台数
String num = priceInfo.getNumber(); String num = priceInfo.getNumber();
//单台成交价
String transactionPrice = priceInfo.getSingleFinalPrice();
String remarks = ""; String remarks = "";
String ftl = "";
// 涉及高低开票的，需要打印两套合同，一套按照成交价打印（记账用），一套为价格空白的合同（开票用）
if ("1".equals(dto.getDiscountKey())) {
// 现车
if ("现车".equals(appOrderDetailsVo.getOrderType())) {
//获取模板
ftl = "existingvehicles_black";
AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo(); AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo();
List<String> stringList = orderModelInfoVo.getVinList(); List<String> stringList = orderModelInfoVo.getVinList();
if ("1".equals(dto.getDiscountKey())) {
if (stringList.size() > 0) { if (stringList.size() > 0) {
remarks = "主车" + num + "台，单台成交价： 元。车架号：" + String.join("、", stringList); remarks = "主车" + num + "台，单台成交价： 元。车架号：" + String.join("、", stringList);
} else { } else {
remarks = "主车" + num + "台，单台成交价： 元。"; remarks = "主车" + num + "台，单台成交价： 元。";
} }
map.put("remarks", remarks);
}
String ftl = "";
// 涉及高低开票的，需要打印两套合同，一套按照成交价打印（记账用），一套为价格空白的合同（开票用）
if ("1".equals(dto.getDiscountKey())) {
// 现车
if ("现车".equals(appOrderDetailsVo.getOrderType())) {
//获取模板
ftl = "existingvehicles_black2";
} else { } else {
// 订车获取模板 // 订车获取模板
ftl = "orderacar_black"; ftl = "orderacar_black";
remarks = "主车" + num + "台，单台成交价： 元。";
} }
map.put("remarks", remarks);
InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + ftl + ".ftl"); InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + ftl + ".ftl");
//生成word文件名 //生成word文件名
String targetPath = docPdfComponent.getUploadTemplateUrl(); String targetPath = docPdfComponent.getUploadTemplateUrl();
@ -1674,7 +1670,8 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
//根据车型sid查询车型的全称 //根据车型sid查询车型的全称
BaseVehicleModel baseVehicleModel = baseVehicleModelService.fetchBySid(appOrderModelInfoVo.getModelSid()); BaseVehicleModel baseVehicleModel = baseVehicleModelService.fetchBySid(appOrderModelInfoVo.getModelSid());
//车型 //车型
String modelName = "车型：" + baseVehicleModel.getModelName() + "。"; String modelName1 = baseVehicleModel.getVehicleTypeValue() + baseVehicleModel.getProductLineValue() + baseVehicleModel.getDriveFormValue() + baseVehicleModel.getGearboxTypeValue() + baseVehicleModel.getVehicleVersionValue() + baseVehicleModel.getPowerValue() + baseVehicleModel.getFuelTypeValue() + baseVehicleModel.getEngineTypeValue() + baseVehicleModel.getEmissionStandardValue() + baseVehicleModel.getMarketSegmentsValue() + baseVehicleModel.getSpecifications();
String modelName = "车型：" + modelName1 + "。";
//配置 //配置
String modelConfig = "配置：" + appOrderModelInfoVo.getConfig() + "。"; String modelConfig = "配置：" + appOrderModelInfoVo.getConfig() + "。";
//上装 //上装
@ -1708,7 +1705,6 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
map.put("discountDetail", discountDetail); map.put("discountDetail", discountDetail);
} }
//保险说明 //保险说明
String insuranceInfo = "保险说明：" + appOrderDetailsVo.getInsuranceInfo() + "。"; String insuranceInfo = "保险说明：" + appOrderDetailsVo.getInsuranceInfo() + "。";
//车价合计 //车价合计
@ -1781,7 +1777,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
});*/ });*/
PrintConfirmVo printConfirmVo = null; PrintConfirmVo printConfirmVo = null;
String urlAll = ""; String urlAll = "";
/*Future<String> future2 = pool.submit(() -> { /* Future<String> future2 = pool.submit(() -> {
return genCarSaleContractBlank(dto, map, appOrderDetailsVo); return genCarSaleContractBlank(dto, map, appOrderDetailsVo);
}); });
Future<String> future2_2 = pool.submit(() -> { Future<String> future2_2 = pool.submit(() -> {

2
anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles.ftl
View File

@ -1044,6 +1044,7 @@
</w:r> </w:r>
</w:p> </w:p>
</#if> </#if>
<#if insuranceInfo??>
<w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000"> <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
<w:pPr> <w:pPr>
<w:widowControl/> <w:widowControl/>
@ -1067,6 +1068,7 @@
<w:t>${insuranceInfo!}</w:t> <w:t>${insuranceInfo!}</w:t>
</w:r> </w:r>
</w:p> </w:p>
</#if>
<w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000"> <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
<w:pPr> <w:pPr>
<w:widowControl/> <w:widowControl/>

1573
anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles2.ftl
View File

File diff suppressed because it is too large

1575
anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black2.ftl
View File

File diff suppressed because it is too large

8
anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar.ftl
View File

@ -1535,7 +1535,7 @@
<w:sz w:val="20"/> <w:sz w:val="20"/>
<w:sz-cs w:val="20"/> <w:sz-cs w:val="20"/>
</w:rPr> </w:rPr>
<w:t> 甲方： 乙方：</w:t> <w:t>甲方： 乙方： </w:t>
</w:r> </w:r>
</w:p> </w:p>
<w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000"> <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
@ -1630,7 +1630,7 @@
</w:rPr> </w:rPr>
<w:tab/> <w:tab/>
</w:r> </w:r>
<w:r> <#-- <w:r>
<w:rPr> <w:rPr>
<w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/> <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
<wx:font wx:val="宋体"/> <wx:font wx:val="宋体"/>
@ -1656,7 +1656,7 @@
<w:sz-cs w:val="20"/> <w:sz-cs w:val="20"/>
</w:rPr> </w:rPr>
<w:tab/> <w:tab/>
</w:r> </w:r>-->
<w:r> <w:r>
<w:rPr> <w:rPr>
<w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/> <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
@ -1665,7 +1665,7 @@
<w:sz-cs w:val="20"/> <w:sz-cs w:val="20"/>
</w:rPr> </w:rPr>
<w:tab/> <w:tab/>
<w:t> 地址：</w:t> <w:t>地址：</w:t>
</w:r> </w:r>
</w:p> </w:p>
<w:p wsp:rsidR="00CE5AB6" wsp:rsidRDefault="00000000"> <w:p wsp:rsidR="00CE5AB6" wsp:rsidRDefault="00000000">

10
anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar_black.ftl
View File

@ -1326,7 +1326,7 @@
<w:sz w:val="20"/> <w:sz w:val="20"/>
<w:sz-cs w:val="20"/> <w:sz-cs w:val="20"/>
</w:rPr> </w:rPr>
<w:t>元 ${depositRemarks!}，乙方提车时交清全部车款。甲方未收到全款前，车辆所有权归甲方所有。</w:t> <w:t>元${depositRemarks!}，乙方提车时交清全部车款。甲方未收到全款前，车辆所有权归甲方所有。</w:t>
</w:r> </w:r>
</w:p> </w:p>
<w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000"> <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
@ -1535,7 +1535,7 @@
<w:sz w:val="20"/> <w:sz w:val="20"/>
<w:sz-cs w:val="20"/> <w:sz-cs w:val="20"/>
</w:rPr> </w:rPr>
<w:t> 甲方： 乙方：</w:t> <w:t>甲方： 乙方： </w:t>
</w:r> </w:r>
</w:p> </w:p>
<w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000"> <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
@ -1630,7 +1630,7 @@
</w:rPr> </w:rPr>
<w:tab/> <w:tab/>
</w:r> </w:r>
<w:r> <#-- <w:r>
<w:rPr> <w:rPr>
<w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/> <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
<wx:font wx:val="宋体"/> <wx:font wx:val="宋体"/>
@ -1656,7 +1656,7 @@
<w:sz-cs w:val="20"/> <w:sz-cs w:val="20"/>
</w:rPr> </w:rPr>
<w:tab/> <w:tab/>
</w:r> </w:r>-->
<w:r> <w:r>
<w:rPr> <w:rPr>
<w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/> <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
@ -1665,7 +1665,7 @@
<w:sz-cs w:val="20"/> <w:sz-cs w:val="20"/>
</w:rPr> </w:rPr>
<w:tab/> <w:tab/>
<w:t> 地址：</w:t> <w:t>地址：</w:t>
</w:r> </w:r>
</w:p> </w:p>
<w:p wsp:rsidR="00CE5AB6" wsp:rsidRDefault="00000000"> <w:p wsp:rsidR="00CE5AB6" wsp:rsidRDefault="00000000">

19
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/SelectCustomerVo.java
View File

@ -0,0 +1,19 @@
package com.yxt.anrui.fin.api.finselectedreceivablesdetailed;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author dimengzhe
* @Date 2023/1/4 9:45
* @Description
*/
@Data
public class SelectCustomerVo implements Vo {
private static final long serialVersionUID = 4691661516865204703L;
@ApiModelProperty("客户名称")
private String customerName;
@ApiModelProperty("客户联系方式")
private String customerPhone;
}

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

@ -53,10 +53,7 @@ import com.yxt.anrui.fin.api.fincollectionconfirmation.*;
import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo; import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo;
import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinConfirmDto; import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinConfirmDto;
import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinSelectDto; import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinSelectDto;
import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.AppFinSelectedReceivablesDetailedDto; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.*;
import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed;
import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedDto;
import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed;
import com.yxt.anrui.fin.api.kingdee.arreceivebill.ARReceivebill; import com.yxt.anrui.fin.api.kingdee.arreceivebill.ARReceivebill;
@ -913,7 +910,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
BigDecimal subscriptionMoneyAll = finSelectedReceivablesDetailedDtos.stream().map(AppFinSelectedReceivablesDetailedDto::getConfirmMoney).reduce(BigDecimal.ZERO, BigDecimal::add); BigDecimal subscriptionMoneyAll = finSelectedReceivablesDetailedDtos.stream().map(AppFinSelectedReceivablesDetailedDto::getConfirmMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
//判断收款金额与所选的总认款金额是否相等 //判断收款金额与所选的总认款金额是否相等
if (finCollectionConfirmation.getFirst() == 0) { if (finCollectionConfirmation.getFirst() == 0) {
if(subscriptionMoneyAll.compareTo(finCollectionConfirmation.getCollectionMoney())>0){ if (subscriptionMoneyAll.compareTo(finCollectionConfirmation.getCollectionMoney()) > 0) {
return rb.setMsg("认款金额不允许超过收款金额"); return rb.setMsg("认款金额不允许超过收款金额");
} }
if (subscriptionMoneyAll.compareTo(finCollectionConfirmation.getCollectionMoney()) != 0) { if (subscriptionMoneyAll.compareTo(finCollectionConfirmation.getCollectionMoney()) != 0) {
@ -1290,20 +1287,80 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
List<ARReceivebill.FRECEIVEBILLENTRY> fEntityList = new ArrayList<>(); List<ARReceivebill.FRECEIVEBILLENTRY> fEntityList = new ArrayList<>();
ARReceivebill.FRECEIVEBILLENTRY freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY(); ARReceivebill.FRECEIVEBILLENTRY freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY();
//推送车款 //推送车款
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos1 = finSelectedReceivablesDetailedService.fetchByAuditState1(sid, 1, "车款"); List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos1 = finSelectedReceivablesDetailedService.fetchByAuditState1(sid, 1, "车款");
List<FinSelectedReceivablesDetailedVo> voListv = finSelectedReceivablesDetailedService.selectDetailsList(sid, 1, "车款");
//查询是否含有车架号
List<String> stringsVin = voListv.stream().filter(v->StringUtils.isNotBlank(v.getVIN())).map(v->v.getVIN()).collect(Collectors.toList());
stringsVin.removeAll(Collections.singleton(null));
if(finSelectedReceivablesDetailedVos1.size()>0){
if (!stringsVin.isEmpty()) {
//查询根据客户名称和手机号有哪些客户
List<SelectCustomerVo> customerList = finSelectedReceivablesDetailedService.selectCustomerList(sid, 1, "车款");
for (SelectCustomerVo vo : customerList) {
BdCustomer bdCustomer = createBdCustomer(confirmation.getUseOrgSid(), vo.getCustomerName(), vo.getCustomerPhone());
ResultBean resultBeanMiddle = bdCustomerService.draftBdCustomer(bdCustomer);
//往来单位
arReceivebill.setFCONTACTUNIT(bdCustomer.getFNumber());
fEntityList = new ArrayList<>();
//查询该客户的车架号不为空的情况
List<FinSelectedReceivablesDetailedVo> vinListVo = finSelectedReceivablesDetailedService.selectVinListVo(sid, 1, "车款", vo.getCustomerName(), vo.getCustomerPhone());
for (FinSelectedReceivablesDetailedVo vvvv : vinListVo) {
freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY();
//结算方式
freceivebillentry.setFSETTLETYPEIDKey(confirmation.getCollectionTypeKey());
freceivebillentry.setFSETTLETYPEIDType("customerPayType");
//收款金额
freceivebillentry.setFRECTOTALAMOUNTFOR(vvvv.getSubscriptionMoney());
//登记日期
freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate());
freceivebillentry.setF_PAEZ_Base1(vvvv.getVIN().substring(vvvv.getVIN().length()-8));
//收款用途
freceivebillentry.setFPURPOSEIDKey("001");
freceivebillentry.setFPURPOSEIDType("cw_skyt");
freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
fEntityList.add(freceivebillentry);
}
//查询该客户的车架号为空的情况
FinSelectedReceivablesDetailedVo vvVo = finSelectedReceivablesDetailedService.fetchByAuditStateV(sid, 1, "车款", vo.getCustomerName(), vo.getCustomerPhone());
freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY();
//结算方式
freceivebillentry.setFSETTLETYPEIDKey(confirmation.getCollectionTypeKey());
freceivebillentry.setFSETTLETYPEIDType("customerPayType");
//收款金额
freceivebillentry.setFRECTOTALAMOUNTFOR(vvVo.getSumAll());
//登记日期
freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate());
//收款用途
freceivebillentry.setFPURPOSEIDKey("001");
freceivebillentry.setFPURPOSEIDType("cw_skyt");
freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
fEntityList.add(freceivebillentry);
//项目类别key、value
arReceivebill.setF_PAEZ_AssistantType("cw_sklb");
FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(vvVo.getReceivablesSid());
if ("1".equals(finUncollectedReceivablesDetailed.getPayTypeKey())) {
arReceivebill.setF_PAEZ_AssistantKey("001");
} else if ("2".equals(finUncollectedReceivablesDetailed.getPayTypeKey())) {
arReceivebill.setF_PAEZ_AssistantKey("002");
}
arReceivebill.setFRECEIVEBILLENTRY(fEntityList);
ResultBean resultBean1 = arReceivebillService.draftArReceivebill(arReceivebill);
}
} else {
fEntityList = new ArrayList<>();
freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY();
finSelectedReceivablesDetailedVos1.removeAll(Collections.singleton(null)); finSelectedReceivablesDetailedVos1.removeAll(Collections.singleton(null));
if (!finSelectedReceivablesDetailedVos1.isEmpty()) { if (!finSelectedReceivablesDetailedVos1.isEmpty()) {
for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos1){ for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos1) {
//先推送客户 //先推送客户
BdCustomer bdCustomer = createBdCustomer(confirmation.getUseOrgSid(),finSelectedReceivablesDetailedVo.getCustomerName(),finSelectedReceivablesDetailedVo.getCustomerPhone()); BdCustomer bdCustomer = createBdCustomer(confirmation.getUseOrgSid(), finSelectedReceivablesDetailedVo.getCustomerName(), finSelectedReceivablesDetailedVo.getCustomerPhone());
ResultBean resultBeanMiddle = bdCustomerService.draftBdCustomer(bdCustomer); ResultBean resultBeanMiddle = bdCustomerService.draftBdCustomer(bdCustomer);
//往来单位 //往来单位
arReceivebill.setFCONTACTUNIT(bdCustomer.getFNumber()); arReceivebill.setFCONTACTUNIT(bdCustomer.getFNumber());
//结算方式 //结算方式
freceivebillentry.setFSETTLETYPEIDKey(confirmation.getCollectionTypeKey()); freceivebillentry.setFSETTLETYPEIDKey(confirmation.getCollectionTypeKey());
freceivebillentry.setFSETTLETYPEIDType("customerPayType"); freceivebillentry.setFSETTLETYPEIDType("customerPayType");
// BigDecimal bigAll = finSelectedReceivablesDetailedVos1.stream().map(FinSelectedReceivablesDetailedVo::getSubscriptionMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
//收款金额 //收款金额
freceivebillentry.setFRECTOTALAMOUNTFOR(finSelectedReceivablesDetailedVo.getSumAll()); freceivebillentry.setFRECTOTALAMOUNTFOR(finSelectedReceivablesDetailedVo.getSumAll());
//登记日期 //登记日期
@ -1316,28 +1373,120 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//项目类别key、value //项目类别key、value
arReceivebill.setF_PAEZ_AssistantType("cw_sklb"); arReceivebill.setF_PAEZ_AssistantType("cw_sklb");
FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(finSelectedReceivablesDetailedVos1.get(0).getReceivablesSid()); FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(finSelectedReceivablesDetailedVos1.get(0).getReceivablesSid());
if("1".equals(finUncollectedReceivablesDetailed.getPayTypeKey())){ if ("1".equals(finUncollectedReceivablesDetailed.getPayTypeKey())) {
arReceivebill.setF_PAEZ_AssistantKey("001"); arReceivebill.setF_PAEZ_AssistantKey("001");
}else if("2".equals(finUncollectedReceivablesDetailed.getPayTypeKey())){ } else if ("2".equals(finUncollectedReceivablesDetailed.getPayTypeKey())) {
arReceivebill.setF_PAEZ_AssistantKey("002"); arReceivebill.setF_PAEZ_AssistantKey("002");
} }
arReceivebill.setFRECEIVEBILLENTRY(fEntityList); arReceivebill.setFRECEIVEBILLENTRY(fEntityList);
ResultBean resultBean1 = arReceivebillService.draftArReceivebill(arReceivebill); ResultBean resultBean1 = arReceivebillService.draftArReceivebill(arReceivebill);
}
}
}
} }
/* List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos1 = finSelectedReceivablesDetailedService.fetchByAuditState1(sid, 1, "车款");
finSelectedReceivablesDetailedVos1.removeAll(Collections.singleton(null));
if (!finSelectedReceivablesDetailedVos1.isEmpty()) {
for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos1) {
//先推送客户
BdCustomer bdCustomer = createBdCustomer(confirmation.getUseOrgSid(), finSelectedReceivablesDetailedVo.getCustomerName(), finSelectedReceivablesDetailedVo.getCustomerPhone());
ResultBean resultBeanMiddle = bdCustomerService.draftBdCustomer(bdCustomer);
//往来单位
arReceivebill.setFCONTACTUNIT(bdCustomer.getFNumber());
//结算方式
freceivebillentry.setFSETTLETYPEIDKey(confirmation.getCollectionTypeKey());
freceivebillentry.setFSETTLETYPEIDType("customerPayType");
//收款金额
freceivebillentry.setFRECTOTALAMOUNTFOR(finSelectedReceivablesDetailedVo.getSumAll());
//登记日期
freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate());
//收款用途
freceivebillentry.setFPURPOSEIDKey("001");
freceivebillentry.setFPURPOSEIDType("cw_skyt");
freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
fEntityList.add(freceivebillentry);
//项目类别key、value
arReceivebill.setF_PAEZ_AssistantType("cw_sklb");
FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(finSelectedReceivablesDetailedVos1.get(0).getReceivablesSid());
if ("1".equals(finUncollectedReceivablesDetailed.getPayTypeKey())) {
arReceivebill.setF_PAEZ_AssistantKey("001");
} else if ("2".equals(finUncollectedReceivablesDetailed.getPayTypeKey())) {
arReceivebill.setF_PAEZ_AssistantKey("002");
} }
arReceivebill.setFRECEIVEBILLENTRY(fEntityList);
ResultBean resultBean1 = arReceivebillService.draftArReceivebill(arReceivebill);
}
}*/
//推送订金 //推送订金
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos2 = finSelectedReceivablesDetailedService.fetchByAuditState1(sid, 1, "订金"); List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos2 = finSelectedReceivablesDetailedService.fetchByAuditState1(sid, 1, "订金");
if(finSelectedReceivablesDetailedVos2.size()>0){
voListv = finSelectedReceivablesDetailedService.selectDetailsList(sid, 1, "订金");
//查询是否含有车架号
stringsVin = voListv.stream().filter(v->StringUtils.isNotBlank(v.getVIN())).map(v->v.getVIN()).collect(Collectors.toList());
stringsVin.removeAll(Collections.singleton(null));
if (!stringsVin.isEmpty()) {
//查询根据客户名称和手机号有哪些客户
List<SelectCustomerVo> customerList = finSelectedReceivablesDetailedService.selectCustomerList(sid, 1, "订金");
for (SelectCustomerVo vo : customerList) {
//先推送客户
BdCustomer bdCustomer = createBdCustomer(confirmation.getUseOrgSid(), vo.getCustomerName(), vo.getCustomerPhone());
ResultBean resultBeanMiddle = bdCustomerService.draftBdCustomer(bdCustomer);
//往来单位
arReceivebill.setFCONTACTUNIT(bdCustomer.getFNumber());
fEntityList = new ArrayList<>();
//查询该客户的车架号不为空的情况
List<FinSelectedReceivablesDetailedVo> vinListVo = finSelectedReceivablesDetailedService.selectVinListVo(sid, 1, "订金", vo.getCustomerName(), vo.getCustomerPhone());
for (FinSelectedReceivablesDetailedVo vvvv : vinListVo) {
freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY();
//结算方式
freceivebillentry.setFSETTLETYPEIDKey(confirmation.getCollectionTypeKey());
freceivebillentry.setFSETTLETYPEIDType("customerPayType");
//收款金额
freceivebillentry.setFRECTOTALAMOUNTFOR(vvvv.getSubscriptionMoney());
//登记日期
freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate());
freceivebillentry.setF_PAEZ_Base1(vvvv.getVIN().substring(vvvv.getVIN().length()-8));
//收款用途
freceivebillentry.setFPURPOSEIDKey("002");
freceivebillentry.setFPURPOSEIDType("cw_skyt");
freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
fEntityList.add(freceivebillentry);
}
//查询该客户的车架号为空的情况
FinSelectedReceivablesDetailedVo vvVo = finSelectedReceivablesDetailedService.fetchByAuditStateV(sid, 1, "订金", vo.getCustomerName(), vo.getCustomerPhone());
freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY();
//结算方式
freceivebillentry.setFSETTLETYPEIDKey(confirmation.getCollectionTypeKey());
freceivebillentry.setFSETTLETYPEIDType("customerPayType");
//收款金额
freceivebillentry.setFRECTOTALAMOUNTFOR(vvVo.getSumAll());
//登记日期
freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate());
//收款用途
freceivebillentry.setFPURPOSEIDKey("002");
freceivebillentry.setFPURPOSEIDType("cw_skyt");
freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
fEntityList.add(freceivebillentry);
//项目类别key、value
arReceivebill.setF_PAEZ_AssistantType("cw_sklb");
arReceivebill.setF_PAEZ_AssistantKey("006");
arReceivebill.setFRECEIVEBILLENTRY(fEntityList);
ResultBean resultBean1 = arReceivebillService.draftArReceivebill(arReceivebill);
}
} else {
fEntityList = new ArrayList<>(); fEntityList = new ArrayList<>();
freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY(); freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY();
finSelectedReceivablesDetailedVos2.removeAll(Collections.singleton(null)); finSelectedReceivablesDetailedVos2.removeAll(Collections.singleton(null));
if (!finSelectedReceivablesDetailedVos2.isEmpty()) { if (!finSelectedReceivablesDetailedVos2.isEmpty()) {
for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos2){ for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos2) {
//先推送客户 //先推送客户
BdCustomer bdCustomer = createBdCustomer(confirmation.getUseOrgSid(),finSelectedReceivablesDetailedVo.getCustomerName(),finSelectedReceivablesDetailedVo.getCustomerPhone()); BdCustomer bdCustomer = createBdCustomer(confirmation.getUseOrgSid(), finSelectedReceivablesDetailedVo.getCustomerName(), finSelectedReceivablesDetailedVo.getCustomerPhone());
ResultBean resultBeanMiddle = bdCustomerService.draftBdCustomer(bdCustomer); ResultBean resultBeanMiddle = bdCustomerService.draftBdCustomer(bdCustomer);
//往来单位 //往来单位
arReceivebill.setFCONTACTUNIT(bdCustomer.getFNumber()); arReceivebill.setFCONTACTUNIT(bdCustomer.getFNumber());
@ -1360,15 +1509,50 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
arReceivebill.setF_PAEZ_AssistantKey("006"); arReceivebill.setF_PAEZ_AssistantKey("006");
ResultBean resultBean2 = arReceivebillService.draftArReceivebill(arReceivebill); ResultBean resultBean2 = arReceivebillService.draftArReceivebill(arReceivebill);
} }
}
}
} }
//推送订金
/*List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos2 = finSelectedReceivablesDetailedService.fetchByAuditState1(sid, 1, "订金");
fEntityList = new ArrayList<>();
freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY();
finSelectedReceivablesDetailedVos2.removeAll(Collections.singleton(null));
if (!finSelectedReceivablesDetailedVos2.isEmpty()) {
for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos2) {
//先推送客户
BdCustomer bdCustomer = createBdCustomer(confirmation.getUseOrgSid(), finSelectedReceivablesDetailedVo.getCustomerName(), finSelectedReceivablesDetailedVo.getCustomerPhone());
ResultBean resultBeanMiddle = bdCustomerService.draftBdCustomer(bdCustomer);
//往来单位
arReceivebill.setFCONTACTUNIT(bdCustomer.getFNumber());
//结算方式
freceivebillentry.setFSETTLETYPEIDKey(confirmation.getCollectionTypeKey());
freceivebillentry.setFSETTLETYPEIDType("customerPayType");
//收款金额
freceivebillentry.setFRECTOTALAMOUNTFOR(finSelectedReceivablesDetailedVo.getSumAll());
//登记日期
freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate());
//收款用途
freceivebillentry.setFPURPOSEIDKey("002");
freceivebillentry.setFPURPOSEIDType("cw_skyt");
freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
fEntityList.add(freceivebillentry);
arReceivebill.setFRECEIVEBILLENTRY(fEntityList);
//项目类别key、value
arReceivebill.setF_PAEZ_AssistantType("cw_sklb");
arReceivebill.setF_PAEZ_AssistantKey("006");
ResultBean resultBean2 = arReceivebillService.draftArReceivebill(arReceivebill);
}
}*/
//简易订单-订金收取 //简易订单-订金收取
if (finSelectedReceivablesDetailedVos1.isEmpty() && finSelectedReceivablesDetailedVos2.isEmpty()) { if (finSelectedReceivablesDetailedVos1.isEmpty() && finSelectedReceivablesDetailedVos2.isEmpty()) {
//先推送客户 //先推送客户
AppBusDepositBuscenterDetailVo busDeposit = busDepositFeign.getDepositInfoDetails(confirmation.getBusSid()).getData(); AppBusDepositBuscenterDetailVo busDeposit = busDepositFeign.getDepositInfoDetails(confirmation.getBusSid()).getData();
BdCustomer bdCustomer = createBdCustomer(confirmation.getUseOrgSid(),busDeposit.getPayName(),busDeposit.getPhone()); BdCustomer bdCustomer = createBdCustomer(confirmation.getUseOrgSid(), busDeposit.getPayName(), busDeposit.getPhone());
ResultBean resultBeanMiddle = bdCustomerService.draftBdCustomer(bdCustomer); ResultBean resultBeanMiddle = bdCustomerService.draftBdCustomer(bdCustomer);
log.info("客户推送："+resultBeanMiddle.getMsg()); log.info("客户推送：" + resultBeanMiddle.getMsg());
//往来单位 //往来单位
arReceivebill.setFCONTACTUNIT(bdCustomer.getFNumber()); arReceivebill.setFCONTACTUNIT(bdCustomer.getFNumber());
fEntityList = new ArrayList<>(); fEntityList = new ArrayList<>();
@ -1391,7 +1575,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
arReceivebill.setF_PAEZ_AssistantType("cw_sklb"); arReceivebill.setF_PAEZ_AssistantType("cw_sklb");
arReceivebill.setF_PAEZ_AssistantKey("006"); arReceivebill.setF_PAEZ_AssistantKey("006");
ResultBean resultBean2 = arReceivebillService.draftArReceivebill(arReceivebill); ResultBean resultBean2 = arReceivebillService.draftArReceivebill(arReceivebill);
log.info("收款单推送："+resultBean2.getMsg()); log.info("收款单推送：" + resultBean2.getMsg());
} }
//=========================================== //===========================================
@ -1526,8 +1710,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
ResultBean deleteResult = baseVehicleTempstateFeign.delByBusSid(sid);*/ ResultBean deleteResult = baseVehicleTempstateFeign.delByBusSid(sid);*/
return rb.success().setMsg("款项确认成功"); return rb.success().setMsg("款项确认成功");
} }
//组装客户推送 //组装客户推送
private BdCustomer createBdCustomer(String useOrgSid,String name,String mobile) { private BdCustomer createBdCustomer(String useOrgSid, String name, String mobile) {
BdCustomer bdCustomer = new BdCustomer(); BdCustomer bdCustomer = new BdCustomer();
ResultBean<SysOrganizationVo> resultBean = sysOrganizationFeign.fetchBySid(useOrgSid); ResultBean<SysOrganizationVo> resultBean = sysOrganizationFeign.fetchBySid(useOrgSid);
if (resultBean.getSuccess()) { if (resultBean.getSuccess()) {

17
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java
View File

@ -35,6 +35,7 @@ import com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinSelectedReceivables
import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo; import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo;
import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed;
import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo;
import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.SelectCustomerVo;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo;
import org.apache.ibatis.annotations.*; import org.apache.ibatis.annotations.*;
@ -94,17 +95,25 @@ public interface FinSelectedReceivablesDetailedMapper extends BaseMapper<FinSele
List<FinSelectedReceivablesDetailedVo> selectDetailedGroupConAndRecAndPay(); List<FinSelectedReceivablesDetailedVo> selectDetailedGroupConAndRecAndPay();
@Update("update fin_selected_receivables_detailed set auditDate = NOW() ,auditState = #{auditState} where sid = #{sid1}") @Update("update fin_selected_receivables_detailed set auditDate = NOW() ,auditState = #{auditState} where sid = #{sid1}")
void updateAuditDateBySid(@Param("sid1") String sid1,@Param("auditState") String auditState); void updateAuditDateBySid(@Param("sid1") String sid1, @Param("auditState") String auditState);
List<AppFinSelectedReceivablesPaymentDetailsVo> selectByCollSid(@Param("collectionBillSid") String collectionBillSid); List<AppFinSelectedReceivablesPaymentDetailsVo> selectByCollSid(@Param("collectionBillSid") String collectionBillSid);
List<AppBusArrearsCarryMoneyVo> selByContractNo(String contractNo); List<AppBusArrearsCarryMoneyVo> selByContractNo(String contractNo);
List<String> selectListByAuditState(@Param("i") int i,@Param("userSid") String userSid,@Param("useOrgSid") String useOrgSid); List<String> selectListByAuditState(@Param("i") int i, @Param("userSid") String userSid, @Param("useOrgSid") String useOrgSid);
List<FinSelectedReceivablesDetailedVo> selectListByVin(@Param("contractNo") String contractNo, @Param("vinNo") String vin,@Param("state") int state); List<FinSelectedReceivablesDetailedVo> selectListByVin(@Param("contractNo") String contractNo, @Param("vinNo") String vin, @Param("state") int state);
List<FinSelectedReceivablesDetailed> getList(@Param("list") List<String> sidsList); List<FinSelectedReceivablesDetailed> getList(@Param("list") List<String> sidsList);
List<FinSelectedReceivablesDetailedVo> fetchByAuditState1(@Param("sid") String sid, @Param("state") int i,@Param("type") String type); List<FinSelectedReceivablesDetailedVo> fetchByAuditState1(@Param("sid") String sid, @Param("state") int i, @Param("type") String type);
List<SelectCustomerVo> selectCustomerList(@Param("sid") String sid, @Param("state") int i, @Param("type") String type);
List<FinSelectedReceivablesDetailedVo> selectDetailsList(@Param("sid") String sid, @Param("state") int i, @Param("type") String type);
List<FinSelectedReceivablesDetailedVo> selectVinListVo(@Param("sid") String sid, @Param("state") int i, @Param("type") String type, @Param("customerName") String customerName, @Param("customerPhone") String customerPhone);
FinSelectedReceivablesDetailedVo fetchByAuditStateV(@Param("sid") String sid, @Param("state") int i, @Param("type") String type, @Param("customerName") String customerName, @Param("customerPhone") String customerPhone);
} }

49
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml
View File

@ -45,7 +45,8 @@
, #{name} , #{name}
, '%') , '%')
</if> </if>
and length(furd.busVinSid)>0 and length(furd.busVinSid)
>0
</where> </where>
order by furd.contractNo desc order by furd.contractNo desc
</select> </select>
@ -124,11 +125,53 @@
<select id="fetchByAuditState1" <select id="fetchByAuditState1"
resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo"> resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo">
select *,sum(subscriptionMoney) as sumAll select *, sum(subscriptionMoney) as sumAll
from fin_selected_receivables_detailed from fin_selected_receivables_detailed
where collSid = #{sid} where collSid = #{sid}
and auditState = #{state} and auditState = #{state}
and receivablesName = #{type} and receivablesName = #{type}
group by concat(customerName,customerPhone) group by concat(customerName, customerPhone)
</select>
<select id="selectCustomerList" resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.SelectCustomerVo">
select customerName, customerPhone
from fin_selected_receivables_detailed
where collSid = #{sid}
and auditState = #{state}
and receivablesName = #{type}
group by concat(customerName, customerPhone)
</select>
<select id="selectDetailsList"
resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo">
select *
from fin_selected_receivables_detailed
where collSid = #{sid}
and auditState = #{state}
and receivablesName = #{type}
</select>
<select id="selectVinListVo"
resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo">
select *
from fin_selected_receivables_detailed
where collSid = #{sid}
and auditState = #{state}
and receivablesName = #{type}
and customerName = #{customerName}
and customerPhone = #{customerPhone}
and length(VIN) > 0
</select>
<select id="fetchByAuditStateV"
resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo">
select *, sum(subscriptionMoney) as sumAll
from fin_selected_receivables_detailed
where collSid = #{sid}
and auditState = #{state}
and receivablesName = #{type}
and customerName = #{customerName}
and customerPhone = #{customerPhone}
and length(VIN) = 0
</select> </select>
</mapper> </mapper>

37
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java
View File

@ -31,10 +31,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinSelectedReceivablesPaymentDetailsQuery; import com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinSelectedReceivablesPaymentDetailsQuery;
import com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinSelectedReceivablesPaymentDetailsVo; import com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinSelectedReceivablesPaymentDetailsVo;
import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo; import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo;
import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.*;
import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedDto;
import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedQuery;
import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo;
import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.base.utils.PagerUtil;
@ -200,8 +197,8 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
return baseMapper.selectDetailedGroupConAndRecAndPay(); return baseMapper.selectDetailedGroupConAndRecAndPay();
} }
public void updateAuditDateBySid(String sid1,String auditState) { public void updateAuditDateBySid(String sid1, String auditState) {
baseMapper.updateAuditDateBySid(sid1,auditState); baseMapper.updateAuditDateBySid(sid1, auditState);
} }
public List<AppFinSelectedReceivablesPaymentDetailsVo> selectByCollSid(String collectionBillSid) { public List<AppFinSelectedReceivablesPaymentDetailsVo> selectByCollSid(String collectionBillSid) {
@ -213,19 +210,35 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
return list; return list;
} }
public List<String> selectListByAuditState(int i,String userSid,String useOrgSid) { public List<String> selectListByAuditState(int i, String userSid, String useOrgSid) {
return baseMapper.selectListByAuditState(i,userSid,useOrgSid); return baseMapper.selectListByAuditState(i, userSid, useOrgSid);
} }
public List<FinSelectedReceivablesDetailedVo> selectListByVin(String contractNo, String vin,int state) { public List<FinSelectedReceivablesDetailedVo> selectListByVin(String contractNo, String vin, int state) {
return baseMapper.selectListByVin(contractNo, vin,state); return baseMapper.selectListByVin(contractNo, vin, state);
} }
public List<FinSelectedReceivablesDetailed> getList(List<String> sidsList) { public List<FinSelectedReceivablesDetailed> getList(List<String> sidsList) {
return baseMapper.getList(sidsList); return baseMapper.getList(sidsList);
} }
public List<FinSelectedReceivablesDetailedVo> fetchByAuditState1(String sid, int i,String type) { public List<FinSelectedReceivablesDetailedVo> fetchByAuditState1(String sid, int i, String type) {
return baseMapper.fetchByAuditState1(sid,i,type); return baseMapper.fetchByAuditState1(sid, i, type);
}
public List<SelectCustomerVo> selectCustomerList(String sid, int i, String type) {
return baseMapper.selectCustomerList(sid, i, type);
}
public List<FinSelectedReceivablesDetailedVo> selectDetailsList(String sid, int i, String type) {
return baseMapper.selectDetailsList(sid, i, type);
}
public List<FinSelectedReceivablesDetailedVo> selectVinListVo(String sid, int i, String type, String customerName, String customerPhone) {
return baseMapper.selectVinListVo(sid, i, type,customerName,customerPhone);
}
public FinSelectedReceivablesDetailedVo fetchByAuditStateV(String sid, int i, String type, String customerName, String customerPhone) {
return baseMapper.fetchByAuditStateV(sid, i, type,customerName,customerPhone);
} }
} }

3
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/arreceivebill/ArReceivebillCastToKingDeeBillFields.java
View File

@ -29,7 +29,9 @@ public class ArReceivebillCastToKingDeeBillFields {
String readJsonFile = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/arreceivebill/data.json"); String readJsonFile = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/arreceivebill/data.json");
String fEntityData_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/arreceivebill/data_data.json"); String fEntityData_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/arreceivebill/data_data.json");
String fEntityModel_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/arreceivebill/data_model.json"); String fEntityModel_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/arreceivebill/data_model.json");
/*
String fPAYBILLENTRY_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/arreceivebill/data_FRECEIVEBILLENTRY.json"); String fPAYBILLENTRY_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/arreceivebill/data_FRECEIVEBILLENTRY.json");
*/
//模板字符创转json //模板字符创转json
JSONObject jsonObj= JSONObject.parseObject(readJsonFile, Feature.OrderedField); JSONObject jsonObj= JSONObject.parseObject(readJsonFile, Feature.OrderedField);
@ -42,6 +44,7 @@ public class ArReceivebillCastToKingDeeBillFields {
//对模板字段赋值 根据传递进来的map数据的集合进行赋值 //对模板字段赋值 根据传递进来的map数据的集合进行赋值
for(int i=0;i<vehicleList.size();i++){ for(int i=0;i<vehicleList.size();i++){
String fPAYBILLENTRY_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/arreceivebill/data_FRECEIVEBILLENTRY.json");
Map<String,String> params=vehicleList.get(i); Map<String,String> params=vehicleList.get(i);
Map<String,String> map_fEntityDetail_=new HashMap<>(); Map<String,String> map_fEntityDetail_=new HashMap<>();
for (Map.Entry<String, String> entry : params.entrySet()) { for (Map.Entry<String, String> entry : params.entrySet()) {

2
anrui-scm/anrui-scm-ui/src/views/gongyingshang/gongyingshangAdd.vue
View File

@ -38,7 +38,7 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item prop="manufacturerCode"> <el-form-item prop="manufacturerCode">
<el-input v-model="baseManufacturerDto.manufacturerCode" :disabled="!isShow" maxlength="20" placeholder="" class="addinputw" clearable/> <el-input v-model="baseManufacturerDto.manufacturerCode" :disabled="!isShow" maxlength="20" placeholder="请填写金蝶供应商编码，如无请自己创建编码" class="addinputw" clearable/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" class="tleftb"> <el-col :span="4" class="tleftb">

32
anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue
View File

@ -34,7 +34,7 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<div class="span-sty spanOneWidth"><span>采购订单编号</span></div> <div class="span-sty spanOneWidth"><span>采购订单编号</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.purchaseOrderNo }}</span></el-form-item> <el-form-item><el-input v-model="formobj.purchaseOrderNo" placeholder="" clearable class="addinputw addinputwOne"/></el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<div class="span-sty spanOneWidth"><span>内部编码</span></div> <div class="span-sty spanOneWidth"><span>内部编码</span></div>
@ -264,7 +264,7 @@ export default {
policyRemarks: '', policyRemarks: '',
policyThree: '', policyThree: '',
policyTwo: '', // 政策3 policyTwo: '', // 政策3
policyTwoo: '', //政策2 policyTwoo: '', // 政策2
priceDate: '', priceDate: '',
purchaseOrderNo: '', purchaseOrderNo: '',
remarks: '', remarks: '',
@ -706,7 +706,15 @@ export default {
saveEdit() { saveEdit() {
this.getUrl() this.getUrl()
if (this.formobj.departureDate === '') { if (this.formobj.departureDate === '') {
alert('厂家发车日期不能为空!') this.$message({ showClose: true, type: 'error', message: '厂家发车日期不能为空' })
return
}
if (this.formobj.onceFreight === '') {
this.$message({ showClose: true, type: 'error', message: '一次运费不能为空' })
return
}
if (this.formobj.onceFreight == 0) {
this.$message({ showClose: true, type: 'error', message: '因一次运费不能为零，请完善一次运费' })
return return
} }
if (this.freightChecked) { if (this.freightChecked) {
@ -746,6 +754,8 @@ export default {
if (resp.success) { if (resp.success) {
this.$message({ showClose: true, type: 'success', message: '保存成功' }) this.$message({ showClose: true, type: 'success', message: '保存成功' })
this.handleReturn('true') this.handleReturn('true')
} else {
this.submitdisabled = false
} }
}).catch(() => { }).catch(() => {
this.submitdisabled = false this.submitdisabled = false
@ -757,6 +767,10 @@ export default {
}, },
submitVehicleApply() { submitVehicleApply() {
this.getUrl() this.getUrl()
if (this.formobj.purchaseOrderNo === '') {
this.$message({ showClose: true, type: 'error', message: '采购订单编号不能为空' })
return
}
if (this.formobj.priceDate === '' || this.formobj.priceDate === null) { if (this.formobj.priceDate === '' || this.formobj.priceDate === null) {
this.$message({ showClose: true, type: 'error', message: '厂家入库日期不能为空' }) this.$message({ showClose: true, type: 'error', message: '厂家入库日期不能为空' })
return return
@ -765,6 +779,14 @@ export default {
this.$message({ showClose: true, type: 'error', message: '物流发车日期不能为空' }) this.$message({ showClose: true, type: 'error', message: '物流发车日期不能为空' })
return return
} }
if (this.formobj.onceFreight === '') {
this.$message({ showClose: true, type: 'error', message: '一次运费不能为空' })
return
}
if (this.formobj.onceFreight == 0) {
this.$message({ showClose: true, type: 'error', message: '因一次运费不能为零，请完善一次运费' })
return
}
if (this.freightChecked) { if (this.freightChecked) {
this.formobj.deductionFreight = 0 this.formobj.deductionFreight = 0
} else { } else {
@ -822,6 +844,8 @@ export default {
message: '提交成功' message: '提交成功'
}) })
this.handleReturn('true') this.handleReturn('true')
} else {
this.submitdisabled = false
} }
}).catch(() => { }).catch(() => {
this.submitdisabled = false this.submitdisabled = false
@ -843,6 +867,8 @@ export default {
message: '提交成功' message: '提交成功'
}) })
this.handleReturn('true') this.handleReturn('true')
} else {
this.submitdisabled = false
} }
}).catch(() => { }).catch(() => {
this.submitdisabled = false this.submitdisabled = false

18
anrui-scm/anrui-scm-ui/src/views/shangzhuang/shangzhuangtaizhangguanli/shangzhuangtaizhangAdd.vue
View File

@ -96,7 +96,7 @@
<div class="headline">主车信息</div> <div class="headline">主车信息</div>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<div class="span-sty spanOneWidth"><span>主车车架号</span></div> <div class="span-sty spanOneWidth"><span><span class="icon">*</span>主车车架号</span></div>
<el-form-item> <el-form-item>
<el-select v-model="formobj.vinNo" @change="changeVinNo" filterable placeholder="请选择" class="addinputw addinputwTwo"> <el-select v-model="formobj.vinNo" @change="changeVinNo" filterable placeholder="请选择" class="addinputw addinputwTwo">
<el-option v-for="item in vinNo_list" :key="item.vinNo" :label="item.vinNo" :value="item.vinNo"> <el-option v-for="item in vinNo_list" :key="item.vinNo" :label="item.vinNo" :value="item.vinNo">
@ -122,11 +122,11 @@
<div class="headline">上装价格信息</div> <div class="headline">上装价格信息</div>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<div class="span-sty spanOneWidth"><span>厂家结算价(元)</span></div> <div class="span-sty spanOneWidth"><span><span class="icon">*</span>厂家结算价(元)</span></div>
<el-form-item><el-input v-model="formobj.costPrice" class="addinputw addinputwTwo" @keyup.native="formobj.costPrice = oninput(formobj.costPrice,2)" placeholder="" clearable></el-input></el-form-item> <el-form-item><el-input v-model="formobj.costPrice" class="addinputw addinputwTwo" @keyup.native="formobj.costPrice = oninput(formobj.costPrice,2)" placeholder="" clearable></el-input></el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<div class="span-sty spanOneWidth"><span>销售指导价(元)</span></div> <div class="span-sty spanOneWidth"><span><span class="icon">*</span>销售指导价(元)</span></div>
<el-form-item><el-input v-model="formobj.guidePrice" class="addinputw addinputwTwo" @keyup.native="formobj.guidePrice = oninput(formobj.guidePrice,2)" placeholder="" clearable></el-input></el-form-item> <el-form-item><el-input v-model="formobj.guidePrice" class="addinputw addinputwTwo" @keyup.native="formobj.guidePrice = oninput(formobj.guidePrice,2)" placeholder="" clearable></el-input></el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -287,6 +287,18 @@ export default {
this.$message({ showClose: true, type: 'error', message: '请选择上装配置' }) this.$message({ showClose: true, type: 'error', message: '请选择上装配置' })
return return
} }
if (this.formobj.vinNo === '') {
this.$message({ showClose: true, type: 'error', message: '主车车架号不能为空' })
return
}
if (this.formobj.costPrice === '') {
this.$message({ showClose: true, type: 'error', message: '厂家结算价不能为空' })
return
}
if (this.formobj.guidePrice === '') {
this.$message({ showClose: true, type: 'error', message: '销售指导价不能为空' })
return
}
this.$refs['form_obj'].validate((valid) => { this.$refs['form_obj'].validate((valid) => {
if (valid) { if (valid) {
this.submitdisabled = true this.submitdisabled = true

8
anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue
View File

@ -501,6 +501,8 @@ export default {
message: resp.msg message: resp.msg
}) })
this.handleReturn('true') this.handleReturn('true')
} else {
this.submitdisabled = false
} }
}).catch(() => { }).catch(() => {
this.submitdisabled = false this.submitdisabled = false
@ -532,6 +534,10 @@ export default {
this.$message({ showClose: true, type: 'error', message: '请检查采购车型列表中厂家回款通路不能为空' }) this.$message({ showClose: true, type: 'error', message: '请检查采购车型列表中厂家回款通路不能为空' })
return return
} }
if (this.formobj.busVehicleApplyDetailList[i].vehicleNo === '' || this.formobj.busVehicleApplyDetailList[i].vehicleNo === null) {
this.$message({ showClose: true, type: 'error', message: '请检查采购车型列表中车辆型号不能为空' })
return
}
} }
} }
this.$refs['form_obj'].validate((valid) => { this.$refs['form_obj'].validate((valid) => {
@ -545,6 +551,8 @@ export default {
message: '提交成功' message: '提交成功'
}) })
this.handleReturn('true') this.handleReturn('true')
} else {
this.submitdisabled = false
} }
}).catch(() => { }).catch(() => {
this.submitdisabled = false this.submitdisabled = false

8
anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue
View File

@ -481,6 +481,8 @@ export default {
} }
}, '*') }, '*')
// this.handleReturn('true') // this.handleReturn('true')
} else {
this.submitdisabled = false
} }
}).catch(() => { }).catch(() => {
this.submitdisabled = false this.submitdisabled = false
@ -512,6 +514,10 @@ export default {
this.$message({ showClose: true, type: 'error', message: '请检查采购车型列表中厂家回款通路不能为空' }) this.$message({ showClose: true, type: 'error', message: '请检查采购车型列表中厂家回款通路不能为空' })
return return
} }
if (this.formobj.busVehicleApplyDetailList[i].vehicleNo === '' || this.formobj.busVehicleApplyDetailList[i].vehicleNo === null) {
this.$message({ showClose: true, type: 'error', message: '请检查采购车型列表中车辆型号不能为空' })
return
}
} }
} }
this.$refs['form_obj'].validate((valid) => { this.$refs['form_obj'].validate((valid) => {
@ -532,6 +538,8 @@ export default {
code: 1 code: 1
} }
}, '*') }, '*')
} else {
this.submitdisabled = false
} }
}).catch(() => { }).catch(() => {
this.submitdisabled = false this.submitdisabled = false

38
anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue
View File

@ -33,7 +33,7 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<div class="span-sty spanOneWidth"><span>采购订单编号</span></div> <div class="span-sty spanOneWidth"><span>采购订单编号</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.purchaseOrderNo }}</span></el-form-item> <el-form-item><el-input v-model="formobj.purchaseOrderNo" placeholder="" clearable class="addinputw addinputwOne"/></el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<div class="span-sty spanOneWidth"><span>内部编码</span></div> <div class="span-sty spanOneWidth"><span>内部编码</span></div>
@ -720,7 +720,15 @@ export default {
saveEdit() { saveEdit() {
this.getUrl() this.getUrl()
if (this.formobj.departureDate === '') { if (this.formobj.departureDate === '') {
alert('厂家发车日期不能为空!') this.$message({ showClose: true, type: 'error', message: '厂家发车日期不能为空' })
return
}
if (this.formobj.onceFreight === '') {
this.$message({ showClose: true, type: 'error', message: '一次运费不能为空' })
return
}
if (this.formobj.onceFreight == 0) {
this.$message({ showClose: true, type: 'error', message: '因一次运费不能为零，请完善一次运费' })
return return
} }
if (this.freightChecked) { if (this.freightChecked) {
@ -757,11 +765,6 @@ export default {
if (valid) { if (valid) {
this.submitdisabled = true this.submitdisabled = true
req.saveOrUpdate(this.formobj).then((resp) => { req.saveOrUpdate(this.formobj).then((resp) => {
/* this.$message({
showClose: true,
type: 'success',
message: resp.msg
})*/
if (resp.success) { if (resp.success) {
// 子页面向父级页面传递值(关闭弹框) // 子页面向父级页面传递值(关闭弹框)
window.parent.postMessage({ window.parent.postMessage({
@ -771,9 +774,10 @@ export default {
code: 1 code: 1
} }
}, '*') }, '*')
} else {
this.submitdisabled = false
} }
}) }).catch(() => {
.catch(() => {
this.submitdisabled = false this.submitdisabled = false
}) })
} else { } else {
@ -783,6 +787,10 @@ export default {
}, },
submitVehicleApply() { submitVehicleApply() {
this.getUrl() this.getUrl()
if (this.formobj.purchaseOrderNo === '') {
this.$message({ showClose: true, type: 'error', message: '采购订单编号不能为空' })
return
}
if (this.formobj.priceDate === '' || this.formobj.priceDate === null) { if (this.formobj.priceDate === '' || this.formobj.priceDate === null) {
this.$message({ showClose: true, type: 'error', message: '厂家入库日期不能为空' }) this.$message({ showClose: true, type: 'error', message: '厂家入库日期不能为空' })
return return
@ -791,6 +799,14 @@ export default {
this.$message({ showClose: true, type: 'error', message: '物流发车日期不能为空' }) this.$message({ showClose: true, type: 'error', message: '物流发车日期不能为空' })
return return
} }
if (this.formobj.onceFreight === '') {
this.$message({ showClose: true, type: 'error', message: '一次运费不能为空' })
return
}
if (this.formobj.onceFreight == 0) {
this.$message({ showClose: true, type: 'error', message: '因一次运费不能为零，请完善一次运费' })
return
}
if (this.freightChecked) { if (this.freightChecked) {
this.formobj.deductionFreight = 0 this.formobj.deductionFreight = 0
} else { } else {
@ -855,6 +871,8 @@ export default {
code: 1 code: 1
} }
}, '*') }, '*')
} else {
this.submitdisabled = false
} }
}).catch(() => { }).catch(() => {
this.submitdisabled = false this.submitdisabled = false
@ -883,6 +901,8 @@ export default {
code: 1 code: 1
} }
}, '*') }, '*')
} else {
this.submitdisabled = false
} }
}).catch(() => { }).catch(() => {
this.submitdisabled = false this.submitdisabled = false

2
anrui-system-ui/src/views/userManage/userManageList.vue
View File

@ -70,7 +70,7 @@
<el-dialog title="设置角色" :visible.sync="roleDialog" width="30%"> <el-dialog title="设置角色" :visible.sync="roleDialog" width="30%">
<el-form :model="roleForm" :rules="rules" ref="roleForm"> <el-form :model="roleForm" :rules="rules" ref="roleForm">
<el-form-item label="角色名称" :label-width="formLabelWidth" prop="roleSid"> <el-form-item label="角色名称" :label-width="formLabelWidth" prop="roleSid">
<el-select v-model="roleForm.roleSid" placeholder="请选择" multiple> <el-select v-model="roleForm.roleSid" placeholder="请选择" filterable multiple>
<el-option v-for="(item,i) in roleList" :key="i" :label="item.name" :value="item.sid"></el-option> <el-option v-for="(item,i) in roleList" :key="i" :label="item.name" :value="item.sid"></el-option>
</el-select> </el-select>
<!--<el-button type="primary" size='mini' @click="toNav('RoleAdminister')" style="margin-left: 10px;" circle icon="el-icon-plus"></el-button>--> <!--<el-button type="primary" size='mini' @click="toNav('RoleAdminister')" style="margin-left: 10px;" circle icon="el-icon-plus"></el-button>-->

Write Preview
Loading…
Cancel
Save