Browse Source

问题修改

master
God 3 years ago
parent
commit
6c2e8fedb9
  1. 23
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleBuyBlank.java
  2. 18
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java
  3. 10
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java
  4. 39
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleOutLibrary.java
  5. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleoffer/BusVehicleOfferDetailVo.java
  6. 3
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAttachTypeEnum.java
  7. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java
  8. 20
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
  9. 20
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java
  10. 69
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
  11. 17
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleoffer/BusVehicleOfferService.java
  12. 2
      anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempDto.java
  13. 3
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundQuery.java
  14. 4
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseQuery.java
  15. 27
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
  16. 4
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java

23
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleBuyBlank.java

@ -0,0 +1,23 @@
package com.yxt.anrui.base.api.basevehicle;
import com.yxt.anrui.base.api.commonappendix.CommonAppendix;
import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @Description 车辆台账买断
*/
@Data
public class BaseVehicleBuyBlank implements Vo {
@ApiModelProperty(value = "车辆sid")
private List<String> vehicleSid;
@ApiModelProperty(value = "买断日期")
private String solidDate;
@ApiModelProperty(value = "买断附件信息")
private CommonAppendix commonAppendix;
}

18
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java

@ -70,6 +70,24 @@ public interface BaseVehicleFeign {
@PostMapping("/saveAll")
public ResultBean saveAll(@Valid @RequestBody List<BaseVehicleDto> dto);
/**
* 车辆台账出库
*
* @return
*/
@ApiOperation("车辆台账出库")
@PostMapping("/vehicleOutLibrary")
public ResultBean vehicleOutLibrary(@RequestBody BaseVehicleOutLibrary baseVehicleOutLibrary);
/**
* 车辆台账买断
*
* @return
*/
@ApiOperation("车辆台账买断")
@PostMapping("/vehicleBuyBreak")
public ResultBean vehicleBuyBreak(@RequestBody BaseVehicleBuyBlank baseVehicleBuyBlank);
/**
* 修改保存
*

10
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java

@ -46,6 +46,16 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign {
return null;
}
@Override
public ResultBean vehicleOutLibrary(BaseVehicleOutLibrary baseVehicleOutLibrary) {
return null;
}
@Override
public ResultBean vehicleBuyBreak(BaseVehicleBuyBlank baseVehicleBuyBlank) {
return null;
}
@Override
public ResultBean update(BaseVehicleDto dto, String sid) {
return ResultBean.fireFail().setMsg("接口anrui-base/basevehicle/update无法访问");

39
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleOutLibrary.java

@ -0,0 +1,39 @@
package com.yxt.anrui.base.api.basevehicle;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Description 车辆台账出库
*/
@Data
public class BaseVehicleOutLibrary implements Vo {
@ApiModelProperty(value = "车辆sid")
private String vehicleSid;
@ApiModelProperty(value = "库存状态value")
private String vehicleStateValue;
@ApiModelProperty(value = "出库类型value")
private String outLibraryValue;
@ApiModelProperty(value = "userSid")
private String userSid;
@ApiModelProperty(value = "合同编号")
private String contractNo;
@ApiModelProperty(value = "成交价")
private String salePrice;
@ApiModelProperty(value = "客户类型key")
private String customerTypeKey;
@ApiModelProperty(value = "客户类型value")
private String customerType;
@ApiModelProperty(value = "客户名称")
private String customerName;
@ApiModelProperty(value = "手机号码")
private String mobile;
@ApiModelProperty(value = "身份证号码")
private String IDNumber;
@ApiModelProperty(value = "联系地址")
private String address;
}

4
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleoffer/BusVehicleOfferDetailVo.java

@ -197,6 +197,10 @@ public class BusVehicleOfferDetailVo implements Vo {
private String salePrice;
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("换装配置")
private String replacementConfig;
@ApiModelProperty("选装配置")
private String optionalConfig;
@ApiModelProperty("创建组织sid")
private String createOrgSid;

3
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAttachTypeEnum.java

@ -51,7 +51,8 @@ public enum CommonAttachTypeEnum {
MANUFACTOR_RETWARE("0014", "厂家退库车辆附件"),
SHUNTINGINVOICINAPPLY("0015", "调车开票附件"),
OUTSOURCINGAPPLY("0016", "外采申请附件"),
INBOUNDAPPLY("0017", "入账申请附件");
INBOUNDAPPLY("0017", "入账申请附件"),
VEHBUYBLANK("0018", "车辆买断附件");
/**
* 附件类型
*/

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

@ -418,4 +418,8 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
IPage<AppScmWarehouseVinVo> getPcVinByWarehouseSid(IPage<VinByWarehouseQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppScmWarehouseVinVo> qw, @Param("warehouseSid") String warehouseSid);
ExiCarConfigDetailVo selectExiCarConfigByVehModelConfigSid(@Param("vehModelConfigSid") String vehModelConfigSid);
void updateVehicleOutLibrary(@Param("sid") String sid,@Param("vehicleState") String vehicleState,@Param("vehicleStateValue") String vehicleStateValue,@Param("salesDate") String salesDate,@Param("salePrice") String salePrice,@Param("remarks") String remarks);
void updateVehicleBuyBreak(@Param("sid") String sid,@Param("solidDate") String solidDate,@Param("settlementStatus") String settlementStatus,@Param("settlementStatusValue") String settlementStatusValue);
}

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

@ -961,4 +961,24 @@
and bv.location = #{warehouseSid}
</where>
</select>
<update id="updateVehicleOutLibrary">
UPDATE
base_vehicle
SET vehicleState = #{vehicleState},
vehicleStateValue = #{vehicleStateValue},
salesDate = #{salesDate},
salePrice = #{salePrice},
remarks = #{remarks}
WHERE sid = #{sid}
</update>
<update id="updateVehicleBuyBreak">
UPDATE
base_vehicle
SET solidDate = #{solidDate},
settlementStatus = #{settlementStatus},
settlementStatusValue = #{settlementStatusValue}
WHERE sid = #{sid}
</update>
</mapper>

20
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java

@ -108,13 +108,19 @@ public class BaseVehicleRest implements BaseVehicleFeign {
BaseVehicle baseVehicle = new BaseVehicle();
dto.fillEntity(baseVehicle);
//锁定状态
String lockedStateKey = VehicleState.LockEnum.UN_LOCK.getCode();
/*String lockedStateKey = VehicleState.LockEnum.UN_LOCK.getCode();
String lockedStateValue = VehicleState.LockEnum.UN_LOCK.getRemarks();
baseVehicle.setLockedState(lockedStateKey);
baseVehicle.setLockedStateValue(lockedStateValue);
baseVehicle.setVehicleState(VehicleState.StockEnum.STOCK.getCode());
baseVehicle.setVehicleStateValue(VehicleState.StockEnum.STOCK.getRemarks());
baseVehicle.setSettlementStatus(VehicleState.BuyoutEnum.UN_BUYOUT.getCode());
baseVehicle.setSettlementStatus(VehicleState.BuyoutEnum.UN_BUYOUT.getCode());*/
baseVehicle.setLockedState(dto.getLockedState());
baseVehicle.setLockedStateValue(dto.getLockedStateValue());
baseVehicle.setVehicleState(dto.getVehicleState());
baseVehicle.setVehicleStateValue(dto.getVehicleStateValue());
baseVehicle.setSettlementStatus(dto.getSettlementStatus());
baseVehicle.setSettlementStatusValue(dto.getSettlementStatusValue());
boolean isSave = baseVehicleService.save(baseVehicle);
BaseVehicleCertificate baseVehicleCertificate = new BaseVehicleCertificate();
if (StringUtils.isNotBlank(dto.getVinNo())){
@ -140,6 +146,16 @@ public class BaseVehicleRest implements BaseVehicleFeign {
return rb.success().setMsg("保存成功");
}
@Override
public ResultBean vehicleOutLibrary(BaseVehicleOutLibrary baseVehicleOutLibrary) {
return baseVehicleService.vehicleOutLibrary(baseVehicleOutLibrary);
}
@Override
public ResultBean vehicleBuyBreak(BaseVehicleBuyBlank baseVehicleBuyBlank) {
return baseVehicleService.vehicleBuyBreak(baseVehicleBuyBlank);
}
@Override
public ResultBean update(BaseVehicleDto dto, String sid) {
ResultBean rb = ResultBean.fireFail();

69
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@ -1,5 +1,6 @@
package com.yxt.anrui.base.biz.basevehicle;
import cn.hutool.core.date.DateUtil;
import com.alibaba.nacos.api.config.filter.IFilterConfig;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@ -10,6 +11,9 @@ import com.yxt.anrui.base.api.basevehicle.*;
import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo;
import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificate;
import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo;
import com.yxt.anrui.base.api.commonappendix.CommonAppendix;
import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto;
import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum;
import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService;
import com.yxt.anrui.base.biz.basevehicleappendix.BaseVehicleAppendixService;
import com.yxt.anrui.base.biz.basevehiclecertificate.BaseVehicleCertificateService;
@ -20,9 +24,15 @@ import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService;
import com.yxt.anrui.base.common.enums.VehicleState;
import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositFeign;
import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositVehicleQuery;
import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTemp;
import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempDto;
import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
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;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.DateUtils;
@ -63,9 +73,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
@Autowired
private BaseModelConfigService baseModelConfigService;
@Autowired
private BaseVehicleModelService baseVehicleModelService;
@Autowired
private CommonAppendixService commonAppendixService;
private SysUserFeign sysUserFeign;
@Autowired
private BaseVehicleAppendixService baseVehicleAppendixService;
@Autowired
@ -78,6 +86,10 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
private BaseVehicleModelAppendixService baseVehicleModelAppendixService;
@Autowired
private BaseVehinstallService baseVehinstallService;
@Autowired
private CrmCustomerTempFeign crmCustomerTempFeign;
@Autowired
private CommonAppendixService commonAppendixService;
/**
* 车辆信息分页列表
@ -1277,7 +1289,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
if (params.getVinNoList().size() > 0) {
qw.notIn("bv.vinNo", params.getVinNoList());
}
//结算状态:0买断
//结算状态:0买断
qw.eq("bv.settlementStatus", VehicleState.BuyoutEnum.UN_BUYOUT.getCode());
//车辆状态:现车
qw.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode());
@ -1614,4 +1626,53 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
return iPage;
}
@Transactional
public ResultBean vehicleOutLibrary(BaseVehicleOutLibrary baseVehicleOutLibrary) {
ResultBean rb = ResultBean.fireFail();
String vehicleSid = baseVehicleOutLibrary.getVehicleSid();
String vehicleStateValue = baseVehicleOutLibrary.getVehicleStateValue();
if (!vehicleStateValue.equals(VehicleState.StockEnum.STOCK.getRemarks())) {
return rb.setMsg("该车辆台账不是库存车辆,请重新选择");
}
String userSid = baseVehicleOutLibrary.getUserSid();
ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(userSid);
if (!userVoResultBean.getSuccess()) {
return rb.setMsg(userVoResultBean.getMsg());
}
StringBuffer remarks = new StringBuffer();
String outLibraryValue = baseVehicleOutLibrary.getOutLibraryValue();
String contractNo = baseVehicleOutLibrary.getContractNo();
if (StringUtils.isNotBlank(outLibraryValue)) {
remarks.append(outLibraryValue).append(" ");
}
if (StringUtils.isNotBlank(contractNo)) {
remarks.append(contractNo);
}
String salePrice = baseVehicleOutLibrary.getSalePrice();
baseMapper.updateVehicleOutLibrary(vehicleSid,VehicleState.StockEnum.OUT_STOCK.getCode(),VehicleState.StockEnum.OUT_STOCK.getRemarks(), DateUtil.today(),salePrice,remarks.toString());
CrmCustomerTempDto crmCustomerTempDto = new CrmCustomerTempDto();
crmCustomerTempDto.setCustomerTypeKey(baseVehicleOutLibrary.getCustomerTypeKey());
crmCustomerTempDto.setCustomerType(baseVehicleOutLibrary.getCustomerType());
crmCustomerTempDto.setName(baseVehicleOutLibrary.getCustomerName());
crmCustomerTempDto.setMobile(baseVehicleOutLibrary.getMobile());
crmCustomerTempDto.setIDNumber(baseVehicleOutLibrary.getIDNumber());
crmCustomerTempDto.setAddress(baseVehicleOutLibrary.getAddress());
crmCustomerTempDto.setStaffSid(userVoResultBean.getData().getStaffSid());
crmCustomerTempFeign.save(crmCustomerTempDto);
return rb.success().setMsg("出库成功");
}
public ResultBean vehicleBuyBreak(BaseVehicleBuyBlank baseVehicleBuyBlank) {
ResultBean rb = ResultBean.fireFail();
List<String> vehicleSid = baseVehicleBuyBlank.getVehicleSid();
String solidDate = baseVehicleBuyBlank.getSolidDate();
CommonAppendix commonAppendix = baseVehicleBuyBlank.getCommonAppendix();
for (String s : vehicleSid) {
baseMapper.updateVehicleBuyBreak(s,solidDate,VehicleState.BuyoutEnum.BUYOUT.getCode(),VehicleState.BuyoutEnum.BUYOUT.getRemarks());
commonAppendix.setLinkSid(s);
commonAppendix.setAttachType(CommonAttachTypeEnum.VEHBUYBLANK.getAttachType());
commonAppendixService.save(commonAppendix);
}
return rb.success().setMsg("买断成功");
}
}

17
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleoffer/BusVehicleOfferService.java

@ -138,18 +138,23 @@ public class BusVehicleOfferService extends MybatisBaseService<BusVehicleOfferMa
busVehicleOfferDetailVo.setVehModelConfigSid(busVehicleInquiry.getVehModelConfigSid());
busVehicleOfferDetailVo.setVehModelConfig(busVehicleInquiry.getVehModelConfig());
busVehicleOfferDetailVo.setMoreConfig(busVehicleInquiry.getMoreConfig());
List<String> stringList = baseVehmodelOptionService.selByVehModelSid(busVehicleInquiry.getVehModelSid());
String repInstr = "";
for (String s : stringList) {
repInstr += s + ",";
//List<String> stringList = baseVehmodelOptionService.selByVehModelSid(busVehicleInquiry.getVehModelSid());
StringBuffer repInstr = new StringBuffer();
String optionalConfig = busVehicleInquiry.getOptionalConfig();
String replacementConfig = busVehicleInquiry.getReplacementConfig();
if (StringUtils.isNotBlank(optionalConfig)) {
repInstr.append(optionalConfig).append(" ");
}
if (StringUtils.isNotBlank(repInstr)){
busVehicleOfferDetailVo.setRepInstr(repInstr.substring(0,repInstr.length()-1));
if (StringUtils.isNotBlank(replacementConfig)){
repInstr.append(replacementConfig);
}
busVehicleOfferDetailVo.setRepInstr(repInstr.toString());
busVehicleOfferDetailVo.setOtherConfig(busVehicleInquiry.getOtherConfig());
busVehicleOfferDetailVo.setVehicleAlias(busVehicleInquiry.getVehModel());
busVehicleOfferDetailVo.setBrandSid(busVehicleInquiry.getBrandSid());
busVehicleOfferDetailVo.setBrandName(busVehicleInquiry.getBrandName());
busVehicleOfferDetailVo.setReplacementConfig(busVehicleInquiry.getReplacementConfig());
busVehicleOfferDetailVo.setOptionalConfig(busVehicleInquiry.getOptionalConfig());
BaseVehicleModel baseVehicleModel = baseVehicleModelService.fetchBySid(busVehicleInquiry.getVehModelSid());
if (baseVehicleModel == null) {
return rb.setMsg("该车型不存在");

2
anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempDto.java

@ -127,6 +127,8 @@ public class CrmCustomerTempDto implements Dto {
private String customerClassKey;
@ApiModelProperty(value = "备注")
private String remarks;
@ApiModelProperty("业务人员sid")
private String staffSid;
//运营信息
@ApiModelProperty(value = "运营信息")

3
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundQuery.java

@ -29,4 +29,7 @@ public class ScmApplyInboundQuery implements Query {
@ApiModelProperty("车型")
private String modelName;
@ApiModelProperty("创建组织sid")
private String createOrgSid;
}

4
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseQuery.java

@ -64,6 +64,6 @@ public class ScmWarehouseQuery implements Query {
@ApiModelProperty("负责人及电话")
private String warehouseContract; // 负责人及电话
@ApiModelProperty("分组")
private String warehouseGroup; // 分组
@ApiModelProperty("分组key")
private String warehouseGroupKey; // 分组key
}

27
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java

@ -1,24 +1,18 @@
package com.yxt.anrui.scm.biz.scmapplyinbound;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationDto;
import com.yxt.anrui.base.api.baseoutsourcingapplication.SubmitBaseOutSourcingApplicationDto;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleDto;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum;
import com.yxt.anrui.base.common.enums.VehicleState;
import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
import com.yxt.anrui.fin.api.kingdee.appayable.APPayable;
import com.yxt.anrui.flowable.api.flow.FlowableFeign;
import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFlowStateEnum;
import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
import com.yxt.anrui.flowable.api.utils.ProcessStateEnum;
import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
@ -27,17 +21,13 @@ import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.scm.api.flow.FlowTaskVo;
import com.yxt.anrui.scm.api.scmapplyinbound.*;
import com.yxt.anrui.scm.api.scmapplyinbound.flow.GetNodeQuery;
import com.yxt.anrui.scm.api.scmapplyinbound.flow.ScmApplyInBoundCompleteDto;
import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicle;
import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicleDto;
import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicleVo;
import com.yxt.anrui.scm.api.scmfile.ScmFileDto;
import com.yxt.anrui.scm.api.scmfile.ScmFileVo;
import com.yxt.anrui.scm.api.scmvehicleexamine.AppScmVehicleExamineDto;
import com.yxt.anrui.scm.api.scmvehicleexamine.ScmEntryVehicleExamineDto;
import com.yxt.anrui.scm.api.scmvehiclereturn.ScmVehicleReturnDto;
import com.yxt.anrui.scm.api.scmvehinspectitem.ScmVehinspectItemDto;
import com.yxt.anrui.scm.biz.flow.FlowableService;
import com.yxt.anrui.scm.biz.scmapplyinboundvehicle.ScmApplyInboundVehicleService;
import com.yxt.anrui.scm.biz.scmfile.ScmFileService;
import com.yxt.anrui.scm.biz.scmvehicleexamine.ScmVehicleExamineService;
@ -115,6 +105,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<ScmApplyInbound> qw = new QueryWrapper<>();
qw.eq("useOrgSid", query.getCreateOrgSid());
if (StringUtils.isNotBlank(query.getPurchaseOrderNo())) {
qw.like("purchaseOrderNo", query.getPurchaseOrderNo());
}
@ -456,16 +447,16 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
baseVehicleDto.setConfigName(booad.getConfigName());
baseVehicleDto.setInsideCode(booad.getInsideCode());
baseVehicleDto.setOrderingNo(booad.getPurchaseOrderNo());
baseVehicleDto.setSettlementStatus("0");
baseVehicleDto.setSettlementStatusValue("未买断");
baseVehicleDto.setLockedState("0");
baseVehicleDto.setLockedStateValue("未锁定");
baseVehicleDto.setVehicleState("0003");
baseVehicleDto.setVehicleStateValue("在途");
baseVehicleDto.setSettlementStatus(VehicleState.BuyoutEnum.UN_BUYOUT.getCode());
baseVehicleDto.setSettlementStatusValue(VehicleState.BuyoutEnum.UN_BUYOUT.getRemarks());
baseVehicleDto.setLockedState(VehicleState.LockEnum.UN_LOCK.getCode());
baseVehicleDto.setLockedStateValue(VehicleState.LockEnum.UN_LOCK.getRemarks());
baseVehicleDto.setVehicleState(VehicleState.StockEnum.ING_STOCK.getCode());
baseVehicleDto.setVehicleStateValue(VehicleState.StockEnum.ING_STOCK.getRemarks());
baseVehicleDto.setManPurOrderTypeKey("001");
baseVehicleDto.setManPurOrderTypeValue("排产订单");
baseVehicleDto.setContractPrice(Integer.parseInt(booad.getContractPrice().toString()));
baseVehicleDto.setFreight(Integer.parseInt(booad.getOnceFreight().subtract(booad.getSecondaryFreight()).toString()));
baseVehicleDto.setFreight(Integer.parseInt(booad.getOnceFreight().add(booad.getSecondaryFreight()).toString()));
baseVehicleDto.setCostPrice(Integer.parseInt(booad.getCostPrice().toString()));
baseVehicleDto.setPriceDate(booad.getPriceDate());
baseVehicleDto.setDepartureDate(booad.getDepartureDate());

4
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java

@ -81,8 +81,8 @@ public class ScmWarehouseService extends MybatisBaseService<ScmWarehouseMapper,
qw.like("warehouseContract", query.getWarehouseContract());
}
if (StringUtils.isNotBlank(query.getWarehouseGroup())) {
qw.eq("warehouseGroup", query.getWarehouseGroup());
if (StringUtils.isNotBlank(query.getWarehouseGroupKey())) {
qw.eq("warehouseGroupKey", query.getWarehouseGroupKey());
}
return qw;
}

Loading…
Cancel
Save