Browse Source

Merge remote-tracking branch 'origin/master'

master
yunuo970428 3 years ago
parent
commit
667386ccee
  1. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturer.java
  2. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerDetailsVo.java
  3. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerDto.java
  4. 10
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeign.java
  5. 5
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeignFallback.java
  6. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManufacturerBankVo.java
  7. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java
  8. 10
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleVo.java
  9. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandDto.java
  10. 1
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusApplyVo.java
  11. 3
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java
  12. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.java
  13. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml
  14. 5
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java
  15. 67
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java
  16. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.java
  17. 16
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml
  18. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankService.java
  19. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java
  20. 23
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java
  21. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
  22. 3
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.java
  23. 1
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.xml
  24. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandService.java
  25. 10
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java
  26. 3
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecord.java
  27. 3
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordDto.java
  28. 12
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java
  29. 10
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeignFallBack.java
  30. 29
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/KingDeeCode.java
  31. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/appayable/APPayable.java
  32. 140
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/appaybill/ApPayBill.java
  33. 3
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/arreceivable/ARReceivable.java
  34. 5
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/bdcustomer/BdCustomer.java
  35. 76
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/bdmaterial/BdMaterial.java
  36. 6
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/bdstock/BDStock.java
  37. 4
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/orgorganizations/OrgOrganizations.java
  38. 51
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/saloutstock/SalOutStock.java
  39. 5
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stkinstock/StkInStock.java
  40. 39
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stktransferdirect/StkTransferDirect.java
  41. 69
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
  42. 24
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java
  43. 122
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeService.java
  44. 1
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appayable/data_model.json
  45. 1
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/ApPayBillCastToKingDeeBillFields.java
  46. 55
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/ApPayBillService.java
  47. 4
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/data_FPAYBILLENTRY.json
  48. 1
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/data_model.json
  49. 1
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdcustomer/data_model.json
  50. 1
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/BdMaterialCastToKingDeeBillFields.java
  51. 184
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/BdMaterialService.java
  52. 1
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/data_model.json
  53. 1
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdstock/data_model.json
  54. 3
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/orgorganizations/data_model.json
  55. 1
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/receivablebill/data_model.json
  56. 6
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/SalOutStockCastToKingDeeBillFields.java
  57. 22
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/SalOutStockService.java
  58. 6
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/data_FEntity.json
  59. 6
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/data_model.json
  60. 11
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkinstock/STKInStockService.java
  61. 3
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkinstock/data_FInStockEntry.json
  62. 3
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/data_model.json
  63. 29
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/timer/TimerUtil.java
  64. 11
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeign.java
  65. 6
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeignFallback.java
  66. 27
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingInfoQueryBatch.java
  67. 5
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java
  68. 5
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java
  69. 8
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingRest.java
  70. 25
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingService.java
  71. 2
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java
  72. 4
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml
  73. 5
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java
  74. 6
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java
  75. 14
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturer.java

@ -109,4 +109,6 @@ public class BaseManufacturer extends BaseEntity {
private String city;
@ApiModelProperty(value = "县区")
private String county;
@ApiModelProperty(value = "厂商开户行sid")
private String manBankSid;
}

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerDetailsVo.java

@ -81,4 +81,6 @@ public class BaseManufacturerDetailsVo implements Vo {
private String city;
@ApiModelProperty(value = "县区")
private String county;
@ApiModelProperty(value = "厂商开户行sid")
private String manBankSid;
}

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerDto.java

@ -121,4 +121,6 @@ public class BaseManufacturerDto implements Dto {
@ApiModelProperty(value = "使用组织名称")
private String useOrgName;
@ApiModelProperty(value = "厂商开户行sid")
private String manBankSid;
}

10
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeign.java

@ -57,6 +57,16 @@ public interface BaseManufacturerFeign {
@ResponseBody
public ResultBean<PagerVo<BaseManufacturerVo>> gysPagerList(@RequestBody PagerQuery<BaseManufacturerQuery> pagerQuery);
/**
* 生成厂商开户行信息到供应商
*
* @return
*/
@ApiOperation("生成厂商开户行信息到供应商")
@PostMapping("/copyManBankToGys")
@ResponseBody
public ResultBean copyManBankToGys(@RequestParam("orgSid") String orgSid);
/**
* 新增保存

5
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeignFallback.java

@ -35,6 +35,11 @@ public class BaseManufacturerFeignFallback implements BaseManufacturerFeign {
return null;
}
@Override
public ResultBean copyManBankToGys(String orgSid) {
return null;
}
@Override
public ResultBean save(BaseManufacturerAllDto dto) {
return ResultBean.fireFail().setMsg("接口anrui-base/basemanufacturer/save无法访问");

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManufacturerBankVo.java

@ -24,6 +24,8 @@ import lombok.Data;
public class BaseManufacturerBankVo implements Vo {
private static final long serialVersionUID = 7902385526436803445L;
private String sid;
@ApiModelProperty("国家")
private String country;

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

@ -175,8 +175,8 @@ public interface BaseVehicleFeign {
* @return
*/
@ApiOperation("修改车辆台账备注")
@PostMapping("/updateVehRemarks/{remarks}/{sid}")
public ResultBean updateVehRemarks(@PathVariable("remarks") String remarks, @PathVariable("sid") String sid);
@PostMapping("/updateVehRemarks")
public ResultBean updateVehRemarks(@RequestParam("remarks") String remarks, @RequestParam("sid") String sid);
/***************************************************** PC现车接口 **********************************************************/
/**

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

@ -26,6 +26,8 @@ import java.util.Date;
@Data
public class BaseVehicleVo implements Vo {
@ApiModelProperty(value = "备注")
private String remarks;
@ApiModelProperty(value = "车型与配置关联表sid")
private String vehModelConfigSid;
@ApiModelProperty(value = "车辆sid")
@ -38,6 +40,8 @@ public class BaseVehicleVo implements Vo {
private String configName;
@ApiModelProperty("车架号(VIN)(陕汽必须的字段)")
private String vinNo;
@ApiModelProperty("车架号后八位")
private String lastVinNo;
@ApiModelProperty("车辆状态value值")
private String vehicleStateValue;
@ApiModelProperty("存放地点名称(陕汽必须的字段)")
@ -102,8 +106,12 @@ public class BaseVehicleVo implements Vo {
private String witPinStateValue;
@ApiModelProperty(value = "合格证状态value")
private String certificateStateValue;
@ApiModelProperty(value = "库龄")
@ApiModelProperty(value = "厂家库龄")
private Long libraryAge;
@ApiModelProperty(value = "公司库龄")
private Long orgLibraryAge;
@ApiModelProperty(value = "买断库龄")
private Long settlementLibraryAge;
@ApiModelProperty(value = "是否为问题车辆(0无问题 1有问题)")
private String isProblemVeh;
@ApiModelProperty(value = "采购系统sid")

4
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandDto.java

@ -35,9 +35,9 @@ public class BaseVehicleBrandDto implements Dto {
@NotBlank(message = "品牌名称不能为空")
private String brandName;
/* @ApiModelProperty("品牌简称(品牌首字母,但不可重复)")
@ApiModelProperty("品牌简称(品牌首字母,但不可重复)")
@NotBlank(message = "品牌简称")
private String brandShortName;*/
private String brandShortName;
@ApiModelProperty(value = "品牌类型", required = true)
@NotBlank(message = "品牌类型不能为空")

1
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusApplyVo.java

@ -13,4 +13,5 @@ public class BusApplyVo implements Vo {
private static final long serialVersionUID = -4976630638474677681L;
private String name;
private String num;
private String code;
}

3
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java

@ -508,7 +508,8 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
/**
* 项目类别:F_PAEZ_Assistant (必填项) 集团内部调车 034
*/
salOutStock.setF_PAEZ_Assistant("034");
salOutStock.setF_PAEZ_AssistantKey("034");
salOutStock.setF_PAEZ_AssistantType("034");
/**
* 销售组织:FSaleOrgId (必填项)
*/

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.java

@ -119,4 +119,6 @@ public interface BaseManufacturerMapper extends BaseMapper<BaseManufacturer> {
List<Map<String, String>> bankNamesDown(String manufacturerSid);
List<BaseManufacturerListVo> selectNameByOrg(@Param("useOrgSid") String useOrgSid, @Param("supplierTypeValue") String supplierTypeValue);
BaseManufacturer fetchByManBankSid(String s);
}

4
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml

@ -168,4 +168,8 @@
<select id="selectNameByOrg" resultType="com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerListVo">
select sid,manufacturerName as name from base_manufacturer where useOrg = #{useOrgSid} and supplierTypeValue=#{supplierTypeValue}
</select>
<select id="fetchByManBankSid" resultType="com.yxt.anrui.base.api.basemanufacturer.BaseManufacturer">
select * from base_manufacturer where manBankSid = #{s}
</select>
</mapper>

5
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java

@ -67,6 +67,11 @@ public class BaseManufacturerRest implements BaseManufacturerFeign {
return rb.success().setData(pv1);
}
@Override
public ResultBean copyManBankToGys(String orgSid) {
return baseManufacturerService.copyManBankToGys(orgSid);
}
@Override
public ResultBean save(BaseManufacturerAllDto dto) {
return baseManufacturerService.saveAll(dto);

67
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java

@ -1,5 +1,6 @@
package com.yxt.anrui.base.biz.basemanufacturer;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.basemanufacturer.*;
@ -11,6 +12,7 @@ import com.yxt.anrui.base.api.basemanufacturerfinance.BaseManufacturerFinanceDto
import com.yxt.anrui.base.api.basemanufacturerfinance.BaseManufacturerFinanceVo;
import com.yxt.anrui.base.biz.basemanufacturerbank.BaseManufacturerBankService;
import com.yxt.anrui.base.biz.basemanufacturerfinance.BaseManufacturerFinanceService;
import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService;
import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
import com.yxt.anrui.fin.api.kingdee.bdsupplier.BdSupplier;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
@ -55,8 +57,11 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
private BaseManufacturerBankService baseManufacturerBankService;//供应厂商开户行信息
@Autowired
private BaseManufacturerFinanceService baseManufacturerFinanceService;//供应厂商财务信息
@Autowired
private BaseVehicleBrandService baseVehicleBrandService;
@Resource
private FinKingDeeFeign finKingDeeFeign;
/**
* 供应厂商分页列表
*
@ -88,8 +93,8 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
}
}
qw.eq("bm.isDelete", 0);
qw.ne("bm.supplierType",0001);
qw.eq("bm.createOrg",params.getCreateOrgSid());
qw.ne("bm.supplierType", 0001);
qw.eq("bm.createOrg", params.getCreateOrgSid());
return baseMapper.pagerList(page, qw);
}
@ -116,7 +121,7 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
}
}
qw.eq("isDelete", 0);
qw.eq("supplierType",0001);
qw.eq("supplierType", 0001);
return qw;
}
@ -283,7 +288,7 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
return resultBean2;
}
}
BdSupplier bdSupplier=new BdSupplier();
BdSupplier bdSupplier = new BdSupplier();
bdSupplier.setFName(dto.getBaseManufacturerDto().getManufacturerName());
bdSupplier.setFLocMobile(dto.getBaseManufacturerDto().getContactMobile());
bdSupplier.setFUseOrgId("101");
@ -396,15 +401,15 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
return rb.success().setMsg("修改成功");
}
public ResultBean<List<Map<String,String>>> wcgysNamesDown(String orgSid) {
public ResultBean<List<Map<String, String>>> wcgysNamesDown(String orgSid) {
ResultBean rb = ResultBean.fireFail();
List<Map<String,String>> manufacturerNames = baseMapper.wcgysNamesDown(orgSid);
List<Map<String, String>> manufacturerNames = baseMapper.wcgysNamesDown(orgSid);
return rb.success().setData(manufacturerNames);
}
public ResultBean<List<Map<String, String>>> bankNamesDown(String manufacturerSid) {
ResultBean rb = ResultBean.fireFail();
List<Map<String,String>> bankNames = baseMapper.bankNamesDown(manufacturerSid);
List<Map<String, String>> bankNames = baseMapper.bankNamesDown(manufacturerSid);
return rb.success().setData(bankNames);
}
@ -412,7 +417,53 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
ResultBean<List<BaseManufacturerListVo>> rb = ResultBean.fireFail();
String useOrgSid = query.getUseOrgSid();
String supplierTypeValue = "主机厂";
List<BaseManufacturerListVo> list = baseMapper.selectNameByOrg(useOrgSid,supplierTypeValue);
List<BaseManufacturerListVo> list = baseMapper.selectNameByOrg(useOrgSid, supplierTypeValue);
return rb.success().setData(list);
}
public ResultBean copyManBankToGys(String orgSid) {
ResultBean rb = ResultBean.fireFail();
List<String> stringList = baseVehicleBrandService.selectManSidByOrgSid(orgSid);
for (String s : stringList) {
BaseManufacturer baseManufacturer = fetchBySid(s);
if (baseManufacturer != null) {
BaseManufacturer baseManufacturer2 = baseMapper.fetchByManBankSid(s);
if (baseManufacturer2 != null) {
String sid = baseManufacturer2.getSid();
BeanUtil.copyProperties(baseManufacturer, baseManufacturer2);
baseManufacturer2.setSid(sid);
baseManufacturer2.setUseOrg(orgSid);
baseManufacturer2.setManBankSid(baseManufacturer.getSid());
saveOrUpdate(baseManufacturer2);
} else {
BaseManufacturer baseManufacturer1 = new BaseManufacturer();
String sid = baseManufacturer1.getSid();
BeanUtil.copyProperties(baseManufacturer, baseManufacturer1);
baseManufacturer1.setSid(sid);
baseManufacturer1.setUseOrg(orgSid);
baseManufacturer1.setManBankSid(baseManufacturer.getSid());
save(baseManufacturer1);
}
}
List<BaseManufacturerBankVo> baseManufacturerBankVos = baseManufacturerBankService.selectDetails(s);
if (baseManufacturerBankVos.size() > 0) {
for (BaseManufacturerBankVo baseManufacturerBankVo : baseManufacturerBankVos) {
BaseManufacturer baseManufacturer2 = baseMapper.fetchByManBankSid(baseManufacturerBankVo.getSid());
if (baseManufacturer2 != null) {
baseManufacturer2.setManufacturerName(baseManufacturerBankVo.getAccountName());
baseManufacturer2.setUseOrg(orgSid);
baseManufacturer2.setManBankSid(baseManufacturerBankVo.getSid());
saveOrUpdate(baseManufacturer2);
} else {
BaseManufacturer baseManufacturer1 = new BaseManufacturer();
baseManufacturer1.setManufacturerName(baseManufacturerBankVo.getAccountName());
baseManufacturer1.setUseOrg(orgSid);
baseManufacturer1.setManBankSid(baseManufacturerBankVo.getSid());
save(baseManufacturer1);
}
}
}
}
return rb.success().setData(stringList);
}
}

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.java

@ -62,4 +62,6 @@ public interface BaseManufacturerBankMapper extends BaseMapper<BaseManufacturerB
List<BusApplyVo> selectByApplySid(String modelSid);
List<BaseManActualVo> actualList(@Param("useOrgSid") String useOrgSid, @Param("code") String code);
List<BusApplyVo> selectBankByApplySid(String createOrgSid);
}

16
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml

@ -31,6 +31,7 @@
<!--根据供应厂商sid查询开户行信息-->
<select id="selectDetails" resultType="com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankVo">
SELECT
bmb.sid,
<!--账户名称-->
bmb.accountName,
<!--银行账号-->
@ -55,15 +56,15 @@
bmb.remarks
FROM base_manufacturer_bank bmb
WHERE bmb.manufacturerSid = #{sid}
AND bmb.isDelete = 0
AND bmb.isDelete = 0
</select>
<select id="selectByApplySid" resultType="com.yxt.anrui.base.api.busvehicleapply.BusApplyVo">
select bmb.bankAccount num, bmb.accountName name
from base_manufacturer_bank bmb
left join base_manufacturer bm on bm.sid = bmb.manufacturerSid
left join base_vehicle_brand bvb on bvb.manufacturerSid = bm.sid
left join base_vehicle_model bvm on bvm.carBrand = bvb.sid
left join base_manufacturer bm on bm.sid = bmb.manufacturerSid
left join base_vehicle_brand bvb on bvb.manufacturerSid = bm.sid
left join base_vehicle_model bvm on bvm.carBrand = bvb.sid
where bvm.sid = #{modelSid}
and bmb.dueBankKey = '2'
</select>
@ -73,9 +74,14 @@
bmb.depositBank,
bmb.bankAccount
from base_manufacturer_bank bmb
left join base_manufacturer bm on bmb.manufacturerSid = bm.sid
left join base_manufacturer bm on bmb.manufacturerSid = bm.sid
where bmb.isDelete = 0
AND bm.useOrg = #{useOrgSid}
and bmb.dueBankKey = #{code}
</select>
<select id="selectBankByApplySid" resultType="com.yxt.anrui.base.api.busvehicleapply.BusApplyVo">
select bm.manufacturerCode code,bmb.bankAccount num,bmb.accountName name from base_manufacturer bm left join base_manufacturer_bank bmb on bm.manBankSid = bmb.sid
where bm.createOrg = #{createOrgSid} and dueBankValue = '订金账户'
</select>
</mapper>

4
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankService.java

@ -73,4 +73,8 @@ public class BaseManufacturerBankService extends MybatisBaseService<BaseManufact
public List<BaseManActualVo> actualList(String useOrgSid, String code) {
return baseMapper.actualList(useOrgSid,code);
}
public List<BusApplyVo> selectBankByApplySid(String createOrgSid) {
return baseMapper.selectBankByApplySid(createOrgSid);
}
}

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

@ -463,5 +463,5 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
IPage<InputVinListVo> saleOrderVin(IPage<BaseVehicle> page, @Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw, @Param("names") String names);
@Update("update base_vehicle set remarks = #{remarks} where sid = #{sid}")
ResultBean updateVehRemarks(@Param("remarks") String remarks,@Param("sid") String sid);
void updateVehRemarks(@Param("remarks") String remarks,@Param("sid") String sid);
}

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

@ -103,6 +103,7 @@ public class BaseVehicleRest implements BaseVehicleFeign {
IPage<BaseVehicleVo> page = baseVehicleService.pagerList(pagerQuery);
List<BaseVehicleVo> records = page.getRecords();
for (BaseVehicleVo record : records) {
//厂家库龄
if (record.getPriceDate() != null) {
Date priceDate = record.getPriceDate();
String today = DateUtil.today();
@ -111,6 +112,28 @@ public class BaseVehicleRest implements BaseVehicleFeign {
long betweenDay = DateUtil.between(priceDate, currentDate, DateUnit.DAY);
record.setLibraryAge(betweenDay * i * -1);
}
//公司库龄
if (record.getArrivalDate() != null) {
Date arrivalDate = record.getArrivalDate();
String today = DateUtil.today();
DateTime currentDate = DateUtil.parse(today);
int i = arrivalDate.compareTo(currentDate);
long betweenDay = DateUtil.between(arrivalDate, currentDate, DateUnit.DAY);
record.setOrgLibraryAge(betweenDay * i * -1);
}
//买断库龄
if (record.getSolidDate() != null) {
Date solidDate = record.getSolidDate();
String today = DateUtil.today();
DateTime currentDate = DateUtil.parse(today);
int i = solidDate.compareTo(currentDate);
long betweenDay = DateUtil.between(solidDate, currentDate, DateUnit.DAY);
record.setSettlementLibraryAge(betweenDay * i * -1);
}
String vinNo = record.getVinNo();
if (StringUtils.isNotBlank(vinNo)){
record.setLastVinNo(vinNo.substring(vinNo.length() - 8));
}
}
PagerVo<BaseVehicleVo> pv = new PagerVo<>();
PagerVo<BaseVehicleVo> pv1 = PagerUtil.pageToVo(page, pv);

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

@ -2643,6 +2643,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
}
public ResultBean updateVehRemarks(String remarks, String sid) {
return baseMapper.updateVehRemarks(remarks,sid);
ResultBean rb = ResultBean.fireFail();
baseMapper.updateVehRemarks(remarks,sid);
return rb.success().setMsg("备注修改成功");
}
}

3
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.java

@ -124,4 +124,7 @@ public interface BaseVehicleBrandMapper extends BaseMapper<BaseVehicleBrand> {
String getBrandShortName(@Param("sid") String sid);
List<BaseVehicleBrandDictionariesVo> selectAppListByUserSid(@Param("useOrg") String useOrg);
@Select("SELECT DISTINCT manufacturerSid FROM base_vehicle_brand WHERE useOrg LIKE %#{orgSid}%")
List<String> selectManSidByOrgSid(String orgSid);
}

1
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.xml

@ -41,6 +41,7 @@
<!--根据sid查询品牌详情-->
<select id="selectBySid" resultType="com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrandDetailsVo">
SELECT bvb.brandName,
bvb.brandShortName,
bvb.brandCode,
bvb.brandType,
bvb.brandTypeValue,

4
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandService.java

@ -229,4 +229,8 @@ public class BaseVehicleBrandService extends MybatisBaseService<BaseVehicleBrand
List<BaseVehicleBrandDictionariesVo> list = baseMapper.selectAppListByUserSid(useOrg);
return list;
}
public List<String> selectManSidByOrgSid(String orgSid) {
return baseMapper.selectManSidByOrgSid(orgSid);
}
}

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

@ -60,7 +60,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;
@ -518,7 +517,7 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
finPaymentrecordDto.setCostTypeKey(DictCommonEnum.costType.CG_TYPE.getCode());
finPaymentrecordDto.setCostTypeValue(DictCommonEnum.costType.CG_TYPE.getRemarks());
//查询收款单位和收款账号
List<BusVehicleApplyDetailVo> busVehicleApplyDetailList = busVehicleApplyDetailService.fetchByApplySid(busVehicleApply.getSid());
/* List<BusVehicleApplyDetailVo> busVehicleApplyDetailList = busVehicleApplyDetailService.fetchByApplySid(busVehicleApply.getSid());
String modelSid = busVehicleApplyDetailList.get(0).getVehicleSid();
//根据车型sid查询账户名称和银行账号
List<BusApplyVo> busApplyVo = baseManufacturerBankService.selectByApplySid(modelSid);
@ -526,6 +525,13 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
if (!busApplyVo.isEmpty()) {
finPaymentrecordDto.setReceiveBankAccount(busApplyVo.get(0).getNum());
finPaymentrecordDto.setReceiveCompany(busApplyVo.get(0).getName());
}*/
List<BusApplyVo> busApplyVo = baseManufacturerBankService.selectBankByApplySid(busVehicleApply.getCreateOrgSid());
busApplyVo.removeAll(Collections.singleton(null));
if (!busApplyVo.isEmpty()) {
finPaymentrecordDto.setReceiveBankAccount(busApplyVo.get(0).getNum());
finPaymentrecordDto.setReceiveCompany(busApplyVo.get(0).getName());
finPaymentrecordDto.setPayCode(busApplyVo.get(0).getCode());
}
finPaymentrecordDto.setBusSid(r.getData());
finPaymentrecordFeign.save(finPaymentrecordDto);

3
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecord.java

@ -98,4 +98,7 @@ public class FinPaymentrecord extends BaseEntity {
@ApiModelProperty(value = "业务编号")
private String busSid;
@ApiModelProperty("供应商编码")
private String payCode;
}

3
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordDto.java

@ -77,4 +77,7 @@ public class FinPaymentrecordDto implements Dto {
@ApiModelProperty(value = "业务编号")
private String busSid;
@ApiModelProperty("供应商编码")
private String payCode;
}

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

@ -66,17 +66,13 @@ public interface FinKingDeeFeign {
@ResponseBody
public ResultBean<String> draftSalOutStock(@RequestBody SalOutStock salOutStock) ;
@ApiOperation("暂存物料的接口")
@PostMapping("/draftBdMaterial")
@ResponseBody
public ResultBean<String> draftBdMaterial(@RequestBody BdMaterial bdMaterial) ;
@ApiOperation("保存物料的接口")
@PostMapping("/saveBdMaterial")
@ResponseBody
public ResultBean<String> saveBdMaterial(@RequestBody BdMaterial bdMaterial) ;
@ApiOperation("暂存物料的接口")
@PostMapping("/draftBdMaterialList")
@ResponseBody
public ResultBean<String> draftBdMaterialList(@RequestBody List<BdMaterial> bdMaterial) ;
@ApiOperation("批量修改物料的接口")
@PostMapping("/saveBdMaterialList")
@ResponseBody
public ResultBean<String> saveBdMaterialList(@RequestBody List<BdMaterial> bdMaterial) ;
@ApiOperation("暂存直接调拨单的接口")
@PostMapping("/draftStkTransferDirect")
@ResponseBody

10
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeignFallBack.java

@ -48,17 +48,13 @@ implements FinKingDeeFeign{
public ResultBean<String> draftSalOutStock(SalOutStock salOutStock) {
return null;
}
@Override
public ResultBean<String> draftBdMaterial(BdMaterial bdMaterial) {
return null;
}
@Override
public ResultBean<String> saveBdMaterial(BdMaterial bdMaterial) {
public ResultBean<String> draftBdMaterialList(List<BdMaterial> bdMaterial) {
return null;
}
@Override
public ResultBean<String> draftBdMaterialList(List<BdMaterial> bdMaterial) {
public ResultBean<String> saveBdMaterialList(List<BdMaterial> bdMaterial) {
return null;
}

29
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/KingDeeCode.java

@ -0,0 +1,29 @@
package com.yxt.anrui.fin.api.kingdee;
/**
* 封装金蝶接口调用后返回给业务的code值
*/
public enum KingDeeCode {
REPEAT("5001","违反唯一性约束"),
SUBMIT("5002","提交失败"),
AUDIT("5003","审核失败"),
ALLOCATE("5004","分配失败"),
NOTEXIST("5005","关键值不存在"),
UNAUDIT("5006","反审核失败"),
ERROR("5000","接口调用失败");
private String code;
private String msg;
KingDeeCode(String code, String msg) {
this.code = code;
this.msg = msg;
}
public String getCode() {
return code;
}
public String getMsg() {
return msg;
}
}

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/appayable/APPayable.java

@ -96,6 +96,8 @@ public class APPayable {
@ApiModelProperty("车辆台数")
public String num;
@ApiModelProperty("备注")
public String FAP_Remark;
@ApiModelProperty("车辆列表")
public List<ScmApplyInboundVehicleDto> vehicleList;
@Data

140
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/appaybill/ApPayBill.java

@ -14,10 +14,42 @@ import java.util.List;
@Data
public class ApPayBill {
@JsonProperty("FDATE")
@NotBlank
//业务日期:FDATE (必填项)
public String FDATE;
@JsonProperty("FDATE")
@NotBlank
//业务日期:FDATE (必填项)
public String FDATE;
@JsonProperty("FRECTUNIT")
@NotBlank
//收款单位:FRECTUNIT (必填项)
public String FRECTUNIT ;
@NotBlank
//采购组织:FPURCHASEORGID
public String FPURCHASEORGID ;
@JsonProperty("FPURCHASEDEPTID")
@NotBlank
//采购部门:FPURCHASEDEPTID(必填项)
public String FPURCHASEDEPTID ;
/*@JsonProperty("F_PAEZ_Assistant")
@NotBlank
//应付类别:F_PAEZ_Assistant (必填项) 默认:005 定金
public String F_PAEZ_Assistant="005";*/
/**
* //应付类别:F_PAEZ_AssistantType (必填项) 默认:005 定金
*/
@JsonProperty("F_PAEZ_AssistantType")
@NotBlank
public String F_PAEZ_AssistantType;
/**
* //应付类别:F_PAEZ_AssistantKey (必填项) 默认:005 定金
*/
@JsonProperty("F_PAEZ_Assistant")
@NotBlank
public String F_PAEZ_AssistantKey;
/**
* //备注:FREMARK
*/
@JsonProperty("FREMARK")
public String FREMARK;
/* @JsonProperty("FCONTACTUNITTYPE")
@NotBlank
//往来单位类型:FCONTACTUNITTYPE (必填项)
@ -30,49 +62,75 @@ public class ApPayBill {
@NotBlank
//收款单位类型:FRECTUNITTYPE (必填项)
public String FRECTUNITTYPE="BD_Supplier";*/
@JsonProperty("FRECTUNIT")
@NotBlank
//收款单位:FRECTUNIT (必填项)
public String FRECTUNIT ;
/* @JsonProperty("FSETTLEORGID")
@NotBlank*/
//结算组织:FSETTLEORGID (必填项)
/*public String FSETTLEORGID ;
@JsonProperty("FPURCHASEORGID")*/
@NotBlank
//采购组织:FPURCHASEORGID
public String FPURCHASEORGID ;
@JsonProperty("FPURCHASEDEPTID")
@NotBlank
//采购部门:FPURCHASEDEPTID(必填项)
public String FPURCHASEDEPTID ;
/* @JsonProperty("FPAYORGID")
@NotBlank*/
//付款组织:FPAYORGID (必填项)
/* public String FPAYORGID ;*/
@JsonProperty("F_PAEZ_Assistant")
@NotBlank
//应付类别:F_PAEZ_Assistant (必填项) 默认:005 定金
public String F_PAEZ_Assistant="005";
@JsonProperty("FPAYBILLENTRY")
@NotBlank
public List<FPAYBILLENTRY> FPAYBILLENTRY=new ArrayList<>();
@Data
public static class FPAYBILLENTRY{
/**
* 结算方式:FSETTLETYPEID (必填项)
*/
@JsonProperty("FSETTLETYPEID")
@NotBlank
public String FSETTLETYPEID="02";
//付款用途:FPURPOSEID (必填项) SFKYT08_SYS:采购付款 SFKYT09_SYS:预付款
@JsonProperty("FPURPOSEID")
@NotBlank
public String FPURPOSEID;
@JsonProperty("FPAYTOTALAMOUNTFOR")
@NotBlank
//表体-应付金额:FPAYTOTALAMOUNTFOR
public double FPAYTOTALAMOUNTFOR;
/**
* 结算方式:FSETTLETYPEID (必填项)
*/
/* @JsonProperty("FSETTLETYPEID")
@NotBlank
public String FSETTLETYPEID;*/
/**
* 结算方式:FSETTLETYPEIDKey (必填项)
*/
@JsonProperty("FSETTLETYPEIDKey")
@NotBlank
public String FSETTLETYPEIDKey;
/**
* 结算方式:FSETTLETYPEIDType (必填项)
*/
@JsonProperty("FSETTLETYPEIDType")
@NotBlank
public String FSETTLETYPEIDType;
//付款用途:FPURPOSEID (必填项) SFKYT08_SYS:采购付款 SFKYT09_SYS:预付款
/*@JsonProperty("FPURPOSEID")
@NotBlank
public String FPURPOSEID;*/
/**
* 付款用途:FPURPOSEIDType (必填项) SFKYT08_SYS采购付款 SFKYT09_SYS预付款
*/
@JsonProperty("FPURPOSEIDType")
@NotBlank
public String FPURPOSEIDType;
/**
* 付款用途:FPURPOSEIDKey (必填项) SFKYT08_SYS采购付款 SFKYT09_SYS预付款
*/
@JsonProperty("FPURPOSEIDKey")
@NotBlank
public String FPURPOSEIDKey;
@JsonProperty("FPAYTOTALAMOUNTFOR")
@NotBlank
//表体-应付金额:FPAYTOTALAMOUNTFOR
public double FPAYTOTALAMOUNTFOR;
@JsonProperty("FACCOUNTID")
@NotBlank
//我方银行账号:FACCOUNTID 第1行分录,银行业务的结算方式,我方银行相关信息必录
public String FACCOUNTID;
@JsonProperty("FPOSTDATE")
@NotBlank
//登账日期:FPOSTDATE (必填项)
public String FPOSTDATE;
/* @JsonProperty("FRuZhangType")
@NotBlank
//入账类型:FRuZhangType (必填项)
public String FRuZhangType="1";*/
/* @JsonProperty("FPayType")
@NotBlank
//支付类型:FPayType (必填项)
public String FPayType;*/
/* @JsonProperty("FPAYAMOUNTFOR_E")
@NotBlank*/
//付款金额:FPAYAMOUNTFOR_E
@ -89,22 +147,6 @@ public class ApPayBill {
@NotBlank*/
//付款金额本位币:FPAYAMOUNT_E
/* public double FPAYAMOUNT_E;*/
@JsonProperty("FACCOUNTID")
@NotBlank
//我方银行账号:FACCOUNTID 第1行分录,银行业务的结算方式,我方银行相关信息必录
public String FACCOUNTID;
@JsonProperty("FPOSTDATE")
@NotBlank
//登账日期:FPOSTDATE (必填项)
public String FPOSTDATE;
@JsonProperty("FRuZhangType")
@NotBlank
//入账类型:FRuZhangType (必填项)
public String FRuZhangType="1";
@JsonProperty("FPayType")
@NotBlank
//支付类型:FPayType (必填项)
public String FPayType;
}
public final static ApPayBill apPayBill = new ApPayBill();

3
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/arreceivable/ARReceivable.java

@ -97,7 +97,8 @@ public class ARReceivable {
public String num;
@ApiModelProperty("客户ID")
public String fcustomerid;
@ApiModelProperty("FAR_Remark")
public String FAR_Remark;
@ApiModelProperty("车辆列表")
public List<ScmApplyInboundVehicleDto> vehicleList;

5
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/bdcustomer/BdCustomer.java

@ -24,6 +24,11 @@ public class BdCustomer {
@JsonProperty("TOrgId")
@NotBlank
public String TOrgIds;
/**
* 备注
*/
@JsonProperty("FDescription")
public String FDescription;
public final static BdCustomer bdCustomer = new BdCustomer();
static {
/* 创建组织:FCreateOrgId (必填项)*/

76
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/bdmaterial/BdMaterial.java

@ -21,16 +21,6 @@ public class BdMaterial {
*/
@JsonProperty("oldFName")
public String oldFName;
/**
*创建组织:FCreateOrgId (必填项)
*/
// @JsonProperty("FCreateOrgId")
// public String FCreateOrgId;
/**
*使用组织:FUseOrgId (必填项)
*/
// @JsonProperty("FUseOrgId")
// public String FUseOrgId;
/**
*名称:FName (必填项)
*/
@ -40,22 +30,72 @@ public class BdMaterial {
/**
*物料分组:FMaterialGroup (必填项)
*/
@NotBlank(message = "物料分组:FMaterialGroup (必填项)")
/*@NotBlank(message = "物料分组:FMaterialGroup (必填项)")
@JsonProperty("FMaterialGroup")
public String FMaterialGroup;
public String FMaterialGroup;*/
@NotBlank(message = "物料分组:FMaterialGroupType (必填项)")
@JsonProperty("FMaterialGroupType")
public String FMaterialGroupType;
@NotBlank(message = "物料分组:FMaterialGroupKey (必填项)")
@JsonProperty("FMaterialGroupKey")
public String FMaterialGroupKey;
/**
*车辆类型:F_PAEZ_Base (必填项)
*/
@NotBlank(message = "车辆类型:F_PAEZ_Base ")
/*@NotBlank(message = "车辆类型:F_PAEZ_Base ")
@JsonProperty("F_PAEZ_Base")
public String F_PAEZ_Base;
public String F_PAEZ_Base;*/
@NotBlank(message = "车辆类型:F_PAEZ_BaseType ")
@JsonProperty("F_PAEZ_BaseType")
public String F_PAEZ_BaseType;
@NotBlank(message = "车辆类型:F_PAEZ_BaseKey ")
@JsonProperty("F_PAEZ_BaseKey")
public String F_PAEZ_BaseKey;
@NotBlank(message = "车辆系别:F_PAEZ_Base2Type ")
@JsonProperty("F_PAEZ_Base2Type")
public String F_PAEZ_Base2Type;
@NotBlank(message = "车辆系别:F_PAEZ_Base2Key ")
@JsonProperty("F_PAEZ_Base2Key")
public String F_PAEZ_Base2Key;
@NotBlank(message = "车辆马力:F_PAEZ_Base3Key ")
@JsonProperty("F_PAEZ_Base3Key")
public String F_PAEZ_Base3Key;
@NotBlank(message = "车辆马力:F_PAEZ_Base3Type ")
@JsonProperty("F_PAEZ_Base3Type")
public String F_PAEZ_Base3Type;
@NotBlank(message = "车辆驱动:F_PAEZ_Base4Type ")
@JsonProperty("F_PAEZ_Base4Type")
public String F_PAEZ_Base4Type;
@NotBlank(message = "车辆驱动:F_PAEZ_Base4Key ")
@JsonProperty("F_PAEZ_Base4Key")
public String F_PAEZ_Base4Key;
/**
* 备注描述
*/
@JsonProperty("FDescription")
public String FDescription;
/**
*创建组织:FCreateOrgId (必填项)
*/
// @JsonProperty("FCreateOrgId")
// public String FCreateOrgId;
/**
*使用组织:FUseOrgId (必填项)
*/
// @JsonProperty("FUseOrgId")
// public String FUseOrgId;
/**
*存货类别:FCategoryID (必填项)
*/
/* @NotBlank(message = "存货类别:FCategoryID ")
/*@NotBlank(message = "存货类别:FCategoryID ")
@JsonProperty("FCategoryID")
public String FCategoryID="CHLB01_SYS";*/
public String FCategoryID;*/
@NotBlank(message = "存货类别:FCategoryIDKey ")
@JsonProperty("FCategoryIDKey")
public String FCategoryIDKey;
@NotBlank(message = "存货类别:FCategoryIDType")
@JsonProperty("FCategoryIDType")
public String FCategoryIDType;
public final static BdMaterial bdMaterial = new BdMaterial();
static {
/**
@ -81,7 +121,7 @@ public class BdMaterial {
/**
* 车辆类型:F_PAEZ_Base (必填项)
*/
bdMaterial.setF_PAEZ_Base("02");
/*bdMaterial.setF_PAEZ_Base("02");*/
}
public static BdMaterial createBdMaterial() {
return bdMaterial;

6
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/bdstock/BDStock.java

@ -30,7 +30,11 @@ public class BDStock implements Serializable {
@JsonProperty("FName")
@NotBlank
private String FName;
/**
* 备注
*/
@JsonProperty("FStockProperty")
private String FStockProperty;
/**
* 分配的分公司的id:TOrgIds (必填项)
*/

4
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/orgorganizations/OrgOrganizations.java

@ -22,7 +22,9 @@ public class OrgOrganizations {
@JsonProperty("FOrgFormID")
@NotBlank
public String FOrgFormID;
/*描述:FDescription*/
@JsonProperty("FDescription")
public String FDescription;
public final static OrgOrganizations orgOrganizations = new OrgOrganizations();
static {
/*名称:FName (必填项)*/

51
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/saloutstock/SalOutStock.java

@ -44,9 +44,34 @@ public class SalOutStock {
// public String FPayerID;
/**
* 项目类别:F_PAEZ_Assistant 调账时项目类别集团内部调车034
*/ @JsonProperty("F_PAEZ_Assistant")
*/
/*@JsonProperty("F_PAEZ_Assistant")
@NotBlank
public String F_PAEZ_Assistant;*/
/**
* 项目类别:F_PAEZ_AssistantType 调账时项目类别集团内部调车034
*/
@JsonProperty("F_PAEZ_AssistantType")
@NotBlank
public String F_PAEZ_AssistantType;
/**
* 项目类别:F_PAEZ_AssistantKey 调账时项目类别集团内部调车034
*/
@JsonProperty("F_PAEZ_AssistantKey")
@NotBlank
public String F_PAEZ_AssistantKey;
/**
* 业务员:F_PAEZ_Base1
*/
@JsonProperty("F_PAEZ_Base1")
@NotBlank
public String F_PAEZ_Assistant="00";
public String F_PAEZ_Base1;
/**
* 中介单位:F_PAEZ_Base
*/
@JsonProperty("F_PAEZ_Base")
@NotBlank
public String F_PAEZ_Base;
/**
* 物料列表
*/
@ -102,6 +127,28 @@ public class SalOutStock {
*/ @JsonProperty("FSalUnitID")
@NotBlank
public String FSalUnitID;
/**
* 销售折让:F_PAEZ_Decimal3
*/ @JsonProperty("F_PAEZ_Decimal3")
@NotBlank
public String F_PAEZ_Decimal3;
/**
* 赠送套餐:F_PAEZ_Decimal4
*/ @JsonProperty("F_PAEZ_Decimal4")
@NotBlank
public String F_PAEZ_Decimal4;
/**
* 返利金额:F_PAEZ_Decimal
*/
@JsonProperty("F_PAEZ_Decimal")
@NotBlank
public String F_PAEZ_Decimal;
/**
* 备注:FEntrynote
*/
@JsonProperty("FEntrynote")
@NotBlank
public String FEntrynote;
}
public final static SalOutStock salOutStock = new SalOutStock();

5
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stkinstock/StkInStock.java

@ -136,6 +136,11 @@ public class StkInStock {
*/@JsonProperty("FStockId")
@NotBlank
public String FStockId;
/**
* 备注
*/
@JsonProperty("FNote")
public String FNote;
}
public final static StkInStock stkInStock = new StkInStock();

39
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stktransferdirect/StkTransferDirect.java

@ -25,6 +25,14 @@ public class StkTransferDirect {
@JsonProperty("FDestStockId")
@NotBlank
public String FDestStockId;
/* 物料编码:FMaterialId (必填项)*/
@JsonProperty("FMaterialId")
@NotBlank
public String FMaterialId;
/* 调出仓库:FSrcStockId (必填项)*/
@JsonProperty("FSrcStockId")
@NotBlank
public String FSrcStockId;
/*调出库存状态:FSrcStockStatusId (必填项)*/
/* @JsonProperty("FSrcStockStatusId")
@NotBlank
@ -81,14 +89,6 @@ public class StkTransferDirect {
// @JsonProperty("FUnitID")
// @NotBlank
//public String FUnitID;
/* 物料编码:FMaterialId (必填项)*/
@JsonProperty("FMaterialId")
@NotBlank
public String FMaterialId;
/* 调出仓库:FSrcStockId (必填项)*/
@JsonProperty("FSrcStockId")
@NotBlank
public String FSrcStockId;
}
/* 调入货主:FOwnerIdHead (必填项)*/
@JsonProperty("FOwnerIdHead")
@ -98,6 +98,19 @@ public class StkTransferDirect {
@JsonProperty("FStockOutOrgId")
@NotBlank
public String FStockOutOrgId;
/* 调入库存组织:FStockOrgId (必填项)*/
@JsonProperty("FStockOrgId")
@NotBlank
public String FStockOrgId;
/* 日期:FDate (必填项)*/
@JsonProperty("FDate")
@NotBlank
public String FDate;
/**
* 备注
*/
@JsonProperty("FNote")
public String FNote;
/* 调拨类型:FTransferBizType (必填项)*/
/*@JsonProperty("FTransferBizType")
@NotBlank
@ -110,10 +123,6 @@ public class StkTransferDirect {
/*@JsonProperty("FOwnerTypeOutIdHead")
@NotBlank
public String FOwnerTypeOutIdHead;*/
/* 调入库存组织:FStockOrgId (必填项)*/
@JsonProperty("FStockOrgId")
@NotBlank
public String FStockOrgId;
/* 调入货主类型:FOwnerTypeIdHead (必填项)*/
/*@JsonProperty("FOwnerTypeIdHead")
@NotBlank
@ -122,19 +131,13 @@ public class StkTransferDirect {
/*@JsonProperty("FBillTypeID")
@NotBlank
public String FBillTypeID;*/
/* 日期:FDate (必填项)*/
@JsonProperty("FDate")
@NotBlank
public String FDate;
/**
* FBillEntry
*/
@JsonProperty("FBillEntry")
@NotBlank
public List<FBillEntry> FBillEntry=new ArrayList<>();
public final static StkTransferDirect stkTransferDirect = new StkTransferDirect();
static {
SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date date=new Date();

69
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java

@ -34,13 +34,14 @@ import com.yxt.anrui.base.api.basemanufactorsubscription.BaseManufactorSubscript
import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyDetailsVo;
import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyFeign;
import com.yxt.anrui.base.common.enums.DictCommonEnum;
import com.yxt.anrui.base.common.enums.ManPurOrderType;
import com.yxt.anrui.fin.api.finpaymentapply.FinPaymentapply;
import com.yxt.anrui.fin.api.finpaymentrecord.*;
import com.yxt.anrui.fin.api.kingdee.appaybill.ApPayBill;
import com.yxt.anrui.fin.biz.finpaymentapply.FinPaymentapplyService;
import com.yxt.anrui.fin.biz.kingdee.FinKingDeeService;
import com.yxt.anrui.fin.biz.kingdee.appaybill.ApPayBillService;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
@ -84,6 +85,8 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
private ApPayBillService apPayBillService;
@Autowired
private BusVehicleApplyFeign busVehicleApplyFeign;
@Autowired
private SysOrganizationFeign sysOrganizationFeign;
public PagerVo<FinPaymentrecordVo> listPageVo(PagerQuery<FinPaymentrecordQuery> pq) {
FinPaymentrecordQuery query = pq.getParams();
@ -182,19 +185,36 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
private ApPayBill createApPayBill(FinPaymentrecord finPaymentrecord) {
ApPayBill apPayBill = new ApPayBill();
//登账日期
// apPayBill.setFPOSTDATE(DateUtil.formatDate(finPaymentrecord.getPayDate()));
// apPayBill.setFPOSTDATE(DateUtil.formatDate(finPaymentrecord.getPayDate()));
//业务日期
apPayBill.setFDATE(DateUtil.formatDate(finPaymentrecord.getPayDate()));
//收款单位
apPayBill.setFRECTUNIT("010001");
// apPayBill.setFRECTUNIT("010001");
apPayBill.setFRECTUNIT(finPaymentrecord.getPayCode());
//采购组织
apPayBill.setFPURCHASEORGID("101");
//根据使用组织查询采购组织的编码
ResultBean<SysOrganizationVo> resultBean = sysOrganizationFeign.fetchBySid(finPaymentrecord.getCreateOrgSid());
if (!resultBean.getSuccess()) {
SysOrganizationVo vo = resultBean.getData();
if (vo != null) {
apPayBill.setFPURCHASEORGID(vo.getOrgCode());
}
}
// apPayBill.setFPURCHASEORGID("101");
//采购部门
apPayBill.setFPURCHASEDEPTID("05.04");
ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.selectByPSid(finPaymentrecord.getCreateOrgSid(), "销售支持部");
if (resultBean1.getSuccess()) {
SysOrganizationVo vo = resultBean1.getData();
if (vo != null) {
apPayBill.setFPURCHASEDEPTID(vo.getOrgCode());
}
}
// apPayBill.setFPURCHASEDEPTID("05.04");
//应付类别默认005定金
apPayBill.setF_PAEZ_Assistant("005");
if ("排产".equals(finPaymentrecord.getCostTitleValue())) {
apPayBill.setF_PAEZ_AssistantKey("005");
apPayBill.setF_PAEZ_AssistantType("定金");
}
List<ApPayBill.FPAYBILLENTRY> FPAYBILLENTRYs = new ArrayList<>();
if (finPaymentrecord.getCost() != null
&& finPaymentrecord.getCost() > 0) {
@ -203,26 +223,31 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
fpaybillentry.setFPAYTOTALAMOUNTFOR(Double.valueOf(finPaymentrecord.getCost()));
//登账日期
fpaybillentry.setFPOSTDATE(DateUtil.formatDate(finPaymentrecord.getPayDate()));
//入账类型
fpaybillentry.setFRuZhangType("1");
//我方银行账号
fpaybillentry.setFACCOUNTID("100473861600010002");//finPaymentrecord.getReceiveBankAccount());
//支付类型
fpaybillentry.setFPayType("A");
// fpaybillentry.setFACCOUNTID("100473861600010002");
fpaybillentry.setFACCOUNTID(finPaymentrecord.getPayBankAccount());
//付款用途
if (ManPurOrderType.CostTitle.DJ_COSTTITLE.getRemarks().equals(finPaymentrecord.getCostTitleValue())) {
fpaybillentry.setFPURPOSEIDKey(finPaymentrecord.getCostTitleKey());
fpaybillentry.setFPURPOSEIDType(finPaymentrecord.getCostTitleValue());
//结算方式
fpaybillentry.setFSETTLETYPEIDKey(finPaymentrecord.getPayWayKey());
fpaybillentry.setFSETTLETYPEIDType(finPaymentrecord.getPayWayValue());
/* if (ManPurOrderType.CostTitle.DJ_COSTTITLE.getRemarks().equals(finPaymentrecord.getCostTitleValue())) {
//订金
fpaybillentry.setFPURPOSEID("SFKYT09_SYS");
fpaybillentry.setFPURPOSEIDKey("SFKYT09_SYS");
fpaybillentry.setFPURPOSEIDType("SFKYT09_SYS");
} else {
//车款
fpaybillentry.setFPURPOSEID("SFKYT08_SYS");
}
//结算方式
if ("承兑".equals(finPaymentrecord.getPayWayValue())) {
fpaybillentry.setFSETTLETYPEID("09");
fpaybillentry.setFPURPOSEIDKey("SFKYT08_SYS");
fpaybillentry.setFPURPOSEIDType("SFKYT08_SYS");
}*/
/* if ("承兑".equals(finPaymentrecord.getPayWayValue())) {
fpaybillentry.setFSETTLETYPEIDKey("09");
fpaybillentry.setFSETTLETYPEIDType("09");
} else {
fpaybillentry.setFSETTLETYPEID("02");
}
fpaybillentry.setFSETTLETYPEIDKey("02");
fpaybillentry.setFSETTLETYPEIDType("02");
}*/
FPAYBILLENTRYs.add(fpaybillentry);
}
if (FPAYBILLENTRYs.size() > 0) {

24
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java

@ -149,28 +149,20 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
public ResultBean<String> draftSalOutStock(@RequestBody @Valid SalOutStock salOutStock) {
return salOutStockService.draftSalOutStock(salOutStock);
}
@ApiOperation("暂存物料的接口")
@PostMapping("/draftBdMaterial")
@ResponseBody
@Override
public ResultBean<String> draftBdMaterial(@RequestBody @Valid BdMaterial bdMaterial) {
return bdMaterialService.draftBdMaterial(bdMaterial);
}
@ApiOperation("暂存物料的接口")
@PostMapping("/saveBdMaterial")
@ResponseBody
@Override
public ResultBean<String> saveBdMaterial(@RequestBody @Valid BdMaterial bdMaterial) {
return bdMaterialService.saveBdMaterial(bdMaterial);
}
@ApiOperation("暂存物料的接口")
@ApiOperation("批量暂存物料的接口")
@PostMapping("/draftBdMaterialList")
@ResponseBody
@Override
public ResultBean<String> draftBdMaterialList(@RequestBody @Valid List<BdMaterial> bdMaterial) {
return bdMaterialService.draftBdMaterialList(bdMaterial);
}
@ApiOperation("批量修改物料的接口")
@PostMapping("/saveBdMaterialList")
@ResponseBody
@Override
public ResultBean<String> saveBdMaterialList(@RequestBody @Valid List<BdMaterial> bdMaterial) {
return bdMaterialService.saveBdMaterialList(bdMaterial);
}
@ApiOperation("暂存直接调拨单的接口")
@PostMapping("/draftStkTransferDirect")
@ResponseBody

122
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeService.java

@ -3,10 +3,13 @@ package com.yxt.anrui.fin.biz.kingdee;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.yxt.anrui.fin.api.kingdee.KingDeeResult;
import com.yxt.anrui.portal.api.sysmapping.SysMappingFeign;
import com.yxt.anrui.portal.api.sysmapping.SysMappingInfoQueryBatch;
import com.yxt.common.base.utils.StringUtils;
import com.yxt.common.core.result.ResultBean;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.lang.reflect.Field;
@ -21,6 +24,8 @@ import java.util.Map;
@Service
public class FinKingDeeService {
public static final Logger log = LoggerFactory.getLogger(FinKingDeeService.class);
@Autowired
public SysMappingFeign sysMappingFeign;
/**
* 调用金蝶的保存接口
* @param data
@ -175,7 +180,89 @@ public class FinKingDeeService {
s=s.substring(0,s.length()-1);
return s;
}
/**
* 获取映射的数据字典的参数
* @param sysMappingInfoQuerys
* @return
*/
public ResultBean<Map<String,Object>> getMappingInfosParams(List<Map<String,List<SysMappingInfoQueryBatch>>> sysMappingInfoQuerys) {
return sysMappingFeign.selectMappingInfoBatch(sysMappingInfoQuerys);
}
/**
* 映射的参数
* @param maps
* @param idKey 映射的实体类具有唯一标识的字段
* @return
*/
public List<Map<String, List<SysMappingInfoQueryBatch>>> makeMappingInfosParams(List< Map<String, Object>> maps,
List<KeyItem> keys,String idKey,
String mapObject,String mapSourceKey) {
List<Map<String,List<SysMappingInfoQueryBatch>>> list=new ArrayList<>();
for( Map<String, Object> stringObjectMap: maps) {
//物料信息转map参数
//业务表的主表数据集合
Map<String, String> map_fEntityModel_ = createMapParams(stringObjectMap);
List<SysMappingInfoQueryBatch> dictValueAndCode = getDictValueAndCode(map_fEntityModel_,keys,mapObject,mapSourceKey);
Map<String,List<SysMappingInfoQueryBatch>> m=new HashMap<>();
m.put(stringObjectMap.get(idKey).toString(),dictValueAndCode);
list.add(m);
}
return list;
}
private List<SysMappingInfoQueryBatch> getDictValueAndCode(Map<String, String> map_fEntityModel_,List<KeyItem> keys,
String mapObject,String mapSourceKey) {
List<SysMappingInfoQueryBatch> sysMappingInfoQuerys=new ArrayList<>();
for(KeyItem ki:keys){
String key = ki.getKey();
String item = ki.getItem();
String FCategoryIDType = map_fEntityModel_.get(key+"Type");
String FCategoryIDKey = map_fEntityModel_.get(key+"Key");
sysMappingInfoQuerys.add(getDictValueAndCodeBatch(FCategoryIDType,FCategoryIDKey,item,mapObject,mapSourceKey));
}
return sysMappingInfoQuerys;
}
private SysMappingInfoQueryBatch getDictValueAndCodeBatch(String DictTypeType,String DictKey,String Map_item,String mapObject,String mapSourceKey) {
SysMappingInfoQueryBatch sysMappingInfoQuery = new SysMappingInfoQueryBatch();
sysMappingInfoQuery.setMap_object("物料");
sysMappingInfoQuery.setMap_sourceKey("CWXT");
sysMappingInfoQuery.setDictTypeCode(DictTypeType);
sysMappingInfoQuery.setDictKey(DictKey);
sysMappingInfoQuery.setMap_item(Map_item);
return sysMappingInfoQuery;
}
/**
* 向物料的实体对象上设置查询回来的映射的数据字典的参数
* @param map_fEntityModel_
* @param data
* @return
*/
public ResultBean< String> setMappingInfosParams(Map<String, String> map_fEntityModel_, Map<String, Object> data,List<KeyItem> kis){
ResultBean< String> rb=ResultBean.fireFail();
for(Map.Entry<String, Object> entry : data.entrySet()){
Object value = entry.getValue();
if(value==null){
log.info("物料映射表不存在值!");
return rb.setMsg("物料映射表不存在值!");
}
JSONArray jsonArray=JSONArray.parseArray(JSONObject.toJSONString(entry.getValue()));
for(int i=0;i<jsonArray.size();i++){
JSONObject s= (JSONObject) jsonArray.get(i);
Object map_item = s.get("map_item");
Object map_itemKey = s.get("map_itemKey");
if(map_item==null|| map_itemKey==null){
log.info("物料映射表不存在值!");
return rb.setMsg("物料映射表不存在值!");
}
kis.forEach(keyItem -> {
if(map_item.equals(keyItem.getItem())){
map_fEntityModel_.put(keyItem.getKey(),map_itemKey.toString());
}
});
}
}
return rb.success();
}
/**
* 调用金蝶接口的数据格式
*/
@ -241,4 +328,39 @@ public class FinKingDeeService {
return data;
}
}
/**
* 封装获取映射的参数的值的时候的实体类的字段
*/
public class KeyItem{
public KeyItem(String key, String item) {
this.key = key;
this.item = item;
}
/**
* key
*/
private String key;
/**
* item
*/
private String item;
public String getKey() {
return key;
}
public void setKey(String key) {
this.key = key;
}
public String getItem() {
return item;
}
public void setItem(String item) {
this.item = item;
}
}
}

1
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appayable/data_model.json

@ -25,6 +25,7 @@
},
"FSetAccountType": "2",
"FISTAXINCOST": false,
"FAP_Remark": "@KD_FAP_Remark",
"FISHookMatch": false,
"FPURCHASEDEPTID":{
"FNumber":"01"

1
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/ApPayBillCastToKingDeeBillFields.java

@ -34,6 +34,7 @@ public class ApPayBillCastToKingDeeBillFields {
//模板字符创转json
JSONObject jsonObj= JSONObject.parseObject(readJsonFile, Feature.OrderedField);
JSONObject jsonFEntityData_= JSONObject.parseObject(fEntityData_,Feature.OrderedField);
fEntityModel_ =KingDeeUtils.replaceTemplateParams(fEntityModel_, map_fEntityModel_);
JSONObject jsonFEntityModel_= JSONObject.parseObject(fEntityModel_,Feature.OrderedField);

55
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/ApPayBillService.java

@ -1,12 +1,18 @@
package com.yxt.anrui.fin.biz.kingdee.appaybill;
import cn.hutool.core.bean.BeanUtil;
import com.yxt.anrui.fin.api.kingdee.KingDeeBillId;
import com.yxt.anrui.fin.api.kingdee.KingDeeBillUrl;
import com.yxt.anrui.fin.api.kingdee.appaybill.ApPayBill;
import com.yxt.anrui.fin.api.kingdee.bdmaterial.BdMaterial;
import com.yxt.anrui.fin.biz.kingdee.FinKingDeeService;
import com.yxt.anrui.portal.api.sysmapping.SysMappingInfoQuery;
import com.yxt.anrui.portal.api.sysmapping.SysMappingInfoQueryBatch;
import com.yxt.anrui.portal.api.sysmapping.SysMappingInfoVo;
import com.yxt.common.core.result.ResultBean;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@ -24,9 +30,58 @@ public class ApPayBillService extends FinKingDeeService {
try {
//业务表的主表数据集合
Map<String,String> map_fEntityModel_= object2Map(apPayBill);//createMapParams(stringObjectMap);
//应付类别
String F_PAEZ_AssistantType = map_fEntityModel_.get("F_PAEZ_AssistantType");
String F_PAEZ_AssistantKey = map_fEntityModel_.get("F_PAEZ_AssistantKey");
SysMappingInfoQuery smiq=new SysMappingInfoQuery();
smiq.setMap_sourceKey("CWXT");
smiq.setMap_object("付款单");
smiq.setMap_item("应付类别");
smiq.setDictKey(F_PAEZ_AssistantKey);
smiq.setDictTypeCode(F_PAEZ_AssistantType);
ResultBean<SysMappingInfoVo> sysMappingInfoVoResultBean = sysMappingFeign.selectMappingInfo(smiq);
boolean success = sysMappingInfoVoResultBean.getSuccess();
if(!success){
return rb.setMsg(sysMappingInfoVoResultBean.getMsg());
}
String F_PAEZ_Assistant=sysMappingInfoVoResultBean.getData().getMap_itemKey();//TODO 根据应付类别的code,key查询金蝶系统中的应付类别的编码 映射来源“CWXT”/“财务系统”
map_fEntityModel_.put("F_PAEZ_Assistant",F_PAEZ_Assistant);
//准备 物料列表的数据 ForEntryBill
List<ApPayBill.FPAYBILLENTRY> fpaybillentrYs = apPayBill.getFPAYBILLENTRY();
List<Map<String, String>> vehicleListMap = createVehicleLists(fpaybillentrYs);
for(int i=0;i<vehicleListMap.size();i++){
Map<String,String> params=vehicleListMap.get(i);
//付款用途
String FPURPOSEIDType = params.get("FPURPOSEIDType");
String FPURPOSEIDKey = params.get("FPURPOSEIDKey");
smiq=new SysMappingInfoQuery();
smiq.setMap_sourceKey("CWXT");
smiq.setMap_object("付款单");
smiq.setMap_item("付款用途");
smiq.setDictKey(FPURPOSEIDKey);
smiq.setDictTypeCode(FPURPOSEIDType);
sysMappingInfoVoResultBean = sysMappingFeign.selectMappingInfo(smiq);
if(! sysMappingInfoVoResultBean.getSuccess()){
return rb.setMsg(sysMappingInfoVoResultBean.getMsg());
}
String FPURPOSEID=sysMappingInfoVoResultBean.getData().getMap_itemKey();//TODO 根据付款用途的code,key查询金蝶系统中的付款用途的编码 映射来源“CWXT”/“财务系统”
params.put("FPURPOSEID",FPURPOSEID);
//结算方式
String FSETTLETYPEIDType = params.get("FSETTLETYPEIDType");
String FSETTLETYPEIDKey = params.get("FSETTLETYPEIDKey");
smiq=new SysMappingInfoQuery();
smiq.setMap_sourceKey("CWXT");
smiq.setMap_object("付款单");
smiq.setMap_item("结算方式");
smiq.setDictKey(FSETTLETYPEIDKey);
smiq.setDictTypeCode(FSETTLETYPEIDType);
sysMappingInfoVoResultBean = sysMappingFeign.selectMappingInfo(smiq);
if(!sysMappingInfoVoResultBean.getSuccess()){
return rb.setMsg(sysMappingInfoVoResultBean.getMsg());
}
String FSETTLETYPEID=sysMappingInfoVoResultBean.getData().getMap_itemKey();//TODO 根据结算方式的code,key查询金蝶系统中的结算方式的编码 映射来源“CWXT”/“财务系统”
params.put("FSETTLETYPEID",FSETTLETYPEID);
}
String kingDeeData = ApPayBillCastToKingDeeBillFields.getKingDeeData(map_fEntityModel_,vehicleListMap);
return accessKingDeeInterface(KingDeeBillId.AP_PAYBILL.getID(),kingDeeData, KingDeeBillUrl.DRAFT_URL.getURL());
} catch (Exception e) {

4
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/data_FPAYBILLENTRY.json

@ -12,6 +12,6 @@
"FPAYAMOUNT_E": @KD_FPAYAMOUNT_E,
"FACCOUNTID": {"FNumber":"@KD_FACCOUNTID"},
"FPOSTDATE": "@KD_FPOSTDATE",
"FRuZhangType": "@KD_FRuZhangType",
"FPayType": "@KD_FPayType"
"FRuZhangType": "1",
"FPayType": "A"
}

1
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/data_model.json

@ -39,6 +39,7 @@
},
"FIsWriteOff": false,
"FREALPAY": false,
"FREMARK": "@KD_FREMARK",
"F_PAEZ_Assistant": {
"FNumber": "001"
},

1
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdcustomer/data_model.json

@ -16,6 +16,7 @@
"FCustTypeId": {
"FNumber": "KHLB001_SYS"
},
"FDescription": "@KD_FDescription",
"FTRADINGCURRID": {
"FNumber": "PRE001"
},

1
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/BdMaterialCastToKingDeeBillFields.java

@ -39,6 +39,7 @@ public class BdMaterialCastToKingDeeBillFields {
JSONObject jsonObj= JSONObject.parseObject(readJsonFile, Feature.OrderedField);
fEntityData_ =KingDeeUtils.replaceTemplateParams(fEntityData_, map_fEntityModel_);
JSONObject jsonFEntityData_= JSONObject.parseObject(fEntityData_,Feature.OrderedField);
fEntityModel_ =KingDeeUtils.replaceTemplateParams(fEntityModel_, map_fEntityModel_);
JSONObject jsonFEntityModel_= JSONObject.parseObject(fEntityModel_,Feature.OrderedField);

184
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/BdMaterialService.java

@ -4,10 +4,11 @@ import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSONObject;
import com.yxt.anrui.fin.api.kingdee.KingDeeBillId;
import com.yxt.anrui.fin.api.kingdee.KingDeeBillUrl;
import com.yxt.anrui.fin.api.kingdee.KingDeeResult;
import com.yxt.anrui.fin.api.kingdee.KingDeeCode;
import com.yxt.anrui.fin.api.kingdee.bdmaterial.BdMaterial;
import com.yxt.anrui.fin.biz.kingdee.FinKingDeeService;
import com.yxt.anrui.fin.biz.kingdee.KingDeeConfig;
import com.yxt.anrui.portal.api.sysmapping.SysMappingInfoQueryBatch;
import com.yxt.common.base.utils.StringUtils;
import com.yxt.common.core.result.ResultBean;
import org.slf4j.Logger;
@ -25,42 +26,115 @@ import java.util.Map;
public class BdMaterialService extends FinKingDeeService {
private static Logger log= LoggerFactory.getLogger(BdMaterialService.class);
/**
* 存物料 list
* @param bdMaterial
* 批量暂存物料 list
* @param bdMaterials
* @return
*/
public ResultBean<String> draftBdMaterialList(List<BdMaterial> bdMaterial) {
public ResultBean<String> draftBdMaterialList(List<BdMaterial> bdMaterials) {
ResultBean<String> rb=ResultBean.fireFail();
// bdMaterial=BdMaterial.createBdMaterial();
Map<String, Object> data = getStringObjectMap(bdMaterials);
List<String> list_r=new ArrayList<>();
for(BdMaterial b:bdMaterials) {
//物料信息转map参数
Map<String, Object> stringObjectMap = BeanUtil.beanToMap(b);
//业务表的主表数据集合
Map<String, String> map_fEntityModel_ = createMapParams(stringObjectMap);
ResultBean<String> stringResultBean = setMappingInfosParams(map_fEntityModel_, data,getKeyItems());
if(!stringResultBean.getSuccess()){
return stringResultBean;
}
map_fEntityModel_.put("IsDeleteEntry", "True");
map_fEntityModel_.put("FMATERIALID", 0 + "");
rb= draftBdMaterial(map_fEntityModel_);
if (rb.getSuccess()) {
list_r.add(rb.getData());
}
}
return rb.success().setData(JSONObject.toJSONString(list_r));
}
private Map<String, Object> getStringObjectMap(List<BdMaterial> bdMaterials) {
List<Map<String, Object>> som=new ArrayList<>();
bdMaterials.forEach(bdMaterial -> {
som.add(BeanUtil.beanToMap(bdMaterial));
});
List<KeyItem> params = getKeyItems();
List<Map<String, List<SysMappingInfoQueryBatch>>> list = makeMappingInfosParams(som,params,"FName",
"物料","CWXT");
ResultBean<Map<String, Object>> sysMappingInfoVoResultBeanBatch = getMappingInfosParams(list);
Map<String, Object> data = sysMappingInfoVoResultBeanBatch.getData();
return data;
}
private List<KeyItem> getKeyItems() {
List<KeyItem> params=new ArrayList<>();
params.add(new KeyItem("FCategoryID","存货类别") );
/* params.add(new KeyItem("FMaterialGroup","物料分组") );
params.add(new KeyItem("F_PAEZ_Base","车辆类型") );
params.add(new KeyItem("F_PAEZ_Base2","车辆系别") );
params.add(new KeyItem("F_PAEZ_Base3","车辆马力") );
params.add(new KeyItem("F_PAEZ_Base4","车辆驱动") );*/
return params;
}
/**
* 批量修改物料 list
* @param bdMaterials
* @return
*/
public ResultBean<String> saveBdMaterialList(List<BdMaterial> bdMaterials) {
// bdMaterial=BdMaterial.createBdMaterial();
List<String> list=new ArrayList<>();
ResultBean<String> rb=ResultBean.fireFail();
for(BdMaterial b:bdMaterial) {
rb= draftBdMaterial(b);
Map<String, Object> data = getStringObjectMap(bdMaterials);
List<String> list_r=new ArrayList<>();
for(BdMaterial b:bdMaterials) {
Map<String, Object> stringObjectMap = BeanUtil.beanToMap(b);
if(StringUtils.isBlank(b.getOldFName())){
return rb.setMsg("FMATERIALID不能为空");
}
ResultBean<String> stringResultBean = null;
try {
stringResultBean = unAudit(b);
} catch (Exception e) {
e.printStackTrace();
}
if(!stringResultBean.getSuccess()){
return stringResultBean;
}
String FMATERIALID=stringResultBean.getData();
Map<String,String> map_fEntityModel_=createMapParams(stringObjectMap);
ResultBean<String> stringResultBean1 = setMappingInfosParams(map_fEntityModel_, data,getKeyItems());
if(!stringResultBean1.getSuccess()){
return stringResultBean1;
}
map_fEntityModel_.put("IsDeleteEntry","False");
map_fEntityModel_.put("FMATERIALID",FMATERIALID);
rb= saveBdMaterial(map_fEntityModel_);
if (rb.getSuccess()) {
list.add(rb.getData());
list_r.add(rb.getData());
}
}
return rb.success();
return rb.success().setData(JSONObject.toJSONString(list_r));
}
/**
* 暂存物料
* @param bdMaterial
* 调用金蝶接口暂存物料
* @param map_fEntityModel_
* @return
*/
public ResultBean<String> draftBdMaterial(BdMaterial bdMaterial) {
private ResultBean<String> draftBdMaterial( Map<String, String> map_fEntityModel_) {
// bdMaterial=BdMaterial.createBdMaterial();
ResultBean<String> rb=ResultBean.fireFail();
//物料信息转map参数
Map<String, Object> stringObjectMap = BeanUtil.beanToMap(bdMaterial);
//业务表的主表数据集合
Map<String,String> map_fEntityModel_=createMapParams(stringObjectMap);
map_fEntityModel_.put("IsDeleteEntry","True");
map_fEntityModel_.put("FMATERIALID",0+"");
String kingDeeData = BdMaterialCastToKingDeeBillFields.getKingDeeData(map_fEntityModel_);
try {
ResultBean<String> draft = draft(kingDeeData);
if (!draft.getSuccess()) return rb.setMsg("物料保存失败!");
String data = draft.getData();
submitAuditAllocate(bdMaterial, data);
ResultBean<String> submit = submitAuditAllocate(data);
if (!submit.getSuccess()) return rb.setCode(KingDeeCode.SUBMIT.getCode()).setData(submit.getData());
ResultBean<String> audit = audit(data);
if (!audit.getSuccess()) return rb.setCode(KingDeeCode.AUDIT.getCode()).setData(audit.getData());
ResultBean<String> allocate = allocate(map_fEntityModel_.get("TOrgIds"), data);
if (!allocate.getSuccess()) return rb.setCode(KingDeeCode.ALLOCATE.getCode()).setData(allocate.getData());
return draft;
} catch (Exception e) {
e.printStackTrace();
@ -70,30 +144,19 @@ public class BdMaterialService extends FinKingDeeService {
/**
* 修改物料的信息
* @param bdMaterial
* @return
*/
public ResultBean<String> saveBdMaterial(BdMaterial bdMaterial) {
private ResultBean<String> saveBdMaterial( Map<String,String> map_fEntityModel_) {
// bdMaterial=BdMaterial.createBdMaterial();
ResultBean<String> rb=ResultBean.fireFail();
//物料信息转map参数
Map<String, Object> stringObjectMap = BeanUtil.beanToMap(bdMaterial);
if(StringUtils.isBlank(bdMaterial.getOldFName())){
return rb.setMsg("FMATERIALID不能为空");
}
try{
ResultBean<String> stringResultBean = hasMaterial(bdMaterial);
if(!stringResultBean.getSuccess()){
return stringResultBean;
}
String FMATERIALID=stringResultBean.getData();
Map<String,String> map_fEntityModel_=createMapParams(stringObjectMap);
map_fEntityModel_.put("IsDeleteEntry","False");
map_fEntityModel_.put("FMATERIALID",FMATERIALID);
ResultBean<String> save = save(map_fEntityModel_);
String data = save.getData();
if (submit( data)) return rb.setMsg("物料提交失败!");
if (audit( data)) return rb.setMsg("物料审核失败!");
ResultBean<String> submit = submitAuditAllocate( data);
if (!submit.getSuccess()) return rb.setCode(KingDeeCode.SUBMIT.getCode()).setMsg(KingDeeCode.SUBMIT.getMsg());
ResultBean<String> audit = audit(data);
if (!audit.getSuccess()) return rb.setCode(KingDeeCode.AUDIT.getCode()).setMsg(KingDeeCode.AUDIT.getMsg());
return save;
} catch (Exception e) {
e.printStackTrace();
@ -113,16 +176,16 @@ public class BdMaterialService extends FinKingDeeService {
kingDeeData, KingDeeConfig.userName_administrator,KingDeeConfig.password_administrator, KingDeeBillUrl.DRAFT_URL.getURL());
if(!stringResultBean.getSuccess()){
log.info("物料保存失败!");
return rb;
return rb.setMsg("物料保存失败!");
}
String data1 = stringResultBean.getData();
JSONObject jsonObject = JSONObject.parseObject(data1);
String data = stringResultBean.getData();
JSONObject jsonObject = JSONObject.parseObject(data);
JSONObject result = (JSONObject)jsonObject.get("Result");
JSONObject responseStatus = (JSONObject)result.get("ResponseStatus");
boolean isSuccess = (boolean) responseStatus.get("IsSuccess");
if(!isSuccess){
log.info("物料保存失败!");
return rb;
log.info("物料编码重复!");
return rb.setCode(KingDeeCode.REPEAT.getCode());
}
log.info("物料保存成功!");
return stringResultBean;
@ -141,7 +204,7 @@ public class BdMaterialService extends FinKingDeeService {
kingDeeData, KingDeeBillUrl.SAVE_URL.getURL());
if(!stringResultBean.getSuccess()){
log.info("物料保存失败!");
return rb;
return rb.setMsg("物料保存失败!");
}
String data1 = stringResultBean.getData();
JSONObject jsonObject = JSONObject.parseObject(data1);
@ -149,8 +212,8 @@ public class BdMaterialService extends FinKingDeeService {
JSONObject responseStatus = (JSONObject)result.get("ResponseStatus");
boolean isSuccess = (boolean) responseStatus.get("IsSuccess");
if(!isSuccess){
log.info("物料保存失败!");
return rb;
log.info("物料编码重复!");
return rb.setCode(KingDeeCode.REPEAT.getCode()).setMsg(KingDeeCode.REPEAT.getMsg());
}
log.info("物料保存成功!");
return stringResultBean;
@ -162,32 +225,30 @@ public class BdMaterialService extends FinKingDeeService {
* @return
* @throws Exception
*/
private ResultBean submitAuditAllocate(BdMaterial bdMaterial, String data) throws Exception {
private ResultBean<String> submitAuditAllocate(String data) throws Exception {
ResultBean<String> rb=ResultBean.fireFail();
if (submit( data)) return rb.setMsg("物料提交失败!");
if (audit( data)) return rb.setMsg("物料审核失败!");
if (allocate(bdMaterial, data)) return rb.setMsg("物料分配失败!");
ResultBean<String> submit = submit(data);
if (!submit.getSuccess()) return rb.setCode(KingDeeCode.SUBMIT.getCode()).setData(submit.getData());
return rb.success();
}
/**
* 分配
* @param bdMaterial
* @param tOrgIds
* @param data
* @return
* @throws Exception
*/
private boolean allocate(BdMaterial bdMaterial, String data) throws Exception {
String allocate = getAllocate(data, bdMaterial.getTOrgIds(),KingDeeBillId.BD_MATERIAL.getID());
private ResultBean<String> allocate(String tOrgIds, String data) throws Exception {
String allocate = getAllocate(data,tOrgIds,KingDeeBillId.BD_MATERIAL.getID());
ResultBean<String> resultBean3 =accessKingDeeInterface(
KingDeeBillId.BD_MATERIAL.getID(), allocate,
KingDeeBillUrl.ALLOCATE_URL.getURL());// allocateKingDeeBillData(KingDeeBillId.BD_MATERIAL.getID(), allocate);
if(!resultBean3.getSuccess()){
log.info("物料分配失败!");
return true;
}
log.info("物料分配成功!");
return false;
return resultBean3;
}
/**
@ -196,16 +257,15 @@ public class BdMaterialService extends FinKingDeeService {
* @return
* @throws Exception
*/
private boolean audit( String data) throws Exception {
private ResultBean<String> audit( String data) throws Exception {
String auditKD = getAuditKD(data,KingDeeBillId.BD_MATERIAL.getID());
ResultBean<String> resultBean2 = accessKingDeeInterface(
KingDeeBillId.BD_MATERIAL.getID(), auditKD,KingDeeBillUrl.AUDIT_URL.getURL());//auditKingDeeBillData(KingDeeBillId.BD_MATERIAL.getID(), auditKD);
if(!resultBean2.getSuccess()){
log.info("物料审核失败!");
return true;
}
log.info("物料审核成功!");
return false;
return resultBean2;
}
/**
@ -214,16 +274,15 @@ public class BdMaterialService extends FinKingDeeService {
* @return
* @throws Exception
*/
private boolean submit( String data) throws Exception {
private ResultBean<String> submit( String data) throws Exception {
String submitKD = getSubmitKD(data,KingDeeBillId.BD_MATERIAL.getID());
ResultBean<String> resultBean1 = accessKingDeeInterface(KingDeeBillId.BD_MATERIAL.getID(),
submitKD,KingDeeBillUrl.SUBMIT_URL.getURL());//submitKingDeeBillData(KingDeeBillId.BD_MATERIAL.getID(), submitKD);
if(!resultBean1.getSuccess()){
log.info("物料提交失败!");
return true;
}
log.info("物料提交成功!");
return false;
return resultBean1;
}
/**
@ -232,19 +291,19 @@ public class BdMaterialService extends FinKingDeeService {
* @return
* @throws Exception
*/
public ResultBean<String> hasMaterial(BdMaterial bdMaterial) throws Exception {
public ResultBean<String> unAudit(BdMaterial bdMaterial) throws Exception {
ResultBean<String> rb=ResultBean.fireFail();
JSONObject result = view(bdMaterial);
JSONObject responseStatus = (JSONObject)result.get("ResponseStatus");
if(responseStatus!=null){//不存在该物料 //新增物料
return rb.setMsg("不存在该物料");
return rb.setCode(KingDeeCode.NOTEXIST.getCode()).setMsg(KingDeeCode.NOTEXIST.getMsg());
}else{ //存在该物料
JSONObject result2 = (JSONObject)result.get("Result");
String DocumentStatus = (String)result2.get("DocumentStatus");//单据状态 A 创建, B 审核中,C 已审核 ,D 重新审核
String Id=result2.get("Id").toString();
boolean audit = isAudit(DocumentStatus, Id);
if(!audit){
return rb.setMsg("物料反审核失败!");
return rb.setCode(KingDeeCode.UNAUDIT.getCode()).setMsg(KingDeeCode.UNAUDIT.getMsg());
}
log.info("Id:{}",Id);
return rb.success().setData(Id);
@ -288,5 +347,4 @@ public class BdMaterialService extends FinKingDeeService {
}
return true;
}
}

1
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/data_model.json

@ -1,5 +1,6 @@
{
"FMATERIALID": @KD_FMATERIALID,
"FDescription": "@KD_FDescription",
"FCreateOrgId": {
"FNumber": "100"
},

1
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdstock/data_model.json

@ -8,6 +8,7 @@
},
"FName": "@KD_FName",
"FStockProperty": "1",
"FDescription": "@KD_FDescription",
"FStockStatusType": "0,1,2,3,4,5,6,7,8",
"FDefReceiveStatusId": {
"FNumber": "KCZT02_SYS"

3
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/orgorganizations/data_model.json

@ -19,5 +19,6 @@
"FService": false,
"FMarketing": false,
"FIsSynCERPOwer": false,
"FAcctOrgType": "1"
"FAcctOrgType": "1",
"FDescription": "@KD_FDescription"
}

1
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/receivablebill/data_model.json

@ -22,6 +22,7 @@
"FSALEORGID": {
"FNumber": "101"
},
"FAR_Remark": "@KD_FAR_Remark",
"FISTAX": true,
"FCancelStatus": "A",
"FBUSINESSTYPE": "BZ",

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

@ -39,6 +39,12 @@ public class SalOutStockCastToKingDeeBillFields {
//模板字符创转json
JSONObject jsonObj= JSONObject.parseObject(readJsonFile, Feature.OrderedField);
JSONObject jsonFEntityData_= JSONObject.parseObject(fEntityData_,Feature.OrderedField);
//项目类别
String F_PAEZ_AssistantCode = map_fEntityModel_.get("F_PAEZ_AssistantCode");
String F_PAEZ_AssistantKey = map_fEntityModel_.get("F_PAEZ_AssistantKey");
String F_PAEZ_Assistant="";//TODO 根据项目类别的code,key查询金蝶系统中的项目类别的编码 映射来源“CWXT”/“财务系统”
map_fEntityModel_.put("F_PAEZ_Assistant",F_PAEZ_Assistant);
fEntityModel_ =KingDeeUtils.replaceTemplateParams(fEntityModel_, map_fEntityModel_);
JSONObject jsonFEntityModel_= JSONObject.parseObject(fEntityModel_,Feature.OrderedField);

22
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/SalOutStockService.java

@ -4,6 +4,8 @@ import com.yxt.anrui.fin.api.kingdee.KingDeeBillId;
import com.yxt.anrui.fin.api.kingdee.KingDeeBillUrl;
import com.yxt.anrui.fin.api.kingdee.saloutstock.SalOutStock;
import com.yxt.anrui.fin.biz.kingdee.FinKingDeeService;
import com.yxt.anrui.portal.api.sysmapping.SysMappingInfoQuery;
import com.yxt.anrui.portal.api.sysmapping.SysMappingInfoVo;
import com.yxt.common.core.result.ResultBean;
import org.springframework.stereotype.Service;
@ -11,7 +13,7 @@ import java.util.List;
import java.util.Map;
/**
* 保存采购出库单
* 保存销售出库单
*/
@Service
public class SalOutStockService extends FinKingDeeService {
@ -27,6 +29,24 @@ public class SalOutStockService extends FinKingDeeService {
try {
//业务表的主表数据集合
Map<String,String> map_fEntityModel_= object2Map(salOutStock);
//项目类别
String F_PAEZ_AssistantType = map_fEntityModel_.get("F_PAEZ_AssistantType");
String F_PAEZ_AssistantKey = map_fEntityModel_.get("F_PAEZ_AssistantKey");
SysMappingInfoQuery smiq=new SysMappingInfoQuery();
smiq.setMap_sourceKey("CWXT");
smiq.setMap_object("销售出库单");
smiq.setMap_item("项目类别");
smiq.setDictKey(F_PAEZ_AssistantKey);
smiq.setDictTypeCode(F_PAEZ_AssistantType);
ResultBean<SysMappingInfoVo> sysMappingInfoVoResultBean = sysMappingFeign.selectMappingInfo(smiq);
boolean success = sysMappingInfoVoResultBean.getSuccess();
if(!success){
return rb.setMsg(sysMappingInfoVoResultBean.getMsg());
}
String F_PAEZ_Assistant=sysMappingInfoVoResultBean.getData().getMap_itemKey();//TODO 根据应付类别的code,key查询金蝶系统中的应付类别的编码 映射来源“CWXT”/“财务系统”
map_fEntityModel_.put("F_PAEZ_Assistant",F_PAEZ_Assistant);
//准备 物料列表的数据 ForEntryBill
List<SalOutStock.FEntity> fEntity = salOutStock.getFEntity();
List<Map<String, String>> vehicleListMap = createVehicleLists(fEntity);

6
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/data_FEntity.json

@ -31,5 +31,9 @@
"FPRICEBASEQTY": 1.0,
"FOUTCONTROL": false,
"FIsOverLegalOrg": false,
"FARNOTJOINQTY": 1.0
"F_PAEZ_Decimal4": "@KD_F_PAEZ_Decimal4",
"F_PAEZ_Decimal3": "@KD_F_PAEZ_Decimal3",
"F_PAEZ_Decimal": "@KD_F_PAEZ_Decimal",
"FARNOTJOINQTY": 1.0,
"FEntrynote": "@KD_FEntrynote"
}

6
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/data_model.json

@ -27,6 +27,12 @@
},
"FOwnerTypeIdHead": "BD_OwnerOrg",
"FIsTotalServiceOrCost": false,
"F_PAEZ_Base1": {
"FSTAFFNUMBER":"@KD_F_PAEZ_Base1"
},
"F_PAEZ_Base": {
"FNUMBER": "@KD_F_PAEZ_Base"
},
"F_PAEZ_Assistant": {
"FNumber": "@KD_F_PAEZ_Assistant"
},

11
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkinstock/STKInStockService.java

@ -15,6 +15,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@ -96,10 +97,14 @@ public class STKInStockService extends FinKingDeeService {
private void bdMaterial(StkInStock stkInStock, StkInStock.FInStockEntry f) {
BdMaterial bdMaterial=new BdMaterial();
bdMaterial.setFName(f.getFMaterialId());
bdMaterial.setF_PAEZ_Base(f.getCllx());
bdMaterial.setFMaterialGroup(f.getWlfz());
bdMaterial.setF_PAEZ_BaseKey(f.getCllx());
bdMaterial.setF_PAEZ_BaseType(f.getCllx());
bdMaterial.setFMaterialGroupKey(f.getWlfz());
bdMaterial.setFMaterialGroupType(f.getWlfz());
bdMaterial.setTOrgIds(stkInStock.getTOrgId());
bdMaterialService.draftBdMaterial(bdMaterial);
List<BdMaterial> list=new ArrayList<>();
list.add(bdMaterial);
bdMaterialService.draftBdMaterialList(list);
}
/**

3
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkinstock/data_FInStockEntry.json

@ -33,6 +33,7 @@
"FPriceUnitQty":1.0,
"FRemainInStockQty":1.0,
"FAPNotJoinQty": 1.0,
"FRemainInStockBaseQty": 1.0
"FRemainInStockBaseQty": 1.0,
"FNote": "@KD_FNote"
}

3
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/data_model.json

@ -5,7 +5,7 @@
},
"FBizType": "NORMAL",
"FTransferDirect": "GENERAL",
"FTransferBizType": "调车",
"FTransferBizType": "组织内调拨",
"FSettleOrgId": {
"FNumber": ""
},
@ -32,6 +32,7 @@
"FNumber": "@KD_FStockOrgId"
},
"FDate": "@KD_FDate",
"FNote": "@KD_FNote",
"FBaseCurrId": {
"FNumber": "PRE001"
},

29
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/timer/TimerUtil.java

@ -0,0 +1,29 @@
package com.yxt.anrui.fin.biz.timer;
import cn.hutool.core.date.DateUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import java.util.Date;
@Slf4j
@Component // 把此类托管给 Spring,不能省略
public class TimerUtil {
// 添加定时任务
/* @Scheduled(cron = "30 40 23 0 0 5") // cron表达式:每周一 23:40:30 执行
public void doTask1(){
log.info("我是定时任务doTask1~:{}",TimerUtil.class);
}*/
// 添加定时任务
@Scheduled(cron = "0/2 * * * * ?") // cron表达式:每隔两秒中执行一次
public void doTask2(){
log.info("我是定时任务doTask2~:{},{}",DateUtil.now(),TimerUtil.class);
}
// 添加定时任务
@Scheduled(cron = "0 59 23 * * ?") // cron表达式:每天晚上23点59分执行一次
public void doTask3(){
log.info("我是定时任务doTask3~:{},{}",DateUtil.now(),TimerUtil.class);
}
}

11
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeign.java

@ -34,6 +34,7 @@ import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
/**
* Project: sysmapping(sysmapping) <br/>
@ -85,9 +86,11 @@ public interface SysMappingFeign {
@PostMapping("/selectMappingInfo")
@ResponseBody
public ResultBean<SysMappingInfoVo> selectMappingInfo(@RequestBody SysMappingInfoQuery query);
@ApiOperation("回显映射")
@GetMapping("/selectMappingListInfo/{dictSid}")
@PostMapping("/selectMappingListInfo")
@ResponseBody
public ResultBean<List<SysMappingInfoVo>> selectMappingListInfo(String dictSid);
@ApiOperation("根据条件查询详情批量")
@PostMapping("/selectMappingInfoBatch")
@ResponseBody
public ResultBean<List<SysMappingInfoVo>> selectMappingListInfo(@PathVariable("dictSid") String dictSid);
public ResultBean<Map<String,Object>> selectMappingInfoBatch(@RequestBody List<Map<String,List<SysMappingInfoQueryBatch>>> sysMappingInfoQuerys) ;
}

6
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeignFallback.java

@ -31,6 +31,7 @@ import com.yxt.common.core.vo.PagerVo;
import org.springframework.stereotype.Component;
import java.util.List;
import java.util.Map;
/**
* Project: sysmapping(sysmapping) <br/>
@ -84,4 +85,9 @@ public class SysMappingFeignFallback implements SysMappingFeign {
public ResultBean<List<SysMappingInfoVo>> selectMappingListInfo(String dictSid) {
return null;
}
@Override
public ResultBean<Map<String,Object>> selectMappingInfoBatch(List<Map<String,List<SysMappingInfoQueryBatch>>> sysMappingInfoQuerys) {
return null;
}
}

27
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingInfoQueryBatch.java

@ -0,0 +1,27 @@
package com.yxt.anrui.portal.api.sysmapping;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class SysMappingInfoQueryBatch implements Query {
private static final long serialVersionUID = 5179141159925489016L;
@ApiModelProperty("映射来源,如CWXT等")
private String map_sourceKey; // 映射来源,如CWXT等
@ApiModelProperty("映射实体,如付款单")
private String map_object; // 映射实体,如付款单
@ApiModelProperty("映射项目类别,如应付类别")
private String map_item; // 映射项目类别,如应付类别
@ApiModelProperty("数据字典类别编码")
private String dictTypeCode; // 数据字典类别编码
@ApiModelProperty("数据key")
private String dictKey; // 数据key
/* @ApiModelProperty("编码")
private String fNumber; // 编码*/
}

5
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java

@ -144,4 +144,9 @@ public interface SysOrganizationFeign {
@ResponseBody
@ApiOperation("当前分公司下所有部门")
ResultBean<List<SysOrganizationListsVo>> selectOrgLists(@SpringQueryMap SysOrganizationListQuery query);
@GetMapping("/selectByPSid")
@ResponseBody
@ApiOperation("查询分公司下的销售支持部")
ResultBean<SysOrganizationVo> selectByPSid(@RequestParam("sid") String sid, @RequestParam("name") String name);
}

5
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java

@ -147,4 +147,9 @@ public class SysOrganizationFeignFallback implements SysOrganizationFeign {
public ResultBean<List<SysOrganizationListsVo>> selectOrgLists(SysOrganizationListQuery query) {
return null;
}
@Override
public ResultBean<SysOrganizationVo> selectByPSid(String sid, String name) {
return null;
}
}

8
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingRest.java

@ -37,6 +37,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
/**
* Project: sysmapping(sysmapping) <br/>
@ -117,4 +118,11 @@ public class SysMappingRest implements SysMappingFeign {
List<SysMappingInfoVo> vo = sysMappingService.selectMappingListInfo(dictSid);
return rb.success().setData(vo);
}
@Override
public ResultBean<Map<String,Object>> selectMappingInfoBatch( @RequestBody List<Map<String,List<SysMappingInfoQueryBatch>>> sysMappingInfoQuerys) {
ResultBean<Map<String,Object>> rb = ResultBean.fireFail();
Map<String,Object> vos = sysMappingService.selectMappingInfoBatch(sysMappingInfoQuerys);
return rb.success().setData(vos);
}
}

25
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingService.java

@ -33,9 +33,13 @@ import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import org.springframework.context.annotation.Bean;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* Project: sysmapping(sysmapping) <br/>
@ -170,4 +174,25 @@ public class SysMappingService extends MybatisBaseService<SysMappingMapper, SysM
public List<SysMappingInfoVo> selectMappingListInfo(String dictSid) {
return baseMapper.selectMappingListInfo(dictSid);
}
public Map<String,Object> selectMappingInfoBatch(List<Map<String,List<SysMappingInfoQueryBatch>>> sysMappingInfoQuerys) {
Map<String,Object> mapDict=new HashMap<>();
for(Map<String,List<SysMappingInfoQueryBatch>> s:sysMappingInfoQuerys){
String FNumber="";
List<Map<String, Object>> l=new ArrayList<>();
for(Map.Entry<String, List<SysMappingInfoQueryBatch>> entry : s.entrySet()){
FNumber = entry.getKey();
List<SysMappingInfoQueryBatch> mapValue = entry.getValue();
System.out.println(FNumber+":"+mapValue);
for(SysMappingInfoQueryBatch ss:mapValue){
SysMappingInfoQuery query=new SysMappingInfoQuery();
BeanUtil.copyProperties(ss,query);
Map<String, Object> stringObjectMap = BeanUtil.beanToMap(selectMappingInfo(query));
l.add(stringObjectMap);
}
}
mapDict.put(FNumber,l);
}
return mapDict;
}
}

2
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java

@ -109,4 +109,6 @@ public interface SysOrganizationMapper extends BaseMapper<SysOrganization> {
List<SysOrganizationListsVo> selectOrgLists(String orgSid);
List<SysOrgStaffVo> selectByOrgDeptSid(String orgDeptSid);
SysOrganizationVo selectByPSid(@Param("sid") String sid, @Param("name") String name);
}

4
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml

@ -193,4 +193,8 @@
left join sys_staffinfo si on so.staffSid = si.sid
where so.orgSid = #{orgDeptSid}
</select>
<select id="selectByPSid" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo">
select * from sys_organization where psid = #{sid} and name = #{name}
</select>
</mapper>

5
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java

@ -366,4 +366,9 @@ public class SysOrganizationRest implements SysOrganizationFeign {
public ResultBean<List<SysOrganizationListsVo>> selectOrgLists(SysOrganizationListQuery query) {
return sysOrganizationService.selectOrgLists(query);
}
@Override
public ResultBean<SysOrganizationVo> selectByPSid(String sid, String name) {
return sysOrganizationService.selectByPSid(sid,name);
}
}

6
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java

@ -507,4 +507,10 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
return rb.success().setData(sysOrganizationListVos);
}
public ResultBean<SysOrganizationVo> selectByPSid(String sid, String name) {
ResultBean<SysOrganizationVo> rb = ResultBean.fireFail();
SysOrganizationVo vo = baseMapper.selectByPSid(sid,name);
return rb.success().setData(vo);
}
}

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

@ -9,6 +9,7 @@ import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleDto;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
import com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderFeign;
import com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderVo;
import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum;
import com.yxt.anrui.base.common.enums.ManPurOrderType;
import com.yxt.anrui.base.common.enums.OperVehicleState;
@ -32,7 +33,6 @@ 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.ScmEntryVehicleExamineDto;
import com.yxt.anrui.scm.api.scmvehinspectitem.ScmVehinspectItemDto;
import com.yxt.anrui.scm.biz.scmapplyinboundvehicle.ScmApplyInboundVehicleService;
import com.yxt.anrui.scm.biz.scmfile.ScmFileService;
@ -50,7 +50,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;
@ -485,6 +484,11 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
for(ScmApplyInboundVehicleDto s:scmApplyInboundVehicleDtos){
//车辆台账推送数据
BaseVehicleDto baseVehicleDto = new BaseVehicleDto();
BusVehicleOrderVo busVehicleOrderVo = busVehicleOrderFeign.fetchBySid(booad.getVehicleOrderSid()).getData();
/*baseVehicleDto.setPurchaseSystemSid();
baseVehicleDto.setPurchaseSystemName();
baseVehicleDto.setManufSaleAccessSid();
baseVehicleDto.setManufSaleAccessName();*/
baseVehicleDto.setVinNo(s.getVinNo());
baseVehicleDto.setModelSid(booad.getModelSid());
baseVehicleDto.setModelName(booad.getModelName());
@ -583,10 +587,12 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
//bm.setFCreateOrgId("100");//创建机构
ResultBean<BaseVehicle> baseVehicleResultBean = baseVehicleFeign.selectByVinNoAndOrgSid(s.getVinNo(),scmApplyInbound.getUseOrgSid());
bm.setFName(baseVehicleResultBean.getData().getVinNo());//物料名称
bm.setFMaterialGroup("03");//物料分组
bm.setFMaterialGroupKey("03");//物料分组
bm.setFMaterialGroupType("03");//物料分组
//bm.setFUseOrgId("100");//使用组织
bm.setTOrgIds("100020");//欧曼黑龙江
bm.setF_PAEZ_Base("牵引");//车辆类型
bm.setF_PAEZ_BaseKey("牵引");//车辆类型
bm.setF_PAEZ_BaseType("牵引");//车辆类型
list.add(bm);
}
}catch (Exception e){

Loading…
Cancel
Save