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

移动端开票申请、欠款开票维护开票信息和客户

master
God 2 years ago
parent
d843ac8838
commit
5f5c062ff3
5 changed files with 432 additions and 422 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java
  2. 808
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallService.java
  3. 10
      anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java
  4. 4
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingDetailsVo.java
  5. 8
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java

8
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java
View File

@ -543,12 +543,12 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
FinBillVehicleDetailsVo finBillVehicleDetailsVo = finBillVehicleFeign.fetchByVehSid(vehSid).getData(); FinBillVehicleDetailsVo finBillVehicleDetailsVo = finBillVehicleFeign.fetchByVehSid(vehSid).getData();
FinBillApplicationDetailsVo finBillApplicationDetailsVo = null; FinBillApplicationDetailsVo finBillApplicationDetailsVo = null;
if (finBillVehicleDetailsVo == null) { if (finBillVehicleDetailsVo == null) {
return rb.setMsg("关联的主车未开票，不可出库"); return rb.setMsg("关联的主车开票申请未审批通过，不可出库");
} else { } else {
String billAppSid = finBillVehicleDetailsVo.getBillAppSid(); String billAppSid = finBillVehicleDetailsVo.getBillAppSid();
finBillApplicationDetailsVo = finBillApplicationFeign.fetchDetailsBySid(billAppSid).getData(); finBillApplicationDetailsVo = finBillApplicationFeign.fetchDetailsBySid(billAppSid).getData();
if (!finBillApplicationDetailsVo.getNodeState().equals("已办结")) { if (!finBillApplicationDetailsVo.getNodeState().equals("已办结")) {
return rb.setMsg("关联的主车未开票，不可出库"); return rb.setMsg("关联的主车开票申请未审批通过，不可出库");
} }
} }
BaseVehicleOutDetailsVo baseVehicleOutDetailsVo = baseVehicleOutService.selByOrgSidAndVehSid(baseTrailer.getUseOrgSid(), vehSid); BaseVehicleOutDetailsVo baseVehicleOutDetailsVo = baseVehicleOutService.selByOrgSidAndVehSid(baseTrailer.getUseOrgSid(), vehSid);
@ -847,12 +847,12 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
FinBillVehicleDetailsVo finBillVehicleDetailsVo = finBillVehicleFeign.fetchByVehSid(vehSid).getData(); FinBillVehicleDetailsVo finBillVehicleDetailsVo = finBillVehicleFeign.fetchByVehSid(vehSid).getData();
FinBillApplicationDetailsVo finBillApplicationDetailsVo = null; FinBillApplicationDetailsVo finBillApplicationDetailsVo = null;
if (finBillVehicleDetailsVo == null) { if (finBillVehicleDetailsVo == null) {
return rb.setMsg("关联的主车未开票，不可出库"); return rb.setMsg("关联的主车开票申请未审批通过，不可出库");
} else { } else {
String billAppSid = finBillVehicleDetailsVo.getBillAppSid(); String billAppSid = finBillVehicleDetailsVo.getBillAppSid();
finBillApplicationDetailsVo = finBillApplicationFeign.fetchDetailsBySid(billAppSid).getData(); finBillApplicationDetailsVo = finBillApplicationFeign.fetchDetailsBySid(billAppSid).getData();
if (!finBillApplicationDetailsVo.getNodeState().equals("已办结")) { if (!finBillApplicationDetailsVo.getNodeState().equals("已办结")) {
return rb.setMsg("关联的主车未开票，不可出库"); return rb.setMsg("关联的主车开票申请未审批通过，不可出库");
} }
} }
//生成单据编号 //生成单据编号

808
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallService.java
View File

@ -72,6 +72,7 @@ import java.math.BigDecimal;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.UUID;
/** /**
* Project: anrui-base(上装配置管理) <br/> * Project: anrui-base(上装配置管理) <br/>
@ -89,432 +90,437 @@ import java.util.List;
@Service @Service
public class BaseVehinstallService extends MybatisBaseService<BaseVehinstallMapper, BaseVehinstall> { public class BaseVehinstallService extends MybatisBaseService<BaseVehinstallMapper, BaseVehinstall> {
@Autowired @Autowired
private BaseVehinstallmodelService baseVehinstallmodelService; private BaseVehinstallmodelService baseVehinstallmodelService;
@Autowired @Autowired
private BaseVehicleService baseVehicleService; private BaseVehicleService baseVehicleService;
@Autowired @Autowired
private BaseVehmodelConfigService baseVehmodelConfigService; private BaseVehmodelConfigService baseVehmodelConfigService;
@Autowired @Autowired
private BaseVehicleOutService baseVehicleOutService; private BaseVehicleOutService baseVehicleOutService;
@Autowired @Autowired
private BasePurchaseSystemService basePurchaseSystemService; private BasePurchaseSystemService basePurchaseSystemService;
@Autowired @Autowired
private BaseVehicleOutApplyService baseVehicleOutApplyService; private BaseVehicleOutApplyService baseVehicleOutApplyService;
@Resource @Resource
private FinKingDeeFeign finKingDeeFeign; private FinKingDeeFeign finKingDeeFeign;
@Autowired @Autowired
private SysOrganizationFeign sysOrganizationFeign; private SysOrganizationFeign sysOrganizationFeign;
private QueryWrapper<BaseVehinstall> createQueryWrapper(BaseVehinstallQuery query) { private QueryWrapper<BaseVehinstall> createQueryWrapper(BaseVehinstallQuery query) {
// todo: 这里根据具体业务调整查询条件 // todo: 这里根据具体业务调整查询条件
// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<BaseVehinstall> qw = new QueryWrapper<>(); QueryWrapper<BaseVehinstall> qw = new QueryWrapper<>();
return qw; return qw;
} }
public PagerVo<BaseVehinstallVo> listPageVo(PagerQuery<BaseVehinstallQuery> pq) { public PagerVo<BaseVehinstallVo> listPageVo(PagerQuery<BaseVehinstallQuery> pq) {
BaseVehinstallQuery query = pq.getParams(); BaseVehinstallQuery query = pq.getParams();
QueryWrapper<BaseVehinstall> qw = new QueryWrapper<>(); QueryWrapper<BaseVehinstall> qw = new QueryWrapper<>();
qw.eq("bv.createOrg",query.getCreateOrgSid()); qw.eq("bv.createOrg", query.getCreateOrgSid());
qw.eq("bvm.createOrgSid",query.getCreateOrgSid()); qw.eq("bvm.createOrgSid", query.getCreateOrgSid());
if (StringUtils.isNotBlank(query.getVehicleTypeKey())){ if (StringUtils.isNotBlank(query.getVehicleTypeKey())) {
qw.eq("bvm.vehicleTypeKey",query.getVehicleTypeKey()); qw.eq("bvm.vehicleTypeKey", query.getVehicleTypeKey());
} }
if (StringUtils.isNotBlank(query.getRefitMethodKey())){ if (StringUtils.isNotBlank(query.getRefitMethodKey())) {
qw.eq("bvm.refitMethodKey",query.getRefitMethodKey()); qw.eq("bvm.refitMethodKey", query.getRefitMethodKey());
} }
if (StringUtils.isNotBlank(query.getRefitFactory())){ if (StringUtils.isNotBlank(query.getRefitFactory())) {
qw.like("bvm.refitFactory",query.getRefitFactory()); qw.like("bvm.refitFactory", query.getRefitFactory());
} }
if (StringUtils.isNotBlank(query.getInstallNameKey())){ if (StringUtils.isNotBlank(query.getInstallNameKey())) {
qw.eq("bvm.installNameKey",query.getInstallNameKey()); qw.eq("bvm.installNameKey", query.getInstallNameKey());
} }
if (StringUtils.isNotBlank(query.getColorKey())){ if (StringUtils.isNotBlank(query.getColorKey())) {
qw.eq("bvm.colorKey",query.getColorKey()); qw.eq("bvm.colorKey", query.getColorKey());
} }
if (StringUtils.isNotBlank(query.getPlateMaterialKey())){ if (StringUtils.isNotBlank(query.getPlateMaterialKey())) {
qw.eq("bvm.plateMaterialKey",query.getPlateMaterialKey()); qw.eq("bvm.plateMaterialKey", query.getPlateMaterialKey());
} }
if (StringUtils.isNotBlank(query.getNoticeModel())){ if (StringUtils.isNotBlank(query.getNoticeModel())) {
qw.like("bv.noticeModel",query.getNoticeModel()); qw.like("bv.noticeModel", query.getNoticeModel());
} }
if (StringUtils.isNotBlank(query.getVinNo())){ if (StringUtils.isNotBlank(query.getVinNo())) {
qw.like("bv.vinNo",query.getVinNo()); qw.like("bv.vinNo", query.getVinNo());
} }
qw.orderByDesc("bv.createTime"); qw.orderByDesc("bv.createTime");
IPage<BaseVehinstall> page = PagerUtil.queryToPage(pq); IPage<BaseVehinstall> page = PagerUtil.queryToPage(pq);
IPage<BaseVehinstallVo> pagging = baseMapper.selectPageVo(page, qw); IPage<BaseVehinstallVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<BaseVehinstallVo> p = PagerUtil.pageToVo(pagging, null); PagerVo<BaseVehinstallVo> p = PagerUtil.pageToVo(pagging, null);
return p; return p;
} }
public void saveOrUpdateDto(BaseVehinstallDto dto){ public void saveOrUpdateDto(BaseVehinstallDto dto) {
String dtoSid = dto.getSid(); String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) { if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto); this.insertByDto(dto);
return; return;
} }
this.updateByDto(dto); this.updateByDto(dto);
} }
public void insertByDto(BaseVehinstallDto dto){ public void insertByDto(BaseVehinstallDto dto) {
BaseVehinstall entity = new BaseVehinstall(); BaseVehinstall entity = new BaseVehinstall();
BeanUtil.copyProperties(dto, entity, "id", "sid"); BeanUtil.copyProperties(dto, entity, "id", "sid");
String salesDate = entity.getSalesDate(); String salesDate = entity.getSalesDate();
if (StringUtils.isBlank(salesDate)){ if (StringUtils.isBlank(salesDate)) {
entity.setSalesDate(""); entity.setSalesDate("");
} }
baseMapper.insert(entity); baseMapper.insert(entity);
} }
public void updateByDto(BaseVehinstallDto dto){ public void updateByDto(BaseVehinstallDto dto) {
String dtoSid = dto.getSid(); String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) { if (StringUtils.isBlank(dtoSid)) {
return; return;
} }
BaseVehinstall entity = fetchBySid(dtoSid); BaseVehinstall entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid"); BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity); baseMapper.updateById(entity);
} }
public BaseVehinstallDetailsVo fetchDetailsVoBySid(String sid) {
BaseVehinstall entity = fetchBySid(sid);
BaseVehinstallDetailsVo vo = new BaseVehinstallDetailsVo();
BeanUtil.copyProperties(entity, vo);
vo.setSid(sid);
String mainSid = vo.getMainSid();
BaseVehinstallmodel baseVehinstallmodel = baseVehinstallmodelService.fetchBySid(mainSid);
vo.setBaseVehinstallmodel(baseVehinstallmodel);
return vo;
}
public BaseVehinstallDetailsVo fetchDetailsVoBySid(String sid){ public List<String> selectListVo(String createOrgSid) {
BaseVehinstall entity = fetchBySid(sid); return baseMapper.selectListVo(createOrgSid);
BaseVehinstallDetailsVo vo = new BaseVehinstallDetailsVo(); }
BeanUtil.copyProperties(entity, vo);
vo.setSid(sid);
String mainSid = vo.getMainSid();
BaseVehinstallmodel baseVehinstallmodel = baseVehinstallmodelService.fetchBySid(mainSid);
vo.setBaseVehinstallmodel(baseVehinstallmodel);
return vo;
}
public List<String> selectListVo(String createOrgSid) { public PagerVo<BaseVehinstallVo> vehInsMod(PagerQuery<BaseVehinstallQuery> pq) {
return baseMapper.selectListVo(createOrgSid); BaseVehinstallQuery query = pq.getParams();
} QueryWrapper<BaseVehinstall> qw = new QueryWrapper<>();
qw.eq("bv.createOrg", query.getCreateOrgSid());
qw.eq("bvm.createOrgSid", query.getCreateOrgSid());
if (StringUtils.isNotBlank(query.getVehicleTypeKey())) {
qw.eq("bvm.vehicleTypeKey", query.getVehicleTypeKey());
}
if (StringUtils.isNotBlank(query.getRefitMethodKey())) {
qw.eq("bvm.refitMethodKey", query.getRefitMethodKey());
}
if (StringUtils.isNotBlank(query.getRefitFactory())) {
qw.like("bvm.refitFactory", query.getRefitFactory());
}
if (StringUtils.isNotBlank(query.getInstallNameKey())) {
qw.eq("bvm.installNameKey", query.getInstallNameKey());
}
if (StringUtils.isNotBlank(query.getColorKey())) {
qw.eq("bvm.colorKey", query.getColorKey());
}
if (StringUtils.isNotBlank(query.getPlateMaterialKey())) {
qw.eq("bvm.plateMaterialKey", query.getPlateMaterialKey());
}
if (StringUtils.isNotBlank(query.getNoticeModel())) {
qw.like("bv.noticeModel", query.getNoticeModel());
}
if (StringUtils.isNotBlank(query.getVinNo())) {
qw.like("bv.vinNo", query.getVinNo());
}
if (query.getJacketSidList().size() > 0) {
qw.notIn("bv.sid", query.getJacketSidList());
}
IPage<BaseVehinstall> page = PagerUtil.queryToPage(pq);
IPage<BaseVehinstallVo> pagging = baseMapper.selectPageVo(page, qw);
List<BaseVehinstallVo> records = pagging.getRecords();
for (BaseVehinstallVo record : records) {
String vinNo = record.getVinNo();
BaseVehicle baseVehicle = baseVehicleService.selVehicleByVinNoAndOrgSid(vinNo, query.getCreateOrgSid());
String modelSid = baseVehicle.getModelSid();
String modelConfigSid = baseVehicle.getModelConfigSid();
BaseVehmodelVo baseVehmodelVo = baseVehmodelConfigService.selectVehPur(modelSid, modelConfigSid, query.getCreateOrgSid());
String guidedPrice = baseVehmodelVo.getGuidedPrice();
record.setVehGuidePrice(guidedPrice);
}
PagerVo<BaseVehinstallVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public PagerVo<BaseVehinstallVo> vehInsMod(PagerQuery<BaseVehinstallQuery> pq) { public List<BaseVehinstall> selectByOrgSidAndVin(String orgSid, String vin) {
BaseVehinstallQuery query = pq.getParams(); return baseMapper.selectByOrgSidAndVin(orgSid, vin);
QueryWrapper<BaseVehinstall> qw = new QueryWrapper<>(); }
qw.eq("bv.createOrg",query.getCreateOrgSid());
qw.eq("bvm.createOrgSid",query.getCreateOrgSid());
if (StringUtils.isNotBlank(query.getVehicleTypeKey())){
qw.eq("bvm.vehicleTypeKey",query.getVehicleTypeKey());
}
if (StringUtils.isNotBlank(query.getRefitMethodKey())){
qw.eq("bvm.refitMethodKey",query.getRefitMethodKey());
}
if (StringUtils.isNotBlank(query.getRefitFactory())){
qw.like("bvm.refitFactory",query.getRefitFactory());
}
if (StringUtils.isNotBlank(query.getInstallNameKey())){
qw.eq("bvm.installNameKey",query.getInstallNameKey());
}
if (StringUtils.isNotBlank(query.getColorKey())){
qw.eq("bvm.colorKey",query.getColorKey());
}
if (StringUtils.isNotBlank(query.getPlateMaterialKey())){
qw.eq("bvm.plateMaterialKey",query.getPlateMaterialKey());
}
if (StringUtils.isNotBlank(query.getNoticeModel())){
qw.like("bv.noticeModel",query.getNoticeModel());
}
if (StringUtils.isNotBlank(query.getVinNo())){
qw.like("bv.vinNo",query.getVinNo());
}
if (query.getJacketSidList().size() > 0) {
qw.notIn("bv.sid", query.getJacketSidList());
}
IPage<BaseVehinstall> page = PagerUtil.queryToPage(pq);
IPage<BaseVehinstallVo> pagging = baseMapper.selectPageVo(page, qw);
List<BaseVehinstallVo> records = pagging.getRecords();
for (BaseVehinstallVo record : records) {
String vinNo = record.getVinNo();
BaseVehicle baseVehicle = baseVehicleService.selVehicleByVinNoAndOrgSid(vinNo, query.getCreateOrgSid());
String modelSid = baseVehicle.getModelSid();
String modelConfigSid = baseVehicle.getModelConfigSid();
BaseVehmodelVo baseVehmodelVo = baseVehmodelConfigService.selectVehPur(modelSid, modelConfigSid, query.getCreateOrgSid());
String guidedPrice = baseVehmodelVo.getGuidedPrice();
record.setVehGuidePrice(guidedPrice);
}
PagerVo<BaseVehinstallVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public List<BaseVehinstall> selectByOrgSidAndVin(String orgSid, String vin) { public BaseVehinstallDetailsVo fetchByVinNoAndOrgSid(String vinNo, String createOrgSid) {
return baseMapper.selectByOrgSidAndVin(orgSid,vin); return baseMapper.fetchByVinNoAndOrgSid(vinNo, createOrgSid);
} }
public BaseVehinstallDetailsVo fetchByVinNoAndOrgSid(String vinNo, String createOrgSid) { public ResultBean<BaseVehinstall> selectOne(String vinNo, String useOrgSid) {
return baseMapper.fetchByVinNoAndOrgSid(vinNo,createOrgSid); ResultBean<BaseVehinstall> rb = ResultBean.fireFail();
} BaseVehinstall baseVehinstall = baseMapper.seletByVinAndUseOrg(vinNo, useOrgSid);
return rb.success().setData(baseVehinstall);
}
public ResultBean<BaseVehinstall> selectOne(String vinNo, String useOrgSid) { public int selectNumGCRK(String bill) {
ResultBean<BaseVehinstall> rb = ResultBean.fireFail(); return baseMapper.selectNumGCRK(bill);
BaseVehinstall baseVehinstall = baseMapper.seletByVinAndUseOrg(vinNo,useOrgSid); }
return rb.success().setData(baseVehinstall);
}
public int selectNumGCRK(String bill) { public ResultBean vehinstallOut(String sid) {
return baseMapper.selectNumGCRK(bill); ResultBean rb = ResultBean.fireFail();
} BaseVehinstall baseVehinstall = fetchBySid(sid);
if (baseVehinstall.getVehicleStateKey().equals("0002")) {
return rb.setMsg("该挂车已出库");
}
BaseVehicle baseVehicle = baseVehicleService.selVehicleByVinNoAndOrgSid(baseVehinstall.getVinNo(), baseVehinstall.getCreateOrg());
String vehicleState = baseVehicle.getVehicleState();
if (!vehicleState.equals("0002")) {
return rb.setMsg("此主车车辆库存状态不是出库，请重新选择");
}
BaseVehicleOutDetailsVo baseVehicleOutDetailsVo = baseVehicleOutService.selByOrgSidAndVehSid(baseVehinstall.getCreateOrg(), baseVehicle.getSid());
BaseVehicleOut baseVehicleOut = new BaseVehicleOut();
BeanUtil.copyProperties(baseVehicleOutDetailsVo, baseVehicleOut, "sid");
baseVehicleOut.setTypeKey("003");
baseVehicleOut.setType("上装挂车");
String billNo = "";
BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = basePurchaseSystemService.fetchDetailsByDeptSid(baseVehicle.getPurchaseSystemSid()).getData();
String date = DateUtil.format(DateUtil.date(), "yyyyMM");
billNo = "XSCKD" + basePurchaseSystemDetailsVo.getOrgCode() + date;
String i = baseMapper.selectNum(billNo);
if (StringUtils.isNotBlank(i)) {
billNo = Rule.getBillNo(billNo, Integer.valueOf(i).intValue());
} else {
billNo = Rule.getBillNo(billNo, 0);
}
baseVehicleOut.setBillNo(billNo);
baseVehicleOut.setTrailerOrInstallMGroupCode("99.02");
baseVehicleOut.setTrailerOrInstallMGroupName("挂车");
baseVehicleOut.setTrailerOrInstallCode(baseVehinstall.getVinNo().substring(baseVehinstall.getVinNo().length() - 8) + "SZ");
baseVehicleOut.setSzOrGCSid(baseVehinstall.getSid());
baseVehicleOut.setTrailerOrInstallName("上装");
BaseVehinstallmodel baseVehinstallmodel = baseVehinstallmodelService.fetchBySid(baseVehinstall.getMainSid());
String wk_long = baseVehinstallmodel.getWk_long();
String wk_wide = baseVehinstallmodel.getWk_wide();
String wk_high = baseVehinstallmodel.getWk_high();
String installName = baseVehinstallmodel.getInstallNameValue();
StringBuilder vehinstallmodel = new StringBuilder();
vehinstallmodel.append(installName).append("(").append("长").append(wk_long).append("mm，").append("宽").append(wk_wide).append("mm，").append("高").append(wk_high).append("mm").append(")");
baseVehicleOut.setTrailerOrInstall(vehinstallmodel.toString());
baseVehicleOut.setTrailerOrInstallDealPrice(baseVehinstall.getGuidePrice());
//备注
String remarks1 = createRemarks(baseVehicleOut);
String remarks2 = baseVehicleOut.getRemarks();
String remarks3 = remarks2 + remarks1;
if ("null".equals(remarks3)) {
remarks3 = "";
}
baseVehicleOut.setRemarks(remarks3);
BaseVehicleOutApply baseVehicleOutApply = new BaseVehicleOutApply();
baseVehicleOutApply.setBillNo(billNo);
baseVehicleOutApply.setSaleDate(baseVehicleOut.getSaleDate());
baseVehicleOutApply.setCustomerSid(baseVehicleOut.getCustomerSid());
baseVehicleOutApply.setCustomerName(baseVehicleOut.getCustomerName());
baseVehicleOutApply.setMobile(baseVehicleOut.getMobile());
baseVehicleOutApply.setOrgSid(baseVehicleOut.getOrgSid());
baseVehicleOutApply.setOrgName(baseVehicleOut.getOrgName());
baseVehicleOutApply.setStaffSid(baseVehicleOut.getStaffSid());
baseVehicleOutApply.setStaffName(baseVehicleOut.getStaffName());
baseVehicleOutApply.setMakeListSid(baseVehicleOut.getCreateBySid());
baseVehicleOutApply.setMakeListName(baseVehicleOut.getCreateByName());
baseVehicleOutApply.setMakeListDate(DateUtil.format(new Date(), "yyyy-MM-dd"));
baseVehicleOutApply.setSaleTypeKey(baseVehicleOut.getTypeKey());
baseVehicleOutApply.setSaleTypeValue(baseVehicleOut.getType());
baseVehicleOutApply.setCreateOrgSid(baseVehicleOut.getCreateOrgSid());
baseVehicleOutApply.setCreateBySid(baseVehicleOut.getCreateBySid());
//保存车辆出库单主表
baseVehicleOutApplyService.save(baseVehicleOutApply);
//出库单子表关联主表sid
baseVehicleOut.setMainSid(baseVehicleOutApply.getSid());
baseVehicleOut.setCreateBySid(baseVehicleOut.getCreateBySid());
baseVehicleOut.setCreateByName(baseVehicleOut.getCreateByName());
baseVehicleOut.setManPurOrderTypeKey(baseVehicle.getManPurOrderTypeKey());
baseVehicleOut.setManPurOrderTypeValue(baseVehicle.getManPurOrderTypeValue());
//保存车辆出库单子表
baseVehicleOutService.save(baseVehicleOut);
//推送金蝶上装销售出库单
SalOutStock salOutStock = createSzOrGcSalOutStock(baseVehinstall, baseVehicle, baseVehicleOut);
finKingDeeFeign.draftSalOutStock(salOutStock);
List<SalOutStock.FEntity> fEntity = salOutStock.getFEntity();
for (SalOutStock.FEntity entity : fEntity) {
String substring = entity.getFMaterialID().substring(entity.getFMaterialID().length() - 1);
if ("Z".equals(substring)) {
baseVehinstall.setVehicleStateKey(VehicleState.StockEnum.OUT_STOCK.getCode());
baseVehinstall.setVehicleStateValue(VehicleState.StockEnum.OUT_STOCK.getRemarks());
baseVehinstall.setSalesDate(DateUtil.formatDate(new Date()));
saveOrUpdate(baseVehinstall);
}
}
return rb.success();
}
public ResultBean vehinstallOut(String sid) { private String createRemarks(BaseVehicleOut baseVehicleOut) {
ResultBean rb = ResultBean.fireFail(); String note = "";
BaseVehinstall baseVehinstall = fetchBySid(sid); if (StringUtils.isNotBlank(baseVehicleOut.getMiddleOne())) {
if (baseVehinstall.getVehicleStateKey().equals("0002")) { if (StringUtils.isNotBlank(baseVehicleOut.getMiddleTwo())) {
return rb.setMsg("该挂车已出库"); if (StringUtils.isNotBlank(baseVehicleOut.getRebateMoneyOne().toString())) {
} if (StringUtils.isNotBlank(baseVehicleOut.getRebateMoneyTwo().toString())) {
BaseVehicle baseVehicle = baseVehicleService.selVehicleByVinNoAndOrgSid(baseVehinstall.getVinNo(),baseVehinstall.getCreateOrg()); note = note + " 返利情况：" + baseVehicleOut.getMiddleOne() + baseVehicleOut.getRebateMoneyOne() + "," + baseVehicleOut.getMiddleTwo() + baseVehicleOut.getRebateMoneyTwo() + "。";
String vehicleState = baseVehicle.getVehicleState(); } else {
if (!vehicleState.equals("0002")) { note = note + " 返利情况：" + baseVehicleOut.getMiddleOne() + baseVehicleOut.getRebateMoneyOne() + "。";
return rb.setMsg("此主车车辆库存状态不是出库，请重新选择"); }
}
BaseVehicleOutDetailsVo baseVehicleOutDetailsVo = baseVehicleOutService.selByOrgSidAndVehSid(baseVehinstall.getCreateOrg(), baseVehicle.getSid());
BaseVehicleOut baseVehicleOut = new BaseVehicleOut();
BeanUtil.copyProperties(baseVehicleOutDetailsVo, baseVehicleOut, "sid");
baseVehicleOut.setTypeKey("003");
baseVehicleOut.setType("上装挂车");
String billNo = "";
BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = basePurchaseSystemService.fetchDetailsByDeptSid(baseVehicle.getPurchaseSystemSid()).getData();
String date = DateUtil.format(DateUtil.date(), "yyyyMM");
billNo = "XSCKD" + basePurchaseSystemDetailsVo.getOrgCode() + date;
String i = baseMapper.selectNum(billNo);
if (StringUtils.isNotBlank(i)) {
billNo = Rule.getBillNo(billNo, Integer.valueOf(i).intValue());
} else {
billNo = Rule.getBillNo(billNo, 0);
}
baseVehicleOut.setBillNo(billNo);
baseVehicleOut.setTrailerOrInstallMGroupCode("99.02");
baseVehicleOut.setTrailerOrInstallMGroupName("挂车");
baseVehicleOut.setTrailerOrInstallCode(baseVehinstall.getVinNo().substring(baseVehinstall.getVinNo().length() - 8) + "SZ");
baseVehicleOut.setSzOrGCSid(baseVehinstall.getSid());
baseVehicleOut.setTrailerOrInstallName("上装");
BaseVehinstallmodel baseVehinstallmodel = baseVehinstallmodelService.fetchBySid(baseVehinstall.getMainSid());
String wk_long = baseVehinstallmodel.getWk_long();
String wk_wide = baseVehinstallmodel.getWk_wide();
String wk_high = baseVehinstallmodel.getWk_high();
String installName = baseVehinstallmodel.getInstallNameValue();
StringBuilder vehinstallmodel = new StringBuilder();
vehinstallmodel.append(installName).append("(").append("长").append(wk_long).append("mm，").append("宽").append(wk_wide).append("mm，").append("高").append(wk_high).append("mm").append(")");
baseVehicleOut.setTrailerOrInstall(vehinstallmodel.toString());
baseVehicleOut.setTrailerOrInstallDealPrice(baseVehinstall.getGuidePrice());
//备注
String remarks1 = createRemarks(baseVehicleOut);
String remarks2 = baseVehicleOut.getRemarks();
String remarks3 = remarks2 + remarks1;
if ("null".equals(remarks3)) {
remarks3 = "";
}
baseVehicleOut.setRemarks(remarks3);
BaseVehicleOutApply baseVehicleOutApply = new BaseVehicleOutApply();
baseVehicleOutApply.setBillNo(billNo);
baseVehicleOutApply.setSaleDate(baseVehicleOut.getSaleDate());
baseVehicleOutApply.setCustomerSid(baseVehicleOut.getCustomerSid());
baseVehicleOutApply.setCustomerName(baseVehicleOut.getCustomerName());
baseVehicleOutApply.setMobile(baseVehicleOut.getMobile());
baseVehicleOutApply.setOrgSid(baseVehicleOut.getOrgSid());
baseVehicleOutApply.setOrgName(baseVehicleOut.getOrgName());
baseVehicleOutApply.setStaffSid(baseVehicleOut.getStaffSid());
baseVehicleOutApply.setStaffName(baseVehicleOut.getStaffName());
baseVehicleOutApply.setMakeListSid(baseVehicleOut.getCreateBySid());
baseVehicleOutApply.setMakeListName(baseVehicleOut.getCreateByName());
baseVehicleOutApply.setMakeListDate(DateUtil.format(new Date(), "yyyy-MM-dd"));
baseVehicleOutApply.setSaleTypeKey(baseVehicleOut.getTypeKey());
baseVehicleOutApply.setSaleTypeValue(baseVehicleOut.getType());
baseVehicleOutApply.setCreateOrgSid(baseVehicleOut.getCreateOrgSid());
baseVehicleOutApply.setCreateBySid(baseVehicleOut.getCreateBySid());
//保存车辆出库单主表
baseVehicleOutApplyService.save(baseVehicleOutApply);
//出库单子表关联主表sid
baseVehicleOut.setMainSid(baseVehicleOutApply.getSid());
baseVehicleOut.setCreateBySid(baseVehicleOut.getCreateBySid());
baseVehicleOut.setCreateByName(baseVehicleOut.getCreateByName());
baseVehicleOut.setManPurOrderTypeKey(baseVehicle.getManPurOrderTypeKey());
baseVehicleOut.setManPurOrderTypeValue(baseVehicle.getManPurOrderTypeValue());
//保存车辆出库单子表
baseVehicleOutService.save(baseVehicleOut);
//推送金蝶上装销售出库单
SalOutStock salOutStock = createSzOrGcSalOutStock(baseVehinstall, baseVehicle, baseVehicleOut);
finKingDeeFeign.draftSalOutStock(salOutStock);
List<SalOutStock.FEntity> fEntity = salOutStock.getFEntity();
for (SalOutStock.FEntity entity : fEntity) {
String substring = entity.getFMaterialID().substring(entity.getFMaterialID().length() - 1);
if ("Z".equals(substring)) {
baseVehinstall.setVehicleStateKey(VehicleState.StockEnum.OUT_STOCK.getCode());
baseVehinstall.setVehicleStateValue(VehicleState.StockEnum.OUT_STOCK.getRemarks());
baseVehinstall.setSalesDate(DateUtil.formatDate(new Date()));
saveOrUpdate(baseVehinstall);
}
}
return rb.success();
}
private String createRemarks(BaseVehicleOut baseVehicleOut) { } else {
String note = ""; if (StringUtils.isNotBlank(baseVehicleOut.getRebateMoneyTwo().toString())) {
if (StringUtils.isNotBlank(baseVehicleOut.getMiddleOne())) { note = note + " 返利情况：" + baseVehicleOut.getMiddleTwo() + baseVehicleOut.getRebateMoneyTwo() + "。";
if (StringUtils.isNotBlank(baseVehicleOut.getMiddleTwo())) { }
if (StringUtils.isNotBlank(baseVehicleOut.getRebateMoneyOne().toString())) { }
if (StringUtils.isNotBlank(baseVehicleOut.getRebateMoneyTwo().toString())) {
note = note + " 返利情况：" + baseVehicleOut.getMiddleOne() + baseVehicleOut.getRebateMoneyOne() + "," + baseVehicleOut.getMiddleTwo() + baseVehicleOut.getRebateMoneyTwo() + "。";
} else {
note = note + " 返利情况：" + baseVehicleOut.getMiddleOne() + baseVehicleOut.getRebateMoneyOne() + "。";
}
} else { } else {
if (StringUtils.isNotBlank(baseVehicleOut.getRebateMoneyTwo().toString())) { if (StringUtils.isNotBlank(baseVehicleOut.getRebateMoneyOne().toString())) {
note = note + " 返利情况：" + baseVehicleOut.getMiddleTwo() + baseVehicleOut.getRebateMoneyTwo() + "。"; note = note + " 返利情况：" + baseVehicleOut.getMiddleOne() + baseVehicleOut.getRebateMoneyOne() + "。";
} }
} }
} else {
if (StringUtils.isNotBlank(baseVehicleOut.getMiddleTwo())) {
if (StringUtils.isNotBlank(baseVehicleOut.getRebateMoneyTwo().toString())) {
note = note + " 返利情况：" + baseVehicleOut.getMiddleOne() + baseVehicleOut.getRebateMoneyOne() + "。";
}
}
}
return note;
}
} else { private SalOutStock createSzOrGcSalOutStock(BaseVehinstall baseVehinstall, BaseVehicle baseVehicle, BaseVehicleOut baseVehicleOut) {
if (StringUtils.isNotBlank(baseVehicleOut.getRebateMoneyOne().toString())) { SalOutStock salOutStock = new SalOutStock();
note = note + " 返利情况：" + baseVehicleOut.getMiddleOne() + baseVehicleOut.getRebateMoneyOne() + "。"; //单据编号
} salOutStock.setFBillNo(baseVehicleOut.getBillNo());
} //日期
} else { salOutStock.setFDate(DateUtil.today());
if (StringUtils.isNotBlank(baseVehicleOut.getMiddleTwo())) { //分公司id
if (StringUtils.isNotBlank(baseVehicleOut.getRebateMoneyTwo().toString())) { BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = basePurchaseSystemService.fetchDetailsByDeptSid(baseVehicle.getPurchaseSystemSid()).getData();
note = note + " 返利情况：" + baseVehicleOut.getMiddleOne() + baseVehicleOut.getRebateMoneyOne() + "。"; salOutStock.setFSaleOrgId(basePurchaseSystemDetailsVo.getOrgCode());
} //客户
} salOutStock.setFCustomerID(baseVehicleOut.getCwCustomerNo());
} //销售部门id
return note; String orgDeptSid = baseVehicleOut.getOrgSid();
} ResultBean<SysOrganizationVo> resultBean = sysOrganizationFeign.fetchBySid(orgDeptSid);
if (resultBean.getSuccess()) {
SysOrganizationVo vo = resultBean.getData();
if (vo != null) {
salOutStock.setFSaleDeptID(vo.getOrgCode());
}
}
//项目类别key和项目类别type
salOutStock.setF_PAEZ_AssistantType("payType");
//销售类型-外采挂车映射
salOutStock.setF_PAEZ_AssistantKey("009");
//物料列表
List<SalOutStock.FEntity> fEntityList = new ArrayList<>();
SalOutStock.FEntity fEntity = new SalOutStock.FEntity();
//单价
fEntity.setFPrice(baseVehicleOut.getTrailerOrInstallDealPrice());
//物料编码
fEntity.setFMaterialID(baseVehinstall.getVinNo().substring(baseVehinstall.getVinNo().length() - 8) + "SZ");
//仓库id
fEntity.setFStockID("ARZSCK");
fEntityList.add(fEntity);
if (fEntityList.size() > 0) {
salOutStock.setFEntity(fEntityList);
return salOutStock;
} else {
return null;
}
}
private SalOutStock createSzOrGcSalOutStock(BaseVehinstall baseVehinstall, BaseVehicle baseVehicle, BaseVehicleOut baseVehicleOut) { private SalOutStock createSzOrGcSalOutStockNew(BaseVehicle baseVehicle, BaseVehicleOut baseVehicleOut, BaseVehicleOutApply baseVehicleOutApply) {
SalOutStock salOutStock = new SalOutStock(); SalOutStock salOutStock = new SalOutStock();
//单据编号 //单据编号
salOutStock.setFBillNo(baseVehicleOut.getBillNo()); salOutStock.setFBillNo(baseVehicleOutApply.getBillNo());
//日期 //日期
salOutStock.setFDate(DateUtil.today()); salOutStock.setFDate(DateUtil.today());
//分公司id //分公司id
BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = basePurchaseSystemService.fetchDetailsByDeptSid(baseVehicle.getPurchaseSystemSid()).getData(); BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = basePurchaseSystemService.fetchDetailsByDeptSid(baseVehicle.getPurchaseSystemSid()).getData();
salOutStock.setFSaleOrgId(basePurchaseSystemDetailsVo.getOrgCode()); salOutStock.setFSaleOrgId(basePurchaseSystemDetailsVo.getOrgCode());
//客户 //客户
salOutStock.setFCustomerID(baseVehicleOut.getCwCustomerNo()); salOutStock.setFCustomerID(baseVehicleOutApply.getContractNo());
//销售部门id //销售部门id
String orgDeptSid = baseVehicleOut.getOrgSid(); String orgDeptSid = baseVehicleOutApply.getOrgSid();
ResultBean<SysOrganizationVo> resultBean = sysOrganizationFeign.fetchBySid(orgDeptSid); ResultBean<SysOrganizationVo> resultBean = sysOrganizationFeign.fetchBySid(orgDeptSid);
if (resultBean.getSuccess()) { if (resultBean.getSuccess()) {
SysOrganizationVo vo = resultBean.getData(); SysOrganizationVo vo = resultBean.getData();
if (vo != null) { if (vo != null) {
salOutStock.setFSaleDeptID(vo.getOrgCode()); salOutStock.setFSaleDeptID(vo.getOrgCode());
} }
} }
//项目类别key和项目类别type //项目类别key和项目类别type
salOutStock.setF_PAEZ_AssistantType("payType"); salOutStock.setF_PAEZ_AssistantType("payType");
//销售类型-外采挂车映射 //销售类型-外采挂车映射
salOutStock.setF_PAEZ_AssistantKey("009"); salOutStock.setF_PAEZ_AssistantKey("009");
//物料列表 //物料列表
List<SalOutStock.FEntity> fEntityList = new ArrayList<>(); List<SalOutStock.FEntity> fEntityList = new ArrayList<>();
SalOutStock.FEntity fEntity = new SalOutStock.FEntity(); SalOutStock.FEntity fEntity = new SalOutStock.FEntity();
//单价 //单价
fEntity.setFPrice(baseVehicleOut.getTrailerOrInstallDealPrice()); fEntity.setFPrice(baseVehicleOut.getPrice().toString());
//物料编码 //物料编码
fEntity.setFMaterialID(baseVehinstall.getVinNo().substring(baseVehinstall.getVinNo().length() - 8) + "SZ"); fEntity.setFMaterialID(baseVehicleOut.getMaterialCode());
//仓库id //仓库id
fEntity.setFStockID("ARZSCK"); fEntity.setFStockID("ARZSCK");
fEntityList.add(fEntity); fEntityList.add(fEntity);
if (fEntityList.size() > 0) { salOutStock.setFEntity(fEntityList);
salOutStock.setFEntity(fEntityList); return salOutStock;
return salOutStock; }
} else {
return null;
}
}
public ResultBean vehinstallOutNew(String sid) { public ResultBean vehinstallOutNew(String sid) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
BaseVehinstall baseVehinstall = fetchBySid(sid); BaseVehinstall baseVehinstall = fetchBySid(sid);
if (baseVehinstall.getVehicleStateKey().equals("0002")) { if (baseVehinstall.getVehicleStateKey().equals("0002")) {
return rb.setMsg("该挂车已出库"); return rb.setMsg("该挂车已出库");
} }
BaseVehicle baseVehicle = baseVehicleService.selVehicleByVinNoAndOrgSid(baseVehinstall.getVinNo(),baseVehinstall.getCreateOrg()); BaseVehicle baseVehicle = baseVehicleService.selVehicleByVinNoAndOrgSid(baseVehinstall.getVinNo(), baseVehinstall.getCreateOrg());
String vehicleState = baseVehicle.getVehicleState(); String vehicleState = baseVehicle.getVehicleState();
if (!vehicleState.equals("0002")) { if (!vehicleState.equals("0002")) {
return rb.setMsg("此主车车辆库存状态不是出库，请重新选择"); return rb.setMsg("此主车车辆库存状态不是出库，请重新选择");
} }
BaseVehicleOutDetailsVo baseVehicleOutDetailsVo = baseVehicleOutService.selByOrgSidAndVehSid(baseVehinstall.getCreateOrg(), baseVehicle.getSid()); //生成单据编号
BaseVehicleOut baseVehicleOut = new BaseVehicleOut(); String billNo = "";
BeanUtil.copyProperties(baseVehicleOutDetailsVo, baseVehicleOut, "sid"); BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = basePurchaseSystemService.fetchDetailsByDeptSid(baseVehicle.getPurchaseSystemSid()).getData();
baseVehicleOut.setTypeKey("003"); String date = DateUtil.format(DateUtil.date(), "yyyyMM");
baseVehicleOut.setType("上装挂车"); billNo = "XSCKD" + basePurchaseSystemDetailsVo.getOrgCode() + date;
String billNo = ""; String i = baseMapper.selectNum(billNo);
BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = basePurchaseSystemService.fetchDetailsByDeptSid(baseVehicle.getPurchaseSystemSid()).getData(); if (StringUtils.isNotBlank(i)) {
String date = DateUtil.format(DateUtil.date(), "yyyyMM"); billNo = Rule.getBillNo(billNo, Integer.valueOf(i).intValue());
billNo = "XSCKD" + basePurchaseSystemDetailsVo.getOrgCode() + date; } else {
String i = baseMapper.selectNum(billNo); billNo = Rule.getBillNo(billNo, 0);
if (StringUtils.isNotBlank(i)) { }
billNo = Rule.getBillNo(billNo, Integer.valueOf(i).intValue()); BaseVehicleOutDetailsVo baseVehicleOutDetailsVo = baseVehicleOutService.selByOrgSidAndVehSid(baseVehinstall.getCreateOrg(), baseVehicle.getSid());
} else { BaseVehicleOutApply baseVehicleOutApply = baseVehicleOutApplyService.fetchBySid(baseVehicleOutDetailsVo.getMainSid());
billNo = Rule.getBillNo(billNo, 0); //出库主表信息录入
} baseVehicleOutApply.setSid(UUID.randomUUID().toString());
baseVehicleOut.setBillNo(billNo); baseVehicleOutApply.setBillNo(billNo);
baseVehicleOut.setTrailerOrInstallMGroupCode("99.02"); //保存车辆出库单主表
baseVehicleOut.setTrailerOrInstallMGroupName("挂车"); baseVehicleOutApplyService.save(baseVehicleOutApply);
baseVehicleOut.setTrailerOrInstallCode(baseVehinstall.getVinNo().substring(baseVehinstall.getVinNo().length() - 8) + "SZ"); BaseVehicleOut baseVehicleOut = new BaseVehicleOut();
baseVehicleOut.setSzOrGCSid(baseVehinstall.getSid()); baseVehicleOut.setCreateBySid(baseVehicleOutApply.getCreateBySid());
baseVehicleOut.setTrailerOrInstallName("上装"); baseVehicleOut.setZcMGroupCode("99.02");
BaseVehinstallmodel baseVehinstallmodel = baseVehinstallmodelService.fetchBySid(baseVehinstall.getMainSid()); baseVehicleOut.setZcMGroupName("挂车");
String wk_long = baseVehinstallmodel.getWk_long(); baseVehicleOut.setVinSid(baseVehicle.getSid());
String wk_wide = baseVehinstallmodel.getWk_wide(); baseVehicleOut.setPrice(new BigDecimal(baseVehinstall.getGuidePrice()));
String wk_high = baseVehinstallmodel.getWk_high(); //出库单子表关联主表sid
String installName = baseVehinstallmodel.getInstallNameValue(); baseVehicleOut.setMainSid(baseVehicleOutApply.getSid());
StringBuilder vehinstallmodel = new StringBuilder(); baseVehicleOut.setManPurOrderTypeKey(baseVehicle.getManPurOrderTypeKey());
vehinstallmodel.append(installName).append("(").append("长").append(wk_long).append("mm，").append("宽").append(wk_wide).append("mm，").append("高").append(wk_high).append("mm").append(")"); baseVehicleOut.setManPurOrderTypeValue(baseVehicle.getManPurOrderTypeValue());
baseVehicleOut.setTrailerOrInstall(vehinstallmodel.toString()); baseVehicleOut.setMaterialCode(baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8) + "SZ");
baseVehicleOut.setTrailerOrInstallDealPrice(baseVehinstall.getGuidePrice()); baseVehicleOut.setMaterialName("上装");
//备注 baseVehicleOut.setMaterialTypeKey("003");
String remarks1 = createRemarks(baseVehicleOut); baseVehicleOut.setMaterialTypeValue("上装");
String remarks2 = baseVehicleOut.getRemarks(); baseVehicleOut.setMaterialSid(baseVehinstall.getSid());
String remarks3 = remarks2 + remarks1; //保存车辆出库单子表
if ("null".equals(remarks3)) { baseVehicleOutService.save(baseVehicleOut);
remarks3 = ""; //推送金蝶上装销售出库单
} SalOutStock salOutStock = createSzOrGcSalOutStockNew(baseVehicle, baseVehicleOut, baseVehicleOutApply);
baseVehicleOut.setRemarks(remarks3); finKingDeeFeign.draftSalOutStock(salOutStock);
BaseVehicleOutApply baseVehicleOutApply = new BaseVehicleOutApply(); List<SalOutStock.FEntity> fEntity = salOutStock.getFEntity();
baseVehicleOutApply.setBillNo(billNo); for (SalOutStock.FEntity entity : fEntity) {
baseVehicleOutApply.setSaleDate(baseVehicleOut.getSaleDate()); baseVehinstall.setVehicleStateKey(VehicleState.StockEnum.OUT_STOCK.getCode());
baseVehicleOutApply.setCustomerSid(baseVehicleOut.getCustomerSid()); baseVehinstall.setVehicleStateValue(VehicleState.StockEnum.OUT_STOCK.getRemarks());
baseVehicleOutApply.setCustomerName(baseVehicleOut.getCustomerName()); baseVehinstall.setSalesDate(DateUtil.formatDate(new Date()));
baseVehicleOutApply.setMobile(baseVehicleOut.getMobile()); saveOrUpdate(baseVehinstall);
baseVehicleOutApply.setOrgSid(baseVehicleOut.getOrgSid()); }
baseVehicleOutApply.setOrgName(baseVehicleOut.getOrgName()); return rb.success();
baseVehicleOutApply.setStaffSid(baseVehicleOut.getStaffSid()); }
baseVehicleOutApply.setStaffName(baseVehicleOut.getStaffName());
baseVehicleOutApply.setMakeListSid(baseVehicleOut.getCreateBySid());
baseVehicleOutApply.setMakeListName(baseVehicleOut.getCreateByName());
baseVehicleOutApply.setMakeListDate(DateUtil.format(new Date(), "yyyy-MM-dd"));
baseVehicleOutApply.setSaleTypeKey(baseVehicleOut.getTypeKey());
baseVehicleOutApply.setSaleTypeValue(baseVehicleOut.getType());
baseVehicleOutApply.setCreateOrgSid(baseVehicleOut.getCreateOrgSid());
baseVehicleOutApply.setCreateBySid(baseVehicleOut.getCreateBySid());
//保存车辆出库单主表
baseVehicleOutApplyService.save(baseVehicleOutApply);
//出库单子表关联主表sid
baseVehicleOut.setMainSid(baseVehicleOutApply.getSid());
baseVehicleOut.setCreateBySid(baseVehicleOut.getCreateBySid());
baseVehicleOut.setCreateByName(baseVehicleOut.getCreateByName());
baseVehicleOut.setManPurOrderTypeKey(baseVehicle.getManPurOrderTypeKey());
baseVehicleOut.setManPurOrderTypeValue(baseVehicle.getManPurOrderTypeValue());
//保存车辆出库单子表
baseVehicleOutService.save(baseVehicleOut);
//推送金蝶上装销售出库单
SalOutStock salOutStock = createSzOrGcSalOutStock(baseVehinstall, baseVehicle, baseVehicleOut);
finKingDeeFeign.draftSalOutStock(salOutStock);
List<SalOutStock.FEntity> fEntity = salOutStock.getFEntity();
for (SalOutStock.FEntity entity : fEntity) {
String substring = entity.getFMaterialID().substring(entity.getFMaterialID().length() - 1);
if ("Z".equals(substring)) {
baseVehinstall.setVehicleStateKey(VehicleState.StockEnum.OUT_STOCK.getCode());
baseVehinstall.setVehicleStateValue(VehicleState.StockEnum.OUT_STOCK.getRemarks());
baseVehinstall.setSalesDate(DateUtil.formatDate(new Date()));
saveOrUpdate(baseVehinstall);
}
}
return rb.success();
}
} }

10
anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java
View File

@ -1161,16 +1161,10 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
crmAppDisAndCustm.setExtra(crmExtra); crmAppDisAndCustm.setExtra(crmExtra);
return rb.success().setData(crmAppDisAndCustm); return rb.success().setData(crmAppDisAndCustm);
} }
CrmCustomerTemp crmCustomerTemp = fetchBySid(dtoSid);
CrmCustomerTempUpdateDto crmCustomerTempDto = new CrmCustomerTempUpdateDto(); CrmCustomerTempUpdateDto crmCustomerTempDto = new CrmCustomerTempUpdateDto();
crmCustomerTempDto.setName(name); BeanUtils.copyProperties(crmCustomerTemp,crmCustomerTempDto);
crmCustomerTempDto.setIDNumber(dto.getTaxpayerNo()); crmCustomerTempDto.setIDNumber(dto.getTaxpayerNo());
crmCustomerTempDto.setMobile(phone);
crmCustomerTempDto.setUserSid(dto.getCreateBySid());
crmCustomerTempDto.setOrgPath(dto.getOrgSidPath());
crmCustomerTempDto.setCertificateTypeKey("01");
crmCustomerTempDto.setCertificateType("身份证");
crmCustomerTempDto.setCustomerTypeKey("1");
crmCustomerTempDto.setCustomerType("个人");
ResultBean resultBean = updateCrmCustomer(crmCustomerTempDto, dtoSid); ResultBean resultBean = updateCrmCustomer(crmCustomerTempDto, dtoSid);
if (!resultBean.getSuccess()) { if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg()); return rb.setMsg(resultBean.getMsg());

4
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingDetailsVo.java
View File

@ -73,4 +73,8 @@ public class FinCompanyInvoicingDetailsVo implements Vo {
private String purchaseSystemName; // 采购系统名称 private String purchaseSystemName; // 采购系统名称
@ApiModelProperty("组织全路径") @ApiModelProperty("组织全路径")
private String orgSidPath; private String orgSidPath;
@ApiModelProperty("业务员sid")
private String staffSid;
@ApiModelProperty("创建人sid")
private String createBySid;
} }

8
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java
View File

@ -390,14 +390,20 @@ public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInv
public ResultBean<FinCompanyInvoicingDetailsVo> qyAppFetchDetailsBySid(String sid) { public ResultBean<FinCompanyInvoicingDetailsVo> qyAppFetchDetailsBySid(String sid) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = fetchDetailsVoBySid(sid); FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = fetchDetailsVoBySid(sid);
if (finCompanyInvoicingDetailsVo != null) { if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getSid())) {
return rb.success().setData(finCompanyInvoicingDetailsVo); return rb.success().setData(finCompanyInvoicingDetailsVo);
} }
CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(sid).getData(); CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(sid).getData();
if (crmCustomerTempVo == null){
return rb.setMsg("该开票名称不存在，请重新选择");
}
finCompanyInvoicingDetailsVo.setSid(crmCustomerTempVo.getSid()); finCompanyInvoicingDetailsVo.setSid(crmCustomerTempVo.getSid());
finCompanyInvoicingDetailsVo.setName(crmCustomerTempVo.getName()); finCompanyInvoicingDetailsVo.setName(crmCustomerTempVo.getName());
finCompanyInvoicingDetailsVo.setPhone(crmCustomerTempVo.getMobile()); finCompanyInvoicingDetailsVo.setPhone(crmCustomerTempVo.getMobile());
finCompanyInvoicingDetailsVo.setTaxpayerNo(crmCustomerTempVo.getIDNumber()); finCompanyInvoicingDetailsVo.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
finCompanyInvoicingDetailsVo.setStaffSid(crmCustomerTempVo.getStaffSid());
finCompanyInvoicingDetailsVo.setCreateBySid(crmCustomerTempVo.getCreateBySid());
finCompanyInvoicingDetailsVo.setStaffSid(crmCustomerTempVo.getStaffSid());
return rb.success().setData(finCompanyInvoicingDetailsVo); return rb.success().setData(finCompanyInvoicingDetailsVo);
} }
} }
Write Preview
Loading…
Cancel
Save