Browse Source

Merge remote-tracking branch 'origin/master'

master
yunuo970428 3 years ago
parent
commit
ce82993fce
  1. 3
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddlemanDetailsVo.java
  2. 3
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddlemanDto.java
  3. 3
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddlemanVo.java
  4. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml
  5. 8
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java
  6. 18
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemiddleman/BaseMiddlemanMapper.xml
  7. 1
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java
  8. 5
      anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicleDemandUpdateDto.java
  9. 5
      anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicledemandDetailsVo.java
  10. 20
      anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicledemandVo.java
  11. 5
      anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemand.java
  12. 14
      anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java
  13. 2
      anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.java
  14. 24
      anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml
  15. 9
      anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java
  16. 5
      anrui-fin/anrui-fin-api/pom.xml
  17. 111
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/Data.java
  18. 9
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java
  19. 20
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/KingDeeBillId.java
  20. 39
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Data.java
  21. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fbilltypeid.java
  22. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fchargeid.java
  23. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fcurrencyid.java
  24. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fexchangetype.java
  25. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fmainbookstdcurrid.java
  26. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fmaterialid.java
  27. 4
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Forderid.java
  28. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fpayconditon.java
  29. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fpayorgid.java
  30. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fpriceunitid.java
  31. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fpurchasedeptid.java
  32. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fsettleorgid.java
  33. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fstockunitid.java
  34. 19
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fsubheadfinc.java
  35. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fsupplierid.java
  36. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Ftransferid.java
  37. 88
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Model.java
  38. 6
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignService.java
  39. 225
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/EntryBillCastToKingDeeBillFields.java
  40. 2
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.java
  41. 29
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml
  42. 14
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java
  43. 2
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineMapper.xml
  44. 3
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitem/ScmVehinspectItemService.java
  45. 2
      anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplication.vue
  46. 4
      anrui-scm/anrui-scm-ui/src/views/supplychain/caigoutuiku/caigoutuikuAdd.vue
  47. 10
      anrui-scm/anrui-scm-ui/src/views/workFlow/caigoutuikuFlow/caigoutuikuEdit.vue
  48. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/carInspected/ImgUrlDto.java
  49. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/carInspected/ImgUrlVo.java

3
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddlemanDetailsVo.java

@ -65,4 +65,7 @@ public class BaseMiddlemanDetailsVo implements Vo {
@ApiModelProperty(value = "用户sid")
private String createBySid;
@ApiModelProperty(value = "备注")
private String remarks;
}

3
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddlemanDto.java

@ -65,4 +65,7 @@ public class BaseMiddlemanDto implements Dto {
@ApiModelProperty(value = "用户sid")
private String createBySid;
@ApiModelProperty(value = "备注")
private String remarks;
}

3
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddlemanVo.java

@ -65,4 +65,7 @@ public class BaseMiddlemanVo implements Vo {
@ApiModelProperty("专员用户sid")
private String createBySid;
@ApiModelProperty(value = "备注")
private String remarks;
}

4
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml

@ -170,14 +170,14 @@
select *
from base_distributor
where sid = #{sid}
and length(disName) = 0
and length(disName) > 0
</select>
<select id="selectBySidOne" resultType="com.yxt.anrui.base.api.basedistributor.BaseDistributor">
select *
from base_distributor
where sid = #{sid}
and length(invoPhone) = 0
and length(invoPhone) > 0
</select>
<update id="updateInvoiceBySid">

8
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java

@ -580,15 +580,15 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
//查询基础信息是否已完善
BaseDistributor distributor = baseMapper.selectBySid(sid);
if (distributor != null) {
vo.setBaseInfoState(0);
} else {
vo.setBaseInfoState(1);
} else {
vo.setBaseInfoState(0);
}
BaseDistributor distributor1 = baseMapper.selectBySidOne(sid);
if (distributor1 != null) {
vo.setInvoiceInfoState(0);
} else {
vo.setInvoiceInfoState(1);
} else {
vo.setInvoiceInfoState(0);
}
int count = baseDistributorAppendixService.selectByLinkSid(sid);
if (count > 0) {

18
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemiddleman/BaseMiddlemanMapper.xml

@ -4,7 +4,14 @@
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.base.api.basemiddleman.BaseMiddlemanVo">
SELECT bm.name, bm.createBySid, bm.mobile, bm.bankName, bm.bankAccount, bm.sid, bm.company
SELECT bm.name,
bm.createBySid,
bm.mobile,
bm.bankName,
bm.bankAccount,
bm.sid,
bm.company,
bm.remarks
FROM base_middleman bm
<where>
${ew.sqlSegment}
@ -30,7 +37,14 @@
</select>
<select id="fetchDetailsVoBySid" resultType="com.yxt.anrui.base.api.basemiddleman.BaseMiddlemanDetailsVo">
select bm.sid, bm.mobile, bm.company, bm.bankName, bm.bankAccount, bm.createBySid,bm.name
select bm.sid,
bm.mobile,
bm.company,
bm.bankName,
bm.bankAccount,
bm.createBySid,
bm.name,
bm.remarks
from base_middleman bm
where bm.sid = #{sid}
</select>

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

@ -100,6 +100,7 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
qw.eq("bva.createBySid", query.getUserSid());
}
}
qw.orderByDesc("bva.id");
IPage<BusVehicleApply> page = PagerUtil.queryToPage(pq);
IPage<BusVehicleApplyVo> pagging = baseMapper.selectPageVo(page, qw);
List<BusVehicleApplyVo> voList = pagging.getRecords();

5
anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicleDemandUpdateDto.java

@ -33,4 +33,9 @@ public class AppCrmVehicleDemandUpdateDto implements Dto {
@ApiModelProperty("意向车型sid")
private String intentionSid;
@ApiModelProperty(value = "金融方案key")
private String financePlan;
@ApiModelProperty(value = "金融方案value")
private String financePlanValue;
}

5
anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicledemandDetailsVo.java

@ -42,4 +42,9 @@ public class AppCrmVehicledemandDetailsVo implements Vo {
@ApiModelProperty(value = "其他配置:pc")
private String otherConfig;
@ApiModelProperty(value = "金融方案key")
private String financePlan;
@ApiModelProperty(value = "金融方案value")
private String financePlanValue;
}

20
anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicledemandVo.java

@ -6,13 +6,11 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
@ApiModel(value = "客户车辆需求信息 视图数据对象", description = "客户车辆需求信息 视图数据对象")
@Data
public class AppCrmVehicledemandVo implements Vo {
private static final long serialVersionUID = -3885773306949969375L;
@ApiModelProperty("车辆需求sid")
private String sid;
@ -31,6 +29,22 @@ public class AppCrmVehicledemandVo implements Vo {
@ApiModelProperty("购车方式value")
private String purchaseType;
@ApiModelProperty(value = "购车方式key")
private String purchaseKey;
@ApiModelProperty(value = "客户sid")
private String customerSid;
@ApiModelProperty(value = "客户名称")
private String customerName;
@ApiModelProperty(value = "客户手机号")
private String customerMobile;
@ApiModelProperty(value = "购车方式key")
private String payTypeUpKey;
@ApiModelProperty(value = "购车方式value")
private String payTypeUpValue;
@ApiModelProperty(value = "新建销售订单按钮是否显示")
private Boolean showAddOrderBtn;
}

5
anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemand.java

@ -78,4 +78,9 @@ public class CrmVehicledemand extends BaseEntity {
@ApiModelProperty("常用配置sid")
private String comonConfigSid;
@ApiModelProperty(value = "金融方案key")
private String financePlan;
@ApiModelProperty(value = "金融方案value")
private String financePlanValue;
}

14
anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java

@ -12,6 +12,7 @@ import com.yxt.anrui.crm.api.crmcustomertemp.*;
import com.yxt.anrui.crm.api.crmfile.CrmFileAttachTypeEnum;
import com.yxt.anrui.crm.api.crmfile.CrmFileDetailsVo;
import com.yxt.anrui.crm.api.crmvehicledemand.AppCrmVehicledemandVo;
import com.yxt.anrui.crm.api.crmvehicledemand.CrmVehicledemand;
import com.yxt.anrui.crm.api.crmvisit.AppCrmVisitThumbDetailsVo;
import com.yxt.anrui.crm.api.crmvisit.CrmVisitVo;
import com.yxt.anrui.crm.api.crmvisit.PcCrmVisitAppendixDto;
@ -338,7 +339,18 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
//意向车型
List<AppCrmVehicledemandVo> appCrmVehicledemandVos = crmVehicledemandService.selectCustomerSid(sid);
if (appCrmVehicledemandVos.size() > 0) {
appCrmVehicledemandVos.removeAll(Collections.singleton(null));
if (!appCrmVehicledemandVos.isEmpty()) {
for (AppCrmVehicledemandVo v : appCrmVehicledemandVos) {
String vehicSid = v.getSid();
//根据车辆需求sid查询是否已完善
CrmVehicledemand crmVehicledemand = crmVehicledemandService.selectOneBySid(vehicSid);
if (crmVehicledemand != null) {
v.setShowAddOrderBtn(true);
} else {
v.setShowAddOrderBtn(false);
}
}
vo.setAppCrmVehicledemandVos(appCrmVehicledemandVos);
} else {
List<AppCrmVehicledemandVo> list = new ArrayList<>();

2
anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.java

@ -108,4 +108,6 @@ public interface CrmVehicledemandMapper extends BaseMapper<CrmVehicledemand> {
IPage<AppOrderCrmVehicleDemandVo> getWantCarList(IPage<CrmVehicledemand> page, @Param(Constants.WRAPPER) QueryWrapper<CrmVehicledemand> qw);
void updateByPrice(@Param("sid") String sid);
CrmVehicledemand selectOneBySid(String vehicSid);
}

24
anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml

@ -32,10 +32,17 @@
cvcd.modelName,
cvcd.modelSid,
cvcd.comonConfigSid,
cvcd.saleReferencePrice AS guidancePrice,
cvcd.createTime,
cvcd.purchaseMethodValue AS purchaseType
cvcd.saleReferencePrice AS guidancePrice,
DATE_FORMAT(cvcd.createTime, '%Y-%m-%d') as createTime,
cvcd.purchaseMethodValue AS purchaseType,
cvcd.purchaseMethod as purchaseKey,
cvcd.financePlan as payTypeUpKey,
cvcd.financePlanValue as payTypeUpValue,
cct.sid as customerSid,
cct.name as customerName,
cct.mobile as customerMobile
FROM crm_vehicledemand cvcd
left join crm_customer_temp cct on cvcd.customerSid = cct.sid
WHERE cvcd.customerSid = #{customerSid}
AND cvcd.states = 1
</select>
@ -99,7 +106,9 @@
cv.number,
cv.estimatedPickupDate AS `date`,
cv.otherConfig,
cv.sketChconfiguration as configName
cv.sketChconfiguration as configName,
cv.financePlan,
cv.financePlanValue
FROM crm_vehicledemand cv
WHERE cv.sid = #{intentionSid}
</select>
@ -152,4 +161,11 @@
set vehicleModelOffer = NULL
where sid = #{sid}
</update>
<select id="selectOneBySid" resultType="com.yxt.anrui.crm.api.crmvehicledemand.CrmVehicledemand">
select *
from crm_vehicledemand
where sid = #{vehicSid}
and length(financePlan) > 0
</select>
</mapper>

9
anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java

@ -354,10 +354,11 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
ResultBean rb = ResultBean.fireFail();
String sid = appCrmVehicleDemandUpdateDto.getIntentionSid();
CrmVehicledemand entity = fetchBySid(sid);
entity.setPurchaseMethod(appCrmVehicleDemandUpdateDto.getPurchaseMethod());
BeanUtil.copyProperties(appCrmVehicleDemandUpdateDto,entity);
/*entity.setPurchaseMethod(appCrmVehicleDemandUpdateDto.getPurchaseMethod());
entity.setPurchaseMethodValue(appCrmVehicleDemandUpdateDto.getPurchaseMethodValue());
entity.setRemarks(appCrmVehicleDemandUpdateDto.getRemarks());
entity.setNumber(appCrmVehicleDemandUpdateDto.getNumber());
entity.setNumber(appCrmVehicleDemandUpdateDto.getNumber());*/
entity.setEstimatedPickupDate(appCrmVehicleDemandUpdateDto.getDate());
if (StringUtils.isNotBlank(appCrmVehicleDemandUpdateDto.getPrice())) {
BigDecimal bigDecimal = new BigDecimal(appCrmVehicleDemandUpdateDto.getPrice());
@ -473,4 +474,8 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
qw.eq("states", 1);
return qw;
}
public CrmVehicledemand selectOneBySid(String vehicSid) {
return baseMapper.selectOneBySid(vehicSid);
}
}

5
anrui-fin/anrui-fin-api/pom.xml

@ -33,6 +33,11 @@
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.10.1</version>
</dependency>
</dependencies>
</project>

111
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/Data.java

@ -1,111 +0,0 @@
package com.yxt.anrui.fin.api.kingdee;
import com.alibaba.fastjson.annotation.JSONField;
import com.alibaba.fastjson.annotation.JSONType;
import java.util.List;
@JSONType(orders={"Creator","NeedUpDateFields","NeedReturnFields","IsDeleteEntry","SubSystemId",
"IsVerifyBaseDataField","IsEntryBatchFill","ValidateFlag","NumberSearch","InterationFlags","Model"})
public class Data {
@JSONField(name = "Creator")
private String Creator;
@JSONField(name = "NeedUpDateFields")
private List<String> NeedUpDateFields;
@JSONField(name = "NeedReturnFields")
private List<String> NeedReturnFields;
@JSONField(name = "IsDeleteEntry")
private String IsDeleteEntry;
@JSONField(name = "SubSystemId")
private String SubSystemId;
@JSONField(name = "IsVerifyBaseDataField")
private String IsVerifyBaseDataField;
@JSONField(name = "IsEntryBatchFill")
private String IsEntryBatchFill;
@JSONField(name = "ValidateFlag")
private String ValidateFlag;
@JSONField(name = "NumberSearch")
private String NumberSearch;
@JSONField(name = "InterationFlags")
private String InterationFlags;
/*@JSONField(name = "Model")
private Model Model;*/
public void setCreator(String Creator) {
this.Creator = Creator;
}
public String getCreator() {
return Creator;
}
public void setNeedUpDateFields(List<String> NeedUpDateFields) {
this.NeedUpDateFields = NeedUpDateFields;
}
public List<String> getNeedUpDateFields() {
return NeedUpDateFields;
}
public void setNeedReturnFields(List<String> NeedReturnFields) {
this.NeedReturnFields = NeedReturnFields;
}
public List<String> getNeedReturnFields() {
return NeedReturnFields;
}
public void setIsDeleteEntry(String IsDeleteEntry) {
this.IsDeleteEntry = IsDeleteEntry;
}
public String getIsDeleteEntry() {
return IsDeleteEntry;
}
public void setSubSystemId(String SubSystemId) {
this.SubSystemId = SubSystemId;
}
public String getSubSystemId() {
return SubSystemId;
}
public void setIsVerifyBaseDataField(String IsVerifyBaseDataField) {
this.IsVerifyBaseDataField = IsVerifyBaseDataField;
}
public String getIsVerifyBaseDataField() {
return IsVerifyBaseDataField;
}
public void setIsEntryBatchFill(String IsEntryBatchFill) {
this.IsEntryBatchFill = IsEntryBatchFill;
}
public String getIsEntryBatchFill() {
return IsEntryBatchFill;
}
public void setValidateFlag(String ValidateFlag) {
this.ValidateFlag = ValidateFlag;
}
public String getValidateFlag() {
return ValidateFlag;
}
public void setNumberSearch(String NumberSearch) {
this.NumberSearch = NumberSearch;
}
public String getNumberSearch() {
return NumberSearch;
}
public void setInterationFlags(String InterationFlags) {
this.InterationFlags = InterationFlags;
}
public String getInterationFlags() {
return InterationFlags;
}
/*public void setModel(Model model) {
this.Model = model;
}
public Model getModel() {
return Model;
}*/
}

9
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java

@ -13,10 +13,10 @@ import org.springframework.web.bind.annotation.RequestBody;
*/
@Api(tags = "财务模块调用金蝶保存业务单据的接口")
@FeignClient(
contextId = "anrui-fin-FinKingDeeFeign",
name = "anrui-kingdee",
path = "v1/finKingDee",
fallback =FinKingDeeFeignFallBack.class
contextId = "anrui-fin-FinKingDeeFeign",
name = "anrui-kingdee",
path = "v1/finKingDee",
fallback =FinKingDeeFeignFallBack.class
)
public interface FinKingDeeFeign {
/**
@ -26,4 +26,5 @@ public interface FinKingDeeFeign {
@ApiOperation("入账保存应付单的接口")
@PostMapping("/draftEntryBill")
ResultBean draftEntryBill(@RequestBody EntryBillDto entryBillDto);
}

20
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/KingDeeBillId.java

@ -0,0 +1,20 @@
package com.yxt.anrui.fin.api.kingdee;
public enum KingDeeBillId {
AP_PAYABLE("AP_Payable","应付单"),;
private String ID;
private String NAME;
KingDeeBillId(String ID, String NAME) {
this.ID = ID;
this.NAME = NAME;
}
public String getID() {
return ID;
}
public String getNAME() {
return NAME;
}
}

39
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/JsonsRootBean.java → anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Data.java

@ -4,34 +4,67 @@ import java.util.List;
import com.alibaba.fastjson.annotation.JSONField;
/**
* Auto-generated: 2022-07-19 8:42:28
*
* Json格式数据详情参考Json格式数据必录
* @author www.jsons.cn
* @website http://www.jsons.cn/json2java/
*/
public class JsonsRootBean {
public class Data {
/**
* Creator创建者内码非必录
*/
@JSONField(alternateNames ="Creator")
private String creator;
/**
* NeedUpDateFields需要更新的字段数组类型格式[key1,key2,...]非必录更新单据体字段得加上单据体key
*/
@JSONField(alternateNames ="NeedUpDateFields")
private List<String> needupdatefields;
/**
* NeedReturnFields需返回结果的字段集合数组类型格式[key,entitykey.key,...]非必录返回单据体字段格式entitykey.key
*/
@JSONField(alternateNames ="NeedReturnFields")
private List<String> needreturnfields;
/**
* IsDeleteEntry是否删除已存在的分录布尔类型默认true非必录
*/
@JSONField(alternateNames ="IsDeleteEntry")
private String isdeleteentry;
/**
* SubSystemId表单所在的子系统内码字符串类型非必录
*/
@JSONField(alternateNames ="SubSystemId")
private String subsystemid;
/**
* IsVerifyBaseDataField是否验证所有的基础资料有效性布尔类默认false非必录
*/
@JSONField(alternateNames ="IsVerifyBaseDataField")
private String isverifybasedatafield;
/**
* IsEntryBatchFill是否批量填充分录默认true非必录
*/
@JSONField(alternateNames ="IsEntryBatchFill")
private String isentrybatchfill;
/**
* ValidateFlag是否验证标志布尔类型默认true非必录
*/
@JSONField(alternateNames ="ValidateFlag")
private String validateflag;
/**
* 是否用编码搜索基础资料布尔类型默认true非必录
*/
@JSONField(alternateNames ="NumberSearch")
private String numbersearch;
/**
* InterationFlags交互标志集合字符串类型分号分隔格式"flag1;flag2;..."非必录例如允许负库存标识STK_InvCheckResult
*/
@JSONField(alternateNames ="InterationFlags")
private String interationflags;
/**
* Model表单数据包Json类型必录
*/
@JSONField(alternateNames ="Model")
private Model model;
public void setCreator(String creator) {
this.creator = creator;
}

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fbilltypeid.java

@ -13,7 +13,7 @@ public class Fbilltypeid {
public void setFnumber(String fnumber) {
this.fnumber = fnumber;
}
public String getFnumber() {
public String getFnumber() {
return fnumber;
}

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fchargeid.java

@ -2,7 +2,7 @@ package com.yxt.anrui.fin.api.kingdee.entrybill.paymentslip;
import com.alibaba.fastjson.annotation.JSONField;
/**
* Auto-generated: 2022-07-19 8:42:28
*
* 收款方:FChargeId
* @author www.jsons.cn
* @website http://www.jsons.cn/json2java/
*/

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fcurrencyid.java

@ -2,7 +2,7 @@ package com.yxt.anrui.fin.api.kingdee.entrybill.paymentslip;
import com.alibaba.fastjson.annotation.JSONField;
/**
* Auto-generated: 2022-07-19 8:42:28
*
*币别:FCURRENCYID (必填项)
* @author www.jsons.cn
* @website http://www.jsons.cn/json2java/
*/

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fexchangetype.java

@ -2,7 +2,7 @@ package com.yxt.anrui.fin.api.kingdee.entrybill.paymentslip;
import com.alibaba.fastjson.annotation.JSONField;
/**
* Auto-generated: 2022-07-19 8:42:28
*
* 汇率类型:FEXCHANGETYPE
* @author www.jsons.cn
* @website http://www.jsons.cn/json2java/
*/

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fmainbookstdcurrid.java

@ -2,7 +2,7 @@ package com.yxt.anrui.fin.api.kingdee.entrybill.paymentslip;
import com.alibaba.fastjson.annotation.JSONField;
/**
* Auto-generated: 2022-07-19 8:42:28
*
* 本位币:FMAINBOOKSTDCURRID
* @author www.jsons.cn
* @website http://www.jsons.cn/json2java/
*/

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fmaterialid.java

@ -4,7 +4,7 @@ import java.util.Date;
import com.alibaba.fastjson.annotation.JSONField;
/**
* Auto-generated: 2022-07-19 8:42:28
*
* 物料编码:FMATERIALID
* @author www.jsons.cn
* @website http://www.jsons.cn/json2java/
*/

4
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Forderid.java

@ -2,7 +2,7 @@ package com.yxt.anrui.fin.api.kingdee.entrybill.paymentslip;
import com.alibaba.fastjson.annotation.JSONField;
/**
* Auto-generated: 2022-07-19 8:42:28
*
* 订货方:FORDERID
* @author www.jsons.cn
* @website http://www.jsons.cn/json2java/
*/
@ -13,7 +13,7 @@ public class Forderid {
public void setFnumber(String fnumber) {
this.fnumber = fnumber;
}
public String getFnumber() {
public String getFnumber() {
return fnumber;
}

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fpayconditon.java

@ -2,7 +2,7 @@ package com.yxt.anrui.fin.api.kingdee.entrybill.paymentslip;
import com.alibaba.fastjson.annotation.JSONField;
/**
* Auto-generated: 2022-07-19 8:42:28
*
* 付款条件:FPayConditon
* @author www.jsons.cn
* @website http://www.jsons.cn/json2java/
*/

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fpayorgid.java

@ -2,7 +2,7 @@ package com.yxt.anrui.fin.api.kingdee.entrybill.paymentslip;
import com.alibaba.fastjson.annotation.JSONField;
/**
* Auto-generated: 2022-07-19 8:42:28
*
* 付款组织:FPAYORGID (必填项)
* @author www.jsons.cn
* @website http://www.jsons.cn/json2java/
*/

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fpriceunitid.java

@ -4,7 +4,7 @@ import com.alibaba.fastjson.annotation.JSONField;
/**
* Auto-generated: 2022-07-19 8:42:28
*
* 计价单位:FPRICEUNITID
* @author www.jsons.cn
* @website http://www.jsons.cn/json2java/
*/

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fpurchasedeptid.java

@ -4,7 +4,7 @@ import com.alibaba.fastjson.annotation.JSONField;
/**
* Auto-generated: 2022-07-19 8:42:28
*
* 采购部门:FPURCHASEDEPTID (必填项)
* @author www.jsons.cn
* @website http://www.jsons.cn/json2java/
*/

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fsettleorgid.java

@ -2,7 +2,7 @@ package com.yxt.anrui.fin.api.kingdee.entrybill.paymentslip;
import com.alibaba.fastjson.annotation.JSONField;
/**
* Auto-generated: 2022-07-19 8:42:28
*
* 结算组织:FSETTLEORGID (必填项)
* @author www.jsons.cn
* @website http://www.jsons.cn/json2java/
*/

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fstockunitid.java

@ -2,7 +2,7 @@ package com.yxt.anrui.fin.api.kingdee.entrybill.paymentslip;
import com.alibaba.fastjson.annotation.JSONField;
/**
* Auto-generated: 2022-07-19 8:42:28
*
* 库存单位:FStockUnitId
* @author www.jsons.cn
* @website http://www.jsons.cn/json2java/
*/

19
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fsubheadfinc.java

@ -7,17 +7,34 @@ import com.alibaba.fastjson.annotation.JSONField;
* @website http://www.jsons.cn/json2java/
*/
public class Fsubheadfinc {
/**
* 到期日计算日期:FACCNTTIMEJUDGETIME
*/
@JSONField(alternateNames ="FACCNTTIMEJUDGETIME")
private String faccnttimejudgetime;
/**
* 本位币:FMAINBOOKSTDCURRID
*/
@JSONField(alternateNames ="FMAINBOOKSTDCURRID")
private Fmainbookstdcurrid fmainbookstdcurrid;
/**
* 汇率类型:FEXCHANGETYPE
*/
@JSONField(alternateNames ="FEXCHANGETYPE")
private Fexchangetype fexchangetype;
/**
* 汇率:FExchangeRate
*/
@JSONField(alternateNames ="FExchangeRate")
private int fexchangerate;
/**
* 税额:FTaxAmountFor
*/
@JSONField(alternateNames ="FTaxAmountFor")
private double ftaxamountfor;
/**
* 不含税金额:FNoTaxAmountFor
*/
@JSONField(alternateNames ="FNoTaxAmountFor")
private double fnotaxamountfor;
public void setFaccnttimejudgetime(String faccnttimejudgetime) {

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fsupplierid.java

@ -4,7 +4,7 @@ import com.alibaba.fastjson.annotation.JSONField;
/**
* Auto-generated: 2022-07-19 8:42:28
*
* 供应商:FSUPPLIERID (必填项)
* @author www.jsons.cn
* @website http://www.jsons.cn/json2java/
*/

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Ftransferid.java

@ -4,7 +4,7 @@ import com.alibaba.fastjson.annotation.JSONField;
/**
* Auto-generated: 2022-07-19 8:42:28
*
* 供货方:FTRANSFERID
* @author www.jsons.cn
* @website http://www.jsons.cn/json2java/
*/

88
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Model.java

@ -6,72 +6,156 @@ import com.yxt.anrui.fin.api.kingdee.entrybill.*;
/**
* Auto-generated: 2022-07-19 8:42:28
*
* 单据类型:FBillTypeID (必填项)
* @author www.jsons.cn
* @website http://www.jsons.cn/json2java/
*/
public class Model {
@JSONField(alternateNames ="FID")
private int fid;
/**
* 单据类型:FBillTypeID (必填项)
*/
@JSONField(alternateNames ="FBillTypeID")
private Fbilltypeid fbilltypeid;
/**
* 单据编号:FBillNo
*/
@JSONField(alternateNames ="FBillNo")
private String fbillno;
/**
* 是否期初单据:FISINIT
*/
@JSONField(alternateNames ="FISINIT")
private boolean fisinit;
/**
* 业务日期:FDATE (必填项)
*/
@JSONField(alternateNames ="FDATE")
private String fdate;
/**
* 到期日:FENDDATE_H
*/
@JSONField(alternateNames ="FENDDATE_H")
private String fenddateH;
/**
* 单据状态:FDOCUMENTSTATUS (必填项)
*/
@JSONField(alternateNames ="FDOCUMENTSTATUS")
private String fdocumentstatus;
/**
* 供应商:FSUPPLIERID (必填项)
*/
@JSONField(alternateNames ="FSUPPLIERID")
private Fsupplierid fsupplierid;
/**
* 币别:FCURRENCYID (必填项)
*/
@JSONField(alternateNames ="FCURRENCYID")
private Fcurrencyid fcurrencyid;
/**
* 付款条件:FPayConditon
*/
@JSONField(alternateNames ="FPayConditon")
private Fpayconditon fpayconditon;
/**
* 价外税:FISPRICEEXCLUDETAX
*/
@JSONField(alternateNames ="FISPRICEEXCLUDETAX")
private boolean fispriceexcludetax;
/**
* 业务类型:FBUSINESSTYPE (必填项)
*/
@JSONField(alternateNames ="FBUSINESSTYPE")
private String fbusinesstype;
/**
* 按含税单价录入:FISTAX
*/
@JSONField(alternateNames ="FISTAX")
private boolean fistax;
/**
* 结算组织:FSETTLEORGID (必填项)
*/
@JSONField(alternateNames ="FSETTLEORGID")
private Fsettleorgid fsettleorgid;
/**
* 付款组织:FPAYORGID (必填项)
*/
@JSONField(alternateNames ="FPAYORGID")
private Fpayorgid fpayorgid;
/**
* 立账类型:FSetAccountType
*/
@JSONField(alternateNames ="FSetAccountType")
private String fsetaccounttype;
/**
*税额计入成本:FISTAXINCOST
*/
@JSONField(alternateNames ="FISTAXINCOST")
private boolean fistaxincost;
/**
* 备注:FAP_Remark
*/
@JSONField(alternateNames ="FAP_Remark")
private String fapRemark;
/**
* 参与暂估应付核销:FISHookMatch
*/
@JSONField(alternateNames ="FISHookMatch")
private boolean fishookmatch;
/**
*采购部门:FPURCHASEDEPTID (必填项)
*/
@JSONField(alternateNames ="FPURCHASEDEPTID")
private Fpurchasedeptid fpurchasedeptid;
/**
* 作废状态:FCancelStatus (必填项)
*/
@JSONField(alternateNames ="FCancelStatus")
private String fcancelstatus;
/**
*是发票审核自动生成:FISBYIV
*/
@JSONField(alternateNames ="FISBYIV")
private boolean fisbyiv;
/**
* 是否需要成本调整:FISGENHSADJ
*/
@JSONField(alternateNames ="FISGENHSADJ")
private boolean fisgenhsadj;
/**
* 先到票后入库:FISINVOICEARLIER
*/
@JSONField(alternateNames ="FISINVOICEARLIER")
private boolean fisinvoicearlier;
/**
* 发票号码:F_PAEZ_Text
*/
@JSONField(alternateNames ="F_PAEZ_Text")
private String fPaezText;
/**
* 项目类别:F_PMZC_Assistant1
*/
@JSONField(alternateNames ="F_PMZC_Assistant1")
private FPmzcAssistant1 fPmzcAssistant1;
/**
*
*/
@JSONField(alternateNames ="FsubHeadSuppiler")
private Fsubheadsuppiler fsubheadsuppiler;
/**
*
*/
@JSONField(alternateNames ="FsubHeadFinc")
private Fsubheadfinc fsubheadfinc;
@JSONField(alternateNames ="FEntityDetail")
private List<Fentitydetail> fentitydetail;
/**
*
*/
@JSONField(alternateNames ="FEntityPlan")
private List<Fentityplan> fentityplan;
public void setFid(int fid) {
this.fid = fid;
}

6
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignService.java

@ -1,8 +1,9 @@
package com.yxt.anrui.fin.biz.kingdee;
import com.alibaba.fastjson.JSONObject;
import com.yxt.anrui.fin.api.kingdee.Data;
import com.yxt.anrui.fin.api.kingdee.KingDeeBillId;
import com.yxt.anrui.fin.api.kingdee.entrybill.EntryBillDto;
import com.yxt.anrui.fin.api.kingdee.entrybill.paymentslip.Data;
import com.yxt.anrui.fin.biz.kingdee.entrybill.EntryBillCastToKingDeeBillFields;
import com.yxt.common.core.result.ResultBean;
import org.springframework.stereotype.Service;
@ -12,6 +13,7 @@ import org.springframework.stereotype.Service;
*/
@Service
public class FinKingDeeFeignService {
/**
* 保存入账申请接口生成的应付单的数据推送到金蝶的平台中
* @param entryBillDto
@ -22,7 +24,7 @@ public class FinKingDeeFeignService {
Data data=new Data();
EntryBillCastToKingDeeBillFields.cast(entryBillDto,data);
try {
return saveBill("",data);
return saveBill(KingDeeBillId.AP_PAYABLE.getID(),data);
} catch (Exception e) {
e.printStackTrace();
}

225
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/EntryBillCastToKingDeeBillFields.java

@ -1,8 +1,10 @@
package com.yxt.anrui.fin.biz.kingdee.entrybill;
import com.yxt.anrui.fin.api.kingdee.Data;
import com.yxt.anrui.fin.api.kingdee.entrybill.EntryBillDto;
import org.springframework.stereotype.Service;
import com.yxt.anrui.fin.api.kingdee.entrybill.paymentslip.*;
import java.util.ArrayList;
import java.util.List;
/**
* 封装转换的类
@ -18,11 +20,226 @@ public class EntryBillCastToKingDeeBillFields {
/**
* InterationFlags交互标志集合字符串类型分号分隔格式"flag1;flag2;..."非必录例如允许负库存标识STK_InvCheckResult
*/
target.setInterationFlags(" ");
target.setInterationflags(" ");
/**
* IsDeleteEntry是否删除已存在的分录布尔类型默认true非必录
*/
target.setIsDeleteEntry("True ");
target.setIsdeleteentry("True ");
/**
* IsEntryBatchFill是否批量填充分录默认true非必录
*/
target.setIsentrybatchfill("True ");
/**
* IsVerifyBaseDataField是否验证所有的基础资料有效性布尔类默认false非必录
*/
target.setIsverifybasedatafield("false ");
/**
* 构造model
*/
createModel(source,target);
/**
* 需返回结果的字段集合数组类型格式[key,entitykey.key,...]非必录返回单据体字段格式entitykey.key
*/
List<String> needreturnfields =new ArrayList<>();
target.setNeedreturnfields(needreturnfields);
/**
* NeedUpDateFields需要更新的字段数组类型格式[key1,key2,...]非必录更新单据体字段得加上单据体key
*/
List<String> needupdatefields=new ArrayList<>();
target.setNeedupdatefields(needupdatefields);
/**
* 是否用编码搜索基础资料布尔类型默认true非必录
*/
target.setNumbersearch("True ");
/**
* SubSystemId表单所在的子系统内码字符串类型非必录
*/
target.setSubsystemid(" ");
/**
* ValidateFlag是否验证标志布尔类型默认true非必录
*/
target.setValidateflag("True ");
}
/**
* 创建 Model
* @param target
*/
private static void createModel(EntryBillDto source,Data target) {
/**
* Model表单数据包Json类型必录
*/
Model model=new Model();
model.setFid(0);
/**
* 单据类型:FBillTypeID (必填项)
*/
Fbilltypeid fbilltypeid=new Fbilltypeid();
fbilltypeid.setFnumber("YFD01_SYS ");
model.setFbilltypeid(fbilltypeid);
/**
*
*/
model.setFbillno(source.getApplicationCode());
/**
* 是否期初单据:FISINIT
*/
model.setFisinit(false);
/**
* 业务日期:FDATE (必填项)
*/
model.setFdate("2022-07-16 00:00:00 ");
/**
* 到期日:FENDDATE_H
*/
model.setFenddateH("2022-07-16 00:00:00 ");
/**
* 单据状态:FDOCUMENTSTATUS (必填项)
*/
model.setFdocumentstatus("Z ");
/**
* 供应商:FSUPPLIERID (必填项)
*/
Fsupplierid fsupplierid=new Fsupplierid();
fsupplierid.setFnumber("010001 ");
model.setFsupplierid(fsupplierid);
/**
* 币别:FCURRENCYID (必填项)
*/
Fcurrencyid fcurrencyid=new Fcurrencyid();
fcurrencyid.setFnumber( "PRE001 ");
model.setFcurrencyid( fcurrencyid);
/**
* 付款条件:FPayConditon
*/
Fpayconditon fpayconditon=new Fpayconditon();
fpayconditon.setFnumber("FKTJ01_SYS ");
model.setFpayconditon(fpayconditon) ;
/**
* 价外税:FISPRICEEXCLUDETAX
*/
model.setFispriceexcludetax(true);
/**
* 业务类型:FBUSINESSTYPE (必填项)
*/
model.setFbusinesstype("CG ") ;
/**
* 按含税单价录入:FISTAX
*/
model.setFistax(true);
/**
* 表头基本 -未付款核销金额作废:FNOTWRITTENOFFAMOUNTFOR
* 结算组织:FSETTLEORGID (必填项)
*/
Fsettleorgid fsettleorgid=new Fsettleorgid();
fsettleorgid.setFnumber("101 ");
model.setFsettleorgid(fsettleorgid);
/**
* 付款组织:FPAYORGID (必填项)
*/
Fpayorgid fpayorgid=new Fpayorgid();
fpayorgid.setFnumber("101 ");
model.setFpayorgid(fpayorgid);
/**
* 立账类型:FSetAccountType
*/
model.setFsetaccounttype("2 ") ;
/**
* 税额计入成本:FISTAXINCOST
*/
model.setFistaxincost(false) ;
/**
* 备注:FAP_Remark
*/
model.setFapRemark("122112 ");
/**
* 参与暂估应付核销:FISHookMatch
*/
model.setFishookmatch(false);
/**
* 采购部门:FPURCHASEDEPTID (必填项)
*/
Fpurchasedeptid fpurchasedeptid=new Fpurchasedeptid();
fpurchasedeptid.setFnumber("02 ");
model.setFpurchasedeptid(fpurchasedeptid);
/**
* 作废状态:FCancelStatus (必填项)
*/
model.setFcancelstatus("A ") ;
/**
*是发票审核自动生成:FISBYIV
*/
model.setFisbyiv(false);
/**
* 是否需要成本调整:FISGENHSADJ
*/
model.setFisgenhsadj(false) ;
/**
* 先到票后入库:FISINVOICEARLIER
*/
model.setFisinvoicearlier(false);
/**
* 发票号码:F_PAEZ_Text
*/
model.setFPaezText("1221121212 ") ;
/**
* 项目类别:F_PMZC_Assistant1
*/
FPmzcAssistant1 fPmzcAssistant1=new FPmzcAssistant1 ();
fPmzcAssistant1.setFnumber("00 ");
model.setFPmzcAssistant1( fPmzcAssistant1);
/**
*
*/
Fsubheadsuppiler fsubheadsuppiler=new Fsubheadsuppiler ();
Forderid forderid=new Forderid();
forderid.setFnumber("010001 ");
fsubheadsuppiler.setForderid( forderid);
Ftransferid ftransferid=new Ftransferid();
ftransferid.setFnumber("010001 ");
fsubheadsuppiler.setFtransferid( ftransferid);
Fchargeid fchargeid=new Fchargeid();
fchargeid.setFnumber("010001 ");
fsubheadsuppiler.setFchargeid( fchargeid);
model.setFsubheadsuppiler(fsubheadsuppiler) ;
Fsubheadfinc fsubheadfinc=new Fsubheadfinc();
fsubheadfinc.setFaccnttimejudgetime("2022-07-16 00:00:00 ") ;
/**
* 本位币:FMAINBOOKSTDCURRID
*/
Fmainbookstdcurrid fmainbookstdcurrid=new Fmainbookstdcurrid();
fmainbookstdcurrid.setFnumber("PRE001 ");
fsubheadfinc.setFmainbookstdcurrid(fmainbookstdcurrid);
/**
* 汇率类型:FEXCHANGETYPE
*/
Fexchangetype fexchangetype=new Fexchangetype();
fexchangetype.setFnumber("HLTX01_SYS ");
fsubheadfinc.setFexchangetype(fexchangetype);
/**
* 汇率:FExchangeRate
*/
fsubheadfinc.setFexchangerate(1) ;
/**
* 税额:FTaxAmountFor
*/
fsubheadfinc.setFtaxamountfor(1.0) ;
/**
* 不含税金额:FNoTaxAmountFor
*/
fsubheadfinc.setFnotaxamountfor( 1.98) ;
model.setFsubheadfinc(fsubheadfinc);
List<Fentitydetail> fentitydetail=new ArrayList<>();
model.setFentitydetail(fentitydetail);
List<Fentityplan> fentityplan=new ArrayList<>();
model.setFentityplan(fentityplan);
/**
* Model表单数据包Json类型必录
*/
target.setModel(model);
}
}

2
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.java

@ -164,4 +164,6 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
List<Map<String,String>> getUserByOrgSid(@Param("userSid") String userSid);
List<SysUserVo> fetchBySids(@Param("sids")List<String> sids);
List<SysUserVo> getUserByRoleSid(String roleSid);
}

29
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml

@ -221,20 +221,29 @@
</select>
<select id="getUserByOrgSid" resultType="java.util.Map">
SELECT
su.sid,st.name
SELECT su.sid,
st.name
FROM sys_user su
LEFT JOIN sys_staffinfo st
ON su.`staffSid` = st.`sid`
LEFT JOIN sys_staffinfo st
ON su.`staffSid` = st.`sid`
WHERE su.sid != #{userSid}
</select>
<select id="fetchBySids" resultType="com.yxt.anrui.portal.api.sysuser.SysUserVo">
select su.*,ss.name from sys_user su
left join sys_staffinfo ss on su.staffSid=ss.sid
select su.*, ss.name
from sys_user su
left join sys_staffinfo ss on su.staffSid = ss.sid
where su.sid in
<foreach collection="sids" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</select>
<foreach collection="sids" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</select>
<select id="getUserByRoleSid" resultType="com.yxt.anrui.portal.api.sysuser.SysUserVo">
select si.name, su.sid, su.staffSid
from sys_user_role sr
left join sys_user su on sr.userSid = su.sid
left join sys_staffinfo si on si.sid = su.staffSid
where sr.roleSid = #{roleSid}
</select>
</mapper>

14
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java

@ -891,11 +891,17 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
String levelTypeKey = sysRoleService.getLevelType(query.getRoleSid());
if (StringUtils.isNotBlank(levelTypeKey)) {
String orgSidPath = query.getOrgSidPath();
if(query.getOrgSidPath().split("/").length>=Integer.parseInt(levelTypeKey)-1){
String levelOrgSid = query.getOrgSidPath().split("/")[Integer.parseInt(levelTypeKey) - 1];
sysUserVoList = baseMapper.getUserByRole(query.getRoleSid(), levelOrgSid);
sysUserVoList.removeAll(Collections.singleton(null));
if(StringUtils.isBlank(orgSidPath)){
sysUserVoList = baseMapper.getUserByRoleSid(query.getRoleSid());
}else{
if(query.getOrgSidPath().split("/").length>=Integer.parseInt(levelTypeKey)-1){
String levelOrgSid = query.getOrgSidPath().split("/")[Integer.parseInt(levelTypeKey) - 1];
sysUserVoList = baseMapper.getUserByRole(query.getRoleSid(), levelOrgSid);
}
}
sysUserVoList.removeAll(Collections.singleton(null));
}
return rb.success().setData(sysUserVoList);

2
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineMapper.xml

@ -32,7 +32,7 @@
and concat(sve.vinNo,sve.modelName,sve.purchaseType) LIKE concat('%', #{names}, '%')
</if>
</where>
ORDER BY id DESC
ORDER BY inspectionDate DESC
</select>
<select id="getCarInspectedInfo"

3
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitem/ScmVehinspectItemService.java

@ -154,6 +154,7 @@ public class ScmVehinspectItemService extends MybatisBaseService<ScmVehinspectIt
text = text + itemConten;
}
vo.setItemConten(text.substring(0, text.length() - 2));
List<AppImgUrlVo> imgUrlVoList = scmVehinspectItemimgService.getAppImgByMainSid(sid);
for (int i = 0; i < imgUrlVoList.size(); i++) {
List<String> files = new ArrayList<>();
@ -199,7 +200,7 @@ public class ScmVehinspectItemService extends MybatisBaseService<ScmVehinspectIt
for (AppImgUrlDto appImgUrlDto : imgUrl) {
List<String> files = appImgUrlDto.getFiles();
for (int i = 0; i < files.size(); i++) {
imgUrls = files.get(i).replace(fileUploadComponent.getUrlPrefix(), "") + ",";
imgUrls = imgUrls + files.get(i).replace(fileUploadComponent.getUrlPrefix(), "") + ",";
}
appImgUrlDto.setImgUrl(imgUrls);
scmVehinspectItemimgService.updateByMainSid(appImgUrlDto.getImgSid(), appImgUrlDto.getImgUrl(), appImgUrlDto.getTitle());

2
anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplication.vue

@ -33,7 +33,7 @@
<div class="listcon">
<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" @selection-change="handleSelectionChange">
<el-table-column width="50px" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column width="30px" type="selection" align="center" />
<el-table-column width="30px" type="selection" align="center" style="padding-left:0px;" />
<el-table-column prop="applicationCode" width="130px;" label="申请单编号" align="center" />
<el-table-column width="150px" label="操作" align="center" >
<template slot-scope="scope">

4
anrui-scm/anrui-scm-ui/src/views/supplychain/caigoutuiku/caigoutuikuAdd.vue

@ -92,7 +92,7 @@
<el-table-column label="操作" align="center" width="250px" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button size="mini" type="danger"
@click="dataDelete(scope.row,scope.$index,list[scope.$index])">删除
@click="dataDelete(scope.$index,formobj.detailsList[scope.$index])">删除
</el-button>
</template>
</el-table-column>
@ -216,7 +216,7 @@ export default {
},
//
dataDelete(index, row) {
this.list.splice(index, 1)
this.list.splice(this.list.indexOf(row), 1)
},
// ===

10
anrui-scm/anrui-scm-ui/src/views/workFlow/caigoutuikuFlow/caigoutuikuEdit.vue

@ -91,7 +91,7 @@
<el-table-column label="操作" align="center" width="250px" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button size="mini" type="danger"
@click="dataDelete(scope.row,scope.$index,list[scope.$index])">删除
@click="dataDelete(scope.$index,formobj.detailsList[scope.$index])">删除
</el-button>
</template>
</el-table-column>
@ -244,11 +244,10 @@
this.formobj.detailsList=this.list
console.log('车辆表数据', this.list)
},
//
//
dataDelete(index, row) {
this.list.splice(index, 1)
this.list.splice(this.list.indexOf(row), 1)
},
showEdit(sid, nodeState) {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
@ -317,7 +316,6 @@
},
saveEdit() {
this.formobj.detailsList = this.list
const _this = this
this.$refs['form_obj'].validate(valid => {
if (valid) {
this.submitdisabled = true
@ -344,7 +342,7 @@
this.formobj.orgSid = this.$store.getters.orgSid
this.formobj.businessSid = this.obj.businessSid
this.formobj.taskId = this.obj.taskId
const _this = this
this.$refs['form_obj'].validate(valid => {
if (valid) {
this.submitdisabled = true

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/carInspected/ImgUrlDto.java

@ -14,6 +14,8 @@ public class ImgUrlDto implements Dto {
private static final long serialVersionUID = -896072904271608090L;
@ApiModelProperty("照片名称")
private String title;
@ApiModelProperty("照片sid")
private String imgSid;
@ApiModelProperty("照片路径")
private List<String> files;
}

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/carInspected/ImgUrlVo.java

@ -13,6 +13,8 @@ public class ImgUrlVo implements Vo {
@ApiModelProperty("照片名称")
private String title;
@ApiModelProperty("照片sid")
private String imgSid;
@ApiModelProperty("照片路径")
private List<String> files;
}

Loading…
Cancel
Save