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

Merge remote-tracking branch 'origin/master'

master
yunuo970428 3 years ago
parent
8c286f48d1 2610f5b110
commit
4c56ad80df
18 changed files with 65 additions and 43 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. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDto.java
  2. 15
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java
  3. 21
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
  4. 4
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stktransferdirect/StkTransferDirect.java
  5. 9
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/BdMaterialCastToKingDeeBillFields.java
  6. 3
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/BdMaterialService.java
  7. 5
      anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
  8. 2
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java
  9. 3
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouse.java
  10. 3
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseDto.java
  11. 4
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseQuery.java
  12. 3
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseVo.java
  13. 7
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java
  14. 4
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java
  15. 2
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinbound/ScmVehicleInboundMapper.xml
  16. 2
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.xml
  17. 4
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java
  18. 5
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDto.java
View File

@ -39,7 +39,7 @@ public class BaseVehicleOutDto implements Dto {
private String customerSid;
@ApiModelProperty("手机号")
private String mobile;
@ApiModelProperty("赠品说明")
@ApiModelProperty("赠品价值")
private String giftsDescription;
@ApiModelProperty("销售折让")

15
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java
View File

@ -28,6 +28,7 @@ import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService;
import com.yxt.anrui.base.biz.basevehicletempstate.BaseVehicleTempstateService;
import com.yxt.anrui.base.biz.basevehmodelconfig.BaseVehmodelConfigService;
import com.yxt.anrui.base.biz.busvehicleinquiry.BusVehicleInquiryService;
import com.yxt.anrui.base.common.enums.CertificState;
import com.yxt.anrui.base.common.enums.ManPurOrderType;
import com.yxt.anrui.base.common.enums.OperVehicleState;
import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
@ -206,14 +207,18 @@ public class BaseVehicleRest implements BaseVehicleFeign {
baseVehicle.setWitPinState(dto.getWitPinState());
baseVehicle.setWitPinStateValue(dto.getWitPinStateValue());
boolean isSave = baseVehicleService.save(baseVehicle);
BaseVehicleCertificate baseVehicleCertificate = new BaseVehicleCertificate();
if (StringUtils.isNotBlank(dto.getVinNo())) {
BaseVehicleCertificate baseVehicleCertificate = new BaseVehicleCertificate();
baseVehicleCertificate.setVinNo(dto.getVinNo());
baseVehicleCertificate.setCertificateState(dto.getCertificateState());
baseVehicleCertificate.setCertificateStateValue(dto.getCertificateStateValue());
baseVehicleCertificate.setCertificateState(CertificState.CertificateState.CERSTATE_XN.getCode());
baseVehicleCertificate.setCertificateStateValue(CertificState.CertificateState.CERSTATE_XN.getRemarks());
baseVehicleCertificate.setVehicleSid(baseVehicle.getSid());
baseVehicleCertificate.setTransferStateKey("001");
baseVehicleCertificate.setTransferStateValue("未接收");
baseVehicleCertificate.setTransferStateKey(CertificState.TransferState.TRANSTATE_WJS.getCode());
baseVehicleCertificate.setTransferStateValue(CertificState.TransferState.TRANSTATE_WJS.getRemarks());
baseVehicleCertificate.setCreateOrgSid(baseVehicle.getCreateOrgSid());
baseVehicleCertificate.setCreateOrgName(baseVehicle.getCreateOrgName());
baseVehicleCertificate.setUseOrgSid(baseVehicle.getUseOrgSid());
baseVehicleCertificate.setUseOrgName(baseVehicle.getUseOrgName());
baseVehicleCertificateService.save(baseVehicleCertificate);
} else {
return rb.setMsg("车架号不能为空");

21
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
View File

@ -173,24 +173,35 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
fEntity.setFMaterialID(dto.getVinNo());
//仓库id
ResultBean<ScmWarehouseVo> voResultBean = scmWarehouseFeign.fetchBySid(baseVehicle.getLocation());
fEntity.setFStockID(voResultBean.getData().getWarehouseCode());
fEntity.setFStockID(voResultBean.getData().getGressionCode());
//销售折让
if (StringUtils.isNotBlank(dto.getSalesAllowance())) {
fEntity.setF_PAEZ_Decimal3(dto.getSalesAllowance());
}
if (StringUtils.isNotBlank(dto.getGiftsDescription())) {
fEntity.setF_PAEZ_Decimal4(dto.getGiftsDescription());
}
//返利金额
fEntity.setF_PAEZ_Decimal(dto.getRebateMoneyOne());
fEntity.setF_PAEZ_Decimal("0");//dto.getRebateMoneyOne()
String remarks = dto.getRemarks();
String note=remarks;
//备注
if (StringUtils.isNotBlank(dto.getRebateMoneyOne())) {
if (StringUtils.isNotBlank(dto.getRebateMoneyTwo())) {
fEntity.setFEntrynote(new BigDecimal(dto.getRebateMoneyOne()).add(new BigDecimal(dto.getRebateMoneyTwo())).toString());
note=note+"。返利情况："+dto.getMiddleOne()+":"+dto.getRebateMoneyOne()+"," + dto.getMiddleTwo()+":"+dto.getRebateMoneyTwo()+"。";
fEntity.setFEntrynote(note);
//返利金额
fEntity.setF_PAEZ_Decimal(new BigDecimal(dto.getRebateMoneyOne()).add(new BigDecimal(dto.getRebateMoneyTwo())).toString());//dto.getRebateMoneyOne()
} else {
fEntity.setFEntrynote(dto.getRebateMoneyOne());
fEntity.setFEntrynote(note+"。返利情况："+dto.getMiddleOne()+":"+dto.getRebateMoneyOne()+"。");
//返利金额
fEntity.setF_PAEZ_Decimal(new BigDecimal(dto.getRebateMoneyOne()).toString());//dto.getRebateMoneyOne()
}
} else {
if (StringUtils.isNotBlank(dto.getRebateMoneyTwo())) {
fEntity.setFEntrynote(dto.getRebateMoneyTwo());
fEntity.setFEntrynote( note+"。返利情况："+dto.getMiddleTwo()+":"+dto.getRebateMoneyTwo()+"。");
//返利金额
fEntity.setF_PAEZ_Decimal(new BigDecimal(dto.getRebateMoneyTwo()).toString());//dto.getRebateMoneyOne()
}
}
fEntityList.add(fEntity);

4
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stktransferdirect/StkTransferDirect.java
View File

@ -91,9 +91,9 @@ public class StkTransferDirect {
//public String FUnitID;
}
/* 调入货主:FOwnerIdHead (必填项)*/
@JsonProperty("FOwnerIdHead")
/* @JsonProperty("FOwnerIdHead")
@NotBlank(message = "FOwnerIdHead不能为空")
public String FOwnerIdHead;
public String FOwnerIdHead;*/
/* 调出库存组织:FStockOutOrgId (必填项)*/
@JsonProperty("FStockOutOrgId")
@NotBlank(message = "FStockOutOrgId不能为空")

9
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/BdMaterialCastToKingDeeBillFields.java
View File

@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.parser.Feature;
import com.yxt.anrui.fin.biz.kingdee.KingDeeUtils;
import com.yxt.common.base.utils.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -42,7 +43,13 @@ public class BdMaterialCastToKingDeeBillFields {
fEntityModel_ =KingDeeUtils.replaceTemplateParams(fEntityModel_, map_fEntityModel_);
JSONObject jsonFEntityModel_= JSONObject.parseObject(fEntityModel_,Feature.OrderedField);
String fields = map_fEntityModel_.get("fields");
if(StringUtils.isBlank(fields)){
jsonFEntityData_.put("NeedUpDateFields",JSONArray.parseArray(JSON.toJSONString(new ArrayList<>())));
}else{
String[] split = fields.split(",");
jsonFEntityData_.put("NeedUpDateFields",JSONArray.parseArray(JSON.toJSONString(split)));
}
jsonFEntityData_.put("Model",JSONObject.parseObject(JSON.toJSONString(jsonFEntityModel_),Feature.OrderedField));
jsonObj.put("data",jsonFEntityData_.toJSONString());

3
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/BdMaterialService.java
View File

@ -1,6 +1,8 @@
package com.yxt.anrui.fin.biz.kingdee.bdmaterial;
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.yxt.anrui.fin.api.kingdee.KingDeeBillId;
import com.yxt.anrui.fin.api.kingdee.KingDeeBillUrl;
@ -115,6 +117,7 @@ public class BdMaterialService extends FinKingDeeService {
return stringResultBean1;
}
map_fEntityModel_.put("IsDeleteEntry","False");
map_fEntityModel_.put("fields","FName,FNumber,FMaterialGroup,F_PAEZ_Base");
map_fEntityModel_.put("FMATERIALID",FMATERIALID);
rb= saveBdMaterial(map_fEntityModel_);
if (rb.getSuccess()) {

5
anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
View File

@ -11,10 +11,11 @@ public enum ProcDefEnum {
// CARSALECONTRACTAPPROVE("新车买卖合同审批", "car_sale_contract_asbspcvd:1:230020"),
SALESPOLICY("销售政策审批流程", "sales_policy_oxeeyzhr:1:247508"),
FINBILLAPPLICATION("开票申请流程", "process_t5ksueur:1:252833"),
ADVANCEGINVOICEAPPLY("提前开票申请流程", "advance_ginvoiceapply:1:242664"),
// ADVANCEGINVOICEAPPLY("提前开票申请流程", "advance_ginvoiceapply:1:242664"),
BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "process_zt1gov6e:1:647504"),
ARREARSCARRYVEHICLE("欠款提车审批流程", "arrears_carryvehicle:1:232589"),
// VEHICLEAPPLY("排产申请流程", "process_9egcg169:7:467504"),//TODO
VEHICLEAPPLY("排产申请流程", "process_9egcg169:9:600004"),//TODO
VEHICLEAPPLY("排产申请流程", "process_9egcg169:10:657508"),//TODO
// RECORDAPPLICATION("入账申请", "record_application_7y80d4r8:1:265008"),//TODO
RECORDAPPLICATION("入库申请", "process_xbwq2c7p:1:530004"),//TODO
SCMVEHICLERETURN("采购退库", "process_md8aeoap:4:392512"),

2
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java
View File

@ -168,10 +168,12 @@ public class SysOrganizationRest implements SysOrganizationFeign {
if(!orgList.contains(orgSid1)){
//根据staffSid查询token
String token = sysUserService.selectByStaffsid(s).getToken();
if(StringUtils.isNotBlank(token)){
//清空该token
redisUtil.remove(token);
}
}
}
}
return rb.success();

3
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouse.java
View File

@ -57,9 +57,6 @@ public class ScmWarehouse extends BaseEntity {
@ApiModelProperty("使用组织sid")
private String useOrgSid; // 使用组织sid
@ApiModelProperty("编码")
private String warehouseCode; // 编码
@ApiModelProperty("名称")
private String warehouseName; // 名称

3
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseDto.java
View File

@ -56,9 +56,6 @@ public class ScmWarehouseDto implements Dto {
@ApiModelProperty("使用组织sid")
private String useOrgSid; // 使用组织sid
@ApiModelProperty("编码")
private String warehouseCode; // 编码
@ApiModelProperty("名称")
private String warehouseName; // 名称

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

@ -52,8 +52,8 @@ public class ScmWarehouseQuery implements Query {
@ApiModelProperty("使用组织sid")
private String useOrgSid; // 使用组织sid
@ApiModelProperty("编码")
private String warehouseCode; // 编码
@ApiModelProperty("库存地点编号")
private String gressionCode;
@ApiModelProperty("名称")
private String warehouseName; // 名称

3
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseVo.java
View File

@ -58,9 +58,6 @@ public class ScmWarehouseVo implements Vo {
@ApiModelProperty("使用组织sid")
private String[][] useOrgSid; // 使用组织sid
@ApiModelProperty("编码")
private String warehouseCode; // 编码
@ApiModelProperty("名称")
private String warehouseName; // 名称

7
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java
View File

@ -332,7 +332,8 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
String businessSid = scmVehicleEnterlibrary.getBusinessSid();
//排产
if (ManPurOrderType.ManOrderType.PC_ORDER.getCode().equals(scmVehicleEnterlibrary.getPurchaseTypeKey()) || ManPurOrderType.ManOrderType.TC_ORDER.getCode().equals(scmVehicleEnterlibrary.getPurchaseTypeKey())) {
if (ManPurOrderType.ManOrderType.PC_ORDER.getCode().equals(scmVehicleEnterlibrary.getPurchaseTypeKey()) ||
ManPurOrderType.ManOrderType.TC_ORDER.getCode().equals(scmVehicleEnterlibrary.getPurchaseTypeKey())) {
BaseVehicleDto baseVehicleDto = new BaseVehicleDto();
baseVehicleDto.setVinNo(dto.getVin());
baseVehicleDto.setVehicleState(VehicleState.StockEnum.STOCK.getCode());
@ -362,10 +363,10 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
StkTransferDirect.FBillEntry fBillEntry = new StkTransferDirect.FBillEntry();
ScmWarehouse scmWarehouse = scmWarehouseService.fetchBySid(scmVehicleEnterlibrary.getLocationSid());
// fBillEntry.setFDestStockId("CK003");//调入仓库
fBillEntry.setFDestStockId(scmWarehouse.getWarehouseCode());//调入仓库
fBillEntry.setFDestStockId(scmWarehouse.getGressionCode());//调入仓库
fBillEntry.setFMaterialId(scmVehicleEnterlibrary.getVinNo());//物料编码
// fBillEntry.setFSrcStockId("CK001");//调出仓库
fBillEntry.setFSrcStockId(scmWarehouse.getWarehouseCode());//调出仓库
fBillEntry.setFSrcStockId("ARZTCK");//调出仓库 在途
FPAYBILLENTRYs.add(fBillEntry);
stkTransferDirect.setFBillEntry(FPAYBILLENTRYs);
ResultBean<String> resultBean = finKingDeeFeign.draftStkTransferDirect(stkTransferDirect);

4
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java
View File

@ -909,10 +909,10 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
StkTransferDirect.FBillEntry fBillEntry = new StkTransferDirect.FBillEntry();
ScmWarehouse scmWarehouse = scmWarehouseService.fetchBySid(scmVehicleGression.getTargetLocationSid());
// fBillEntry.setFDestStockId("CK003");//调入仓库
fBillEntry.setFDestStockId(scmWarehouse.getWarehouseCode());//调入仓库
fBillEntry.setFDestStockId(scmWarehouse.getGressionCode());//调入仓库
fBillEntry.setFMaterialId(s);//物料编码
scmWarehouse = scmWarehouseService.fetchBySid(scmVehicleGression.getLocationSid());
fBillEntry.setFSrcStockId(scmWarehouse.getWarehouseCode());//调出仓库
fBillEntry.setFSrcStockId(scmWarehouse.getGressionCode());//调出仓库
// fBillEntry.setFSrcStockId("CK001");//调出仓库
FPAYBILLENTRYs.add(fBillEntry);
stkTransferDirect.setFBillEntry(FPAYBILLENTRYs);

2
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinbound/ScmVehicleInboundMapper.xml
View File

@ -17,7 +17,7 @@
sw.warehouseContract,
DATE_FORMAT(si.inboundDate, '%Y-%m-%d') as inboundDate
from scm_vehicle_inbound si
left join scm_warehouse sw on si.warehouseCode = sw.warehouseCode
left join scm_warehouse sw on si.warehouseCode = sw.gressionCode
${ew.customSqlSegment}
</select>

2
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.xml
View File

@ -81,7 +81,7 @@
resultType="com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.ScmVehicleStayPatrolinspectionVo">
select *
from scm_vehicle_patrolinspection svp
where svp.mainSid = #{vin}
where svp.vinNo = #{vin}
and svp.id &lt; #{id}
and svp.createOrgSid = #{useOrgSid}
ORDER BY id DESC

4
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java
View File

@ -120,7 +120,7 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
ScmVehiclePatrolinspectionQuery query = pq.getParams();
QueryWrapper<ScmVehiclePatrolinspection> qw = new QueryWrapper<>();
qw.eq("createOrgSid", query.getCreateOrgSid());
qw.eq("isDelete",0);
qw.eq("isDelete", 0);
if (StringUtils.isNotBlank(query.getVinNo())) {
qw.like("vinNo", query.getVinNo());
}
@ -141,7 +141,9 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
record.setPatrolInspectionDate(scmVehicleStayPatrolinspectionVo.getPatrolInspectionDate());
}
BaseVehicleVo vehicleVo = baseVehicleFeign.selVehicleByVinNo(vinNo).getData();
if (vehicleVo != null) {
record.setModel(vehicleVo.getModelName());
}
String locationSid = record.getLocationSid();
ScmWarehouse scmWarehouse = scmWarehouseService.fetchBySid(locationSid);
record.setLiableSid(scmWarehouse.getLibTubeSid());

5
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java
View File

@ -64,8 +64,8 @@ public class ScmWarehouseService extends MybatisBaseService<ScmWarehouseMapper,
qw.eq("useOrgSid", query.getUseOrgSid());
}
if (StringUtils.isNotBlank(query.getWarehouseCode())) {
qw.eq("warehouseCode", query.getWarehouseCode());
if (StringUtils.isNotBlank(query.getGressionCode())) {
qw.eq("gressionCode", query.getGressionCode());
}
if (StringUtils.isNotBlank(query.getWarehouseName())) {
@ -107,7 +107,6 @@ public class ScmWarehouseService extends MybatisBaseService<ScmWarehouseMapper,
public void saveOrUpdateDto(ScmWarehouseDto dto) {
ScmWarehouse entity = new ScmWarehouse();
dto.fillEntity(entity);
entity.setWarehouseCode(dto.getGressionCode());
this.saveOrUpdate(entity);
}

Write Preview
Loading…
Cancel
Save