Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
God 3 years ago
parent
commit
a70a8ffd4d
  1. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.java
  2. 40
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml
  3. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java
  4. 11
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java
  5. 13
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
  6. 10
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java
  7. 10
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java
  8. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
  9. 7
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDepositInfoVo.java
  10. 7
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java
  11. 6
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderPriceInfoVo.java
  12. 48
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
  13. 17
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml
  14. 26
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  15. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositMapper.xml
  16. 11
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java
  17. 7
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.xml
  18. 6
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/AppScmVehicleStayInventoryDetailedsVo.java
  19. 2
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclestaypatrolinspection/AppScmVehicleStayPatrolinspectionPageQuery.java
  20. 10
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java
  21. 2
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.xml
  22. 2
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionMapper.java
  23. 4
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionMapper.xml
  24. 6
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionService.java
  25. 10
      anrui-scm/anrui-scm-ui/src/api/cheliang/dictcommons.js
  26. 47
      anrui-scm/anrui-scm-ui/src/api/gongyingshang/gongyingshang.js
  27. 15
      anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js
  28. 433
      anrui-scm/anrui-scm-ui/src/views/gongyingshang/gongyingshangAdd.vue
  29. 210
      anrui-scm/anrui-scm-ui/src/views/gongyingshang/gongyingshangInfo.vue
  30. 341
      anrui-scm/anrui-scm-ui/src/views/gongyingshang/gongyingshanggaunli.vue
  31. 231
      anrui-scm/anrui-scm-ui/src/views/gongyingshang/relation/gongyingshangBank.vue
  32. 9
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderDepositInfoVo.java
  33. 19
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderDetailsVo.java
  34. 8
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderPriceInfoVo.java
  35. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/StayPatrolinspectionPageQuery.java
  36. 4
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehicleApply/VehicleApplyVo.java

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.java

@ -212,5 +212,5 @@ public interface BaseModelConfigMapper extends BaseMapper<BaseModelConfig> {
int selectCount();
List<String> checkConfigNameBySid(@Param("sid") String sid,@Param("createOrgSid") String createOrgSid);
List<String> checkConfigNameBySid(@Param("sid") String sid, @Param("createOrgSid") String createOrgSid);
}

40
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml

@ -230,8 +230,8 @@
bmc.multimedia,
bv.guidedPrice
FROM base_vehicle bv
LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.sid
LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.sid
LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
WHERE bvm.sid = #{modelSid}
</select>
<select id="selectAppConfigListByModelSid2"
@ -266,16 +266,16 @@
FROM base_vehmodel_config bvc
WHERE bvc.configurationItemsSid = bmc.sid) AS priceValidity
FROM base_vehmodel_config bvc
LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
WHERE bvm.sid = #{modelSid}
</select>
<select id="selectVehicleQuantity" resultType="java.lang.String">
SELECT count(*)
FROM base_model_config bmc
LEFT JOIN base_vehmodel_config bvc ON bvc.configurationItemsSid = bmc.sid
LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
LEFT JOIN base_vehmodel_config bvc ON bvc.configurationItemsSid = bmc.sid
LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
WHERE bmc.sid = #{sid}
AND bvm.sid = #{modelSid}
</select>
@ -304,8 +304,8 @@
bmc.multimedia,
bmc.otherConfig
FROM base_vehmodel_config bvc
LEFT JOIN base_model_config bmc ON bmc.sid = bvc.configurationItemsSid
LEFT JOIN base_vehicle_model bvm ON bvm.sid = bvc.modelSid
LEFT JOIN base_model_config bmc ON bmc.sid = bvc.configurationItemsSid
LEFT JOIN base_vehicle_model bvm ON bvm.sid = bvc.modelSid
WHERE bvc.modelSid = #{modelSid}
AND bvc.configurationItemsSid = #{configSid}
AND bvc.useOrgSid = #{useOrg}
@ -482,8 +482,8 @@
bmc.multimedia,
bmc.otherConfig
FROM bus_vehicle_apply_detail bvad
LEFT JOIN base_model_config bmc ON bmc.sid = bvad.configSid
LEFT JOIN base_vehicle_model bvm ON bvm.sid = bvad.vehicleSid
LEFT JOIN base_model_config bmc ON bmc.sid = bvad.configSid
LEFT JOIN base_vehicle_model bvm ON bvm.sid = bvad.vehicleSid
WHERE bmc.sid = #{configSid}
AND bvm.sid = #{modelSid}
</select>
@ -501,15 +501,15 @@
bvm.driveFormValue,
bvm.fuelTypeValue,
bvm.gearboxTypeValue,
bvm.marketSegmentsValue as marketSegments,
bvm.departmentValue as department,
bvm.marketSegmentsValue as marketSegments,
bvm.departmentValue as department,
bvm.emissionStandardValue,
bvm.engineTypeValue,
bvm.announcementModel,
bvm.specifications,
bvm.insideCode
FROM base_vehicle_model bvm
LEFT JOIN base_vehmodel_config bvc ON bvc.modelSid = bvm.sid
LEFT JOIN base_vehmodel_config bvc ON bvc.modelSid = bvm.sid
where bvm.sid = #{modelSid}
and bvc.useOrgSid = #{useOrgSid}
</select>
@ -578,7 +578,7 @@
(select SUM(distinct cast((cast(bo.platformNo as signed) -
IFNULL(cast(bo.lockingNum as signed), '0')) as signed)) as quantity
from bus_vehicle_order bo
LEFT JOIN bus_vehicle_apply_detail bd on bo.purchaseRequisitionSid = bd.applySid
LEFT JOIN bus_vehicle_apply_detail bd on bo.purchaseRequisitionSid = bd.applySid
where bo.useOrgSid = bvc.useOrgSid
and bd.vehicleSid = #{modelSid}
and bd.configSid = #{configSid}) AS produceCarNum
@ -616,8 +616,8 @@
-- bv.salePrice as price,
bmc.otherConfig
FROM base_vehicle bv
LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.sid
LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.sid
LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
WHERE bvm.sid = #{modelSid}
AND bmc.sid = #{configSid}
</select>
@ -643,7 +643,9 @@
bmc.independentSources,
bmc.fuelTank,
bmc.multimedia,
bvc.guidedPrice as price,
if(MIN(bvc.guidedPrice) = MAX(bvc.guidedPrice), convert(MAX(bvc.guidedPrice) / 10000, decimal (10, 2)),
CONCAT(convert(MIN(bvc.guidedPrice) / 10000, decimal (10, 2)), '-',
convert(MAX(bvc.guidedPrice) / 10000, decimal (10, 2)))) AS price,
bvc.priceValidity,
bvm.sid as modelSid,
bvm.vehicleAlias as modelName,
@ -654,6 +656,7 @@
FROM base_vehicle bv
WHERE bv.modelSid = bvc.modelSid
AND bv.modelConfigSid = bvc.configurationItemsSid
AND (bv.vehicleStateValue = '库存' or bv.vehicleStateValue = '在途' or bv.vehicleStateValue = '调入')
AND bv.lockedState = #{state}
and bv.useOrgSid = #{orgSid}) AS nowCarNum,
(select SUM(distinct cast((cast(bo.platformNo as signed)-IFNULL(cast(bo.lockingNum as signed),'0')) as signed))
@ -772,6 +775,7 @@
<select id="checkByConfigName" resultType="java.lang.String">
SELECT CONCAT(configName, otherConfig) configNameOther
FROM base_model_config
WHERE isDelete = 0 AND createOrg = #{createOrgSid}
WHERE isDelete = 0
AND createOrg = #{createOrgSid}
</select>
</mapper>

4
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java

@ -859,7 +859,7 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
return baseMapper.selectCount();
}
public List<String> checkConfigNameBySid(String sid,String createOrgSid) {
return baseMapper.checkConfigNameBySid(sid,createOrgSid);
public List<String> checkConfigNameBySid(String sid, String createOrgSid) {
return baseMapper.checkConfigNameBySid(sid, createOrgSid);
}
}

11
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java

@ -48,6 +48,7 @@ import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordFeign;
import com.yxt.anrui.flowable.api.flow.FlowableFeign;
import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
import com.yxt.anrui.flowable.api.sysprourl.SysProUrlFeign;
import com.yxt.anrui.flowable.api.sysprourl.SysProUrlVo;
import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
@ -67,6 +68,7 @@ import com.yxt.anrui.scm.api.scmvehicleexamine.ScmEntryVehicleExamineDto;
import com.yxt.anrui.scm.api.scmvehicleexamine.ScmVehicleExamineFeign;
import com.yxt.anrui.scm.api.scmvehinspectitem.ScmVehinspectItemDto;
import com.yxt.anrui.scm.api.scmvehinspectitem.ScmVehinspectItemFeign;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.DateUtils;
import com.yxt.common.base.utils.PagerUtil;
@ -127,6 +129,8 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
private SysProUrlFeign sysProUrlFeign;
@Autowired
private MessageFeign messageFeign;
@Autowired
private FileUploadComponent fileUploadComponent;
private QueryWrapper<BaseOutsourcingApplication> createQueryWrapper(BaseOutsourcingApplicationQuery query) {
// todo: 这里根据具体业务调整查询条件
@ -745,7 +749,7 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
List<CommonAppendixVo> commonAppendixVos = commonAppendixService.selByLinkSid(sid);
List<String> stringList = new ArrayList<>();
if (commonAppendixVos != null && commonAppendixVos.size() > 0) {
stringList.add(commonAppendixVos.get(0).getFilePath());
stringList.add(fileUploadComponent.getUrlPrefix()+commonAppendixVos.get(0).getFilePath());
}
vo.setImages(stringList);
return rb.success().setData(vo);
@ -760,7 +764,10 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
*/
public String getMessage(UpdateFlowFieldVo ufVo, Map<String, Object> appMap, BaseOutsourcingApplication baseOutsourcingApplication) {
//=====极光推送信息========================================参数组装
List<String> receiveSidList = Arrays.asList(ufVo.getNextNodeUserSids().split(","));
String procId = baseOutsourcingApplication.getProcInstSid();
ResultBean<List<LatestTaskVo>> resultBean = flowTaskFeign.getLatestTasks(procId);
String nextNodeUserSids = resultBean.getData().get(0).getASSIGNEE_();
List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
//根据用户的sid查询用户的id
ResultBean<String> stringList1 = sysUserFeign.selectIdBySid(receiveSidList);
List<String> reveiveIdList = Arrays.asList(stringList1.getData().split(","));

13
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml

@ -630,7 +630,9 @@
bvm.vehicleVersionValue AS versionValue,
bvm.fuelTypeValue,
bvm.gearboxTypeValue,
(SELECT CONCAT(MIN(bvc.guidedPrice), '-', MAX(bvc.guidedPrice))
(SELECT if(MIN(bvc.guidedPrice) = MAX(bvc.guidedPrice), convert(MAX(bvc.guidedPrice) / 10000, decimal (10, 2)),
CONCAT(convert(MIN(bvc.guidedPrice) / 10000, decimal (10, 2)), '-',
convert(MAX(bvc.guidedPrice) / 10000, decimal (10, 2))))
FROM base_vehmodel_config bvc
WHERE bvc.modelSid = bvm.sid
AND bvc.useOrgSid = #{useOrgSid}) AS guidedPrice,
@ -642,7 +644,8 @@
FROM base_vehicle bv
WHERE bv.modelSid = bvm.sid
AND bv.lockedState = #{state}
and bv.useOrgSid = #{useOrgSid}) AS nowCarNum
AND (bv.vehicleStateValue = '库存' or bv.vehicleStateValue = '在途' or bv.vehicleStateValue = '调入')
AND bv.useOrgSid = #{useOrgSid}) AS nowCarNum
FROM base_vehicle bv
LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
left join base_vehmodel_config bvc on bvc.modelSid = bvm.sid
@ -757,7 +760,8 @@
DATE_FORMAT(bv.priceDate, '%Y-%m-%d') as priceDate,
bv.costPrice as priced,
bv.insideCode,
(select count(*) from base_vehicle bvv where bvv.insideCode = bv.insideCode and (bvv.vehicleStateValue = '库存' or bvv.vehicleStateValue = '调入')) as vehicleNum,
(select count(*) from base_vehicle bvv where bvv.insideCode = bv.insideCode and (bvv.vehicleStateValue = '库存' or
bvv.vehicleStateValue = '调入')) as vehicleNum,
(select datediff(now(),DATE_FORMAT(bv.priceDate,'%Y-%m-%d'))) as dayNum
FROM base_vehicle bv
@ -1029,6 +1033,7 @@
<select id="selectByVinNoAndOrgSid" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicle">
SELECT *
FROM base_vehicle
WHERE vinNo = #{vinNo} AND useOrgSid = #{useOrgSid}
WHERE vinNo = #{vinNo}
AND useOrgSid = #{useOrgSid}
</select>
</mapper>

10
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java

@ -22,6 +22,7 @@ import com.yxt.anrui.flowable.api.flow.FlowableFeign;
import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo;
import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
import com.yxt.anrui.flowable.api.sysprourl.SysProUrlFeign;
import com.yxt.anrui.flowable.api.sysprourl.SysProUrlVo;
import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
@ -284,7 +285,6 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
return rb.setMsg(resultBean.getMsg());
}
String businessSid = resultBean.getData();
baseVehicleActualSales = fetchBySid(businessSid);
//判断车辆的结算状态是否包含预买断的状态,如果是的话,返回提交失败
boolean isTrue = isTrue(businessSid);
if (isTrue) {
@ -319,6 +319,7 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
baseVehicleService.updateVeh(baseVehicle);
}
//极光推送
baseVehicleActualSales = fetchBySid(businessSid);
String msgSid = getMessage(ufVo, appMap, baseVehicleActualSales);
return voResultBean;
}
@ -384,6 +385,7 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
UpdateFlowFieldVo ufVo = resultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
//极光推送
baseVehicleActualSales = fetchBySid(bv.getBusinessSid());
String msgSid = getMessage(ufVo, appMap, baseVehicleActualSales);
return rb.success().setData(resultBean.getData());
} else {
@ -474,6 +476,7 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
//更新业务中的流程相关的参数
updateFlowFiled(map);
//极光推送
baseVehicleActualSales = fetchBySid(query.getBusinessSid());
String msgSid = getMessage(ufVo, appMap, baseVehicleActualSales);
return rb.success();
}
@ -567,7 +570,10 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
public String getMessage(UpdateFlowFieldVo ufVo, Map<String, Object> appMap, BaseVehicleActualSales baseVehicleActualSales) {
//=====极光推送信息========================================参数组装
List<String> receiveSidList = Arrays.asList(ufVo.getNextNodeUserSids().split(","));
String procId = baseVehicleActualSales.getProcInstId();
ResultBean<List<LatestTaskVo>> resultBean = flowTaskFeign.getLatestTasks(procId);
String nextNodeUserSids = resultBean.getData().get(0).getASSIGNEE_();
List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
//根据用户的sid查询用户的id
ResultBean<String> stringList1 = sysUserFeign.selectIdBySid(receiveSidList);
List<String> reveiveIdList = Arrays.asList(stringList1.getData().split(","));

10
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java

@ -34,6 +34,7 @@ import com.yxt.anrui.flowable.api.flow.FlowableFeign;
import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo;
import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
import com.yxt.anrui.flowable.api.sysprourl.SysProUrlFeign;
import com.yxt.anrui.flowable.api.sysprourl.SysProUrlVo;
import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
@ -351,7 +352,6 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
}
String businessSid = resultBean.getData();
busVehicleApply = fetchBySid(businessSid);
//创建BusinessVariables实体对象
BusinessVariables bv = new BusinessVariables();
//流程中的参数赋值、若有网关,则赋值网关中判断的字段。
@ -377,6 +377,7 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
UpdateFlowFieldVo ufVo = voResultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(ufVo));
//极光推送
busVehicleApply = fetchBySid(businessSid);
String msgSid = getMessage(ufVo, appMap, busVehicleApply);
return voResultBean;
}
@ -510,6 +511,7 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
finPaymentrecordFeign.save(finPaymentrecordDto);
}
} else {
busVehicleApply = fetchBySid(businessSid);
String msgSid = getMessage(ufVo, appMap, busVehicleApply);
}
return rb.success().setData(resultBean.getData());
@ -606,6 +608,7 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
Map<String, Object> map = BeanUtil.beanToMap(ufVo);
//更新业务中的流程相关的参数
updateFlowFiled(map);
busVehicleApply = fetchBySid(businessSid);
String msgSid = getMessage(ufVo, appMap, busVehicleApply);
return rb.success();
}
@ -725,7 +728,10 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
*/
public String getMessage(UpdateFlowFieldVo ufVo, Map<String, Object> appMap, BusVehicleApply busVehicleApply) {
//=====极光推送信息========================================参数组装
List<String> receiveSidList = Arrays.asList(ufVo.getNextNodeUserSids().split(","));
String procId = busVehicleApply.getProcInstId();
ResultBean<List<LatestTaskVo>> resultBean = flowTaskFeign.getLatestTasks(procId);
String nextNodeUserSids = resultBean.getData().get(0).getASSIGNEE_();
List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
//根据用户的sid查询用户的id
ResultBean<String> stringList1 = sysUserFeign.selectIdBySid(receiveSidList);
List<String> reveiveIdList = Arrays.asList(stringList1.getData().split(","));

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java

@ -1149,7 +1149,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
//查询台数
String num = priceInfo.getNumber();
//单台成交价
String transactionPrice = priceInfo.getTransactionPrice();
String transactionPrice = priceInfo.getSingleFinalPrice();
String remarks = "主车" + num + "台,单台成交价:" + transactionPrice + "元。";
//优惠说明
//ToDo:

7
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDepositInfoVo.java

@ -4,6 +4,8 @@ import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @Author dimengzhe
* @Date 2022/6/9 16:27
@ -27,4 +29,9 @@ public class AppOrderDepositInfoVo implements Vo {
private String sid;
@ApiModelProperty(value = "订金交纳方式")
private String type;
@ApiModelProperty("需补交订金")
private String makeUpDeposit;
@ApiModelProperty("所有订金结转上传的委托书")
private List<String> images;
}

7
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java

@ -79,4 +79,11 @@ public class AppOrderDetailsVo implements Vo {
@ApiModelProperty("任务id")
private String taskId;
@ApiModelProperty("订单编号")
private String billNo;
@ApiModelProperty("资金类型")
private String financePlanValue;
@ApiModelProperty("付款类型")
private String payTypeKey;
}

6
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderPriceInfoVo.java

@ -24,4 +24,10 @@ public class AppOrderPriceInfoVo implements Vo {
private String date;
@ApiModelProperty(value = "预计提车地点")
private String address;
@ApiModelProperty("单台整体指导价")
private String singleGuildPrice;
@ApiModelProperty("单台整体成交价")
private String singleFinalPrice;
}

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

@ -1211,6 +1211,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
return rb.success().setData(busMainDeposit.getSid());
}
}
/**
* 新增/修改虚拟订单订金收取添加车辆信息方法
*
@ -1754,7 +1755,6 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
return rb.setMsg(resultBean.getMsg());
}
String businessSid = resultBean.getData();
busMainDeposit = fetchBySid(businessSid);
//创建BusinessVariables实体对象
BusinessVariables bv = new BusinessVariables();
//流程中的参数赋值、若有网关,则赋值网关中判断的字段。
@ -1778,6 +1778,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
UpdateFlowFieldVo ufVo = voResultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(ufVo));
//极光推送
busMainDeposit = fetchBySid(businessSid);
String msgSid = getMessage(ufVo, appMap, busMainDeposit);
return voResultBean;
}
@ -1858,7 +1859,6 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
return rb.setMsg(resultBean.getMsg());
}
String businessSid = resultBean.getData();
busMainDeposit = fetchBySid(businessSid);
//创建BusinessVariables实体对象
BusinessVariables bv = new BusinessVariables();
//流程中的参数赋值、若有网关,则赋值网关中判断的字段。
@ -1883,6 +1883,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
UpdateFlowFieldVo ufVo = voResultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(ufVo));
//极光推送
busMainDeposit = fetchBySid(businessSid);
String msgSid = getMessage(ufVo, appMap, busMainDeposit);
return voResultBean;
}
@ -1906,10 +1907,10 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
String userSid = bv.getUserSid();
SysOrganizationVo data = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData();
bv.setOrgSidPath(data.getOrgSidPath());
Map<String,Object> variables = new HashMap<>();
Map<String,Object> appMap = new HashMap<>();
appMap.put("sid",bv.getBusinessSid());
variables.put("app",appMap);
Map<String, Object> variables = new HashMap<>();
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", bv.getBusinessSid());
variables.put("app", appMap);
bv.setFormVariables(variables);
if (bv.getTaskId().equals(busMainDeposit.getTaskId())) {
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
@ -1919,6 +1920,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
UpdateFlowFieldVo ufVo = resultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
//极光推送
busMainDeposit = fetchBySid(bv.getBusinessSid());
String msgSid = getMessage(ufVo, appMap, busMainDeposit);
return rb.success().setData(resultBean.getData());
} else {
@ -1991,10 +1993,10 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
if (businessTaskId.equals(query.getTaskId())) {
FlowTaskVo flowTaskVo = new FlowTaskVo();
BeanUtil.copyProperties(query, flowTaskVo);
Map<String,Object> variables = new HashMap<>();
Map<String,Object> appMap = new HashMap<>();
appMap.put("sid",appMap);
variables.put("app",appMap);
Map<String, Object> variables = new HashMap<>();
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", appMap);
variables.put("app", appMap);
flowTaskVo.setValues(variables);
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo);
if (!resultBean.getSuccess()) {
@ -2005,6 +2007,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
//更新业务中的流程相关的参数
updateFlowFiled(map);
//极光推送
busMainDeposit = fetchBySid(query.getBusinessSid());
String msgSid = getMessage(ufVo, appMap, busMainDeposit);
return rb.success();
}
@ -2064,6 +2067,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
/**
* 消息推送
*
* @param ufVo
* @param appMap
* @param busMainDeposit
@ -2071,7 +2075,10 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
*/
public String getMessage(UpdateFlowFieldVo ufVo, Map<String, Object> appMap, BusMainDeposit busMainDeposit) {
//=====极光推送信息========================================参数组装
List<String> receiveSidList = Arrays.asList(ufVo.getNextNodeUserSids().split(","));
String procId = busMainDeposit.getProcInsId();
ResultBean<List<LatestTaskVo>> resultBean = flowTaskFeign.getLatestTasks(procId);
String nextNodeUserSids = resultBean.getData().get(0).getASSIGNEE_();
List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
//根据用户的sid查询用户的id
ResultBean<String> stringList1 = sysUserFeign.selectIdBySid(receiveSidList);
List<String> reveiveIdList = Arrays.asList(stringList1.getData().split(","));
@ -2080,7 +2087,18 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
BeanUtil.copyProperties(ufVo, messageJsonDto);
//查询流程审批的页面操作地址组装json的参数
//根据taskDef和移动端标识
ResultBean<SysProUrlVo> selectUrlByKey = sysProUrlFeign.selectUrlByKey(ProcDefEnum.VEHICLEAPPLY.getProDefId(), ufVo.getTaskDefKey(), "1", "2");
String proDefId = "";
String name = "";
if ("01".equals(busMainDeposit.getDepositBillTypeKey())) {//订金收取
proDefId = ProcDefEnum.ORDERDEPOSITAPPROVE.getProDefId();
name = "简易订单申请-订金收取";
} else {
if ("02".equals(busMainDeposit.getDepositBillTypeKey())) {//车辆预定
proDefId = ProcDefEnum.ORDERDEPOSITVEHICLEAPPROVE.getProDefId();
name = "简易订单申请-车辆预定";
}
}
ResultBean<SysProUrlVo> selectUrlByKey = sysProUrlFeign.selectUrlByKey(proDefId, ufVo.getTaskDefKey(), "1", "2");
SysProUrlVo sysProUrlVo = selectUrlByKey.getData();
messageFlowableDto.setBusinessSid(busMainDeposit.getSid());
messageFlowableDto.setApp_type("2");
@ -2100,9 +2118,9 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
messageFlowableDto.setJson(messageJsonDto);
messageFlowableDto.setList(receiveSidList);
messageFlowableDto.setReceiveIdList(reveiveIdList);
messageFlowableDto.setModuleName("简易订单申请");
messageFlowableDto.setMsgContent("简易订单申请");
messageFlowableDto.setMsgTitle("简易订单申请");
messageFlowableDto.setModuleName(name);
messageFlowableDto.setMsgContent(name);
messageFlowableDto.setMsgTitle(name);
messageFlowableDto.setCreateName(busMainDeposit.getStaffName());
messageFlowableDto.setTaskId(ufVo.getTaskId());
ResultBean<String> stringResultBean = messageFeign.getMessage(messageFlowableDto);

17
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml

@ -54,7 +54,7 @@
case bo.isInsurance
when 0 then '否'
when 1 then '是' end as insuranceInfo,
if(bo.nodeState = '已办结', true, false) as showContractBtn,
if(bo.nodeState = '已办结', true, false) as showContractBtn,
bo.nodeState is null as showUpdateBtn,
bo.nodeState is null as showDeleteBtn,
0 as showFinancialBtn
@ -67,11 +67,11 @@
${ew.sqlSegment}
<if test="name != null and name != ''">
and concat(IFNULL(bo.customerName
, '')
, ifnull(bo.billNo
, '')) LIKE concat('%'
, #{name}
, '%')
, '')
, ifnull(bo.billNo
, '')) LIKE concat('%'
, #{name}
, '%')
</if>
</where>
order by bo.id
@ -184,7 +184,10 @@
when 1 then '现车'
when 2 then '采购订单'
when 3 then '排产' end as orderType,
bo.orgSid
bo.orgSid,
bo.billNo,
bo.financePlanValue,
bo.payTypeKey
from bus_sales_order bo
where sid = #{sid}
</select>

26
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@ -91,6 +91,7 @@ import com.yxt.anrui.flowable.api.flow.FlowableFeign;
import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo;
import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign;
import com.yxt.anrui.flowable.api.sysprourl.SysProUrlFeign;
import com.yxt.anrui.flowable.api.sysprourl.SysProUrlVo;
@ -909,6 +910,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
//更新业务中的流程相关的参数
updateFlowFiled(map);
//极光推送
busSalesOrder = fetchBySid(query.getBusinessSid());
String msgSid = getMessage(ufVo, (Map<String, Object>) variables.get("app"), busSalesOrder);
return rb.success();
}
@ -1161,7 +1163,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
pq.getParams().setStaffSid(data.getStaffSid());
QueryWrapper<BusSalesOrder> qw = appCreateQueryWrapper(pq.getParams());
IPage<BusSalesOrder> page = PagerUtil.queryToPage(pq);
IPage<AppBusSalesOrderVo> pagging = baseMapper.getSaleOrders(page, qw,pq.getParams().getName());
IPage<AppBusSalesOrderVo> pagging = baseMapper.getSaleOrders(page, qw, pq.getParams().getName());
for (AppBusSalesOrderVo record : pagging.getRecords()) {
if (StringUtils.isNotBlank(record.getCustomerImage())) {
record.setCustomerImage(fileUploadComponent.getUrlPrefix() + record.getCustomerImage());
@ -1972,7 +1974,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
if (orderVoResultBean.getSuccess()) {
List<AppBaseVehicleOrderVo> voList = orderVoResultBean.getData();
voList.removeAll(Collections.singleton(null));
if(!voList.isEmpty()){
if (!voList.isEmpty()) {
for (AppBaseVehicleOrderVo vehicleOrderVo : voList) {
vinNoList.add(vehicleOrderVo.getVin());
}
@ -2018,7 +2020,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
if (applyListResultBean.getSuccess()) {
List<AppBusVehicleApplyListVo> applyListVos = applyListResultBean.getData();
applyListVos.removeAll(Collections.singleton(null));
if(!applyListVos.isEmpty()){
if (!applyListVos.isEmpty()) {
for (AppBusVehicleApplyListVo applyListVo : applyListVos) {
AppReadyCarVo appReadyCarVo = new AppReadyCarVo();
BeanUtil.copyProperties(applyListVo, appReadyCarVo);
@ -2141,6 +2143,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
/***************************价格信息***************************************/
AppOrderPriceInfoVo priceInfo = busSalesOrderPriceService.selectPrice(sid);
if (priceInfo != null) {
if (vo.getModelInfo() != null) {
priceInfo.setTransactionPrice(vo.getModelInfo().getPrice());
}
vo.setPriceInfo(priceInfo);
}
/***************************上装信息***************************************/
@ -2175,13 +2180,21 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
if ("02".equals(depositInfo.getDepositTypeKey())) {
List<BusDepositFictitiousDetailsVo> list = busDepositFictitiousService.detailsList(depositInfo.getSid());
list.removeAll(Collections.singleton(null));
List<String> stringList = new ArrayList<>();
if (!list.isEmpty()) {
for (BusDepositFictitiousDetailsVo v : list) {
String b = "编号为" + v.getDepositBillNo() + "虚拟订单订金转入" + v.getPrice() + "元,";
a = a + b;
if (StringUtils.isNotBlank(v.getPayPath())) {
List<String> payPathList = Arrays.asList(v.getPayPath().split(","));
for (int i = 0; i < payPathList.size(); i++) {
stringList.add(fileUploadComponent.getUrlPrefix() + payPathList.get(i));
}
}
}
a = a + "原订金额度使用完后,其收据自动作废。";
depositInfo.setDepositRemarks(a);
depositInfo.setImages(stringList);
}
}
vo.setDepositInfo(depositInfo);
@ -2250,6 +2263,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
UpdateFlowFieldVo ufVo = voResultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(ufVo));
//极光推送
busSalesOrder = fetchBySid(businessSid);
String msgSid = getMessage(ufVo, (Map<String, Object>) variables.get("app"), busSalesOrder);
return voResultBean;
}
@ -2325,6 +2339,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
UpdateFlowFieldVo ufVo = resultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
//极光推送
busSalesOrder = fetchBySid(bv.getBusinessSid());
String msgSid = getMessage(ufVo, (Map<String, Object>) variables.get("app"), busSalesOrder);
return rb.success().setData(resultBean.getData());
} else {
@ -2403,7 +2418,10 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
public String getMessage(UpdateFlowFieldVo ufVo, Map<String, Object> appMap, BusSalesOrder busSalesOrder) {
//=====极光推送信息========================================参数组装
List<String> receiveSidList = Arrays.asList(ufVo.getNextNodeUserSids().split(","));
String procId = busSalesOrder.getProcInstId();
ResultBean<List<LatestTaskVo>> resultBean = flowTaskFeign.getLatestTasks(procId);
String nextNodeUserSids = resultBean.getData().get(0).getASSIGNEE_();
List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
//根据用户的sid查询用户的id
ResultBean<String> stringList1 = sysUserFeign.selectIdBySid(receiveSidList);
List<String> reveiveIdList = Arrays.asList(stringList1.getData().split(","));

2
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositMapper.xml

@ -71,7 +71,7 @@
</update>
<select id="selectDeposit" resultType="com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDepositInfoVo">
select deposit, depositAll as depositTotal, sid, depositTypeKey,depositType as type
select deposit, depositAll as depositTotal, sid, depositTypeKey,depositType as type,makeUpDeposit
from bus_sales_order_deposit
where salesOrderSid = #{sid}
</select>

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

@ -45,6 +45,7 @@ import com.yxt.anrui.buscenter.biz.bussalesorderprice.BusSalesOrderPriceService;
import com.yxt.anrui.flowable.api.flowcomment.FlowComment;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserInfoVo;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
@ -87,6 +88,8 @@ public class BusSalesOrderDepositService extends MybatisBaseService<BusSalesOrde
private SysUserFeign sysUserFeign;
@Autowired
private BusDepositService busDepositService;
@Autowired
private FileUploadComponent fileUploadComponent;
public String saveOrderDepo(BusSalesOrderDepositDto busSalesOrderDepositDto, String sid) {
BusSalesOrderDeposit busSalesOrderDeposit = new BusSalesOrderDeposit();
@ -216,7 +219,13 @@ public class BusSalesOrderDepositService extends MybatisBaseService<BusSalesOrde
BusDepositFictitious busDepositFictitious = new BusDepositFictitious();
BeanUtil.copyProperties(listDto, busDepositFictitious, "sid");
busDepositFictitious.setDepositSid(depositSid);
busDepositFictitious.setPayPath(StringUtils.join(listDto.getEntrustImage(), ","));
if(listDto.getEntrustImage().size()>0){
String payPath = StringUtils.join(listDto.getEntrustImage(), ",");
if(payPath.contains(fileUploadComponent.getUrlPrefix())){
payPath = payPath.replaceAll(fileUploadComponent.getUrlPrefix(),"");
}
busDepositFictitious.setPayPath(payPath);
}
busDepositFictitiousService.save(busDepositFictitious);
}
}

7
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.xml

@ -49,11 +49,12 @@
</select>
<select id="selectPrice" resultType="com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderPriceInfoVo">
select bp.singleFinalPrice as transactionPrice,
bp.quantity as number,
select bp.quantity as number,
bp.priceSum as totalPrice,
DATE_FORMAT(bp.plannedPickUpDate, '%Y-%m-%d') as date,
bp.plannedPickUpLocation as address
bp.plannedPickUpLocation as address,
bp.singleGuildPrice,
bp.singleFinalPrice
from bus_sales_order_price bp
where bp.salesOrderSid = #{sid}
</select>

6
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/AppScmVehicleStayInventoryDetailedsVo.java

@ -79,4 +79,10 @@ public class AppScmVehicleStayInventoryDetailedsVo implements Vo {
@ApiModelProperty("见证材料")
private List<String> images;
@ApiModelProperty("定位")
private String address;
@ApiModelProperty("定位经纬度")
private String addressCode;
}

2
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclestaypatrolinspection/AppScmVehicleStayPatrolinspectionPageQuery.java

@ -11,7 +11,7 @@ public class AppScmVehicleStayPatrolinspectionPageQuery implements Query {
private String userSid;
@ApiModelProperty("优先匹配车架号 存放地点 巡检人员")
private String name;
private String names;
@ApiModelProperty("存放地点 “”/null 全部 有值时只查询当前存放地点的记录")
private String warehouseSid;

10
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java

@ -42,6 +42,7 @@ import com.yxt.anrui.flowable.api.flow.FlowableFeign;
import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo;
import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
import com.yxt.anrui.flowable.api.sysprourl.SysProUrlFeign;
import com.yxt.anrui.flowable.api.sysprourl.SysProUrlVo;
import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
@ -628,7 +629,6 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
return rb.setMsg(resultBean.getMsg());
}
String businessSid = resultBean.getData();
scmVehicleGression = fetchBySid(businessSid);
String state = "2";
baseMapper.updateStateBySid(businessSid, state);
//创建BusinessVariables实体对象
@ -656,6 +656,7 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
UpdateFlowFieldVo ufVo = voResultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(ufVo));
//极光推送
scmVehicleGression = fetchBySid(businessSid);
String msgSid = getMessage(ufVo, appMap, scmVehicleGression);
return voResultBean;
}
@ -746,6 +747,7 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
UpdateFlowFieldVo ufVo = resultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
//极光推送
scmVehicleGression = fetchBySid(bv.getBusinessSid());
String msgSid = getMessage(ufVo, appMap, scmVehicleGression);
return rb.success().setData(resultBean.getData());
} else {
@ -829,6 +831,7 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
//更新业务中的流程相关的参数
updateFlowFiled(map);
scmVehicleGression = fetchBySid(query.getBusinessSid());
String msgSid = getMessage(ufVo, appMap, scmVehicleGression);
return rb.success();
}
@ -1024,7 +1027,10 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
*/
public String getMessage(UpdateFlowFieldVo ufVo, Map<String, Object> appMap, ScmVehicleGression scmVehicleGression) {
//=====极光推送信息========================================参数组装
List<String> receiveSidList = Arrays.asList(ufVo.getNextNodeUserSids().split(","));
String procId = scmVehicleGression.getProcInstId();
ResultBean<List<LatestTaskVo>> resultBean = flowTaskFeign.getLatestTasks(procId);
String nextNodeUserSids = resultBean.getData().get(0).getASSIGNEE_();
List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
//根据用户的sid查询用户的id
ResultBean<String> stringList1 = sysUserFeign.selectIdBySid(receiveSidList);
List<String> reveiveIdList = Arrays.asList(stringList1.getData().split(","));

2
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.xml

@ -58,6 +58,8 @@
location AS warehouse,
inventoryName AS `name`,
InventoryStateKey AS state,
address,
addressCode,
remarks
FROM scm_vehicle_inventory
where sid = #{recordSid}

2
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionMapper.java

@ -76,7 +76,7 @@ public interface ScmVehicleStayPatrolinspectionMapper extends BaseMapper<ScmVehi
* @param name
* @return
*/
IPage<AppScmVehicleStayPatrolinspectionPageVo> getInventoryList(IPage<AppScmVehicleStayPatrolinspectionPageQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppScmVehicleStayPatrolinspectionPageVo> qw, @Param("name") String name);
IPage<AppScmVehicleStayPatrolinspectionPageVo> getInventoryList(IPage<AppScmVehicleStayPatrolinspectionPageQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppScmVehicleStayPatrolinspectionPageVo> qw, @Param("names") String names);
void updateByStaySid(@Param("patrolInspectionSid") String patrolInspectionSid, @Param("newTime") String newTime, @Param("userName") String userName);

4
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionMapper.xml

@ -51,8 +51,8 @@
scm_vehicle_stay_patrolinspection svsp
<where>
${ew.sqlSegment}
<if test="name != '' and name != null ">
and concat(svsp.mainSid,svsp.patrolInspectionName) LIKE concat('%', #{name}, '%')
<if test="names != '' and names != null ">
and concat(svsp.mainSid) LIKE concat('%', #{names}, '%')
</if>
</where>
ORDER BY id DESC

6
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionService.java

@ -169,10 +169,10 @@ public class ScmVehicleStayPatrolinspectionService extends MybatisBaseService<Sc
pagerQuery.getParams().setUseOrgSid(useOrgSid);
QueryWrapper<AppScmVehicleStayPatrolinspectionPageVo> qw = appQueryWrapper(pagerQuery.getParams());
AppScmVehicleStayPatrolinspectionPageQuery params = pagerQuery.getParams();
IPage<AppScmVehicleStayPatrolinspectionPageVo> iPage = baseMapper.getInventoryList(page, qw, params.getName());
IPage<AppScmVehicleStayPatrolinspectionPageVo> iPage = baseMapper.getInventoryList(page, qw, params.getNames());
List<AppScmVehicleStayPatrolinspectionPageVo> records = iPage.getRecords();
for (AppScmVehicleStayPatrolinspectionPageVo record : records) {
List<ScmVehicleStayPatrolinspectionVo> scmVehicleStayPatrolinspectionVos = baseMapper.selPatrolinspection(record.getVin(), record.getId(),useOrgSid);
List<ScmVehicleStayPatrolinspectionVo> scmVehicleStayPatrolinspectionVos = baseMapper.selPatrolinspection(record.getVin(), record.getId(), useOrgSid);
if (scmVehicleStayPatrolinspectionVos.size() <= 0) {
record.setInspectionDate("无");
@ -220,7 +220,7 @@ public class ScmVehicleStayPatrolinspectionService extends MybatisBaseService<Sc
}
public void updateByState(String patrolInspectionSid, int i) {
baseMapper.updateByState(patrolInspectionSid,i);
baseMapper.updateByState(patrolInspectionSid, i);
}
public void updateState(String stayInspSid) {

10
anrui-scm/anrui-scm-ui/src/api/cheliang/dictcommons.js

@ -26,6 +26,16 @@ export function getListOrg(data) {
})
}
// 获取厂商
export function getNamesDownes(data) {
return request({
url: '/base/v1/basemanufacturer/namesDown',
method: 'get',
params: data,
data: qs.stringify(data),
})
}
// 根据登陆人sid查询分公司 (孟哲写的接口)
export function getPathSidByUserSid(data) {
return request({

47
anrui-scm/anrui-scm-ui/src/api/gongyingshang/gongyingshang.js

@ -0,0 +1,47 @@
import request from '@/utils/request'
import qs from 'qs'
export default {
// 查询分页列表
gysPagerList: function(params) {
return request({
url: '/base/v1/basemanufacturer/gysPagerList',
method: 'post',
data: params,
headers: { 'Content-Type': 'application/json' }
})
},
// 保存修改记录
save: function(params) {
return request({
url: '/base/v1/basemanufacturer/save',
method: 'post',
data: params,
headers: { 'Content-Type': 'application/json' }
})
},
// 保存修改记录
update: function(params, sid) {
return request({
url: '/base/v1/basemanufacturer/update/' + sid,
method: 'post',
data: params,
headers: { 'Content-Type': 'application/json' }
})
},
// 通过sid查询一条记录
fetchBySid: function(sid) {
return request({
url: '/base/v1/basemanufacturer/details/' + sid,
method: 'get'
})
},
// 通过sid删除一条或多条记录
delBySids: function(data) {
return request({
url: '/base/v1/basemanufacturer/deleteBySids?sids=' + data,
method: 'DELETE',
data: qs.stringify(data)
})
}
}

15
anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js

@ -613,6 +613,21 @@ const codemenu = [
meta: { title: '验车检查项目管理', noCache: true }
}]
},
// 车辆检查
{
path: '/gongyingshang',
component: Layout,
redirect: '/gongyingshang',
meta: {
title: '供应商管理'
},
children: [{
path: '/gongyingshang',
component: () => import('@/views/gongyingshang/gongyingshanggaunli.vue'),
name: 'gongyingshanggaunli',
meta: { title: '供应商管理', noCache: true }
}]
},
// 流程审批
// 入账管理编辑

433
anrui-scm/anrui-scm-ui/src/views/gongyingshang/gongyingshangAdd.vue

@ -0,0 +1,433 @@
<template>
<div class="app-container">
<div v-show="viewState == 1">
<div class="tab-header webtop">
<div>{{ viewTitle }}</div>
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveEdit()">保存
</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
</div>
<div class="listconadd">
<el-form ref="form_obj" :model="baseManufacturerDto" :rules="rules" class="formadd">
<div class="title">
<div>基本信息</div>
</div>
<el-row>
<el-col :span="4" class="tleftb">
<span><span class="icon">*</span>厂商名称</span>
</el-col>
<el-col :span="8">
<el-form-item prop="manufacturerName">
<el-input v-model="baseManufacturerDto.manufacturerName" maxlength="20" placeholder="" class="addinputw" clearable/>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span>简称</span>
</el-col>
<el-col :span="8">
<el-form-item>
<el-input v-model="baseManufacturerDto.manufacturerAs" maxlength="20" placeholder="" class="addinputw" clearable/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<span>编码</span>
</el-col>
<el-col :span="8">
<el-form-item>
<el-input v-model="baseManufacturerDto.manufacturerCode" maxlength="20" placeholder="" class="addinputw" clearable/>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span><span class="icon">*</span>分类</span>
</el-col>
<el-col :span="8">
<el-form-item prop="supplierTypeValue">
<el-select v-model="baseManufacturerDto.supplierTypeValue" class="addinputw" placeholder="" @change="changeSupplierType">
<el-option v-for="item in supplierType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue" :disabled="item.dictValue === '主机厂'"/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<span><span class="icon">*</span>通讯地址</span>
</el-col>
<el-col :span="20">
<el-form-item prop="manufacturerAddress">
<el-input v-model="baseManufacturerDto.manufacturerAddress" maxlength="80" placeholder="" class="addinputw addinputw01"
clearable/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<span><span class="icon">*</span>厂商办公电话</span>
</el-col>
<el-col :span="8">
<el-form-item prop="manufacturerTelePhone">
<el-input v-model="baseManufacturerDto.manufacturerTelePhone" maxlength="20" placeholder="例:010-88888888" class="addinputw"
clearable/>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span>传真</span>
</el-col>
<el-col :span="8">
<el-form-item>
<el-input v-model="baseManufacturerDto.manufacturerFax" maxlength="20" placeholder="例:010-88888888" class="addinputw" clearable/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<span><span class="icon">*</span>联系人姓名</span>
</el-col>
<el-col :span="8">
<el-form-item prop="contactName">
<el-input v-model="baseManufacturerDto.contactName" maxlength="5" placeholder="" class="addinputw" clearable/>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span><span class="icon">*</span>联系人手机号</span>
</el-col>
<el-col :span="8">
<el-form-item prop="contactMobile">
<el-input v-model="baseManufacturerDto.contactMobile" maxlength="11" placeholder="" class="addinputw" clearable/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<span>联系人办公电话</span>
</el-col>
<el-col :span="8">
<el-form-item>
<el-input v-model="baseManufacturerDto.contactTelePhone" maxlength="14" placeholder="例:010-88888888" class="addinputw" clearable/>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span>微信号</span>
</el-col>
<el-col :span="8">
<el-form-item prop="weChatID">
<el-input v-model="baseManufacturerDto.weChatID" maxlength="100" placeholder="" class="addinputw" clearable/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<span>邮编</span>
</el-col>
<el-col :span="8">
<el-form-item prop="">
<el-input v-model="baseManufacturerDto.zipCode" maxlength="20" placeholder="" class="addinputw" clearable/>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span>邮箱</span>
</el-col>
<el-col :span="8">
<el-form-item>
<el-input v-model="baseManufacturerDto.email" maxlength="20" placeholder="" class="addinputw" clearable/>
</el-form-item>
</el-col>
</el-row>
<div class="divStyle">
<div>开户行信息</div>
<div>
<el-button type="primary" size="mini" icon="el-icon-plus" class="btntopblueline" @click="addBank()">新增
</el-button>
</div>
</div>
<el-table :key="tableKey" :data="baseManufacturerBankDto" :index="index" border style="width: 100%">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column fixed label="操作" align="center" width="130px">
<template slot-scope="scope">
<el-button size="mini" type="danger" @click="handleDel(baseManufacturerBankDto[scope.$index])">删除</el-button>
<el-button size="mini" type="primary" @click="handleEdit(baseManufacturerBankDto[scope.$index],scope.$index)">编辑
</el-button>
</template>
</el-table-column>
<el-table-column prop="dueBankValue" width="140px" label="账户类型" align="center"/>
<el-table-column prop="depositBank" width="180px" label="开户银行" align="center"/>
<el-table-column prop="bankAccount" width="160px" label="银行账号" align="center"/>
<el-table-column prop="accountName" width="130px" label="账号名称" align="center"/>
<el-table-column prop="bankingOutlets" width="180px" label="银行网点" align="center"/>
<el-table-column prop="bankAddress" width="260px" label="开户行地址" align="center"/>
<el-table-column prop="paymentLines" width="160px" label="联行号" align="center"/>
<el-table-column prop="swiftCode" width="200px" label="swiftcode(银行代码)" align="center"/>
<el-table-column prop="currency" width="130px" label="币种" align="center"/>
<el-table-column prop="remarks" width="240px" label="描述" align="center"/>
</el-table>
</el-form>
</div>
</div>
<gongyingshangBank v-show="viewState == 2 || viewState == 3" ref="divBank" @doback="resetState" @handleBank="backData"/>
</div>
</template>
<script>
import req from '@/api/gongyingshang/gongyingshang'
import { typeValues } from '@/api/cheliang/dictcommons'
import gongyingshangBank from './relation/gongyingshangBank'
export default {
name: 'gongyingshangAdd',
components: {
gongyingshangBank
},
data() {
var checkSubmit = (rule, value, callback) => {
const Submit = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/
if (Submit.test(value)) {
return callback()
}
callback(new Error('请输入手机号'))
}
var checkChuanzhen = (rule, value, callback) => {
const BanGongDianHua = /\d{3}-\d{8}|\d{4}-\d{7}/
if (value) {
//
if (!BanGongDianHua.test(value)) {
callback(new Error('请输入正确的传真格式'))
}
callback()
} else {
callback()
}
}
var checkBanGongDianHua = (rule, value, callback) => {
const BanGongDianHua = /\d{3}-\d{8}|\d{4}-\d{7}/
if (BanGongDianHua.test(value)) {
return callback()
}
callback(new Error('请输入办公电话'))
}
return {
tableKey: 0,
index: 0,
viewState: 1,
viewTitle: '',
dialogStatus: '',
sid: '',
supplierType_list: [],
baseManufacturerDto: {
manufacturerName: '',
manufacturerAs: '',
manufacturerCode: '',
supplierType: '',
supplierTypeValue: '',
manufacturerAddress: '',
manufacturerTelePhone: '',
manufacturerFax: '',
contactName: '',
contactMobile: '',
contactTelePhone: '',
weChatID: '',
zipCode: '',
email: '',
createOrg: '',
useOrg: ''
},
baseManufacturerBankDto: [],
rules: {
manufacturerName: [{
required: true,
message: '请填写厂商名称',
trigger: 'blur'
}],
supplierTypeValue: [{
required: true,
message: '请选择分类',
trigger: 'change'
}],
manufacturerAddress: [{
required: true,
message: '请填写厂商通讯地址',
trigger: 'blur'
}],
manufacturerTelePhone: [{
required: true,
validator: checkBanGongDianHua,
trigger: 'blur'
}],
manufacturerFax: [{
required: true,
validator: checkChuanzhen,
trigger: 'blur'
}],
contactName: [{
required: true,
message: '请填写联系人名字',
trigger: 'blur'
}],
contactMobile: [{
required: true,
validator: checkSubmit,
trigger: 'blur'
}]
},
submitdisabled: false
}
},
methods: {
init() {
typeValues({ type: 'supplierType' }).then((res) => {
if (res.success) {
this.supplierType_list = res.data
}
})
},
changeSupplierType(value) {
let bb = null
this.supplierType_list.forEach((e) => {
if (e.dictValue === value) {
bb = {
key: e.dictKey,
value: e.dictValue
}
}
})
this.baseManufacturerDto.supplierType = bb.key
},
addBank() {
this.viewState = 2
this.$refs['divBank'].showAdd()
},
backData(info, index) {
this.viewState = 1
if (index === '') {
this.baseManufacturerBankDto.push({
country: info.country,
dueBankValue: info.dueBankValue,
dueBankKey: info.dueBankKey,
depositBank: info.depositBank,
bankAccount: info.bankAccount,
accountName: info.accountName,
bankingOutlets: info.bankingOutlets,
bankAddress: info.bankAddress,
paymentLines: info.paymentLines,
swiftCode: info.swiftCode,
currency: info.currency,
remarks: info.remarks
})
return
}
if (index >= 0) {
this.baseManufacturerBankDto[index] = {
country: info.country,
dueBankValue: info.dueBankValue,
dueBankKey: info.dueBankKey,
depositBank: info.depositBank,
bankAccount: info.bankAccount,
accountName: info.accountName,
bankingOutlets: info.bankingOutlets,
bankAddress: info.bankAddress,
paymentLines: info.paymentLines,
swiftCode: info.swiftCode,
currency: info.currency,
remarks: info.remarks
}
return
}
},
handleDel(index) {
this.baseManufacturerBankDto.splice(this.baseManufacturerBankDto.indexOf(index), 1)
},
handleEdit(row, index) {
this.viewState = 3
const bankInfo = row
this.$refs['divBank'].showEdit(bankInfo, index)
},
showAdd(createOrgSid) {
this.init()
this.dialogStatus = 'add'
this.viewTitle = '【新增】供应商'
this.baseManufacturerDto.createOrg = createOrgSid
this.baseManufacturerDto.useOrg = createOrgSid
},
showEdit(row) {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
this.dialogStatus = 'edit'
req.fetchBySid(row.sid).then(resp => {
this.sid = row.sid
this.baseManufacturerDto = resp.data.baseManufacturerDto
this.baseManufacturerBankDto = resp.data.baseManufacturerBankDto
}).catch(e => {
this.formobj = row
})
},
saveEdit() {
this.$refs['form_obj'].validate(valid => {
if (valid) {
this.submitdisabled = true
const formobj = {
baseManufacturerBankDto: this.baseManufacturerBankDto,
baseManufacturerDto: this.baseManufacturerDto
}
if (this.dialogStatus === 'add') {
req.save(formobj).then(resp => {
this.submitdisabled = false
if (resp.success) {
this.$message({ showClose: true, type: 'success', message: resp.msg })
this.handleReturn('true')
}
}).catch(() => {
this.submitdisabled = false
})
} else if (this.dialogStatus === 'edit') {
req.update(formobj, this.sid).then(resp => {
this.submitdisabled = false
if (resp.success) {
this.$message({ showClose: true, type: 'success', message: resp.msg })
this.handleReturn('true')
}
}).catch(() => {
this.submitdisabled = false
})
}
} else {
return false
}
})
},
handleLook(sid) {
this.viewState = 2
this.$refs['divPaiChan'].showInfo(sid)
},
resetState() {
this.viewState = 1
},
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.dialogStatus = ''
this.sid = ''
this.baseManufacturerDto = {}
this.baseManufacturerBankDto = []
this.$refs['form_obj'].resetFields()
this.$emit('doback')
}
}
}
</script>
<style scoped>
.divStyle {
padding: 7px;
font-weight: bold;
font-size: 16px;
background-color: #0294d7;
text-align: left;
color: #ffffff;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
</style>

210
anrui-scm/anrui-scm-ui/src/views/gongyingshang/gongyingshangInfo.vue

@ -0,0 +1,210 @@
<template>
<div class="app-container">
<div>
<div class="tab-header webtop">
<div>{{ viewTitle }}</div>
<div>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
</div>
<div class="listconadd">
<el-form ref="form_obj" :model="baseManufacturerDto" :rules="rules" class="formadd">
<div class="title">
<div>基本信息</div>
</div>
<el-row>
<el-col :span="4" class="tleftb">
<span><span class="icon">*</span>厂商名称</span>
</el-col>
<el-col :span="8">
<el-form-item>
<span>{{ baseManufacturerDto.manufacturerName }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span>简称</span>
</el-col>
<el-col :span="8">
<el-form-item>
<span>{{ baseManufacturerDto.manufacturerAs }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<span>编码</span>
</el-col>
<el-col :span="8">
<el-form-item>
<span>{{ baseManufacturerDto.manufacturerCode }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span><span class="icon">*</span>分类</span>
</el-col>
<el-col :span="8">
<el-form-item>
<span>{{ baseManufacturerDto.supplierTypeValue }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<span><span class="icon">*</span>通讯地址</span>
</el-col>
<el-col :span="20">
<el-form-item>
<span>{{ baseManufacturerDto.manufacturerAddress }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<span><span class="icon">*</span>厂商办公电话</span>
</el-col>
<el-col :span="8">
<el-form-item>
<span>{{ baseManufacturerDto.manufacturerTelePhone }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span>传真</span>
</el-col>
<el-col :span="8">
<el-form-item>
<span>{{ baseManufacturerDto.manufacturerFax }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<span><span class="icon">*</span>联系人姓名</span>
</el-col>
<el-col :span="8">
<el-form-item>
<span>{{ baseManufacturerDto.contactName }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span><span class="icon">*</span>联系人手机号</span>
</el-col>
<el-col :span="8">
<el-form-item>
<span>{{ baseManufacturerDto.contactMobile }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<span>联系人办公电话</span>
</el-col>
<el-col :span="8">
<el-form-item>
<span>{{ baseManufacturerDto.contactTelePhone }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span>微信号</span>
</el-col>
<el-col :span="8">
<el-form-item>
<span>{{ baseManufacturerDto.weChatID }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<span>邮编</span>
</el-col>
<el-col :span="8">
<el-form-item>
<span>{{ baseManufacturerDto.zipCode }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span>邮箱</span>
</el-col>
<el-col :span="8">
<el-form-item>
<span>{{ baseManufacturerDto.email }}</span>
</el-form-item>
</el-col>
</el-row>
<div class="title">
<div>开户行信息</div>
</div>
<el-table :key="tableKey" :data="baseManufacturerBankDto" :index="index" border style="width: 100%">
<el-table-column fixed width="60px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="dueBankValue" width="140px" label="账户类型" align="center"/>
<el-table-column prop="depositBank" width="180px" label="开户银行" align="center"/>
<el-table-column prop="bankAccount" width="160px" label="银行账号" align="center"/>
<el-table-column prop="accountName" width="130px" label="账号名称" align="center"/>
<el-table-column prop="bankingOutlets" width="180px" label="银行网点" align="center"/>
<el-table-column prop="bankAddress" width="260px" label="开户行地址" align="center"/>
<el-table-column prop="paymentLines" width="160px" label="联行号" align="center"/>
<el-table-column prop="swiftCode" width="200px" label="swiftcode(银行代码)" align="center"/>
<el-table-column prop="currency" width="130px" label="币种" align="center"/>
<el-table-column prop="remarks" width="240px" label="描述" align="center"/>
</el-table>
</el-form>
</div>
</div>
</div>
</template>
<script>
import req from '@/api/gongyingshang/gongyingshang'
export default {
name: 'gongyingshangInfo',
data() {
return {
tableKey: 0,
index: 0,
viewTitle: '',
supplierType_list: [],
baseManufacturerDto: {
manufacturerName: '',
manufacturerAs: '',
manufacturerCode: '',
supplierType: '',
supplierTypeValue: '',
manufacturerAddress: '',
manufacturerTelePhone: '',
manufacturerFax: '',
contactName: '',
contactMobile: '',
contactTelePhone: '',
weChatID: '',
zipCode: '',
email: '',
createOrg: '',
useOrg: ''
},
baseManufacturerBankDto: [],
rules: {},
submitdisabled: false
}
},
methods: {
showInfo(row) {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
this.viewTitle = '供应商详情'
req.fetchBySid(row.sid).then(resp => {
this.baseManufacturerDto = resp.data.baseManufacturerDto
this.baseManufacturerBankDto = resp.data.baseManufacturerBankDto
}).catch(e => {
this.formobj = row
})
},
handleReturn() {
this.$emit('doback')
}
}
}
</script>
<style scoped>
</style>

341
anrui-scm/anrui-scm-ui/src/views/gongyingshang/gongyingshanggaunli.vue

@ -0,0 +1,341 @@
<template>
<div class="app-container">
<div v-show="viewState == 1">
<button-bar view-title="供应商管理" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
<div class="main-content">
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
<div v-show="isSearchShow" class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="110px" class="tab-header">
<el-form-item label="厂商名称">
<el-input v-model="listQuery.params.manufacturerName" clearable placeholder="" class="addinputw"></el-input>
</el-form-item>
<el-form-item label="厂商分类">
<el-select v-model="listQuery.params.supplierType" filterable clearable placeholder="请选择厂商分类">
<el-option v-for="item in supplierType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey" :disabled="item.dictValue === '主机厂'"/>
</el-select>
</el-form-item>
<el-form-item label="厂商办公电话">
<el-input v-model="listQuery.params.manufacturerTelePhone" maxlength="130" placeholder="" class="addinputw" clearable/>
</el-form-item>
<el-form-item label="联系人">
<el-input v-model="listQuery.params.contactName" maxlength="125" placeholder="" class="addinputw" clearable/>
</el-form-item>
</el-form>
<div class="btn">
<el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">查询</el-button>
<el-button type="primary" icon="el-icon-refresh" size="small" @click="handleReset">重置</el-button>
</div>
</div>
</div>
<div class="listtop">
<div class="tit">供应商信息列表</div>
<!-- 翻页分页 -->
<pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
</div>
<div>
<el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
<el-table-column type="selection" align="center" width="50"/>
<el-table-column label="序号" fixed type="index" width="80" :index="indexMethod" align="center"/>
<el-table-column label="操作" fixed align="center" width="90px" class-name="small-padding fixed-width">
<template slot-scope="{row}">
<el-button size="mini" type="primary" @click="handleEdit(row)">编辑</el-button>
</template>
</el-table-column>
<el-table-column prop="jc" label="厂商名称" width="220" header-align="center" align="left">
<template slot-scope="scope">
<span class="bluezi" @click="handleCheck(scope.row)">{{ scope.row.manufacturerName }}</span>
</template>
</el-table-column>
<el-table-column label="厂商分类" width="110" align="center">
<template slot-scope="scope">
<span>{{ scope.row.supplierTypeValue }}</span>
</template>
</el-table-column>
<el-table-column label="厂商通讯地址" width="" header-align="center" align="left">
<template slot-scope="scope">
<span>{{ scope.row.manufacturerAddress }}</span>
</template>
</el-table-column>
<el-table-column label="厂商办公电话" width="180" align="center">
<template slot-scope="scope">
<span>{{ scope.row.manufacturerTelePhone }}</span>
</template>
</el-table-column>
<el-table-column label="联系人姓名" width="120" align="center">
<template slot-scope="scope">
<span>{{ scope.row.contactName }}</span>
</template>
</el-table-column>
<el-table-column label="联系人手机号码" width="140" align="center">
<template slot-scope="scope">
<span>{{ scope.row.contactMobile }}</span>
</template>
</el-table-column>
</el-table>
</div>
<div class="pages">
<!-- 翻页 -->
<pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
</div>
</div>
</div>
<gongyingshangAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="handleFilter"/>
<gongyingshangInfo v-show="viewState == 4" ref="divinfo" @doback="resetState"/>
</div>
</template>
<script>
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import ButtonBar from '@/components/ButtonBar'
import { typeValues, getPathSidByUserSid } from '@/api/cheliang/dictcommons'
import gongyingshangAdd from './gongyingshangAdd'
import gongyingshangInfo from './gongyingshangInfo'
import req from '@/api/gongyingshang/gongyingshang'
export default {
name: 'gongyingshangguanli',
components: {
Pagination,
pageye,
ButtonBar,
gongyingshangAdd,
gongyingshangInfo
},
data() {
return {
btndisabled: false,
btnList: [
{
type: 'primary',
size: 'small',
icon: 'plus',
btnKey: 'toAdd',
btnLabel: '新增'
},
{
type: 'danger',
size: 'small',
icon: 'del',
btnKey: 'doDel',
btnLabel: '删除'
},
{
type: 'success',
size: 'small',
icon: 'export',
btnKey: 'build',
btnLabel: '导出'
},
{
type: 'info',
size: 'small',
icon: 'cross',
btnKey: 'doClose',
btnLabel: '关闭'
}
],
viewState: 1,
isSearchShow: false,
searchxianshitit: '显示查询条件',
sids: [],
// -----------
tableKey: 0,
list: [],
listLoading: false,
listQuery: {
params: {
manufacturerName: '',
supplierType: '',
useOrgSid: '',
createOrgSid: '',
manufacturerTelePhone: '',
contactName: ''
},
current: 1,
size: 5,
total: 0
},
supplierType_list: [],
rules: {}
}
},
mounted() {
this.$refs['btnbar'].setButtonList(this.btnList)
},
created() {
//
this.init()
},
methods: {
resetState() {
this.viewState = 1
},
btnHandle(btnKey) {
console.log('XXXXXXXXXXXXXXX ' + btnKey)
switch (btnKey) {
case 'toAdd':
this.toAdd()
break
case 'doDel':
this.doDel()
break
case 'doExport':
this.doExport()
break
case 'doClose':
this.doClose()
break
default:
break
}
},
//
clicksearchShow() {
this.isSearchShow = !this.isSearchShow
if (this.isSearchShow) {
this.searchxianshitit = '隐藏查询条件'
} else {
this.searchxianshitit = '显示查询条件'
}
},
init() {
getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
if (res.success) {
this.listQuery.params.createOrgSid = res.data
this.getType()
this.getList()
}
})
},
getType() {
typeValues({
type: 'supplierType'
}).then((res) => {
if (res.code === '200') {
this.supplierType_list = res.data
console.log('厂商分类', this.supplierType_list)
}
})
},
//
indexMethod(index) {
var pagestart = (this.listQuery.current - 1) * this.listQuery.size
var pageindex = index + 1 + pagestart
return pageindex
},
//
getList() {
this.listLoading = true
req.gysPagerList(this.listQuery).then((response) => {
this.listLoading = false
if (response.code === '200' && response.data && response.data.total > 0) {
this.list = response.data.records
this.listQuery.total = response.data.total
} else {
this.list = []
this.listQuery.total = 0
}
})
},
//
handleFilter() {
this.listQuery.current = 1
this.getList()
},
handleReset() {
this.listQuery = {
params: {
manufacturerName: '',
supplierType: '',
useOrgSid: '',
createOrgSid: '',
manufacturerTelePhone: '',
contactName: ''
},
current: 1,
size: 5
}
this.init()
},
//
toAdd() {
this.viewState = 2
this.$refs['divadd'].showAdd(this.listQuery.params.createOrgSid)
},
handleSelectionChange(row) {
const aa = []
row.forEach((element) => {
aa.push(element.sid)
})
this.sids = aa
},
// ID
doDel() {
if (this.sids.length > 0) {
const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
this.$confirm(tip, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
const loading = this.$loading({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
req.delBySids(this.sids.toString()).then(resp => {
if (resp.success) {
loading.close()
this.$message({ type: 'success', message: resp.msg, showClose: true })
this.getList()
} else {
loading.close()
}
}).catch(e => {
loading.close()
})
}).catch(() => {
})
} else {
this.$message({ type: 'error', message: '没有选择厂商!!', showClose: true })
return
}
},
handleEdit(row) {
this.viewState = 3
this.$refs['divadd'].showEdit(row)
},
//
handleCheck(row) {
this.viewState = 4
this.$refs['divinfo'].showInfo(row)
},
//
// doExport() {
// basefinbankExportExcel(this.sids).then((res) => {
// const blob = new Blob([res], {
// type: 'application/vnd.ms-excel'
// })
// const objectUrl = URL.createObjectURL(blob)
// window.location.href = objectUrl
// this.$notify({
// title: '',
// message: '',
// type: 'success',
// duration: 2000
// })
// })
// },
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
}
}
}
</script>
<style scoped>
</style>

231
anrui-scm/anrui-scm-ui/src/views/gongyingshang/relation/gongyingshangBank.vue

@ -0,0 +1,231 @@
<template>
<div class="app-container">
<div class="tab-header webtop">
<div>
<div>{{ viewTitle }}</div>
</div>
<div>
<el-button type="primary" size="small" @click="handleCreate()">保存</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
</div>
<div class="listconadd">
<el-form ref="dataForm" :model="bankInfo" class="formadd" :rules="rules">
<el-row style="border-top: 1px solid #e0e3eb ">
<el-col :span="4" class="tleftb">
<span>国家</span>
</el-col>
<el-col :span="8">
<el-form-item>
<el-input v-model="bankInfo.country" maxlength="125" placeholder="" class="addinputw" clearable/>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span>账户类型</span>
</el-col>
<el-col :span="8">
<el-form-item prop="dueBank"> <!--dueBankKey dueBankValue-->
<el-select v-model="bankInfo.dueBankValue" class="addinputw" placeholder="" @change="receiptBankChange">
<el-option v-for="item in receiptBank_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<span>开户银行</span>
</el-col>
<el-col :span="8">
<el-form-item prop="depositBank">
<el-input v-model="bankInfo.depositBank" maxlength="125" placeholder="" class="addinputw" clearable/>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span>银行账号</span>
</el-col>
<el-col :span="8">
<el-form-item prop="bankAccount">
<!--@keyup.native="bankInfo.bankAccount = oninput(bankInfo.bankAccount,2)"-->
<el-input v-model="bankInfo.bankAccount" maxlength="125" placeholder="" class="addinputw" clearable
onkeyup="value=value.replace(/[^\d]/g,'')"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<span>账户名称</span>
</el-col>
<el-col :span="8">
<el-form-item prop="accountName">
<el-input v-model="bankInfo.accountName" maxlength="125" placeholder="" class="addinputw" clearable/>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span>银行网点</span>
</el-col>
<el-col :span="8">
<el-form-item prop="bankingOutlets">
<el-input v-model="bankInfo.bankingOutlets" maxlength="125" placeholder="" class="addinputw" clearable/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<span>开户行地址</span>
</el-col>
<el-col :span="8">
<el-form-item prop="bankAddress">
<el-input v-model="bankInfo.bankAddress" maxlength="125" placeholder="" class="addinputw" clearable/>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span>联行号</span>
</el-col>
<el-col :span="8">
<el-form-item prop="paymentLines">
<el-input v-model="bankInfo.paymentLines" maxlength="125" placeholder="" class="addinputw" clearable
onkeyup="value=value.replace(/[^\d]/g,'')"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<span>Swiftcode(银行代码)</span>
</el-col>
<el-col :span="8">
<el-form-item prop="swiftCode">
<el-input v-model="bankInfo.swiftCode" maxlength="125" placeholder="" class="addinputw" clearable/>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span>币种</span>
</el-col>
<el-col :span="8">
<el-form-item prop="currency">
<el-input v-model="bankInfo.currency" maxlength="125" placeholder="" class="addinputw" clearable/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<span>描述</span>
</el-col>
<el-col :span="20">
<el-form-item>
<el-input v-model="bankInfo.remarks" maxlength="125" placeholder="" class="addinputw" clearable/>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
</div>
</template>
<script>
import { typeValues } from '@/api/cheliang/dictcommons'
export default {
name: 'gongyingshangBank',
data() {
return {
bankInfo_index: '',
viewTitle: '',
dialogStatus: '',
receiptBank_list: [],
bankInfo: {
country: '中国',
dueBankValue: '',
depositBank: '',
bankAccount: '',
accountName: '',
bankingOutlets: '',
bankAddress: '',
paymentLines: '',
swiftCode: '',
currency: '人民币',
remarks: ''
},
rules: {}
}
},
methods: {
getType() {
typeValues({ type: 'dueBank' }).then((res) => {
if (res.success) {
this.receiptBank_list = res.data
}
})
},
receiptBankChange(val) {
if (val) {
const choosetItem = this.receiptBank_list.filter((item) => item.dictValue === val)
this.bankInfo.dueBankKey = choosetItem[0].dictKey
}
},
showAdd() {
this.bankInfo = {
country: '中国',
dueBankValue: '',
depositBank: '',
bankAccount: '',
accountName: '',
bankingOutlets: '',
bankAddress: '',
paymentLines: '',
swiftCode: '',
currency: '人民币',
remarks: ''
}
this.bankInfo_index = ''
this.dialogStatus = 'add'
this.viewTitle = '【新增】开户行信息'
this.getType()
},
showEdit(bankInfo, index) {
this.dialogStatus = 'edit'
this.viewTitle = '【编辑】开户行信息'
this.bankInfo = bankInfo
this.bankInfo_index = index
this.getType()
},
handleCreate() {
if (this.dialogStatus === 'add') {
if (JSON.stringify(this.bankInfo) !== '{}') {
this.$emit('handleBank', this.bankInfo, this.bankInfo_index)
} else {
this.$message({
showClose: true,
message: '请填写开户行信息!',
type: 'error'
})
}
}
if (this.dialogStatus === 'edit') {
this.$emit('handleBank', this.bankInfo, this.bankInfo_index)
}
},
handleReturn() {
this.dialogStatus = ''
this.bankInfo = {
country: '中国',
dueBankValue: '',
depositBank: '',
bankAccount: '',
accountName: '',
bankingOutlets: '',
bankAddress: '',
paymentLines: '',
swiftCode: '',
currency: '人民币',
remarks: ''
}
this.bankInfo_index = ''
this.$emit('doback')
}
}
}
</script>
<style scoped>
</style>

9
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderDepositInfoVo.java

@ -1,9 +1,12 @@
package com.yxt.anrui.terminal.api.autoservice.saleOrders.order;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @Author dimengzhe
* @Date 2022/6/9 16:05
@ -21,4 +24,10 @@ public class OrderDepositInfoVo implements Vo {
@ApiModelProperty(value = "订金结转方式")
private String type;
@ApiModelProperty("需补交订金")
@JsonProperty("compensatePay")
private String makeUpDeposit;
@ApiModelProperty("所有订金结转上传的委托书")
private List<String> images;
}

19
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderDetailsVo.java

@ -1,5 +1,6 @@
package com.yxt.anrui.terminal.api.autoservice.saleOrders.order;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -14,8 +15,8 @@ import java.util.List;
@Data
public class OrderDetailsVo implements Vo {
private static final long serialVersionUID = 3824138856793171263L;
@ApiModelProperty(value = "合同编号")
private String contractId;
// @ApiModelProperty(value = "合同编号")
// private String contractId;
@ApiModelProperty(value = "制单日期")
private String orderDate;
@ApiModelProperty(value = "客户sid")
@ -28,8 +29,8 @@ public class OrderDetailsVo implements Vo {
private String phone;
@ApiModelProperty(value = "客户类型")
private String customerKey;
@ApiModelProperty(value = "订单类型")
private String orderType;
// @ApiModelProperty(value = "订单类型")
// private String orderType;
@ApiModelProperty(value = "挂靠公司")
private String affiliated;
@ApiModelProperty(value = "开票类型")
@ -70,4 +71,14 @@ public class OrderDetailsVo implements Vo {
@ApiModelProperty("任务id")
private String taskId;
@ApiModelProperty("订单编号")
@JsonProperty("orderId")
private String billNo;
@ApiModelProperty("资金类型")
@JsonProperty("fundsSource")
private String financePlanValue;
@ApiModelProperty("付款类型")
@JsonProperty("payType")
private String payTypeKey;
}

8
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderPriceInfoVo.java

@ -1,5 +1,6 @@
package com.yxt.anrui.terminal.api.autoservice.saleOrders.order;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -23,4 +24,11 @@ public class OrderPriceInfoVo implements Vo {
private String date;
@ApiModelProperty(value = "预计提车地点")
private String address;
@ApiModelProperty("单台整体指导价")
@JsonProperty("guidancePrice")
private String singleGuildPrice;
@ApiModelProperty("单台整体成交价")
@JsonProperty("overallPrice")
private String singleFinalPrice;
}

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/StayPatrolinspectionPageQuery.java

@ -11,7 +11,7 @@ public class StayPatrolinspectionPageQuery implements Query {
private String userSid;
@ApiModelProperty("优先匹配车架号 存放地点 巡检人员")
private String name;
private String names;
@ApiModelProperty("存放地点 “”/null 全部 有值时只查询当前存放地点的记录")
private String warehouseSid;

4
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehicleApply/VehicleApplyVo.java

@ -27,8 +27,8 @@ public class VehicleApplyVo implements Vo {
@JsonProperty("applyName")
private String createByName;
@ApiModelProperty(value = "排产类型")
@JsonProperty("scheduleType")
@ApiModelProperty(value = "采购原因")
@JsonProperty("reason")
private String schedulingType;
@ApiModelProperty(value = "订金合计")

Loading…
Cancel
Save