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

问题修改

master
God 2 years ago
parent
a45ba4162c
commit
866421c32f
9 changed files with 114 additions and 34 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java
  2. 2
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderreturnvehapply/BusSalesOrderReturnVehApply.java
  3. 2
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyDetailsVo.java
  4. 2
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyDto.java
  5. 8
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyMapper.java
  6. 7
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyMapper.xml
  7. 116
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java
  8. 8
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryService.java
  9. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrderRetVeh/flowable/OrderRetVehSubmitDto.java

1
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java
View File

@ -25,6 +25,7 @@ public enum BillTypeEnum {
SKD("SKD","款项确认"),
GCRK("GCRK","挂车入库"),
SZRK("SZRK","上装入库"),
XSDDTCSQ("XSDDTCSQ","销售订单退车申请"),
;
private String billType;

2
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderreturnvehapply/BusSalesOrderReturnVehApply.java
View File

@ -98,4 +98,6 @@ public class BusSalesOrderReturnVehApply extends BaseEntity {
private String orgSidPath; // 组织机构全路径sid
@ApiModelProperty("申请编号")
private String applyNo; // 申请编号
@ApiModelProperty("销售订单sid")
private String orderSid; // 销售订单sid
}

2
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyDetailsVo.java
View File

@ -114,6 +114,8 @@ public class BusSalesOrderReturnVehApplyDetailsVo implements Vo {
private String fundsSource; //资金来源
@ApiModelProperty("制单日期")
private String creatTime; //制单日期
@ApiModelProperty("销售订单sid")
private String orderSid; // 销售订单sid
@ApiModelProperty("退库车辆列表")
private List<BusSalesOrderReturnVehDetailsVo> busSalesOrderReturnVehs = new ArrayList<>();
}

2
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyDto.java
View File

@ -109,6 +109,8 @@ public class BusSalesOrderReturnVehApplyDto implements Dto {
private String orgSidPath; // 组织机构全路径sid
@ApiModelProperty("申请编号")
private String applyNo; // 申请编号
@ApiModelProperty("销售订单sid")
private String orderSid; // 销售订单sid
@ApiModelProperty("退车车辆列表")
private List<BusSalesOrderReturnVehDto> busSalesOrderReturnVehs;
}

8
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyMapper.java
View File

@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderReturnVehApplyDetailsVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@ -66,8 +67,13 @@ public interface BusSalesOrderReturnVehApplyMapper extends BaseMapper<BusSalesOr
int selectBySid(String join);
@Select("select count(*) from bus_sales_order_return_veh_apply where contractNo = #{contractNo}")
@Select("select count(*) from bus_sales_order_return_veh_apply where contractNo = #{contractNo} and nodeState != '终止'")
int selectByContractNo(String contractNo);
int updateFlowFiled(Map<String, Object> map);
int selectNum(String bill);
@Select("SELECT * FROM bus_sales_order_return_veh_apply WHERE contractNo = #{contractId} and nodeState != '终止'")
BusSalesOrderReturnVehApply fetchByContractNo(String contractId);
}

7
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyMapper.xml
View File

@ -46,4 +46,11 @@
</if>
WHERE sid = #{sid}
</update>
<select id="selectNum" resultType="int">
SELECT IFNULL(CAST(REPLACE(MAX(applyNo), #{bill}, '')AS SIGNED),0) CODE
from bus_sales_order_return_veh_apply
where applyNo LIKE concat(#{bill}, '%')
</select>
</mapper>

116
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java
View File

@ -36,6 +36,9 @@ import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo;
import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateFeign;
import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo;
import com.yxt.anrui.base.common.enums.BillTypeEnum;
import com.yxt.anrui.base.common.utils.Rule;
import com.yxt.anrui.base.common.utils.domain.BillNo;
import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.flow.BusSalesOrderReturnVehApplyTaskQuery;
import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo;
import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderModelInfoVo;
@ -62,6 +65,8 @@ import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo;
import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
@ -138,6 +143,8 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
private MessageFeign messageFeign;
@Resource
private FileUploadComponent fileUploadComponent;
@Resource
private SysOrganizationFeign sysOrganizationFeign;
public PagerVo<BusSalesOrderReturnVehApplyVo> listPageVo(PagerQuery<BusSalesOrderReturnVehApplyQuery> pq) {
BusSalesOrderReturnVehApplyQuery query = pq.getParams();
@ -173,6 +180,7 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
if (i > 0) {
return rb.setMsg("已存在当前订单的退车申请");
}
dto.setStopNum(String.valueOf(busSalesOrderReturnVehs.size()));
String mainSid = this.insertByDto(dto);
for (BusSalesOrderReturnVehDto busSalesOrderReturnVeh : busSalesOrderReturnVehs) {
busSalesOrderReturnVeh.setMainSid(mainSid);
@ -199,6 +207,16 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
BusSalesOrderReturnVehApply entity = new BusSalesOrderReturnVehApply();
BeanUtil.copyProperties(dto, entity, "id", "sid");
entity.setNodeState("待提交");
String applyNo = "";
if (StringUtils.isNotBlank(dto.getUseOrgSid())){
applyNo = getXSDDTCSQApplyCode(dto.getUseOrgSid());
}else {
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.getUseOrgByUserSid(dto.getCreateBySid()).getData();
applyNo = getXSDDTCSQApplyCode(sysOrganizationVo.getSid());
entity.setUseOrgSid(sysOrganizationVo.getSid());
entity.setUseOrgName(sysOrganizationVo.getName());
}
entity.setApplyNo(applyNo);
baseMapper.insert(entity);
return entity.getSid();
}
@ -216,8 +234,21 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
public ResultBean<BusSalesOrderReturnVehApplyDetailsVo> fetchDetailsVoBySid(String sid) {
ResultBean rb = ResultBean.fireFail();
BusSalesOrderReturnVehApply entity = fetchBySid(sid);
AppOrderDetailsVo appOrderDetailsVo = busSalesOrderService.getSaleOrderDetails(entity.getOrderSid()).getData();
AppOrderModelInfoVo modelInfo = appOrderDetailsVo.getModelInfo();
BusSalesOrderReturnVehApplyDetailsVo vo = new BusSalesOrderReturnVehApplyDetailsVo();
BeanUtil.copyProperties(entity, vo);
//制单日期
vo.setCreatTime(DateUtil.formatDate(entity.getCreateTime()));
//资金来源
vo.setFundsSource(appOrderDetailsVo.getFinancePlanValue());
//客户头像
vo.setCustomerPhoto(fileUploadComponent.getUrlPrefix() + appOrderDetailsVo.getCustomerImage());
//客户电话
vo.setCustomerPhone(appOrderDetailsVo.getPhone());
vo.setBrandName(modelInfo.getBrand());
vo.setModelImage(fileUploadComponent.getUrlPrefix() + modelInfo.getModelImage());
vo.setConfigSid(modelInfo.getConfigSid());
List<BusSalesOrderReturnVehDetailsVo> busSalesOrderReturnVehDetailsVos = busSalesOrderReturnVehService.fetchByMainSid(sid);
vo.setBusSalesOrderReturnVehs(busSalesOrderReturnVehDetailsVos);
return rb.success().setData(vo);
@ -226,7 +257,48 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
public ResultBean<BusSalesOrderReturnVehApplyDetailsVo> fetchDetailsByOrderSid(String orderSid) {
ResultBean rb = ResultBean.fireFail();
BusSalesOrderReturnVehApplyDetailsVo busSalesOrderReturnVehApplyDetailsVo = new BusSalesOrderReturnVehApplyDetailsVo();
List<BusSalesOrderReturnVehDetailsVo> busSalesOrderReturnVehDetailsVoArrayList = new ArrayList<BusSalesOrderReturnVehDetailsVo>();
AppOrderDetailsVo appOrderDetailsVo = busSalesOrderService.getSaleOrderDetails(orderSid).getData();
if (appOrderDetailsVo == null){
BusSalesOrderReturnVehApply busSalesOrderReturnVehApply = fetchBySid(orderSid);
appOrderDetailsVo = busSalesOrderService.getSaleOrderDetails(busSalesOrderReturnVehApply.getOrderSid()).getData();
}
AppOrderModelInfoVo modelInfo = appOrderDetailsVo.getModelInfo();
List<VinListsVo> vinListsVos = modelInfo.getVinListsVos();
BaseModelConfigSelectVo baseModelConfigSelectVo = baseModelConfigFeign.details(modelInfo.getConfigSid()).getData();
for (VinListsVo vinListsVo : vinListsVos) {
BusSalesOrderReturnVehDetailsVo busSalesOrderReturnVehDetailsVo = new BusSalesOrderReturnVehDetailsVo();
String vinSid = vinListsVo.getVinSid();
BaseVehicleSelectVo baseVehicleSelectVo = baseVehicleFeign.details(vinSid).getData();
BaseVehicleCertificateVo baseVehicleCertificateVo = baseVehicleCertificateFeign.selStateByVehicleSid(vinListsVo.getVinSid()).getData();
busSalesOrderReturnVehDetailsVo.setVehSid(vinSid);
busSalesOrderReturnVehDetailsVo.setVinNo(vinListsVo.getVinNo());
busSalesOrderReturnVehDetailsVo.setCarColorKey(baseModelConfigSelectVo.getCarColorKey());
busSalesOrderReturnVehDetailsVo.setCarColorValue(baseModelConfigSelectVo.getCarColor());
if (baseVehicleCertificateVo != null){
busSalesOrderReturnVehDetailsVo.setCertificateStateKey(baseVehicleCertificateVo.getCertificateState());
busSalesOrderReturnVehDetailsVo.setCertificateStateValue(baseVehicleCertificateVo.getCertificateStateValue());
}else {
busSalesOrderReturnVehDetailsVo.setCertificateStateKey("-");
busSalesOrderReturnVehDetailsVo.setCertificateStateValue("-");
}
busSalesOrderReturnVehDetailsVo.setInvoicingStateKey("");
busSalesOrderReturnVehDetailsVo.setInvoicingStateValue("");
busSalesOrderReturnVehDetailsVo.setInsureStateKey("");
busSalesOrderReturnVehDetailsVo.setInsureStateValue("");
busSalesOrderReturnVehDetailsVo.setStockStateKey(baseVehicleSelectVo.getVehicleState());
busSalesOrderReturnVehDetailsVo.setStockStateValue(baseVehicleSelectVo.getVehicleStateValue());
busSalesOrderReturnVehDetailsVoArrayList.add(busSalesOrderReturnVehDetailsVo);
}
BusSalesOrderReturnVehApply busSalesOrderReturnVehApply = baseMapper.fetchByContractNo(appOrderDetailsVo.getContractId());
if (busSalesOrderReturnVehApply != null){
if (!busSalesOrderReturnVehApply.getNodeState().equals("终止")){
BusSalesOrderReturnVehApplyDetailsVo data = fetchDetailsVoBySid(busSalesOrderReturnVehApply.getSid()).getData();
data.setBusSalesOrderReturnVehs(busSalesOrderReturnVehDetailsVoArrayList);
return rb.success().setData(data);
};
}
busSalesOrderReturnVehApplyDetailsVo.setOrderSid(orderSid);
//制单日期
busSalesOrderReturnVehApplyDetailsVo.setCreatTime(DateUtil.formatDate(new Date()));
//资金来源
@ -242,7 +314,6 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
busSalesOrderReturnVehApplyDetailsVo.setCustomerNo(crmCustomerTempVo.getCustomerNo());
busSalesOrderReturnVehApplyDetailsVo.setSaleTypeKey(appOrderDetailsVo.getPayTypeKey());
busSalesOrderReturnVehApplyDetailsVo.setSaleTypeValue(appOrderDetailsVo.getPayType());
AppOrderModelInfoVo modelInfo = appOrderDetailsVo.getModelInfo();
busSalesOrderReturnVehApplyDetailsVo.setModelSid(modelInfo.getModelSid());
busSalesOrderReturnVehApplyDetailsVo.setModelName(modelInfo.getModelName());
busSalesOrderReturnVehApplyDetailsVo.setBrandName(modelInfo.getBrand());
@ -274,33 +345,6 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
StringBuilder collection = new StringBuilder();
collection.append("订金").append(":").append("应收").append(djys).append("实收").append(djss).append(" ").append("车款").append(":").append("应收").append(ckys).append("实收").append(ckss);
busSalesOrderReturnVehApplyDetailsVo.setCollection(collection.toString());
List<BusSalesOrderReturnVehDetailsVo> busSalesOrderReturnVehDetailsVoArrayList = new ArrayList<BusSalesOrderReturnVehDetailsVo>();
List<VinListsVo> vinListsVos = modelInfo.getVinListsVos();
BaseModelConfigSelectVo baseModelConfigSelectVo = baseModelConfigFeign.details(modelInfo.getConfigSid()).getData();
for (VinListsVo vinListsVo : vinListsVos) {
BusSalesOrderReturnVehDetailsVo busSalesOrderReturnVehDetailsVo = new BusSalesOrderReturnVehDetailsVo();
String vinSid = vinListsVo.getVinSid();
BaseVehicleSelectVo baseVehicleSelectVo = baseVehicleFeign.details(vinSid).getData();
BaseVehicleCertificateVo baseVehicleCertificateVo = baseVehicleCertificateFeign.selStateByVehicleSid(vinListsVo.getVinSid()).getData();
busSalesOrderReturnVehDetailsVo.setVehSid(vinSid);
busSalesOrderReturnVehDetailsVo.setVinNo(vinListsVo.getVinNo());
busSalesOrderReturnVehDetailsVo.setCarColorKey(baseModelConfigSelectVo.getCarColorKey());
busSalesOrderReturnVehDetailsVo.setCarColorValue(baseModelConfigSelectVo.getCarColor());
if (baseVehicleCertificateVo != null){
busSalesOrderReturnVehDetailsVo.setCertificateStateKey(baseVehicleCertificateVo.getCertificateState());
busSalesOrderReturnVehDetailsVo.setCertificateStateValue(baseVehicleCertificateVo.getCertificateStateValue());
}else {
busSalesOrderReturnVehDetailsVo.setCertificateStateKey("-");
busSalesOrderReturnVehDetailsVo.setCertificateStateValue("-");
}
busSalesOrderReturnVehDetailsVo.setInvoicingStateKey("");
busSalesOrderReturnVehDetailsVo.setInvoicingStateValue("");
busSalesOrderReturnVehDetailsVo.setInsureStateKey("");
busSalesOrderReturnVehDetailsVo.setInsureStateValue("");
busSalesOrderReturnVehDetailsVo.setStockStateKey(baseVehicleSelectVo.getVehicleState());
busSalesOrderReturnVehDetailsVo.setStockStateValue(baseVehicleSelectVo.getVehicleStateValue());
busSalesOrderReturnVehDetailsVoArrayList.add(busSalesOrderReturnVehDetailsVo);
}
busSalesOrderReturnVehApplyDetailsVo.setBusSalesOrderReturnVehs(busSalesOrderReturnVehDetailsVoArrayList);
return rb.success().setData(busSalesOrderReturnVehApplyDetailsVo);
}
@ -385,6 +429,7 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
return voResultBean;
}
if (r == 2) {
dto.setInstanceId(dto.getProcInstId());
// ToDo:驳回到发起人后再次提交
if (StringUtils.isBlank(dto.getInstanceId())) {
return rb.setMsg("参数错误：instanceId");
@ -453,7 +498,7 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
if ("2".equals(saleTypeKey)) {
i = true;
}
appMap.put("sid", businessSid);
appMap.put("orderSid", businessSid);
variables.put("app", appMap);
variables.put("isAdj", i);
bv.setFormVariables(variables);
@ -652,4 +697,17 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
}
return rb.setMsg("操作失败!提交的数据不一致!");
}
public String getXSDDTCSQApplyCode(String useOrgSid) {
//获取分公司sid
ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.fetchBySid(useOrgSid);
String orgCode = resultBean1.getData().getOrgCode();
BillNo b = new BillNo();
b.setOrgCode(orgCode);
b.setBillType(BillTypeEnum.XSDDTCSQ.getBillType());
String bill = Rule.getBill(b);
int i = baseMapper.selectNum(bill);
String billNo = Rule.getBillNo(bill, i);
return billNo;
}
}

8
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryService.java
View File

@ -297,11 +297,11 @@ public class ScmApplyInboundQueryService extends MybatisBaseService<ScmApplyInbo
sf.setCllx(scmApplyInboundVehQueryDetailsVo.getVehicleTypeKey());
sf.setCllxType("sellChannel");
//填充直接调拨单物料列表数据
StkTransferDirect.FBillEntry fBillEntry = new StkTransferDirect.FBillEntry();
/*StkTransferDirect.FBillEntry fBillEntry = new StkTransferDirect.FBillEntry();
fBillEntry.setFMaterialId(sf.getFMaterialId());//物料编码
fBillEntry.setFDestStockId("ARZTCK");//调入仓库
fBillEntry.setFSrcStockId("ARZSCK");//调出仓库
FPAYBILLENTRYs.add(fBillEntry);
FPAYBILLENTRYs.add(fBillEntry);*/
} else if (ManPurOrderType.ManOrderType.WC_ORDER.getCode().equals(scmApplyInboundQuery.getManPurOrderTypeKey())) {
//车辆类型-外采主车
sf.setCllx("60");
@ -314,14 +314,14 @@ public class ScmApplyInboundQueryService extends MybatisBaseService<ScmApplyInbo
stkInStock.setFInStockEntry(fInStockEntry);
ResultBean<String> stringResultBean = finKingDeeFeign.draftStkInStock(stkInStock);
//外采不推送直接调拨单
if (stringResultBean.getSuccess() && !ManPurOrderType.ManOrderType.WC_ORDER.getCode().equals(scmApplyInboundQuery.getManPurOrderTypeKey())) {
/*if (stringResultBean.getSuccess() && !ManPurOrderType.ManOrderType.WC_ORDER.getCode().equals(scmApplyInboundQuery.getManPurOrderTypeKey())) {
//推送调拨单
StkTransferDirect stkTransferDirect = new StkTransferDirect();
stkTransferDirect.setFStockOrgId(stkInStock.getTOrgId()); //调入库存组织
stkTransferDirect.setFDate(stkInStock.getFDate()); //日期
stkTransferDirect.setFBillEntry(FPAYBILLENTRYs);
finKingDeeFeign.draftStkTransferDirect(stkTransferDirect);
}
}*/
} catch (Exception e) {
e.printStackTrace();
}

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrderRetVeh/flowable/OrderRetVehSubmitDto.java
View File

@ -75,6 +75,8 @@ public class OrderRetVehSubmitDto implements Dto {
private String fundsSource; //资金来源
@ApiModelProperty("制单日期")
private String creatTime; //制单日期
@ApiModelProperty("销售订单sid")
private String orderSid; // 销售订单sid
@ApiModelProperty("退库车辆列表")
private List<AppBusSalesOrderReturnVehDto> busSalesOrderReturnVehs = new ArrayList<>();
}

Write Preview
Loading…
Cancel
Save