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
4a84ea6a44 011fdf9910
commit
6580b8eaf6
10 changed files with 201 additions and 202 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. 257
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
  2. 2
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderModelInfoVo.java
  3. 6
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  4. 59
      anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouseAdd.vue
  5. 4
      anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue
  6. 4
      anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangMai.vue
  7. 24
      anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue
  8. 20
      anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangguanli.vue
  9. 10
      anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangDaiBanInfo.vue
  10. 17
      anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue

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

@ -773,7 +773,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
//获取模板 //获取模板
ftl = "existingvehicles"; ftl = "existingvehicles";
AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo(); AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo();
List<String> stringList = orderModelInfoVo.getVinList(); List<String> stringList = orderModelInfoVo.getOrderVinList();
if (stringList.size() > 0) { if (stringList.size() > 0) {
remarks = "主车" + num + "台，单台成交价：" + transactionPrice + "元。车架号：" + String.join("、", stringList); remarks = "主车" + num + "台，单台成交价：" + transactionPrice + "元。车架号：" + String.join("、", stringList);
} else { } else {
@ -816,7 +816,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
//获取模板 //获取模板
ftl = "existingvehicles"; ftl = "existingvehicles";
AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo(); AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo();
List<String> stringList = orderModelInfoVo.getVinList(); List<String> stringList = orderModelInfoVo.getOrderVinList();
if (stringList.size() > 0) { if (stringList.size() > 0) {
remarks = "主车" + num + "台，单台成交价：" + transactionPrice + "元。车架号：" + String.join("、", stringList); remarks = "主车" + num + "台，单台成交价：" + transactionPrice + "元。车架号：" + String.join("、", stringList);
} else { } else {
@ -894,7 +894,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
//获取模板 //获取模板
ftl = "existingvehicles_black"; ftl = "existingvehicles_black";
AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo(); AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo();
List<String> stringList = orderModelInfoVo.getVinList(); List<String> stringList = orderModelInfoVo.getOrderVinList();
if (stringList.size() > 0) { if (stringList.size() > 0) {
remarks = "主车" + num + "台，单台成交价： 元。车架号：" + String.join("、", stringList); remarks = "主车" + num + "台，单台成交价： 元。车架号：" + String.join("、", stringList);
} else { } else {
@ -943,7 +943,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
//获取模板 //获取模板
ftl = "existingvehicles_black"; ftl = "existingvehicles_black";
AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo(); AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo();
List<String> stringList = orderModelInfoVo.getVinList(); List<String> stringList = orderModelInfoVo.getOrderVinList();
if (stringList.size() > 0) { if (stringList.size() > 0) {
remarks = "主车" + num + "台，单台成交价： 元。车架号：" + String.join("、", stringList); remarks = "主车" + num + "台，单台成交价： 元。车架号：" + String.join("、", stringList);
} else { } else {
@ -1022,7 +1022,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
//查询销售订单的现车 //查询销售订单的现车
AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo(); AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo();
AppOrderPriceInfoVo priceInfo = appOrderDetailsVo.getPriceInfo(); AppOrderPriceInfoVo priceInfo = appOrderDetailsVo.getPriceInfo();
List<String> stringList = orderModelInfoVo.getVinList(); List<String> stringList = orderModelInfoVo.getOrderVinList();
List<InvoicMessageContractVo> invoicMessageContractVos = new ArrayList<>(); List<InvoicMessageContractVo> invoicMessageContractVos = new ArrayList<>();
if (stringList.size() > 0) { if (stringList.size() > 0) {
for (int i = 0; i < stringList.size(); i++) { for (int i = 0; i < stringList.size(); i++) {
@ -1775,115 +1775,119 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
String contractNo = getApplyCode(dto.getUserSid(), appOrderModelInfoVo.getModelSid()); String contractNo = getApplyCode(dto.getUserSid(), appOrderModelInfoVo.getModelSid());
map.put("contractNo", contractNo); map.put("contractNo", contractNo);
String url = ""; String url = "";
PrintConfirmVo printConfirmVo = null;
String urlAll = "";
try { try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build(); .setNameFormat("demo-pool-%d").build();
ExecutorService pool = new ThreadPoolExecutor(2, 100, ExecutorService pool = new ThreadPoolExecutor(2, 100,
0L, TimeUnit.MILLISECONDS, 0L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
/* Future<String> future1 = pool.submit(() -> { if("1".equals(appOrderDetailsVo.getPayTypeKey())){//全款
return genCarSaleContract(dto, map, appOrderDetailsVo); /* Future<String> future1 = pool.submit(() -> {
}); return genCarSaleContract(dto, map, appOrderDetailsVo);
Future<String> future1_2 = pool.submit(() -> {
return genCarSaleContract2(dto, map, appOrderDetailsVo);
});*/
PrintConfirmVo printConfirmVo = null;
String urlAll = "";
/* Future<String> future2 = pool.submit(() -> {
return genCarSaleContractBlank(dto, map, appOrderDetailsVo);
});
Future<String> future2_2 = pool.submit(() -> {
return genCarSaleContractBlank2(dto, map, appOrderDetailsVo);
});
//接收车辆委托书
Future<String> future4 = pool.submit(() -> {
return getReceiveCar(map, appOrderDetailsVo);
});
Future<String> future5 = pool.submit(() -> {
return getInvoicMessage(map, appOrderDetailsVo);
});
String singleFinalPriceOne = priceInfo.getSingleFinalPrice();
String depositOne = depositInfo.getDeposit();
//单台成交价与单台订金相等
Future<String> future6 = null;
if (new BigDecimal(singleFinalPriceOne).compareTo(new BigDecimal(depositOne)) != 0) {
future6 = pool.submit(() -> {
return getCarFin(map, appOrderDetailsVo);
}); });
} Future<String> future1_2 = pool.submit(() -> {
Future<String> future7 = pool.submit(() -> { return genCarSaleContract2(dto, map, appOrderDetailsVo);
return getMoneyFin(map, appOrderDetailsVo);
});
Future<String> future8 = null;
if (!"02".equals(appOrderDetailsVo.getInvoiceType())) {
future8 = pool.submit(() -> {
return getCarContract(map, appOrderDetailsVo);
}); });
} Future<String> future2 = pool.submit(() -> {
List<File> filesList = new ArrayList<>(); return genCarSaleContractBlank(dto, map, appOrderDetailsVo);
if (future1 != null) { });
if (StringUtils.isNotBlank(future1.get())) { Future<String> future2_2 = pool.submit(() -> {
File file = new File(docPdfComponent.getUploadTemplateUrl() + future1.get()); return genCarSaleContractBlank2(dto, map, appOrderDetailsVo);
filesList.add(file); });
//接收车辆委托书
Future<String> future4 = pool.submit(() -> {
return getReceiveCar(map, appOrderDetailsVo);
});
Future<String> future5 = pool.submit(() -> {
return getInvoicMessage(map, appOrderDetailsVo);
});
String singleFinalPriceOne = priceInfo.getSingleFinalPrice();
String depositOne = depositInfo.getDeposit();
//单台成交价与单台订金相等
Future<String> future6 = null;
if (new BigDecimal(singleFinalPriceOne).compareTo(new BigDecimal(depositOne)) != 0) {
future6 = pool.submit(() -> {
return getCarFin(map, appOrderDetailsVo);
});
} }
} Future<String> future7 = pool.submit(() -> {
if (future1_2 != null) { return getMoneyFin(map, appOrderDetailsVo);
if (StringUtils.isNotBlank(future1_2.get())) { });
File file = new File(docPdfComponent.getUploadTemplateUrl() + future1_2.get()); Future<String> future8 = null;
filesList.add(file); if (!"02".equals(appOrderDetailsVo.getInvoiceType())) {
future8 = pool.submit(() -> {
return getCarContract(map, appOrderDetailsVo);
});
} }
} List<File> filesList = new ArrayList<>();
if (future2 != null) { if (future1 != null) {
if (StringUtils.isNotBlank(future2.get())) { if (StringUtils.isNotBlank(future1.get())) {
File file = new File(docPdfComponent.getUploadTemplateUrl() + future2.get()); File file = new File(docPdfComponent.getUploadTemplateUrl() + future1.get());
filesList.add(file); filesList.add(file);
}
} }
} if (future1_2 != null) {
if (future2_2 != null) { if (StringUtils.isNotBlank(future1_2.get())) {
if (StringUtils.isNotBlank(future2_2.get())) { File file = new File(docPdfComponent.getUploadTemplateUrl() + future1_2.get());
File file = new File(docPdfComponent.getUploadTemplateUrl() + future2_2.get()); filesList.add(file);
filesList.add(file); }
} }
} if (future2 != null) {
//合并pdf文件 if (StringUtils.isNotBlank(future2.get())) {
if (future8 != null) { File file = new File(docPdfComponent.getUploadTemplateUrl() + future2.get());
if (StringUtils.isNotBlank(future8.get())) { filesList.add(file);
File file = new File(docPdfComponent.getUploadTemplateUrl() + future8.get()); }
}
if (future2_2 != null) {
if (StringUtils.isNotBlank(future2_2.get())) {
File file = new File(docPdfComponent.getUploadTemplateUrl() + future2_2.get());
filesList.add(file);
}
}
//合并pdf文件
if (future8 != null) {
if (StringUtils.isNotBlank(future8.get())) {
File file = new File(docPdfComponent.getUploadTemplateUrl() + future8.get());
filesList.add(file);
}
}
if (StringUtils.isNotBlank(future4.get())) {
File file = new File(docPdfComponent.getUploadTemplateUrl() + future4.get());
filesList.add(file); filesList.add(file);
} }
} if (StringUtils.isNotBlank(future5.get())) {
if (StringUtils.isNotBlank(future4.get())) { File file = new File(docPdfComponent.getUploadTemplateUrl() + future5.get());
File file = new File(docPdfComponent.getUploadTemplateUrl() + future4.get());
filesList.add(file);
}
if (StringUtils.isNotBlank(future5.get())) {
File file = new File(docPdfComponent.getUploadTemplateUrl() + future5.get());
filesList.add(file);
}
if (future6 != null) {
if (StringUtils.isNotBlank(future6.get())) {
File file = new File(docPdfComponent.getUploadTemplateUrl() + future6.get());
filesList.add(file); filesList.add(file);
} }
} if (future6 != null) {
if (StringUtils.isNotBlank(future6.get())) {
File file = new File(docPdfComponent.getUploadTemplateUrl() + future6.get());
filesList.add(file);
}
}
if (StringUtils.isNotBlank(future7.get())) { if (StringUtils.isNotBlank(future7.get())) {
File file = new File(docPdfComponent.getUploadTemplateUrl() + future7.get()); File file = new File(docPdfComponent.getUploadTemplateUrl() + future7.get());
filesList.add(file); filesList.add(file);
} }
if (filesList.size() > 0) { if (filesList.size() > 0) {
String typeName = ContractTemplateEnum.CONTRACTALL.getName() + "_" + DateUtil.format(new Date(), "yyyMMdd") + System.currentTimeMillis() + ".pdf"; // String typeName = ContractTemplateEnum.CONTRACTALL.getName() + "_" + DateUtil.format(new Date(), "yyyMMdd") + System.currentTimeMillis() + ".pdf";
File allFile = WordConvertUtils.mulFile2One(filesList, docPdfComponent.getUploadTemplateUrl() + typeName); String typeName = appOrderDetailsVo.getPayType()+contractNo+".pdf";
System.out.println("-========" + docPdfComponent.getUploadTemplateUrl() + typeName); File allFile = WordConvertUtils.mulFile2One(filesList, docPdfComponent.getUploadTemplateUrl() + typeName);
urlAll = typeName; System.out.println("-========" + docPdfComponent.getUploadTemplateUrl() + typeName);
urlAll = typeName;
}
if (StringUtils.isNotBlank(urlAll)) {
printConfirmVo = new PrintConfirmVo();
// printConfirmVo.setName(MessageFormat.format("《{0}》", ContractTemplateEnum.CONTRACTALL.getName()));
printConfirmVo.setName(MessageFormat.format("《{0}》",appOrderDetailsVo.getPayType()+contractNo));
printConfirmVo.setDownloadUrl(docPdfComponent.getPrefixTemplateUrl() + urlAll);
list.add(printConfirmVo);
}*/
} }
if (StringUtils.isNotBlank(urlAll)) {
printConfirmVo = new PrintConfirmVo();
printConfirmVo.setName(MessageFormat.format("《{0}》", ContractTemplateEnum.CONTRACTALL.getName()));
printConfirmVo.setDownloadUrl(docPdfComponent.getPrefixTemplateUrl() + urlAll);
list.add(printConfirmVo);
}*/
//生成合同数据 //生成合同数据
//根据销售订单sid查询合同表中是否存在 //根据销售订单sid查询合同表中是否存在
CommonContractBuscenterVo commonContractBuscenterVo = baseMapper.selectByBusSid(dto.getBusSid()); CommonContractBuscenterVo commonContractBuscenterVo = baseMapper.selectByBusSid(dto.getBusSid());
@ -1973,7 +1977,6 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
//单台成交价与单台订金相等 //单台成交价与单台订金相等
if (new BigDecimal(singleFinalPrice).compareTo(new BigDecimal(deposit)) != 0) {//推送车款 if (new BigDecimal(singleFinalPrice).compareTo(new BigDecimal(deposit)) != 0) {//推送车款
String money = new BigDecimal(singleFinalPrice).subtract(new BigDecimal(deposit)).toString(); String money = new BigDecimal(singleFinalPrice).subtract(new BigDecimal(deposit)).toString();
// if ("现车".equals(appOrderDetailsVo.getOrderType())) {
List<VinListsVo> vinList = appOrderModelInfoVo.getVinListsVos(); List<VinListsVo> vinList = appOrderModelInfoVo.getVinListsVos();
for (int i = 0; i < vinList.size(); i++) { for (int i = 0; i < vinList.size(); i++) {
UnCollectionDto unCollectionDto = new UnCollectionDto(); UnCollectionDto unCollectionDto = new UnCollectionDto();
@ -2005,34 +2008,6 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
unCollectionDto.setPurchaseSystemSid(appOrderDetailsVo.getPurchaseSystemSid()); unCollectionDto.setPurchaseSystemSid(appOrderDetailsVo.getPurchaseSystemSid());
finUncollectedDetailedFeign.saveUnCollection(unCollectionDto); finUncollectedDetailedFeign.saveUnCollection(unCollectionDto);
} }
/* } else {
int qualiy = Integer.valueOf(appOrderModelInfoVo.getTotal()).intValue();
for (int i = 0; i < qualiy; i++) {
UnCollectionDto unCollectionDto = new UnCollectionDto();
//合同sid
unCollectionDto.setContractSid(commonContract.getSid());
//合同编号
unCollectionDto.setContractNo(commonContract.getContractNo());
//客户名称
unCollectionDto.setCustomerName(appOrderDetailsVo.getName());
//客户sid
unCollectionDto.setCustomerSid(appOrderDetailsVo.getCustomerSid());
//客户类型
unCollectionDto.setCustomerClass(appOrderDetailsVo.getCustomerKey());
//客户类型
unCollectionDto.setCustomerClassKey(appOrderDetailsVo.getCustomerType());
//客户头像
unCollectionDto.setCustomerImage(appOrderDetailsVo.getCustomerImage());
unCollectionDto.setReceivablesName("车款");
unCollectionDto.setCustomerPhone(appOrderDetailsVo.getPhone());
unCollectionDto.setUseOrgSid(appOrderDetailsVo.getUseOrgSid());
unCollectionDto.setCurrentReceivableMoney(money);
unCollectionDto.setUserSid(dto.getUserSid());
unCollectionDto.setReveivableMoney(money);
finUncollectedDetailedFeign.saveUnCollection(unCollectionDto);
}
}*/
} }
//添加推送至款项确认的应收未收明细中 //添加推送至款项确认的应收未收明细中
List<VinListsVo> vinList = appOrderModelInfoVo.getVinListsVos(); List<VinListsVo> vinList = appOrderModelInfoVo.getVinListsVos();
@ -2079,7 +2054,6 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
unCollectionDto.setCustomerPhone(appOrderDetailsVo.getPhone()); unCollectionDto.setCustomerPhone(appOrderDetailsVo.getPhone());
unCollectionDto.setUseOrgSid(appOrderDetailsVo.getUseOrgSid()); unCollectionDto.setUseOrgSid(appOrderDetailsVo.getUseOrgSid());
unCollectionDto.setVinNo(vinList.get(i).getVinNo()); unCollectionDto.setVinNo(vinList.get(i).getVinNo());
// unCollectionDto.setCurrentReceivableMoney(depositInfo.getDeposit());
unCollectionDto.setCurrentReceivableMoney(bigDecimalKeyAll.toString()); unCollectionDto.setCurrentReceivableMoney(bigDecimalKeyAll.toString());
unCollectionDto.setUserSid(dto.getUserSid()); unCollectionDto.setUserSid(dto.getUserSid());
unCollectionDto.setReveivableMoney(depositInfo.getDeposit()); unCollectionDto.setReveivableMoney(depositInfo.getDeposit());
@ -2091,39 +2065,12 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
finUncollectedDetailedFeign.saveUnCollection(unCollectionDto); finUncollectedDetailedFeign.saveUnCollection(unCollectionDto);
} }
} }
/*} else {
int qualiy = Integer.valueOf(appOrderModelInfoVo.getTotal()).intValue();
for (int i = 0; i < qualiy; i++) {
UnCollectionDto unCollectionDto = new UnCollectionDto();
//合同sid
unCollectionDto.setContractSid(commonContract.getSid());
//合同编号
unCollectionDto.setContractNo(commonContract.getContractNo());
//客户名称
unCollectionDto.setCustomerName(appOrderDetailsVo.getName());
//客户sid
unCollectionDto.setCustomerSid(appOrderDetailsVo.getCustomerSid());
//客户类型
unCollectionDto.setCustomerClass(appOrderDetailsVo.getCustomerKey());
//客户类型
unCollectionDto.setCustomerClassKey(appOrderDetailsVo.getCustomerType());
//客户头像
unCollectionDto.setCustomerImage(appOrderDetailsVo.getCustomerImage());
unCollectionDto.setReceivablesName("订金");
unCollectionDto.setCustomerPhone(appOrderDetailsVo.getPhone());
unCollectionDto.setUseOrgSid(appOrderDetailsVo.getUseOrgSid());
unCollectionDto.setCurrentReceivableMoney(depositInfo.getDeposit());
unCollectionDto.setUserSid(dto.getUserSid());
unCollectionDto.setReveivableMoney(depositInfo.getDeposit());
finUncollectedDetailedFeign.saveUnCollection(unCollectionDto);
}
}*/
return commonContract.getSid(); return commonContract.getSid();
}); });
} }
if("2".equals(appOrderDetailsVo.getPayTypeKey())){
return rb.setMsg("贷款合同附件请线下处理");
}
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
return rb.setMsg("生成文件失败"); return rb.setMsg("生成文件失败");

2
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderModelInfoVo.java
View File

@ -31,8 +31,10 @@ public class AppOrderModelInfoVo implements Vo {
private String type; private String type;
@ApiModelProperty(value = "车架号") @ApiModelProperty(value = "车架号")
private List<String> vinList = new ArrayList<>(); private List<String> vinList = new ArrayList<>();
private List<String> orderVinList = new ArrayList<>();
@ApiModelProperty(value = "采购订单编号") @ApiModelProperty(value = "采购订单编号")
private List<String> orderList = new ArrayList<>(); private List<String> orderList = new ArrayList<>();
private List<String> orderStringList = new ArrayList<>();
@ApiModelProperty(value = "合计数量") @ApiModelProperty(value = "合计数量")
private String total; private String total;

6
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
View File

@ -2878,15 +2878,21 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
//查询车架号 //查询车架号
// List<String> vinList = busSalesOrderVehicleService.selectList(sid); // List<String> vinList = busSalesOrderVehicleService.selectList(sid);
List<VinListsVo> vinLists = busSalesOrderVehicleService.selectLists(sid); List<VinListsVo> vinLists = busSalesOrderVehicleService.selectLists(sid);
//包含采购系统的车架号
List<String> vinList = vinLists.stream().map(v->v.getVinNo()).collect(Collectors.toList()); List<String> vinList = vinLists.stream().map(v->v.getVinNo()).collect(Collectors.toList());
List<String> orderVinList = busSalesOrderVehicleService.selectList(sid);
modelInfo.setVinList(vinList); modelInfo.setVinList(vinList);
modelInfo.setOrderVinList(orderVinList);
} else { } else {
if ("1".equals(modelInfo.getType())) { if ("1".equals(modelInfo.getType())) {
//查询采购订单编号 //查询采购订单编号
// List<String> stringList = busSalesVehicleOrderService.selectList(sid); // List<String> stringList = busSalesVehicleOrderService.selectList(sid);
List<BusSalesVehicleOrder> stringLists = busSalesVehicleOrderService.selectLists(sid); List<BusSalesVehicleOrder> stringLists = busSalesVehicleOrderService.selectLists(sid);
//包含采购系统的采购订单编号
List<String> stringList = stringLists.stream().map(v->v.getLinkNo()).collect(Collectors.toList()); List<String> stringList = stringLists.stream().map(v->v.getLinkNo()).collect(Collectors.toList());
List<String> orderStringList = busSalesVehicleOrderService.selectList(sid);
modelInfo.setOrderList(stringList); modelInfo.setOrderList(stringList);
modelInfo.setOrderStringList(orderStringList);
} }
} }
List<VinListsVo> vinListVoList = busSalesOrderVehicleService.selectByDetailsSid(sid); List<VinListsVo> vinListVoList = busSalesOrderVehicleService.selectByDetailsSid(sid);

59
anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouseAdd.vue
View File

@ -24,7 +24,7 @@
</el-col> </el-col>
<el-col :span="9"> <el-col :span="9">
<el-form-item prop=""> <el-form-item prop="">
<el-input v-model="formobj.useOrg" placeholder="使用组织" class="addinputw" :disabled="true"/> <el-input v-model="formobj.useOrg" placeholder="" class="addinputw" :disabled="true"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3" class="tleftb"> <el-col :span="3" class="tleftb">
@ -125,7 +125,6 @@ export default {
warehouseGroup_list: [], warehouseGroup_list: [],
libTube_list: [], libTube_list: [],
formobj: { formobj: {
id: '',
sid: '', sid: '',
useOrg: '', // 使用组织 useOrg: '', // 使用组织
useOrgSid: '', // 使用组织sid useOrgSid: '', // 使用组织sid
@ -137,8 +136,7 @@ export default {
warehouseGroupValue: '', warehouseGroupValue: '',
warehouseGroupKey: '', warehouseGroupKey: '',
libTubeName: '', libTubeName: '',
libTubeSid: '', libTubeSid: ''
orgPath: ''
}, },
rules: { rules: {
useOrg: [{ required: true, message: '使用组织不能为空', trigger: 'change' }], // 使用组织 useOrg: [{ required: true, message: '使用组织不能为空', trigger: 'change' }], // 使用组织
@ -163,12 +161,12 @@ export default {
getUseOrg() { getUseOrg() {
getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => { getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
if (res.success) { if (res.success) {
this.formobj.useOrgSid = res.data // 使用组织sid
fetchBySid(res.data).then((resp) => { fetchBySid(res.data).then((resp) => {
if (resp.success) { if (resp.success) {
this.formobj.useOrg = res.data.name // 使用组织 this.formobj.useOrg = resp.data.name // 使用组织
} }
}) })
this.formobj.useOrgSid = res.data // 使用组织sid
} }
}) })
}, },
@ -186,7 +184,6 @@ export default {
console.log('触发下拉框按钮', value) console.log('触发下拉框按钮', value)
let bb = null let bb = null
this.useOrg_list.forEach((e) => { this.useOrg_list.forEach((e) => {
// eslint-disable-next-line eqeqeq
if (e.name === value) { if (e.name === value) {
bb = { bb = {
name: e.name, name: e.name,
@ -316,20 +313,20 @@ export default {
handleReturn(isreload) { handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist') if (isreload === 'true') this.$emit('reloadlist')
this.formobj.id = '' this.formobj = {
this.formobj.sid = '' // SID sid: '',
this.formobj.useOrg = '' // 使用组织 useOrg: '', // 使用组织
this.useOrgSid = '' // 使用组织sid useOrgSid: '', // 使用组织sid
this.gressionCode = '' // 编码 gressionCode: '', // 编码
this.formobj.warehouseName = '' // 名称 warehouseName: '', // 名称
this.formobj.warehouseAttribute = '' // 存放地点属性 warehouseAttribute: '', // 存放地点属性
this.formobj.warehouseContract = '' // 存放地点负责人 warehouseContract: '', // 存放地点负责人
this.formobj.warehouseContractSid = '' // 存放地点负责人sid warehouseContractSid: '', // 存放地点负责人sid
this.formobj.warehouseGroup = '' // 分组 warehouseGroupValue: '',
this.formobj.libTubeSid = '' warehouseGroupKey: '',
this.formobj.libTubeName = '' libTubeName: '',
this.formobj.orgPath = '' libTubeSid: ''
// this.useOrg_list = [] }
this.$refs['form_obj'].resetFields() this.$refs['form_obj'].resetFields()
this.$emit('doback') this.$emit('doback')
}, },
@ -339,7 +336,6 @@ export default {
}) })
this.dialogStatus = 'add' this.dialogStatus = 'add'
this.viewTitle = '【新增】存放地点' this.viewTitle = '【新增】存放地点'
this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath')
this.getUseOrg() this.getUseOrg()
this.getType() this.getType()
}, },
@ -349,24 +345,13 @@ export default {
}) })
this.dialogStatus = 'edit' this.dialogStatus = 'edit'
this.viewTitle = '【修改】存放地点' this.viewTitle = '【修改】存放地点'
req.fetchBySid(row.sid).then(resp => { req.fetchBySid(row.sid).then((resp) => {
const vdata = resp.data if (resp.success) {
this.formobj.id = vdata.id this.formobj = resp.data
this.formobj.sid = vdata.sid // SID }
this.formobj.useOrg = vdata.useOrg // 使用组织
this.formobj.gressionCode = vdata.gressionCode // 编码
this.formobj.warehouseName = vdata.warehouseName // 名称
this.formobj.warehouseAttribute = vdata.warehouseAttribute // 存放地点属性
this.formobj.warehouseContract = vdata.warehouseContract // 存放地点负责人
this.formobj.warehouseContractSid = vdata.warehouseContractSid // 存放地点负责人sid
this.formobj.warehouseGroupKey = vdata.warehouseGroupKey // 分组
this.formobj.warehouseGroupValue = vdata.warehouseGroupValue // 分组
this.formobj.libTubeName = vdata.libTubeName
this.formobj.libTubeSid = vdata.libTubeSid
}).catch(e => { }).catch(e => {
this.formobj = row this.formobj = row
}) })
this.getUseOrg()
this.getType() this.getType()
}, },
saveAdd() { saveAdd() {

4
anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue
View File

@ -674,6 +674,10 @@ export default {
this.$message({ showClose: true, type: 'error', message: '请选择车型' }) this.$message({ showClose: true, type: 'error', message: '请选择车型' })
return return
} }
if (this.temp.settlementStatusValue !== '' && this.temp.settlementStatusValue === '买断' && this.temp.solidDate === '') {
this.$message({ showClose: true, type: 'error', message: '因买断状态为买断，则买断日期不能为空' })
return
}
this.$refs['dataForm'].validate((valid) => { this.$refs['dataForm'].validate((valid) => {
if (valid) { if (valid) {
this.FormLoading = true this.FormLoading = true

4
anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangMai.vue
View File

@ -104,6 +104,10 @@ export default {
// 保存 // 保存
handleCreate() { handleCreate() {
this.getUrl() this.getUrl()
if (this.temp.solidDate === '') {
this.$message({ showClose: true, message: '买断日期不能为空！', type: 'error' })
return
}
if (this.temp.commonAppendix.length < 1) { if (this.temp.commonAppendix.length < 1) {
this.$message({ this.$message({
showClose: true, showClose: true,

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

@ -217,7 +217,7 @@
<script> <script>
import req from '@/api/ruzhang/scmapplyinbound' import req from '@/api/ruzhang/scmapplyinbound'
import upload_picture from '@/components/uploadFile/upload_picture' import upload_picture from '@/components/uploadFile/upload_picture'
import { getPathSidByUserSid, fetchBySid } from '@/api/cheliang/dictcommons' import { getOrgSidByPath, fetchBySid } from '@/api/cheliang/dictcommons'
export default { export default {
name: 'RuzhangAdd', name: 'RuzhangAdd',
components: { components: {
@ -280,7 +280,8 @@ export default {
deductionPolicyFourThree: '', // 计算政策4: 扣减政策3 deductionPolicyFourThree: '', // 计算政策4: 扣减政策3
scmFiles: [], scmFiles: [],
vehicleList: [], vehicleList: [],
vehicleOrderSid: '' vehicleOrderSid: '',
orgPath: ''
}, },
rules: {}, rules: {},
submitdisabled: false submitdisabled: false
@ -288,7 +289,7 @@ export default {
}, },
methods: { methods: {
init() { init() {
getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((resp) => { getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
if (resp.success) { if (resp.success) {
this.formobj.useOrgSid = resp.data this.formobj.useOrgSid = resp.data
fetchBySid(this.formobj.useOrgSid).then((res) => { fetchBySid(this.formobj.useOrgSid).then((res) => {
@ -632,6 +633,7 @@ export default {
const data = resp.data const data = resp.data
this.formobj = data this.formobj = data
this.formobj.userSid = window.sessionStorage.getItem('userSid') this.formobj.userSid = window.sessionStorage.getItem('userSid')
this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath')
if (this.formobj.scmFiles.length > 0) { if (this.formobj.scmFiles.length > 0) {
this.formobj.scmFiles.forEach((e) => { this.formobj.scmFiles.forEach((e) => {
this.imgList.push({ this.imgList.push({
@ -817,6 +819,21 @@ export default {
} else { } else {
this.formobj.deductionPolicyFourThree = 1 this.formobj.deductionPolicyFourThree = 1
} }
// 判断车辆列表不能为空
var hint1 = 0
if (this.formobj.vehicleList.length > 0) {
for (var i = 0; i < this.formobj.vehicleList.length; i++) {
if (this.formobj.vehicleList[i].vinNo !== '') {
hint1 = 1
break
}
}
}
if (hint1 === 0) {
this.$message({ showClose: true, type: 'error', message: '车辆列表不能为空' })
return
}
// 判断车辆列表中是否有未填写的车架号记录，如果有则进行分批入库的功能
var hint = 0 var hint = 0
if (this.formobj.vehicleList.length > 0) { if (this.formobj.vehicleList.length > 0) {
for (var i = 0; i < this.formobj.vehicleList.length; i++) { for (var i = 0; i < this.formobj.vehicleList.length; i++) {
@ -854,6 +871,7 @@ export default {
}) })
}).catch(() => { }).catch(() => {
hint = 0 hint = 0
hint1 = 0
}) })
} else { } else {
this.$refs['form_obj'].validate(valid => { this.$refs['form_obj'].validate(valid => {

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

@ -55,7 +55,11 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="applicationDate" label="申请日期" align="center" width="100"/> <el-table-column prop="applicationDate" label="申请日期" align="center" width="100"/>
<el-table-column prop="pcApplicationCode" label="排产申请编号" align="center" width="170"/> <el-table-column label="采购申请编号" align="center" width="170">
<template slot-scope="scope">
<span class="bluezi" @click="hangleLook(scope.row)">{{ scope.row.pcApplicationCode }}</span>
</template>
</el-table-column>
<el-table-column prop="purchaseOrderNo" label="采购订单编号" align="center" width="170"/> <el-table-column prop="purchaseOrderNo" label="采购订单编号" align="center" width="170"/>
<el-table-column prop="modelName" label="车型" align="center"/> <el-table-column prop="modelName" label="车型" align="center"/>
<el-table-column prop="vehicleNum" fit label="台数" align="center" width="60"/> <el-table-column prop="vehicleNum" fit label="台数" align="center" width="60"/>
@ -74,6 +78,8 @@
<div-add v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList"/> <div-add v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList"/>
<!--详情部分组件--> <!--详情部分组件-->
<div-info v-show="viewState == 4" ref="divinfo" @doback="resetState"/> <div-info v-show="viewState == 4" ref="divinfo" @doback="resetState"/>
<!-- 查看采购申请详情 -->
<cheliangpaichanInfo v-show="viewState == 5" ref="divCaiGouInfo" @doback="resetState"/>
<el-dialog title="" :visible.sync="centerDialogVisible" width="78%" height="1%" :before-close="closeIt" center> <el-dialog title="" :visible.sync="centerDialogVisible" width="78%" height="1%" :before-close="closeIt" center>
<iframe frameborder="0" id="iframe" style="width:100%;" scrolling="no" :src="this.centerDialogVisible === true ? url :''"></iframe> <iframe frameborder="0" id="iframe" style="width:100%;" scrolling="no" :src="this.centerDialogVisible === true ? url :''"></iframe>
</el-dialog> </el-dialog>
@ -85,9 +91,10 @@ import req from '@/api/ruzhang/scmapplyinbound'
import ButtonBar from '@/components/ButtonBar' import ButtonBar from '@/components/ButtonBar'
import Pagination from '@/components/pagination' import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye' import pageye from '@/components/pagination/pageye'
import { getPathSidByUserSid } from '@/api/cheliang/dictcommons' import { getOrgSidByPath } from '@/api/cheliang/dictcommons'
import divAdd from './ruzhangAdd' import divAdd from './ruzhangAdd'
import divInfo from './ruzhangInfo' import divInfo from './ruzhangInfo'
import cheliangpaichanInfo from '../../../views/supplychain/cheliangpaichan/cheliangpaichanInfo'
import { getStorage } from '@/utils/auth' import { getStorage } from '@/utils/auth'
export default { export default {
@ -97,7 +104,8 @@ export default {
Pagination, Pagination,
pageye, pageye,
divAdd, divAdd,
divInfo divInfo,
cheliangpaichanInfo
}, },
data() { data() {
return { return {
@ -188,7 +196,7 @@ export default {
} }
}, },
init() { init() {
getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((resp) => { getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
if (resp.success) { if (resp.success) {
this.queryParams.params.createOrgSid = resp.data this.queryParams.params.createOrgSid = resp.data
this.loadList() this.loadList()
@ -218,6 +226,10 @@ export default {
const sid = row.sid const sid = row.sid
this.$refs['divinfo'].showInfo(sid, row) this.$refs['divinfo'].showInfo(sid, row)
}, },
hangleLook(row) {
this.viewState = 5
this.$refs['divCaiGouInfo'].showInfo(row.vehicleOrderSid, row)
},
// 查询 // 查询
dosearch() { dosearch() {
this.queryParams.current = 1 this.queryParams.current = 1

10
anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangDaiBanInfo.vue
View File

@ -235,8 +235,8 @@
</el-col> </el-col>
</el-row> </el-row>
<div style="text-align:center;margin-top: 20px;"> <div style="text-align:center;margin-top: 20px;">
<el-button type="primary" size="mini" @click="reject">确 定</el-button> <el-button type="primary" :disabled="submitdisabled" size="mini" @click="reject">确定</el-button>
<el-button type="info " size="mini" @click="nodeDialogVisible = false">取 消</el-button> <el-button type="info " :disabled="submitdisabled" size="mini" @click="nodeDialogVisible = false">取消</el-button>
</div> </div>
</el-form> </el-form>
</el-dialog> </el-dialog>
@ -463,6 +463,7 @@ export default {
/** 同意任务 */ /** 同意任务 */
handleAgree() { handleAgree() {
this.linkByParameter.comment = this.dialogList.comment this.linkByParameter.comment = this.dialogList.comment
this.submitdisabled = true
req.complete(this.linkByParameter).then((response) => { req.complete(this.linkByParameter).then((response) => {
if (response.success) { if (response.success) {
this.$notify({ this.$notify({
@ -471,6 +472,7 @@ export default {
type: 'success', type: 'success',
duration: 2000 duration: 2000
}) })
this.submitdisabled = false
this.nodeDialogVisible = false this.nodeDialogVisible = false
// 子页面向父级页面传递值 // 子页面向父级页面传递值
window.parent.postMessage({ window.parent.postMessage({
@ -480,7 +482,11 @@ export default {
code: 1 code: 1
} }
}, '*') }, '*')
} else {
this.submitdisabled = false
} }
}).catch(() => {
this.submitdisabled = false
}) })
}, },
/** 驳回任务 */ /** 驳回任务 */

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

@ -277,7 +277,8 @@ export default {
deductionPolicyTwoOne: '', deductionPolicyTwoOne: '',
scmFiles: [], scmFiles: [],
vehicleList: [], vehicleList: [],
vehicleOrderSid: '' vehicleOrderSid: '',
orgPath: ''
}, },
rules: {}, rules: {},
submitdisabled: false submitdisabled: false
@ -837,6 +838,19 @@ export default {
} else { } else {
this.formobj.deductionPolicyFourThree = 1 this.formobj.deductionPolicyFourThree = 1
} }
var hint1 = 0
if (this.formobj.vehicleList.length > 0) {
for (var i = 0; i < this.formobj.vehicleList.length; i++) {
if (this.formobj.vehicleList[i].vinNo !== '') {
hint1 = 1
break
}
}
}
if (hint1 === 0) {
this.$message({ showClose: true, type: 'error', message: '车辆列表不能为空' })
return
}
var hint = 0 var hint = 0
if (this.formobj.vehicleList.length > 0) { if (this.formobj.vehicleList.length > 0) {
for (var i = 0; i < this.formobj.vehicleList.length; i++) { for (var i = 0; i < this.formobj.vehicleList.length; i++) {
@ -881,6 +895,7 @@ export default {
}) })
}).catch(() => { }).catch(() => {
hint = 0 hint = 0
hint1 = 0
}) })
} else { } else {
this.$refs['form_obj'].validate(valid => { this.$refs['form_obj'].validate(valid => {

Write Preview
Loading…
Cancel
Save