Browse Source

Merge remote-tracking branch 'origin/master'

master
God 3 years ago
parent
commit
9bfd94e6a8
  1. 10
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java
  2. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml
  3. 5
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
  4. 35
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
  5. 3
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java
  6. 1
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml
  7. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java
  8. 8
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml
  9. 6
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  10. 53
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationDetailedVo.java
  11. 4
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationPageVo.java
  12. 4
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java
  13. 105
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java
  14. 5
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java
  15. 6
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeignFallBack.java
  16. 20
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/appayable/kingdeedata/FPmzcAssistant.java
  17. 22
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/appayable/kingdeedata/FPmzcAssistant1.java
  18. 22
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/appayable/kingdeedata/FPmzcBase.java
  19. 20
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/appayable/kingdeedata/FPmzcBase1.java
  20. 22
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/appayable/kingdeedata/Fpurchasedeptid.java
  21. 22
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/appayable/kingdeedata/Fsupplierid.java
  22. 369
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/appayable/kingdeedata/Model.java
  23. 126
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/appayable/kingdeedata/data.json
  24. 35
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/appaybill/ApPayBill.java
  25. 147
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/kingdeedata/Data.java
  26. 20
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/kingdeedata/Fbilltypeid.java
  27. 20
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/kingdeedata/Fchargeid.java
  28. 20
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/kingdeedata/Fcurrencyid.java
  29. 229
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/kingdeedata/Fentitydetail.java
  30. 40
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/kingdeedata/Fentityplan.java
  31. 20
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/kingdeedata/Fexchangetype.java
  32. 20
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/kingdeedata/Fmainbookstdcurrid.java
  33. 22
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/kingdeedata/Fmaterialid.java
  34. 20
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/kingdeedata/Forderid.java
  35. 20
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/kingdeedata/Fpayconditon.java
  36. 20
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/kingdeedata/Fpayorgid.java
  37. 22
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/kingdeedata/Fpriceunitid.java
  38. 20
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/kingdeedata/Fsettleorgid.java
  39. 20
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/kingdeedata/Fstockunitid.java
  40. 85
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/kingdeedata/Fsubheadfinc.java
  41. 39
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/kingdeedata/Fsubheadsuppiler.java
  42. 22
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/kingdeedata/Ftransferid.java
  43. 127
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/purmrb/PurMrb.java
  44. 214
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/saloutstock/SalOutStock.java
  45. 43
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stkinstock/StkInStock.java
  46. 1
      anrui-fin/anrui-fin-biz/pom.xml
  47. 10
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java
  48. 24
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml
  49. 11
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java
  50. 29
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  51. 25
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java
  52. 3
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/KingDeeSaveSKD.java
  53. 18
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appayable/APPayableCastToKingDeeBillFields.java
  54. 12
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appayable/APPayableService.java
  55. 0
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appayable/data.json
  56. 0
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appayable/data_FEntityDetail.json
  57. 0
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appayable/data_data.json
  58. 0
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appayable/data_model.json
  59. 0
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appayable/remarks.txt
  60. 0
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appayable/testParams.txt
  61. 0
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appayable/应付单的参数必填备注.xlsx
  62. 4
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/ApPayBillService.java
  63. 2
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/purmrb/PurMrbService.java
  64. 10
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/receivablebill/ReceivableBillCastToKingDeeBillFields.java
  65. 0
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/receivablebill/data.json
  66. 0
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/receivablebill/data_FEntityDetail.json
  67. 0
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/receivablebill/data_FEntityPlan.json
  68. 0
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/receivablebill/data_data.json
  69. 0
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/receivablebill/data_model.json
  70. 66
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/SalOutStockCastToKingDeeBillFields.java
  71. 80
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/SalOutStockService.java
  72. 4
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/data.json
  73. 33
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/data_FEntity.json
  74. 13
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/data_data.json
  75. 51
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/data_model.json
  76. 276
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/remarks.txt
  77. 0
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/testParams.txt
  78. 1
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/webapi测试的数据.txt
  79. BIN
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/采购出库单的参数必填备注.xlsx
  80. 2
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkinstock/STKInStockService.java
  81. 5
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeign.java
  82. 5
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeignFallback.java
  83. 1
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java
  84. 2
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.java
  85. 119
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml
  86. 5
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoRest.java
  87. 7
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java
  88. 10
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionDetailsVo.java
  89. 5
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionDto.java
  90. 5
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionInfoVo.java
  91. 5
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGression.java
  92. 25
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionDto.java
  93. 16
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java
  94. 8
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java
  95. 2
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetService.java
  96. 22
      anrui-scm/anrui-scm-ui/src/api/cheliang/basevehicle.js
  97. 19
      anrui-scm/anrui-scm-ui/src/api/cheliang/dictcommons.js
  98. 335
      anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangpeijianchange/cheliangpeijian.vue
  99. 30
      anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue
  100. 80
      anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangeng.vue

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

@ -268,7 +268,7 @@ public interface BaseVehicleFeign {
@ApiOperation("调车申请查询调出分公司车架号和库存地点")
@PostMapping("/purSellVinNoAndLoc")
ResultBean<List<Map<String,String>>> purSellVinNoAndLoc(@RequestParam("sellerOrgSid") String sellerOrgSid);
ResultBean<List<Map<String, String>>> purSellVinNoAndLoc(@RequestParam("sellerOrgSid") String sellerOrgSid);
@ApiOperation("销售订单选择现车分页列表")
@PostMapping("/selectVo")
@ -354,6 +354,12 @@ public interface BaseVehicleFeign {
@GetMapping("/getVinByWarehouseSid/{warehouseSid}/{userSid}")
public ResultBean<List<AppScmWarehouseVinVo>> getVinByWarehouseSid(@PathVariable("warehouseSid") String warehouseSid, @PathVariable("userSid") String userSid);
/**
* 存放地点变更选择车辆
*
* @param pagerQuery
* @return
*/
@ApiOperation("Pc根据仓库sid 获取车架号")
@PostMapping("/getPcVinByWarehouseSid")
public ResultBean<PagerVo<AppScmWarehouseVinVo>> getPcVinByWarehouseSid(@RequestBody PagerQuery<VinByWarehouseQuery> pagerQuery);
@ -364,5 +370,5 @@ public interface BaseVehicleFeign {
@ApiOperation("根据车架号和分公司sid查询车辆信息")
@PostMapping("/selectByVinNoAndOrgSid")
ResultBean<BaseVehicle> selectByVinNoAndOrgSid(@RequestParam("vinNo") String vinNo,@RequestParam("createOrgSid") String createOrgSid);
ResultBean<BaseVehicle> selectByVinNoAndOrgSid(@RequestParam("vinNo") String vinNo, @RequestParam("createOrgSid") String createOrgSid);
}

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml

@ -547,6 +547,7 @@
FROM base_vehicle bv
WHERE bv.modelSid = bvc.modelSid
AND bv.modelConfigSid = bvc.configurationItemsSid
and (bv.vehicleStateValue = '库存' or bv.vehicleStateValue = '在途' or bv.vehicleStateValue = '调入')
AND bv.lockedState = #{lockedStateKey}
and bv.useOrgSid = #{orgSid}) AS nowCarNum,
(select SUM(distinct cast((cast(bo.platformNo as signed)-IFNULL(cast(bo.lockingNum as signed),'0')) as signed))
@ -728,6 +729,7 @@
FROM base_vehicle bv
WHERE bv.modelSid = bvc.modelSid
AND bv.modelConfigSid = bvc.configurationItemsSid
and (bv.vehicleStateValue = '库存' or bv.vehicleStateValue = '在途' or bv.vehicleStateValue = '调入')
AND bv.lockedState = #{lockedStateKey}
and bv.useOrgSid = #{orgSid}) AS nowCarNum,
(select SUM(distinct cast((cast(bo.platformNo as signed)-IFNULL(cast(bo.lockingNum as signed),'0')) as signed))

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

@ -555,8 +555,9 @@
(SELECT count(*)
FROM base_vehicle bv
WHERE bv.modelSid = bvm.sid
AND bv.vehicleStateValue = "库存"
OR bv.vehicleStateValue = "在途"
AND (bv.vehicleStateValue = '库存'
OR bv.vehicleStateValue = '在途'
or bv.vehicleStateValue = '调入')
AND lockedState = #{lockedStateKey}
AND bv.useOrgSid =
#{useOrgSid}) AS nowCarNum,

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

@ -21,7 +21,6 @@ import com.yxt.anrui.base.biz.basevehicleappendix.BaseVehicleAppendixService;
import com.yxt.anrui.base.biz.basevehiclecertificate.BaseVehicleCertificateService;
import com.yxt.anrui.base.biz.basevehiclemodelappendix.BaseVehicleModelAppendixService;
import com.yxt.anrui.base.biz.basevehinstall.BaseVehinstallService;
import com.yxt.anrui.base.biz.basevehmodelconfig.BaseVehmodelConfigMapper;
import com.yxt.anrui.base.biz.basevehmodelconfig.BaseVehmodelConfigService;
import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService;
import com.yxt.anrui.base.common.enums.CertificState;
@ -773,12 +772,15 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
if (StringUtils.isNotBlank(pagerQuery.getCarColor())) { // 颜色
qw.like("bmc.carColor", pagerQuery.getCarColor());
}
if (StringUtils.isNotBlank(pagerQuery.getVehicleState())) { //车辆状态
/* if (StringUtils.isNotBlank(pagerQuery.getVehicleState())) { //车辆状态
qw.and(wrapper -> wrapper.eq("bv.vehicleState", "0004").or().eq("bv.vehicleState", "0005"));
}
if (StringUtils.isNotBlank(pagerQuery.getLockedState())) { //锁定状态
}*/
/*if (StringUtils.isNotBlank(pagerQuery.getLockedState())) { //锁定状态
qw.and(wrapper -> wrapper.eq("bv.lockedState", "0").or().isNull("bv.lockedState").or().eq("bv.lockedStateValue", ""));
}
}*/
qw.eq("bv.lockedState",VehicleState.LockEnum.UN_LOCK.getCode());
//库存或调入或内销
qw.and(wrapper -> wrapper.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.ING_STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.DR_STOCK.getCode()));
if (StringUtils.isNotBlank(pagerQuery.getUseOrg())) { // 分公司
qw.eq("bv.useOrgSid", pagerQuery.getUseOrg());
}
@ -1330,6 +1332,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
private QueryWrapper<BaseVehicle> vehicleActualWrapper(BaseVehicleReturnQuery params) {
QueryWrapper<BaseVehicle> qw = new QueryWrapper<>();
if (params != null) {
//本分公司
if (StringUtils.isNotBlank(params.getUserSid())) {
String orgSid = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid()).getData();
qw.eq("bv.createOrgSid", orgSid);
@ -1384,9 +1387,13 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
}
//结算状态:0未买断
qw.eq("bv.settlementStatus", VehicleState.BuyoutEnum.UN_BUYOUT.getCode());
//车辆状态:现车
qw.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode());
//库存或调出或内销
qw.and(wrapper -> wrapper.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.DC_STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.NX_STOCK.getCode()));
//非外采或非内购
qw.and(wrapper -> wrapper.eq("bv.manPurOrderTypeKey", ManPurOrderType.ManOrderType.PC_ORDER.getCode()).or().eq("bv.manPurOrderTypeKey", ManPurOrderType.ManOrderType.NG_ORDER.getCode()));
//非删除
qw.eq("bv.isDelete", 0);
}
return qw;
}
@ -1502,6 +1509,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
if (StringUtils.isNotBlank(query.getUseOrg())) {//分公司
qw.eq("bv.useOrgSid", query.getUseOrg());
}
qw.and(wrapper -> wrapper.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.ING_STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.DR_STOCK.getCode()));
qw.eq("bv.lockedState",VehicleState.LockEnum.UN_LOCK.getCode());
}
return qw;
}
@ -1619,8 +1628,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
if (StringUtils.isNotBlank(resultBean.getData())) {
qw.eq("bv.createOrgSid", resultBean.getData());
}
qw.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode());
qw.and(wrapper -> wrapper.eq("bv.witPinState", VehicleState.ShuntingEnum.UN_SHUNTING.getCode()).or().eq("bv.witPinState", VehicleState.ShuntingEnum.WITPURCHASE));
qw.and(wrapper -> wrapper.eq("bv.vehicleState", VehicleState.StockEnum.RETURNING_STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.DR_STOCK.getCode()));
List<AppScmWarehouseVinVo> list = baseMapper.getVinByWarehouseSid(warehouseSid, qw);
if (list.size() <= 0) {
return rb.setMsg("该存放地点,暂无车辆");
@ -1631,9 +1639,9 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
public ResultBean<List<AppScmInventoryRecordsVo>> selectInventoryRecords(String userSid) {
ResultBean rb = ResultBean.fireFail();
String userOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
//条件:本分公司、非删除、库存或采购退库中
//条件:本分公司、非删除、库存或采购退库中或调入或调出中
QueryWrapper<BaseVehicle> qw = new QueryWrapper<>();
qw.and(wrapper -> wrapper.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.RETURNING_STOCK.getCode()));
qw.and(wrapper -> wrapper.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.RETURNING_STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.DCZ_STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.DR_STOCK.getCode()));
List<AppScmInventoryRecordsVo> list = baseMapper.selectInventoryRecords(userOrgSid, qw);
return rb.success().setData(list);
}
@ -1727,8 +1735,9 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
if (StringUtils.isNotBlank(params.getUseOrgSid())) {
qw.eq("bv.createOrgSid", params.getUseOrgSid());
}
qw.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode());
qw.and(wrapper -> wrapper.eq("bv.witPinState", VehicleState.ShuntingEnum.UN_SHUNTING.getCode()).or().eq("bv.witPinState", VehicleState.ShuntingEnum.WITPURCHASE.getCode()).or().eq("bv.witPinState", VehicleState.ShuntingEnum.OUTCOLL.getCode()));
qw.eq("bv.isDelete",0);
//库存或调入或采购退库中
qw.and(wrapper -> wrapper.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.DR_STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.RETURNING_STOCK.getCode()));
IPage<AppScmWarehouseVinVo> iPage = baseMapper.getPcVinByWarehouseSid(page, qw, params.getWarehouseSid());
return iPage;
}

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

@ -508,7 +508,7 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
finPaymentrecordDto.setBusSid(r.getData());
finPaymentrecordFeign.save(finPaymentrecordDto);
}
}else{
} else {
String msgSid = getMessage(ufVo, appMap, busVehicleApply);
}
return rb.success().setData(resultBean.getData());
@ -757,6 +757,7 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
messageFlowableDto.setMsgContent("排产申请");
messageFlowableDto.setMsgTitle("排产申请");
messageFlowableDto.setCreateName(busVehicleApply.getCreateByName());
messageFlowableDto.setTaskId(ufVo.getTaskId());
ResultBean<String> stringResultBean = messageFeign.getMessage(messageFlowableDto);
String msgSid = stringResultBean.getData();
return msgSid;

1
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml

@ -95,7 +95,6 @@
</if>
</where>
</if>
order by bmd.id desc
</select>
<delete id="deleteVirtualOrder">

2
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java

@ -74,7 +74,7 @@ public interface BusSalesOrderMapper extends BaseMapper<BusSalesOrder> {
* @param qw
* @return
*/
IPage<AppBusSalesOrderVo> getSaleOrders(IPage<BusSalesOrder> page, @Param(Constants.WRAPPER) QueryWrapper<BusSalesOrder> qw);
IPage<AppBusSalesOrderVo> getSaleOrders(IPage<BusSalesOrder> page, @Param(Constants.WRAPPER) QueryWrapper<BusSalesOrder> qw,@Param("name") String name);
/**
* 根据销售订单sid查询车型信息

8
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml

@ -65,6 +65,14 @@
left join bus_sales_order_deposit bd on bd.salesOrderSid = bo.sid
<where>
${ew.sqlSegment}
<if test="name != null and name != ''">
and concat(IFNULL(bo.customerName
, '')
, ifnull(bo.billNo
, '')) LIKE concat('%'
, #{name}
, '%')
</if>
</where>
</select>
<!--根据销售订单sid查询车型信息-->

6
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@ -1138,10 +1138,6 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<BusSalesOrder> qw = new QueryWrapper<>();
if (query != null) {
//客户名称
if (StringUtils.isNotBlank(query.getName())) {
qw.like("bo.customerName", query.getName());
}
//销售订单类型“”或null 全部 “1” 待办理 “2”已办理
if (StringUtils.isNotBlank(query.getType())) {
//待办理
@ -1172,7 +1168,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
pq.getParams().setStaffSid(data.getStaffSid());
QueryWrapper<BusSalesOrder> qw = appCreateQueryWrapper(pq.getParams());
IPage<BusSalesOrder> page = PagerUtil.queryToPage(pq);
IPage<AppBusSalesOrderVo> pagging = baseMapper.getSaleOrders(page, qw);
IPage<AppBusSalesOrderVo> pagging = baseMapper.getSaleOrders(page, qw,pq.getParams().getName());
for (AppBusSalesOrderVo record : pagging.getRecords()) {
if (StringUtils.isNotBlank(record.getCustomerImage())) {
record.setCustomerImage(fileUploadComponent.getUrlPrefix() + record.getCustomerImage());

53
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationDetailedVo.java

@ -0,0 +1,53 @@
package com.yxt.anrui.fin.api.fincollectionconfirmation;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
@Data
public class AppFinCollectionConfirmationDetailedVo implements Vo {
private static final long serialVersionUID = 1283485126933789095L;
@ApiModelProperty("收款银行")
private String collectionBank;
@ApiModelProperty("款项明细-合同")
private List<AppFinSelectedReceivablesPaymentDetailsVo> contractList = new ArrayList<>();
@ApiModelProperty("汇款确认")
private List<String> images = new ArrayList<>();
@ApiModelProperty("付款金额")
private String paymentMoney;
@ApiModelProperty("收款时间")
private String collectionDate;
@ApiModelProperty("付款名称")
private String paymentName;
@ApiModelProperty("收款账号")
private String collectionNum;
@ApiModelProperty("收款申请状态")
private String collectionBillState;
@ApiModelProperty("打款凭证")
private List<String> payFiles = new ArrayList<>();
@ApiModelProperty("打款凭证Url")
private String paymentVoucherUrl;
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("收款方式")
private String collectionType;
}

4
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationPageVo.java

@ -12,7 +12,7 @@ public class AppFinCollectionConfirmationPageVo implements Vo {
@ApiModelProperty("收款账号")
private String collectionNum;
@ApiModelProperty("状态")
private String collectionBillState;
private int collectionBillState;
@ApiModelProperty("收款银行")
private String collectionBank;
@ApiModelProperty("收款类型")
@ -34,7 +34,7 @@ public class AppFinCollectionConfirmationPageVo implements Vo {
@ApiModelProperty("是否显示删除")
private boolean showDelete;
@ApiModelProperty("认款状态")
private String state;
private int state;
}

4
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java

@ -93,6 +93,10 @@ public interface FinCollectionConfirmationFeign {
@GetMapping("/initCollectionConfirm/{collectionBillSid}/{userSid}")
public ResultBean<AppFinCollectionConfirmationInitVo> initCollectionConfirm(@PathVariable("collectionBillSid") String collectionBillSid, @PathVariable("userSid") String userSid);
@ApiOperation("手机端—款项确认申请详情")
@GetMapping("/getCollectionConfirmDetail/{collectionBillSid}")
public ResultBean<AppFinCollectionConfirmationDetailedVo> getCollectionConfirmDetail(@PathVariable("collectionBillSid") String collectionBillSid);
@ApiOperation("手机端—提交款项确认申请")
@PostMapping("/submitCollectionConfirm")
public ResultBean submitCollectionConfirm(@RequestBody AppFinCollectionConfirmationDto dto);

105
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java

@ -47,65 +47,70 @@ import org.springframework.stereotype.Component;
@Component
public class FinCollectionConfirmationFeignFallback implements FinCollectionConfirmationFeign {
@Override
public ResultBean<PagerVo<FinCollectionConfirmationVo>> listPage(PagerQuery<FinCollectionConfirmationQuery> pq){
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-fin/fincollectionconfirmation/listPage无法访问");
}
@Override
public ResultBean<PagerVo<FinCollectionConfirmationVo>> listPage(PagerQuery<FinCollectionConfirmationQuery> pq) {
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-fin/fincollectionconfirmation/listPage无法访问");
}
@Override
public ResultBean save(FinCollectionConfirmationDto dto){
return ResultBean.fireFail().setMsg("接口anrui-fin/fincollectionconfirmation/save无法访问");
}
@Override
public ResultBean save(FinCollectionConfirmationDto dto) {
return ResultBean.fireFail().setMsg("接口anrui-fin/fincollectionconfirmation/save无法访问");
}
@Override
public ResultBean delBySids( String[] sids){
return ResultBean.fireFail().setMsg("接口anrui-fin/fincollectionconfirmation/delBySids无法访问");
}
@Override
public ResultBean delBySids(String[] sids) {
return ResultBean.fireFail().setMsg("接口anrui-fin/fincollectionconfirmation/delBySids无法访问");
}
@Override
public ResultBean<FinCollectionConfirmationDetailsVo> fetchBySid(String sid){
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-fin/fincollectionconfirmation/fetchBySid无法访问");
}
@Override
public ResultBean<FinCollectionConfirmationDetailsVo> fetchBySid(String sid) {
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-fin/fincollectionconfirmation/fetchBySid无法访问");
}
@Override
public ResultBean cashierConfirm(String sid) {
return null;
}
@Override
public ResultBean cashierConfirm(String sid) {
return null;
}
@Override
public ResultBean cashierReject(String sid) {
return null;
}
@Override
public ResultBean cashierReject(String sid) {
return null;
}
@Override
public ResultBean<PagerVo<AppFinCollectionConfirmationPageVo>> getCollectionConfirmList(PagerQuery<AppFinCollectionConfirmationQuery> pagerQuery) {
return null;
}
@Override
public ResultBean<PagerVo<AppFinCollectionConfirmationPageVo>> getCollectionConfirmList(PagerQuery<AppFinCollectionConfirmationQuery> pagerQuery) {
return null;
}
@Override
public ResultBean addCollectionConfirm(AppFinCollectionConfirmationDto dto) {
return null;
}
@Override
public ResultBean addCollectionConfirm(AppFinCollectionConfirmationDto dto) {
return null;
}
@Override
public ResultBean<AppFinCollectionConfirmationInitVo> initCollectionConfirm(String collectionBillSid, String userSid) {
return null;
}
@Override
public ResultBean<AppFinCollectionConfirmationInitVo> initCollectionConfirm(String collectionBillSid, String userSid) {
return null;
}
@Override
public ResultBean submitCollectionConfirm(AppFinCollectionConfirmationDto dto) {
return null;
}
@Override
public ResultBean<AppFinCollectionConfirmationDetailedVo> getCollectionConfirmDetail(String collectionBillSid) {
return null;
}
@Override
public ResultBean deleteCollectionConfirm(String collectionBillSid) {
return null;
}
@Override
public ResultBean submitCollectionConfirm(AppFinCollectionConfirmationDto dto) {
return null;
}
@Override
public ResultBean<PagerVo<AppFinUncollectedReceivablesDetailedVo>> getPaymentDetailsList(PagerQuery<AppFinSelectedReceivablesPaymentDetailsQuery> pagerQuery) {
return null;
}
@Override
public ResultBean deleteCollectionConfirm(String collectionBillSid) {
return null;
}
@Override
public ResultBean<PagerVo<AppFinUncollectedReceivablesDetailedVo>> getPaymentDetailsList(PagerQuery<AppFinSelectedReceivablesPaymentDetailsQuery> pagerQuery) {
return null;
}
}

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

@ -4,6 +4,7 @@ import com.yxt.anrui.fin.api.kingdee.appayable.APPayable;
import com.yxt.anrui.fin.api.kingdee.appaybill.ApPayBill;
import com.yxt.anrui.fin.api.kingdee.arreceivable.ARReceivable;
import com.yxt.anrui.fin.api.kingdee.purmrb.PurMrb;
import com.yxt.anrui.fin.api.kingdee.saloutstock.SalOutStock;
import com.yxt.anrui.fin.api.kingdee.stkinstock.StkInStock;
import com.yxt.common.core.result.ResultBean;
import io.swagger.annotations.Api;
@ -54,4 +55,8 @@ public interface FinKingDeeFeign {
@PostMapping("/draftPurMrb")
@ResponseBody
public ResultBean draftPurMrb(@RequestBody PurMrb purMrb) ;
@ApiOperation("保存采购出库单的接口")
@PostMapping("/draftSalOutStock")
@ResponseBody
public ResultBean draftSalOutStock(@RequestBody SalOutStock salOutStock) ;
}

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

@ -4,6 +4,7 @@ import com.yxt.anrui.fin.api.kingdee.appayable.APPayable;
import com.yxt.anrui.fin.api.kingdee.appaybill.ApPayBill;
import com.yxt.anrui.fin.api.kingdee.arreceivable.ARReceivable;
import com.yxt.anrui.fin.api.kingdee.purmrb.PurMrb;
import com.yxt.anrui.fin.api.kingdee.saloutstock.SalOutStock;
import com.yxt.anrui.fin.api.kingdee.stkinstock.StkInStock;
import com.yxt.common.core.result.ResultBean;
@ -33,4 +34,9 @@ implements FinKingDeeFeign{
public ResultBean draftPurMrb(PurMrb purMrb) {
return null;
}
@Override
public ResultBean draftSalOutStock(SalOutStock salOutStock) {
return null;
}
}

20
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/appayable/kingdeedata/FPmzcAssistant.java

@ -1,20 +0,0 @@
package com.yxt.anrui.fin.api.kingdee.appayable.kingdeedata;
import com.alibaba.fastjson.annotation.JSONField;
/**
* Auto-generated: 2022-07-19 8:42:28
*
* @author www.jsons.cn
* @website http://www.jsons.cn/json2java/
*/
public class FPmzcAssistant {
@JSONField(alternateNames = "FNumber")
private String fnumber;
public void setFnumber(String fnumber) {
this.fnumber = fnumber;
}
public String getFnumber() {
return fnumber;
}
}

22
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/appayable/kingdeedata/FPmzcAssistant1.java

@ -1,22 +0,0 @@
package com.yxt.anrui.fin.api.kingdee.appayable.kingdeedata;
import com.alibaba.fastjson.annotation.JSONField;
/**
* Auto-generated: 2022-07-19 8:42:28
*
* @author www.jsons.cn
* @website http://www.jsons.cn/json2java/
*/
public class FPmzcAssistant1 {
@JSONField(alternateNames ="FNumber")
private String fnumber;
public void setFnumber(String fnumber) {
this.fnumber = fnumber;
}
public String getFnumber() {
return fnumber;
}
}

22
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/appayable/kingdeedata/FPmzcBase.java

@ -1,22 +0,0 @@
package com.yxt.anrui.fin.api.kingdee.appayable.kingdeedata;
import com.alibaba.fastjson.annotation.JSONField;
/**
* Auto-generated: 2022-07-19 8:42:28
*
* @author www.jsons.cn
* @website http://www.jsons.cn/json2java/
*/
public class FPmzcBase {
@JSONField(alternateNames ="FNUMBER")
private String fnumber;
public void setFnumber(String fnumber) {
this.fnumber = fnumber;
}
public String getFnumber() {
return fnumber;
}
}

20
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/appayable/kingdeedata/FPmzcBase1.java

@ -1,20 +0,0 @@
package com.yxt.anrui.fin.api.kingdee.appayable.kingdeedata;
import com.alibaba.fastjson.annotation.JSONField;
/**
* Auto-generated: 2022-07-19 8:42:28
*
* @author www.jsons.cn
* @website http://www.jsons.cn/json2java/
*/
public class FPmzcBase1 {
@JSONField(alternateNames ="FNUMBER")
private String fnumber;
public void setFnumber(String fnumber) {
this.fnumber = fnumber;
}
public String getFnumber() {
return fnumber;
}
}

22
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/appayable/kingdeedata/Fpurchasedeptid.java

@ -1,22 +0,0 @@
package com.yxt.anrui.fin.api.kingdee.appayable.kingdeedata;
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/
*/
public class Fpurchasedeptid {
@JSONField(alternateNames ="FNumber")
private String fnumber;
public void setFnumber(String fnumber) {
this.fnumber = fnumber;
}
public String getFnumber() {
return fnumber;
}
}

22
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/appayable/kingdeedata/Fsupplierid.java

@ -1,22 +0,0 @@
package com.yxt.anrui.fin.api.kingdee.appayable.kingdeedata;
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/
*/
public class Fsupplierid {
@JSONField(alternateNames ="FNumber")
private String fnumber;
public void setFnumber(String fnumber) {
this.fnumber = fnumber;
}
public String getFnumber() {
return fnumber;
}
}

369
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/appayable/kingdeedata/Model.java

@ -1,369 +0,0 @@
package com.yxt.anrui.fin.api.kingdee.appayable.kingdeedata;
import java.util.List;
import com.alibaba.fastjson.annotation.JSONField;
import com.yxt.anrui.fin.api.kingdee.kingdeedata.*;
/**
* 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;
}
public int getFid() {
return fid;
}
public void setFbilltypeid(Fbilltypeid fbilltypeid) {
this.fbilltypeid = fbilltypeid;
}
public Fbilltypeid getFbilltypeid() {
return fbilltypeid;
}
public void setFbillno(String fbillno) {
this.fbillno = fbillno;
}
public String getFbillno() {
return fbillno;
}
public void setFisinit(boolean fisinit) {
this.fisinit = fisinit;
}
public boolean getFisinit() {
return fisinit;
}
public void setFdate(String fdate) {
this.fdate = fdate;
}
public String getFdate() {
return fdate;
}
public void setFenddateH(String fenddateH) {
this.fenddateH = fenddateH;
}
public String getFenddateH() {
return fenddateH;
}
public void setFdocumentstatus(String fdocumentstatus) {
this.fdocumentstatus = fdocumentstatus;
}
public String getFdocumentstatus() {
return fdocumentstatus;
}
public void setFsupplierid(Fsupplierid fsupplierid) {
this.fsupplierid = fsupplierid;
}
public Fsupplierid getFsupplierid() {
return fsupplierid;
}
public void setFcurrencyid(Fcurrencyid fcurrencyid) {
this.fcurrencyid = fcurrencyid;
}
public Fcurrencyid getFcurrencyid() {
return fcurrencyid;
}
public void setFpayconditon(Fpayconditon fpayconditon) {
this.fpayconditon = fpayconditon;
}
public Fpayconditon getFpayconditon() {
return fpayconditon;
}
public void setFispriceexcludetax(boolean fispriceexcludetax) {
this.fispriceexcludetax = fispriceexcludetax;
}
public boolean getFispriceexcludetax() {
return fispriceexcludetax;
}
public void setFbusinesstype(String fbusinesstype) {
this.fbusinesstype = fbusinesstype;
}
public String getFbusinesstype() {
return fbusinesstype;
}
public void setFistax(boolean fistax) {
this.fistax = fistax;
}
public boolean getFistax() {
return fistax;
}
public void setFsettleorgid(Fsettleorgid fsettleorgid) {
this.fsettleorgid = fsettleorgid;
}
public Fsettleorgid getFsettleorgid() {
return fsettleorgid;
}
public void setFpayorgid(Fpayorgid fpayorgid) {
this.fpayorgid = fpayorgid;
}
public Fpayorgid getFpayorgid() {
return fpayorgid;
}
public void setFsetaccounttype(String fsetaccounttype) {
this.fsetaccounttype = fsetaccounttype;
}
public String getFsetaccounttype() {
return fsetaccounttype;
}
public void setFistaxincost(boolean fistaxincost) {
this.fistaxincost = fistaxincost;
}
public boolean getFistaxincost() {
return fistaxincost;
}
public void setFapRemark(String fapRemark) {
this.fapRemark = fapRemark;
}
public String getFapRemark() {
return fapRemark;
}
public void setFishookmatch(boolean fishookmatch) {
this.fishookmatch = fishookmatch;
}
public boolean getFishookmatch() {
return fishookmatch;
}
public void setFpurchasedeptid(Fpurchasedeptid fpurchasedeptid) {
this.fpurchasedeptid = fpurchasedeptid;
}
public Fpurchasedeptid getFpurchasedeptid() {
return fpurchasedeptid;
}
public void setFcancelstatus(String fcancelstatus) {
this.fcancelstatus = fcancelstatus;
}
public String getFcancelstatus() {
return fcancelstatus;
}
public void setFisbyiv(boolean fisbyiv) {
this.fisbyiv = fisbyiv;
}
public boolean getFisbyiv() {
return fisbyiv;
}
public void setFisgenhsadj(boolean fisgenhsadj) {
this.fisgenhsadj = fisgenhsadj;
}
public boolean getFisgenhsadj() {
return fisgenhsadj;
}
public void setFisinvoicearlier(boolean fisinvoicearlier) {
this.fisinvoicearlier = fisinvoicearlier;
}
public boolean getFisinvoicearlier() {
return fisinvoicearlier;
}
public void setFPaezText(String fPaezText) {
this.fPaezText = fPaezText;
}
public String getFPaezText() {
return fPaezText;
}
public void setFPmzcAssistant1(FPmzcAssistant1 fPmzcAssistant1) {
this.fPmzcAssistant1 = fPmzcAssistant1;
}
public FPmzcAssistant1 getFPmzcAssistant1() {
return fPmzcAssistant1;
}
public void setFsubheadsuppiler(Fsubheadsuppiler fsubheadsuppiler) {
this.fsubheadsuppiler = fsubheadsuppiler;
}
public Fsubheadsuppiler getFsubheadsuppiler() {
return fsubheadsuppiler;
}
public void setFsubheadfinc(Fsubheadfinc fsubheadfinc) {
this.fsubheadfinc = fsubheadfinc;
}
public Fsubheadfinc getFsubheadfinc() {
return fsubheadfinc;
}
public void setFentitydetail(List<Fentitydetail> fentitydetail) {
this.fentitydetail = fentitydetail;
}
public List<Fentitydetail> getFentitydetail() {
return fentitydetail;
}
public void setFentityplan(List<Fentityplan> fentityplan) {
this.fentityplan = fentityplan;
}
public List<Fentityplan> getFentityplan() {
return fentityplan;
}
}

126
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/appayable/kingdeedata/data.json

@ -1,126 +0,0 @@
{
"Creator":"@KD_Creator",
"NeedUpDateFields":[],
"NeedReturnFields":[],
"IsDeleteEntry":"True",
"SubSystemId":"",
"IsVerifyBaseDataField":"false",
"IsEntryBatchFill":"True",
"ValidateFlag":"True",
"NumberSearch":"True",
"InterationFlags":"",
"Model":{
"FID":0,
"FBillTypeID":{
"FNUMBER":"YFD01_SYS"
},
"FBillNo":"123123",
"FISINIT":false,
"FDATE":"2022-07-1800:00:00",
"FENDDATE_H":"2022-07-1800:00:00",
"FDOCUMENTSTATUS":"Z",
"FSUPPLIERID":{
"FNumber":"010001"
},
"FCURRENCYID":{
"FNumber":"PRE001"
},
"FPayConditon":{
"FNumber":"FKTJ01_SYS"
},
"FISPRICEEXCLUDETAX":true,
"FBUSINESSTYPE":"CG",
"FISTAX":true,
"FSETTLEORGID":{
"FNumber":"101"
},
"FPAYORGID":{
"FNumber":"101"
},
"FSetAccountType":"2",
"FISTAXINCOST":false,
"FAP_Remark":"1231",
"FISHookMatch":false,
"FPURCHASEDEPTID":{
"FNumber":"01"
},
"FCancelStatus":"A",
"FISBYIV":false,
"FISGENHSADJ":false,
"FISINVOICEARLIER":false,
"F_PAEZ_Text":"231231231231",
"F_PMZC_Assistant1":{
"FNumber":"00"
},
"FsubHeadSuppiler":{
"FORDERID":{
"FNumber":"010001"
},
"FTRANSFERID":{
"FNumber":"010001"
},
"FChargeId":{
"FNumber":"010001"
}
},
"FsubHeadFinc":{
"FACCNTTIMEJUDGETIME":"2022-07-1800:00:00",
"FMAINBOOKSTDCURRID":{
"FNumber":"PRE001"
},
"FEXCHANGETYPE":{
"FNumber":"HLTX01_SYS"
},
"FExchangeRate":1.0,
"FTaxAmountFor":0.98,
"FNoTaxAmountFor":98.02
},
"FEntityDetail":[
{
"FMATERIALID":{
"FNumber":"&12"
},
"FMaterialDesc":"@KD_FMaterialDesc",
"FPRICEUNITID":{
"FNumber":"ba"
},
"FPrice":99.01,
"FPriceQty":1.0,
"FTaxPrice":100.0,
"FPriceWithTax":99.0,
"FEntryTaxRate":1.0,
"F_PMZC_Assistant":{
"FNumber":"1904110789"
},
"F_PMZC_Base":{
"FNUMBER":"0001F"
},
"F_PMZC_Base1":{
"FNUMBER":"01.001"
},
"FEntryDiscountRate":1.0,
"FDISCOUNTAMOUNTFOR":1.0,
"FNoTaxAmountFor_D":98.02,
"FTAXAMOUNTFOR_D":0.98,
"FALLAMOUNTFOR_D":99.0,
"FINCLUDECOST":false,
"FISOUTSTOCK":false,
"FIsFree":false,
"FStockUnitId":{
"FNumber":"ba"
},
"FStockQty":1.0,
"FStockBaseQty":1.0,
"FPriceBaseDen":1.0,
"FStockBaseNum":1.0
}
],
"FEntityPlan":[
{
"FENDDATE":"2022-07-1800:00:00",
"FPAYAMOUNTFOR":99.0,
"FPAYRATE":100.0
}
]
}
}

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

@ -1,4 +1,5 @@
package com.yxt.anrui.fin.api.kingdee.appaybill;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
@ -10,36 +11,47 @@ import java.util.List;
@Data
public class ApPayBill {
@JsonProperty("FPOSTDATE")
@NotBlank
//登账日期:FPOSTDATE (必填项)
private String FPOSTDATE;
@JsonProperty("FDATE")
@NotBlank
//业务日期:FDATE (必填项)
private String FDATE;
@JsonProperty("FCONTACTUNITTYPE")
@NotBlank
//往来单位类型:FCONTACTUNITTYPE (必填项)
private String FCONTACTUNITTYPE="BD_Supplier";
@JsonProperty("FCONTACTUNIT")
@NotBlank
//往来单位:FCONTACTUNIT (必填项)
private String FCONTACTUNIT="010001";
@JsonProperty("FRECTUNITTYPE")
@NotBlank
//收款单位类型:FRECTUNITTYPE (必填项)
private String FRECTUNITTYPE="BD_Supplier";
@JsonProperty("FRECTUNIT")
@NotBlank
//收款单位:FRECTUNIT (必填项)
private String FRECTUNIT="010001";
@JsonProperty("FSETTLEORGID")
@NotBlank
//结算组织:FSETTLEORGID (必填项)
private String FSETTLEORGID="101";
@JsonProperty("FPURCHASEORGID")
@NotBlank
//采购组织:FPURCHASEORGID
private String FPURCHASEORGID="101";
@JsonProperty("FPURCHASEDEPTID")
@NotBlank
//采购部门:FPURCHASEDEPTID(必填项)
private String FPURCHASEDEPTID="05.04";
@JsonProperty("FPAYORGID")
@NotBlank
//付款组织:FPAYORGID (必填项)
private String FPAYORGID="101";
@JsonProperty("FPAYBILLENTRY")
@NotBlank
private List<FPAYBILLENTRY> FPAYBILLENTRY=new ArrayList<>();
@Data
@ -47,38 +59,49 @@ public class ApPayBill {
/**
* 结算方式:FSETTLETYPEID (必填项)
*/
@JsonProperty("FSETTLETYPEID")
@NotBlank
private String FSETTLETYPEID="02";
//付款用途:FPURPOSEID (必填项)
@JsonProperty("FPURPOSEID")
@NotBlank
private String FPURPOSEID="SFKYT08_SYS";
@JsonProperty("FPAYTOTALAMOUNTFOR")
@NotBlank
//表体-应付金额:FPAYTOTALAMOUNTFOR
private double FPAYTOTALAMOUNTFOR=1000.0;
private double FPAYTOTALAMOUNTFOR;
@JsonProperty("FPAYAMOUNTFOR_E")
@NotBlank
//付款金额:FPAYAMOUNTFOR_E
private double FPAYAMOUNTFOR_E=1000.0;
private double FPAYAMOUNTFOR_E;
@JsonProperty("FSETTLEPAYAMOUNTFOR")
@NotBlank
//折后金额:FSETTLEPAYAMOUNTFOR
private double FSETTLEPAYAMOUNTFOR=1000.0;
private double FSETTLEPAYAMOUNTFOR;
@JsonProperty("FREALPAYAMOUNTFOR_D")
@NotBlank
//表体-实付金额:FREALPAYAMOUNTFOR_D
private double FREALPAYAMOUNTFOR_D=1000.0;
private double FREALPAYAMOUNTFOR_D;
@JsonProperty("FPAYAMOUNT_E")
@NotBlank
//付款金额本位币:FPAYAMOUNT_E
private double FPAYAMOUNT_E=1000.0;
private double FPAYAMOUNT_E;
@JsonProperty("FACCOUNTID")
@NotBlank
//我方银行账号:FACCOUNTID 第1行分录,银行业务的结算方式,我方银行相关信息必录
private String FACCOUNTID;
@JsonProperty("FPOSTDATE")
@NotBlank
//登账日期:FPOSTDATE (必填项)
private String FPOSTDATE;
@JsonProperty("FRuZhangType")
@NotBlank
//入账类型:FRuZhangType (必填项)
private String FRuZhangType="1";
@JsonProperty("FPayType")
@NotBlank
//支付类型:FPayType (必填项)
private String FPayType="A";
private String FPayType;
}
private final static ApPayBill apPayBill = new ApPayBill();

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

@ -1,147 +0,0 @@
package com.yxt.anrui.fin.api.kingdee.kingdeedata;
import java.util.List;
import com.alibaba.fastjson.annotation.JSONField;
import com.yxt.anrui.fin.api.kingdee.appayable.kingdeedata.Model;
/**
* Auto-generated: 2022-07-19 8:42:28
* Json格式数据详情参考Json格式数据必录
* @author www.jsons.cn
* @website http://www.jsons.cn/json2java/
*/
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;
}
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;
}
}

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

@ -1,20 +0,0 @@
package com.yxt.anrui.fin.api.kingdee.kingdeedata;
import com.alibaba.fastjson.annotation.JSONField;
/**
* Auto-generated: 2022-07-19 8:42:28
* 单据类型:FBillTypeID (必填项)
* @author www.jsons.cn
* @website http://www.jsons.cn/json2java/
*/
public class Fbilltypeid {
@JSONField(alternateNames = "FNUMBER")
private String fnumber;
public void setFnumber(String fnumber) {
this.fnumber = fnumber;
}
public String getFnumber() {
return fnumber;
}
}

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

@ -1,20 +0,0 @@
package com.yxt.anrui.fin.api.kingdee.kingdeedata;
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/
*/
public class Fchargeid {
@JSONField(alternateNames ="FNumber")
private String fnumber;
public void setFnumber(String fnumber) {
this.fnumber = fnumber;
}
public String getFnumber() {
return fnumber;
}
}

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

@ -1,20 +0,0 @@
package com.yxt.anrui.fin.api.kingdee.kingdeedata;
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/
*/
public class Fcurrencyid {
@JSONField(alternateNames ="FNumber")
private String fnumber;
public void setFnumber(String fnumber) {
this.fnumber = fnumber;
}
public String getFnumber() {
return fnumber;
}
}

229
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/kingdeedata/Fentitydetail.java

@ -1,229 +0,0 @@
package com.yxt.anrui.fin.api.kingdee.kingdeedata;
import com.alibaba.fastjson.annotation.JSONField;
import com.yxt.anrui.fin.api.kingdee.appayable.kingdeedata.*;
/**
* Auto-generated: 2022-07-19 8:42:28
*
* @author www.jsons.cn
* @website http://www.jsons.cn/json2java/
*/
public class Fentitydetail {
@JSONField(alternateNames ="FMATERIALID")
private Fmaterialid fmaterialid;
@JSONField(alternateNames ="FMaterialDesc")
private String fmaterialdesc;
@JSONField(alternateNames ="FPRICEUNITID")
private Fpriceunitid fpriceunitid;
@JSONField(alternateNames ="FPrice")
private double fprice;
@JSONField(alternateNames ="FPriceQty")
private int fpriceqty;
@JSONField(alternateNames ="FTaxPrice")
private int ftaxprice;
@JSONField(alternateNames ="FPriceWithTax")
private int fpricewithtax;
@JSONField(alternateNames ="FEntryTaxRate")
private int fentrytaxrate;
@JSONField(alternateNames ="F_PMZC_Assistant")
private FPmzcAssistant fPmzcAssistant;
@JSONField(alternateNames ="F_PMZC_Base")
private FPmzcBase fPmzcBase;
@JSONField(alternateNames ="F_PMZC_Base1")
private FPmzcBase1 fPmzcBase1;
@JSONField(alternateNames ="FEntryDiscountRate")
private int fentrydiscountrate;
@JSONField(alternateNames ="FDISCOUNTAMOUNTFOR")
private int fdiscountamountfor;
@JSONField(alternateNames ="FNoTaxAmountFor_D")
private double fnotaxamountforD;
@JSONField(alternateNames ="FTAXAMOUNTFOR_D")
private double ftaxamountforD;
@JSONField(alternateNames ="FALLAMOUNTFOR_D")
private int fallamountforD;
@JSONField(alternateNames ="FINCLUDECOST")
private boolean fincludecost;
@JSONField(alternateNames ="FISOUTSTOCK")
private boolean fisoutstock;
@JSONField(alternateNames ="FIsFree")
private boolean fisfree;
@JSONField(alternateNames ="FStockUnitId")
private Fstockunitid fstockunitid;
@JSONField(alternateNames ="FStockQty")
private int fstockqty;
@JSONField(alternateNames ="FStockBaseQty")
private int fstockbaseqty;
@JSONField(alternateNames ="FPriceBaseDen")
private int fpricebaseden;
@JSONField(alternateNames ="FStockBaseNum")
private int fstockbasenum;
public void setFmaterialid(Fmaterialid fmaterialid) {
this.fmaterialid = fmaterialid;
}
public Fmaterialid getFmaterialid() {
return fmaterialid;
}
public void setFmaterialdesc(String fmaterialdesc) {
this.fmaterialdesc = fmaterialdesc;
}
public String getFmaterialdesc() {
return fmaterialdesc;
}
public void setFpriceunitid(Fpriceunitid fpriceunitid) {
this.fpriceunitid = fpriceunitid;
}
public Fpriceunitid getFpriceunitid() {
return fpriceunitid;
}
public void setFprice(double fprice) {
this.fprice = fprice;
}
public double getFprice() {
return fprice;
}
public void setFpriceqty(int fpriceqty) {
this.fpriceqty = fpriceqty;
}
public int getFpriceqty() {
return fpriceqty;
}
public void setFtaxprice(int ftaxprice) {
this.ftaxprice = ftaxprice;
}
public int getFtaxprice() {
return ftaxprice;
}
public void setFpricewithtax(int fpricewithtax) {
this.fpricewithtax = fpricewithtax;
}
public int getFpricewithtax() {
return fpricewithtax;
}
public void setFentrytaxrate(int fentrytaxrate) {
this.fentrytaxrate = fentrytaxrate;
}
public int getFentrytaxrate() {
return fentrytaxrate;
}
public void setFPmzcAssistant(FPmzcAssistant fPmzcAssistant) {
this.fPmzcAssistant = fPmzcAssistant;
}
public FPmzcAssistant getFPmzcAssistant() {
return fPmzcAssistant;
}
public void setFPmzcBase(FPmzcBase fPmzcBase) {
this.fPmzcBase = fPmzcBase;
}
public FPmzcBase getFPmzcBase() {
return fPmzcBase;
}
public void setFPmzcBase1(FPmzcBase1 fPmzcBase1) {
this.fPmzcBase1 = fPmzcBase1;
}
public FPmzcBase1 getFPmzcBase1() {
return fPmzcBase1;
}
public void setFentrydiscountrate(int fentrydiscountrate) {
this.fentrydiscountrate = fentrydiscountrate;
}
public int getFentrydiscountrate() {
return fentrydiscountrate;
}
public void setFdiscountamountfor(int fdiscountamountfor) {
this.fdiscountamountfor = fdiscountamountfor;
}
public int getFdiscountamountfor() {
return fdiscountamountfor;
}
public void setFnotaxamountforD(double fnotaxamountforD) {
this.fnotaxamountforD = fnotaxamountforD;
}
public double getFnotaxamountforD() {
return fnotaxamountforD;
}
public void setFtaxamountforD(double ftaxamountforD) {
this.ftaxamountforD = ftaxamountforD;
}
public double getFtaxamountforD() {
return ftaxamountforD;
}
public void setFallamountforD(int fallamountforD) {
this.fallamountforD = fallamountforD;
}
public int getFallamountforD() {
return fallamountforD;
}
public void setFincludecost(boolean fincludecost) {
this.fincludecost = fincludecost;
}
public boolean getFincludecost() {
return fincludecost;
}
public void setFisoutstock(boolean fisoutstock) {
this.fisoutstock = fisoutstock;
}
public boolean getFisoutstock() {
return fisoutstock;
}
public void setFisfree(boolean fisfree) {
this.fisfree = fisfree;
}
public boolean getFisfree() {
return fisfree;
}
public void setFstockunitid(Fstockunitid fstockunitid) {
this.fstockunitid = fstockunitid;
}
public Fstockunitid getFstockunitid() {
return fstockunitid;
}
public void setFstockqty(int fstockqty) {
this.fstockqty = fstockqty;
}
public int getFstockqty() {
return fstockqty;
}
public void setFstockbaseqty(int fstockbaseqty) {
this.fstockbaseqty = fstockbaseqty;
}
public int getFstockbaseqty() {
return fstockbaseqty;
}
public void setFpricebaseden(int fpricebaseden) {
this.fpricebaseden = fpricebaseden;
}
public int getFpricebaseden() {
return fpricebaseden;
}
public void setFstockbasenum(int fstockbasenum) {
this.fstockbasenum = fstockbasenum;
}
public int getFstockbasenum() {
return fstockbasenum;
}
}

40
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/kingdeedata/Fentityplan.java

@ -1,40 +0,0 @@
package com.yxt.anrui.fin.api.kingdee.kingdeedata;
import com.alibaba.fastjson.annotation.JSONField;
/**
* Auto-generated: 2022-07-19 8:42:28
*
* @author www.jsons.cn
* @website http://www.jsons.cn/json2java/
*/
public class Fentityplan {
@JSONField(alternateNames ="FENDDATE")
private String fenddate;
@JSONField(alternateNames ="FPAYAMOUNTFOR")
private int fpayamountfor;
@JSONField(alternateNames ="FPAYRATE")
private int fpayrate;
public void setFenddate(String fenddate) {
this.fenddate = fenddate;
}
public String getFenddate() {
return fenddate;
}
public void setFpayamountfor(int fpayamountfor) {
this.fpayamountfor = fpayamountfor;
}
public int getFpayamountfor() {
return fpayamountfor;
}
public void setFpayrate(int fpayrate) {
this.fpayrate = fpayrate;
}
public int getFpayrate() {
return fpayrate;
}
}

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

@ -1,20 +0,0 @@
package com.yxt.anrui.fin.api.kingdee.kingdeedata;
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/
*/
public class Fexchangetype {
@JSONField(alternateNames ="FNumber")
private String fnumber;
public void setFnumber(String fnumber) {
this.fnumber = fnumber;
}
public String getFnumber() {
return fnumber;
}
}

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

@ -1,20 +0,0 @@
package com.yxt.anrui.fin.api.kingdee.kingdeedata;
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/
*/
public class Fmainbookstdcurrid {
@JSONField(alternateNames ="FNumber")
private String fnumber;
public void setFnumber(String fnumber) {
this.fnumber = fnumber;
}
public String getFnumber() {
return fnumber;
}
}

22
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/kingdeedata/Fmaterialid.java

@ -1,22 +0,0 @@
package com.yxt.anrui.fin.api.kingdee.kingdeedata;
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/
*/
public class Fmaterialid {
@JSONField(alternateNames ="FNumber")
private Date fnumber;
public void setFnumber(Date fnumber) {
this.fnumber = fnumber;
}
public Date getFnumber() {
return fnumber;
}
}

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

@ -1,20 +0,0 @@
package com.yxt.anrui.fin.api.kingdee.kingdeedata;
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/
*/
public class Forderid {
@JSONField(alternateNames = "FNumber")
private String fnumber;
public void setFnumber(String fnumber) {
this.fnumber = fnumber;
}
public String getFnumber() {
return fnumber;
}
}

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

@ -1,20 +0,0 @@
package com.yxt.anrui.fin.api.kingdee.kingdeedata;
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/
*/
public class Fpayconditon {
@JSONField(alternateNames ="FNumber")
private String fnumber;
public void setFnumber(String fnumber) {
this.fnumber = fnumber;
}
public String getFnumber() {
return fnumber;
}
}

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

@ -1,20 +0,0 @@
package com.yxt.anrui.fin.api.kingdee.kingdeedata;
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/
*/
public class Fpayorgid {
@JSONField(alternateNames ="FNumber")
private String fnumber;
public void setFnumber(String fnumber) {
this.fnumber = fnumber;
}
public String getFnumber() {
return fnumber;
}
}

22
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/kingdeedata/Fpriceunitid.java

@ -1,22 +0,0 @@
package com.yxt.anrui.fin.api.kingdee.kingdeedata;
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/
*/
public class Fpriceunitid {
@JSONField(alternateNames ="FNumber")
private String fnumber;
public void setFnumber(String fnumber) {
this.fnumber = fnumber;
}
public String getFnumber() {
return fnumber;
}
}

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

@ -1,20 +0,0 @@
package com.yxt.anrui.fin.api.kingdee.kingdeedata;
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/
*/
public class Fsettleorgid {
@JSONField(alternateNames ="FNumber")
private String fnumber;
public void setFnumber(String fnumber) {
this.fnumber = fnumber;
}
public String getFnumber() {
return fnumber;
}
}

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

@ -1,20 +0,0 @@
package com.yxt.anrui.fin.api.kingdee.kingdeedata;
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/
*/
public class Fstockunitid {
@JSONField(alternateNames ="FNumber")
private String fnumber;
public void setFnumber(String fnumber) {
this.fnumber = fnumber;
}
public String getFnumber() {
return fnumber;
}
}

85
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/kingdeedata/Fsubheadfinc.java

@ -1,85 +0,0 @@
package com.yxt.anrui.fin.api.kingdee.kingdeedata;
import com.alibaba.fastjson.annotation.JSONField;
import com.yxt.anrui.fin.api.kingdee.kingdeedata.Fexchangetype;
import com.yxt.anrui.fin.api.kingdee.kingdeedata.Fmainbookstdcurrid;
/**
* Auto-generated: 2022-07-19 8:42:28
*
* @author www.jsons.cn
* @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) {
this.faccnttimejudgetime = faccnttimejudgetime;
}
public String getFaccnttimejudgetime() {
return faccnttimejudgetime;
}
public void setFmainbookstdcurrid(Fmainbookstdcurrid fmainbookstdcurrid) {
this.fmainbookstdcurrid = fmainbookstdcurrid;
}
public Fmainbookstdcurrid getFmainbookstdcurrid() {
return fmainbookstdcurrid;
}
public void setFexchangetype(Fexchangetype fexchangetype) {
this.fexchangetype = fexchangetype;
}
public Fexchangetype getFexchangetype() {
return fexchangetype;
}
public void setFexchangerate(int fexchangerate) {
this.fexchangerate = fexchangerate;
}
public int getFexchangerate() {
return fexchangerate;
}
public void setFtaxamountfor(double ftaxamountfor) {
this.ftaxamountfor = ftaxamountfor;
}
public double getFtaxamountfor() {
return ftaxamountfor;
}
public void setFnotaxamountfor(double fnotaxamountfor) {
this.fnotaxamountfor = fnotaxamountfor;
}
public double getFnotaxamountfor() {
return fnotaxamountfor;
}
}

39
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/kingdeedata/Fsubheadsuppiler.java

@ -1,39 +0,0 @@
package com.yxt.anrui.fin.api.kingdee.kingdeedata;
import com.alibaba.fastjson.annotation.JSONField;
/**
* Auto-generated: 2022-07-19 8:42:28
*
* @author www.jsons.cn
* @website http://www.jsons.cn/json2java/
*/
public class Fsubheadsuppiler {
@JSONField(alternateNames ="FORDERID")
private Forderid forderid;
@JSONField(alternateNames ="FTRANSFERID")
private Ftransferid ftransferid;
@JSONField(alternateNames ="FChargeId")
private Fchargeid fchargeid;
public void setForderid(Forderid forderid) {
this.forderid = forderid;
}
public Forderid getForderid() {
return forderid;
}
public void setFtransferid(Ftransferid ftransferid) {
this.ftransferid = ftransferid;
}
public Ftransferid getFtransferid() {
return ftransferid;
}
public void setFchargeid(Fchargeid fchargeid) {
this.fchargeid = fchargeid;
}
public Fchargeid getFchargeid() {
return fchargeid;
}
}

22
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/kingdeedata/Ftransferid.java

@ -1,22 +0,0 @@
package com.yxt.anrui.fin.api.kingdee.kingdeedata;
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/
*/
public class Ftransferid {
@JSONField(alternateNames ="FNumber")
private String fnumber;
public void setFnumber(String fnumber) {
this.fnumber = fnumber;
}
public String getFnumber() {
return fnumber;
}
}

127
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/purmrb/PurMrb.java

@ -1,5 +1,7 @@
package com.yxt.anrui.fin.api.kingdee.purmrb;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import javax.validation.constraints.NotBlank;
@ -12,51 +14,63 @@ import java.util.List;
* 采购退料单
*/
@Data
@ApiModel()
public class PurMrb {
/**
* 退料日期:FDate (必填项)
*/
@NotBlank
@JsonProperty("FDate")
private String FDate;
/**
* 退料组织:FStockOrgId (必填项)
*/@NotBlank
@JsonProperty("FStockOrgId")
private String FStockOrgId;
/**
* 需求组织:FRequireOrgId (必填项)
*/@NotBlank
@JsonProperty("FRequireOrgId")
private String FRequireOrgId;
/**
* 采购组织:FPurchaseOrgId (必填项)
*/@NotBlank
@JsonProperty("FPurchaseOrgId")
private String FPurchaseOrgId;
/**
* 供应商:FSupplierID (必填项)
*/@NotBlank
@JsonProperty("FSupplierID")
private String FSupplierID;
/**
* 接收方:FACCEPTORID
*/@NotBlank
@JsonProperty("FACCEPTORID")
private String FACCEPTORID;
/**
* 结算方:FSettleId
*/@NotBlank
@JsonProperty("FSettleId")
private String FSettleId;
/**
* 收款方:FCHARGEID
*/@NotBlank
@JsonProperty("FCHARGEID")
private String FCHARGEID;
/**
* 货主:FOwnerIdHead (必填项)
*/@NotBlank
@JsonProperty("FOwnerIdHead")
private String FOwnerIdHead;
/**
* 结算组织:FSettleOrgId (必填项)
*/@NotBlank
@JsonProperty("FSettleOrgId")
private String FSettleOrgId;
/**
* 物料列表
*/@NotBlank
@JsonProperty("FPURMRBENTRY")
private List<FPURMRBENTRY> FPURMRBENTRY=new ArrayList<>();
@ -65,150 +79,215 @@ public class PurMrb {
/**
* 物料编码:FMATERIALID (必填项)
*/@NotBlank
@JsonProperty("FMATERIALID")
private String FMATERIALID;
/**
* 物料说明:FMaterialDesc
*/@NotBlank
@JsonProperty("FMaterialDesc")
private String FMaterialDesc;
/**
* 库存单位:FUnitID (必填项)
*/@NotBlank
@JsonProperty("FUnitID")
private String FUnitID;
/**
* 批号:FLot
*/@NotBlank
@JsonProperty("FLot")
private String FLot;
/**
* 实退数量:FRMREALQTY
*/@NotBlank
@JsonProperty("FRMREALQTY")
private double FRMREALQTY;
/**
* 补料数量:FREPLENISHQTY
*/@NotBlank
@JsonProperty("FREPLENISHQTY")
private double FREPLENISHQTY;
/**
* 扣款数量:FKEAPAMTQTY
*/@NotBlank
@JsonProperty("FKEAPAMTQTY")
private double FKEAPAMTQTY;
/**
* 计价单位:FPRICEUNITID (必填项)
*/@NotBlank
@JsonProperty("FPRICEUNITID")
private String FPRICEUNITID;
/**
* 仓库:FSTOCKID
*/@NotBlank
@JsonProperty("FSTOCKID")
private String FSTOCKID;
/**
* 库存状态:FStockStatusId
*/@NotBlank
@JsonProperty("FStockStatusId")
private String FStockStatusId;
/**
* 计价基本数量:FPriceBaseQty
*/@NotBlank
@JsonProperty("FPriceBaseQty")
private double FPriceBaseQty;
/**
* 采购单位:FCarryUnitId (必填项)
*/@NotBlank
@JsonProperty("FCarryUnitId")
private String FCarryUnitId;
/**
* 采购数量:FCarryQty
*/@NotBlank
@JsonProperty("FCarryQty")
private double FCarryQty;
/**
* 采购基本数量:FCarryBaseQty
*/@NotBlank
@JsonProperty("FCarryBaseQty")
private double FCarryBaseQty;
}
private final static PurMrb purMrb = new PurMrb();
static {
SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date date=new Date();
/**
* 退料日期:FDate (必填项)
*/
purMrb.setFDate(sdf.format(date));
/**
* 退料组织:FStockOrgId (必填项)
*/purMrb.setFStockOrgId("101");
*/
purMrb.setFStockOrgId("101");
/**
* 需求组织:FRequireOrgId (必填项)
*/purMrb.setFRequireOrgId( "101");
*/
purMrb.setFRequireOrgId( "101");
/**
* 采购组织:FPurchaseOrgId (必填项)
*/purMrb.setFPurchaseOrgId("101");
*/
purMrb.setFPurchaseOrgId("101");
/**
* 供应商:FSupplierID (必填项)
*/purMrb.setFSupplierID("010001");
*/
purMrb.setFSupplierID("010001");
/**
* 接收方:FACCEPTORID
*/purMrb.setFACCEPTORID("010001");
*/
purMrb.setFACCEPTORID("010001");
/**
* 结算方:FSettleId
*/purMrb.setFSettleId("010001");
*/
purMrb.setFSettleId("010001");
/**
* 收款方:FCHARGEID
*/purMrb.setFCHARGEID("010001");
*/
purMrb.setFCHARGEID("010001");
/**
* 货主:FOwnerIdHead (必填项)
*/purMrb.setFOwnerIdHead("101");
*/
purMrb.setFOwnerIdHead("101");
/**
* 结算组织:FSettleOrgId (必填项)
*/purMrb.setFSettleOrgId("101");
*/
purMrb.setFSettleOrgId("101");
List<FPURMRBENTRY> FPURMRBENTRY=new ArrayList<>();
FPURMRBENTRY fp=new FPURMRBENTRY();
/**
* 物料编码:FMATERIALID (必填项)
*/fp.setFMATERIALID(" JX091054");
*/
fp.setFMATERIALID(" JX091054");
/**
* 物料说明:FMaterialDesc
*/fp.setFMaterialDesc("X牵引6*4-550超");
*/
fp.setFMaterialDesc("X牵引6*4-550超");
/**
* 库存单位:FUnitID (必填项)
*/fp.setFUnitID("liang");
*/
fp.setFUnitID("liang");
/**
* 批号:FLot
*/fp.setFLot("liang");
*/
fp.setFLot("liang");
/**
* 实退数量:FRMREALQTY
*/fp.setFRMREALQTY(1.0);
*/
fp.setFRMREALQTY(1.0);
/**
* 补料数量:FREPLENISHQTY
*/fp.setFREPLENISHQTY(1.0);
*/
fp.setFREPLENISHQTY(1.0);
/**
* 扣款数量:FKEAPAMTQTY
*/fp.setFKEAPAMTQTY(1.0);
*/
fp.setFKEAPAMTQTY(1.0);
/**
* 计价单位:FPRICEUNITID (必填项)
*/fp.setFPRICEUNITID("liang");
*/
fp.setFPRICEUNITID("liang");
/**
* 仓库:FSTOCKID
*/fp.setFSTOCKID("CK001");
*/
fp.setFSTOCKID("CK001");
/**
* 库存状态:FStockStatusId
*/fp.setFStockStatusId("KCZT01_SYS");
*/
fp.setFStockStatusId("KCZT01_SYS");
/**
* 计价基本数量:FPriceBaseQty
*/fp.setFPriceBaseQty(1.0);
*/
fp.setFPriceBaseQty(1.0);
/**
* 采购单位:FCarryUnitId (必填项)
*/fp.setFCarryUnitId("liang");
*/
fp.setFCarryUnitId("liang");
/**
* 采购数量:FCarryQty
*/fp.setFCarryQty(1.0);
*/
fp.setFCarryQty(1.0);
/**
* 采购基本数量:FCarryBaseQty
*/fp.setFCarryBaseQty(1.0);
*/
fp.setFCarryBaseQty(1.0);
FPURMRBENTRY.add(fp);
/**
* 物料列表
*/purMrb.setFPURMRBENTRY(FPURMRBENTRY);
*/
purMrb.setFPURMRBENTRY(FPURMRBENTRY);
}
public static PurMrb createPurMrb() {
return purMrb;
}
}

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

@ -0,0 +1,214 @@
package com.yxt.anrui.fin.api.kingdee.saloutstock;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@Data
public class SalOutStock {
/**
* 日期:FDate (必填项)
*/
@JsonProperty("FDate")
private String FDate;
/**
* 销售组织:FSaleOrgId (必填项)
*/
@JsonProperty("FSaleOrgId")
private String FSaleOrgId;
/**
* 客户:FCustomerID (必填项)
*/
@JsonProperty("FCustomerID")
private String FCustomerID;
/**
* 销售部门:FSaleDeptID (必填项)
*/ @JsonProperty("FSaleDeptID")
private String FSaleDeptID;
/**
* 发货组织:FStockOrgId (必填项)
*/ @JsonProperty("FStockOrgId")
private String FStockOrgId;
/**
* 收货方:FReceiverID FCustomerID
*/ @JsonProperty("FReceiverID")
private String FReceiverID;
/**
* 结算方:FSettleID FCustomerID
*/ @JsonProperty("FSettleID")
private String FSettleID;
/**
* 付款方:FPayerID FCustomerID
*/ @JsonProperty("FPayerID")
private String FPayerID;
/**
* 项目类别:F_PAEZ_Assistant (必填项)
*/ @JsonProperty("F_PAEZ_Assistant")
private String F_PAEZ_Assistant;
/**
* 结算组织:FSettleOrgID (必填项)
*/ @JsonProperty("FSettleOrgID")
private String FSettleOrgID;
/**
* 物料列表
*/
@JsonProperty("FEntity")
private List<FEntity> FEntity=new ArrayList<>();
@Data
public static class FEntity{
/**
* 物料编码:FMaterialID
*/
@JsonProperty("FMaterialID")
private String FMaterialID;
/**
* 库存单位:FUnitID (必填项)
*/ @JsonProperty("FUnitID")
private String FUnitID;
/**
* 实发数量:FRealQty
*/ @JsonProperty("FRealQty")
private double FRealQty;
/**
* 批号:FLot
*/ @JsonProperty("Flot")
private String Flot;
/**
* 货主:FOwnerID (必填项)
*/ @JsonProperty("FOwnerID")
private String FOwnerID;
/**
* 仓库:FStockID
*/ @JsonProperty("FStockID")
private String FStockID;
/**
* 库存状态:FStockStatusID
*/ @JsonProperty("FStockStatusID")
private String FStockStatusID;
/**
* 销售单位:FSalUnitID
*/ @JsonProperty("FSalUnitID")
private String FSalUnitID;
/**
* 销售数量:FSALUNITQTY
*/ @JsonProperty("FSALUNITQTY")
private double FSALUNITQTY;
/**
* 销售基本数量:FSALBASEQTY
*/ @JsonProperty("FSALBASEQTY")
private double FSALBASEQTY;
/**
* 计价基本数量:FPRICEBASEQTY
*/ @JsonProperty("FPRICEBASEQTY")
private double FPRICEBASEQTY;
/**
* 未关联应收数量计价单位:FARNOTJOINQTY
*/ @JsonProperty("FARNOTJOINQTY")
private double FARNOTJOINQTY;
}
private final static SalOutStock salOutStock = new SalOutStock();
static {
SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date date=new Date();
/**
* 日期:FDate (必填项)
*/
salOutStock.setFDate(sdf.format(date));
/**
* 销售组织:FSaleOrgId (必填项)
*/
salOutStock.setFSaleOrgId("101");
/**
* 客户:FCustomerID (必填项)
*/
salOutStock.setFCustomerID(" JXYXB");
/**
* 销售部门:FSaleDeptID (必填项)
*/
salOutStock.setFSaleDeptID("05.04");
/**
* 发货组织:FStockOrgId (必填项)
*/
salOutStock.setFStockOrgId("101");
/**
* 收货方:FReceiverID FCustomerID
*/
salOutStock.setFReceiverID(" JXYXB");
/**
* 结算方:FSettleID FCustomerID
*/
salOutStock.setFSettleID(" JXYXB");
/**
* 付款方:FPayerID FCustomerID
*/
salOutStock.setFPayerID(" JXYXB");
/**
* 项目类别:F_PAEZ_Assistant (必填项)
*/
salOutStock.setF_PAEZ_Assistant("00");
/**
* 结算组织:FSettleOrgID (必填项)
*/
salOutStock.setFSettleOrgID("101");
List<FEntity> fEntity=new ArrayList<>();
FEntity fe= new FEntity();
/**
* 物料编码:FMaterialID
*/
fe.setFMaterialID(" JX091054");
/**
* 库存单位:FUnitID (必填项)
*/
fe.setFUnitID("liang");
/**
* 实发数量:FRealQty
*/
fe.setFRealQty(1.0);
/**
* 批号:FLot
*/
fe.setFlot("1233321");
/**
* 货主:FOwnerID (必填项)
*/
fe.setFOwnerID("101");
/**
* 仓库:FStockID
*/
fe.setFStockID("CK001");
/**
* 库存状态:FStockStatusID
*/
fe.setFStockStatusID("KCZT01_SYS");
/**
* 销售单位:FSalUnitID
*/
fe.setFSalUnitID("liang");
/**
* 销售数量:FSALUNITQTY
*/
fe.setFSALUNITQTY(1.0);
/**
* 销售基本数量:FSALBASEQTY
*/
fe.setFSALBASEQTY(1.0);
/**
* 计价基本数量:FPRICEBASEQTY
*/
fe.setFPRICEBASEQTY(1.0);
/**
* 未关联应收数量计价单位:FARNOTJOINQTY
*/
fe.setFARNOTJOINQTY(1.0);
fEntity.add(fe);
salOutStock.setFEntity(fEntity);
}
public static SalOutStock createSalOutStock() {
return salOutStock;
}
}

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

@ -1,5 +1,6 @@
package com.yxt.anrui.fin.api.kingdee.stkinstock;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
@ -16,73 +17,73 @@ public class StkInStock {
private String sid;
/**
* //采购组织:FPurchaseOrgId (必填项)
*/
*/@JsonProperty("FPurchaseOrgId")
@NotBlank
private String FPurchaseOrgId;
/**
* // 收料组织:FStockOrgId (必填项)
*/
*/@JsonProperty("FStockOrgId")
@NotBlank
private String FStockOrgId;
/**
* // 采购部门:FPurchaseDeptId (必填项)
*/
*/@JsonProperty("FPurchaseDeptId")
@NotBlank
private String FPurchaseDeptId;
/**
* // 供应商:FSupplierId (必填项)
*/
*/@JsonProperty("FSupplierId")
@NotBlank
private String FSupplierId;
/**
* // 入库日期:FDate (必填项)
*/
*/@JsonProperty("FDate")
@NotBlank
private String FDate;
/**
* // 货主:FOwnerIdHead (必填项)
*/
*/@JsonProperty("FOwnerIdHead")
@NotBlank
private String FOwnerIdHead;
/**
* // 单据类型:FBillTypeID (必填项)
*/
*/@JsonProperty("FBillTypeID")
@NotBlank
private String FBillTypeID="RKD01_SYS";
/**
* // 货主类型:FOwnerTypeIdHead (必填项)
*/
*/@JsonProperty("FOwnerTypeIdHead")
@NotBlank
private String FOwnerTypeIdHead;
/**
* // 定价时点:FPriceTimePoint (必填项)
*/
*/@JsonProperty("FPriceTimePoint")
@NotBlank
private String FPriceTimePoint;
/**
* // 结算币别:FSettleCurrId (必填项)
*/
*/@JsonProperty("FSettleCurrId")
@NotBlank
private String FSettleCurrId;
/**
* // 结算组织:FSettleOrgId (必填项)
*/
*/@JsonProperty("FSettleOrgId")
@NotBlank
private String FSettleOrgId;
/**
* // 物料列表:FInStockEntry (必填项)
*/
*/@JsonProperty("FInStockEntry")
@NotBlank
private List<FInStockEntry> FInStockEntry=new ArrayList<>();
@ -91,55 +92,55 @@ public class StkInStock {
/**
* // 物料编码:FMaterialId (必填项)
*/
*/@JsonProperty("FMaterialId")
@NotBlank
private String FMaterialId;
/**
* // 库存单位:FUnitID (必填项)
*/
*/@JsonProperty("FUnitID")
@NotBlank
private String FUnitID;
/**
* // 实收数量:FRealQty
*/
*/@JsonProperty("FRealQty")
@NotBlank
private double FRealQty;
/**
* // 计价数量:FPriceUnitQty
*/
*/@JsonProperty("FPriceUnitQty")
@NotBlank
private String FPriceUnitQty;
/**
* // 采购数量:FRemainInStockQty
*/
*/@JsonProperty("FRemainInStockQty")
@NotBlank
private double FRemainInStockQty;
/**
* // 批号:FLot
*/
*/@JsonProperty("FLot")
@NotBlank
private String FLot;
/**
* // 仓库:FStockId
*/
*/@JsonProperty("FStockId")
@NotBlank
private String FStockId;
/**
* // 计价单位:FPriceUnitID (必填项)
*/
*/@JsonProperty("FPriceUnitID")
@NotBlank
private String FPriceUnitID;
/**
* // 采购单位:FRemainInStockUnitId (必填项)
*/
*/@JsonProperty("FRemainInStockUnitId")
@NotBlank
private String FRemainInStockUnitId;

1
anrui-fin/anrui-fin-biz/pom.xml

@ -107,6 +107,7 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>2.7.2</version>
<executions>
<execution>
<goals>

10
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java

@ -87,5 +87,13 @@ public interface FinCollectionConfirmationMapper extends BaseMapper<FinCollectio
void cashierConfirm(String sid);
@Update("update fin_collection_confirmation set paymentState = #{paymentState} where sid = #{sid}")
void updatePaymentStateBySid(@Param("sid") String sid,@Param("paymentState") int paymentState);
void updatePaymentStateBySid(@Param("sid") String sid, @Param("paymentState") int paymentState);
/**
* 手机端款项确认申请详情
*
* @param collectionBillSid
* @return
*/
AppFinCollectionConfirmationDetailedVo getCollectionConfirmDetail(String collectionBillSid);
}

24
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml

@ -18,9 +18,11 @@
<!--手机端—获取款项确认列表-->
<select id="getCollectionConfirmList"
resultType="com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinCollectionConfirmationPageVo">
select sid AS collectionBillSid,
SELECT
sid AS collectionBillSid,
collectionBankNum AS collectionNum,
subscriptionState AS collectionBillState,
auditState AS collectionBillState,
paymentState AS `state`,
collectionBank,
collectionTypeValue AS collectionType,
collectionDate,
@ -28,7 +30,10 @@
collectionMoney,
remarks,
balance
from fin_collection_confirmation
FROM
fin_collection_confirmation
ORDER BY
id DESC
<where>
${ew.sqlSegment}
</where>
@ -49,4 +54,17 @@
WHERE sid = #{collectionBillSid}
AND useOrgSid = #{useOrgSid}
</select>
<select id="getCollectionConfirmDetail"
resultType="com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinCollectionConfirmationDetailedVo">
SELECT collectionBank,
collectionDate,
payerName AS paymentName,
collectionBankNum AS collectionNum,
collectionTypeValue AS collectionType,
collectionMoney AS paymentMoney,
paymentVoucherUrl,
remarks
FROM fin_collection_confirmation
WHERE sid = #{collectionBillSid}
</select>
</mapper>

11
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java

@ -135,6 +135,17 @@ public class FinCollectionConfirmationRest implements FinCollectionConfirmationF
return finCollectionConfirmationService.initCollectionConfirm(collectionBillSid, userSid);
}
/**
* 手机端款项确认申请详情
*
* @param collectionBillSid
* @return
*/
@Override
public ResultBean<AppFinCollectionConfirmationDetailedVo> getCollectionConfirmDetail(String collectionBillSid) {
return finCollectionConfirmationService.getCollectionConfirmDetail(collectionBillSid);
}
/**
* 手机端提交款项确认申请
*

29
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@ -347,13 +347,13 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
IPage<AppFinCollectionConfirmationPageVo> collectionConfirmList = baseMapper.getCollectionConfirmList(page, qw);
for (AppFinCollectionConfirmationPageVo record : collectionConfirmList.getRecords()) {
Integer balance = record.getBalance();
String collectionBillState = record.getCollectionBillState();
if (balance <= 0 || collectionBillState.equals("1") || collectionBillState.equals("3")) {
int collectionBillState = record.getCollectionBillState();
if (balance <= 0 || collectionBillState == 1 || collectionBillState == 3) {
record.setShowHandle(false);
}
record.setShowDownload(false);
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByCillSid(record.getCollectionBillSid());
if (finSelectedReceivablesDetailedVos.size() > 0 || collectionBillState != "1") {
if (finSelectedReceivablesDetailedVos.size() > 0 || collectionBillState != 1) {
record.setShowDelete(false);
}
}
@ -410,7 +410,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
commonAppendixDto.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType());
commonAppendixFeign.save(commonAppendixDto);
}
payFilePath += payFilePath + ",";
payFilePath = payFilePath + ",";
}
if (StringUtils.isNotBlank(payFilePath)) {
finCollectionConfirmation.setPaymentVoucherUrl(payFilePath);
@ -427,6 +427,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
return rb.setMsg("已选应收款项金额已超出该确认单应收金额总额,请重新核对");
}
finCollectionConfirmation.setBalance(totalSubscriptionMone);
finCollectionConfirmation.setPaymentState(1);
finCollectionConfirmation.setAuditState(1);
save(finCollectionConfirmation);
return rb.success();
@ -449,6 +450,26 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
return rb.success().setData(vo);
}
/**
* 手机端款项确认申请详情
*
* @param collectionBillSid
* @return
*/
public ResultBean<AppFinCollectionConfirmationDetailedVo> getCollectionConfirmDetail(String collectionBillSid) {
ResultBean<AppFinCollectionConfirmationDetailedVo> rb = ResultBean.fireFail();
List<String> payFiles = new ArrayList<>();
AppFinCollectionConfirmationDetailedVo vo = baseMapper.getCollectionConfirmDetail(collectionBillSid);
if (StringUtils.isNotBlank(vo.getPaymentVoucherUrl())) {
String[] split = vo.getPaymentVoucherUrl().split(",");
for (String s : split) {
payFiles.add(fileUploadComponent.getUrlPrefix() + s);
}
vo.setPayFiles(payFiles);
}
return rb.success().setData(vo);
}
/**
* 手机端提交款项确认申请
*

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

@ -5,11 +5,13 @@ import com.yxt.anrui.fin.api.kingdee.appayable.APPayable;
import com.yxt.anrui.fin.api.kingdee.appaybill.ApPayBill;
import com.yxt.anrui.fin.api.kingdee.arreceivable.ARReceivable;
import com.yxt.anrui.fin.api.kingdee.purmrb.PurMrb;
import com.yxt.anrui.fin.api.kingdee.saloutstock.SalOutStock;
import com.yxt.anrui.fin.api.kingdee.stkinstock.StkInStock;
import com.yxt.anrui.fin.biz.kingdee.appaybill.ApPayBillService;
import com.yxt.anrui.fin.biz.kingdee.entrybill.EntryBillService;
import com.yxt.anrui.fin.biz.kingdee.appayable.APPayableService;
import com.yxt.anrui.fin.biz.kingdee.purmrb.PurMrbService;
import com.yxt.anrui.fin.biz.kingdee.receivablebill.ReceivableBillService;
import com.yxt.anrui.fin.biz.kingdee.saloutstock.SalOutStockService;
import com.yxt.anrui.fin.biz.kingdee.stkinstock.STKInStockService;
import com.yxt.common.core.result.ResultBean;
import io.swagger.annotations.Api;
@ -25,7 +27,7 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
* 应付单service
*/
@Autowired
private EntryBillService entryBillService;
private APPayableService apPayableService;
/**
* 收款单service
*/
@ -41,15 +43,23 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
*/
@Autowired
private STKInStockService stkInStockService;
/**
* 保存采购退料单service
*/
@Autowired
private PurMrbService purMrbService;
/**
* 保存采购出库单
*/
@Autowired
private SalOutStockService salOutStockService;
@ApiOperation("入账保存应付单的接口")
@PostMapping("/draftEntryBill")
@ResponseBody
@Override
public ResultBean draftEntryBill(@RequestBody APPayable APPayable) {
return entryBillService.draftEntryBill(APPayable);
return apPayableService.draftAPPayable(APPayable);
}
@ApiOperation("保存应收单的接口")
@PostMapping("/draftReceivableBill")
@ -80,5 +90,12 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
public ResultBean draftPurMrb(@RequestBody PurMrb purMrb) {
return purMrbService.draftPurMrb(purMrb);
}
@ApiOperation("保存采购出库单的接口")
@PostMapping("/draftSalOutStock")
@ResponseBody
@Override
public ResultBean draftSalOutStock(@RequestBody SalOutStock salOutStock) {
return salOutStockService.draftSalOutStock(salOutStock);
}
}

3
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/KingDeeSaveSKD.java

@ -94,6 +94,9 @@ public class KingDeeSaveSKD {
log.info("ss-:{}",ss);*/
/*String ss="{\"formId\":\"PUR_MRB\",\"data\":\"{\\\"Creator\\\":\\\"\\\",\\\"NeedUpDateFields\\\":[],\\\"NeedReturnFields\\\":[],\\\"IsDeleteEntry\\\":\\\"True\\\",\\\"SubSystemId\\\":\\\"\\\",\\\"IsVerifyBaseDataField\\\":\\\"false\\\",\\\"IsEntryBatchFill\\\":\\\"True\\\",\\\"ValidateFlag\\\":\\\"True\\\",\\\"NumberSearch\\\":\\\"True\\\",\\\"InterationFlags\\\":\\\"\\\",\\\"Model\\\":{\\\"FID\\\":0,\\\"FBillTypeID\\\":{\\\"FNUMBER\\\":\\\"TLD01_SYS\\\"},\\\"FDate\\\":\\\"2022-08-12 00:00:00\\\",\\\"FMRTYPE\\\":\\\"B\\\",\\\"FMRMODE\\\":\\\"A\\\",\\\"FStockOrgId\\\":{\\\"FNumber\\\":\\\"101\\\"},\\\"FRequireOrgId\\\":{\\\"FNumber\\\":\\\"101\\\"},\\\"FPurchaseOrgId\\\":{\\\"FNumber\\\":\\\"101\\\"},\\\"FSupplierID\\\":{\\\"FNumber\\\":\\\"010001\\\"},\\\"FACCEPTORID\\\":{\\\"FNumber\\\":\\\"010001\\\"},\\\"FSettleId\\\":{\\\"FNumber\\\":\\\"010001\\\"},\\\"FCHARGEID\\\":{\\\"FNumber\\\":\\\"010001\\\"},\\\"FOwnerTypeIdHead\\\":\\\"BD_OwnerOrg\\\",\\\"FOwnerIdHead\\\":{\\\"FNumber\\\":\\\"101\\\"},\\\"FPURMRBFIN\\\":{\\\"FSettleOrgId\\\":{\\\"FNumber\\\":\\\"101\\\"},\\\"FSettleCurrId\\\":{\\\"FNumber\\\":\\\"PRE001\\\"},\\\"FIsIncludedTax\\\":true,\\\"FPRICETIMEPOINT\\\":\\\"1\\\",\\\"FLOCALCURRID\\\":{\\\"FNumber\\\":\\\"PRE001\\\"},\\\"FEXCHANGETYPEID\\\":{\\\"FNumber\\\":\\\"HLTX01_SYS\\\"},\\\"FEXCHANGERATE\\\":1.0,\\\"FISPRICEEXCLUDETAX\\\":true},\\\"FPURMRBENTRY\\\":[{\\\"FRowType\\\":\\\"Standard\\\",\\\"FMATERIALID\\\":{\\\"FNumber\\\":\\\" JX091054\\\"},\\\"FMaterialDesc\\\":\\\"X牵引6*4-550超\\\",\\\"FUnitID\\\":{\\\"FNumber\\\":\\\"liang\\\"},\\\"Flot\\\":{\\\"FNumber\\\":\\\"liang\\\"},\\\"FRMREALQTY\\\":1.0,\\\"FREPLENISHQTY\\\":1.0,\\\"FKEAPAMTQTY\\\":1.0,\\\"FPRICEUNITID\\\":{\\\"FNumber\\\":\\\"liang\\\"},\\\"FSTOCKID\\\":{\\\"FNumber\\\":\\\"CK001\\\"},\\\"FStockStatusId\\\":{\\\"FNumber\\\":\\\"KCZT01_SYS\\\"},\\\"FIsReceiveUpdateStock\\\":false,\\\"FGiveAway\\\":false,\\\"FPriceBaseQty\\\":1.0,\\\"FCarryUnitId\\\":{\\\"FNumber\\\":\\\"liang\\\"},\\\"FCarryQty\\\":1.0,\\\"FCarryBaseQty\\\":1.0,\\\"FBILLINGCLOSE\\\":false,\\\"FIsStock\\\":false}]}}\"}";
log.info("ss-:{}",ss);*/
/*String ss="{\"formId\":\"SAL_OUTSTOCK\",\"data\":\"{\\\"Creator\\\":\\\"\\\",\\\"NeedUpDateFields\\\":[],\\\"NeedReturnFields\\\":[],\\\"IsDeleteEntry\\\":\\\"True\\\",\\\"SubSystemId\\\":\\\"\\\",\\\"IsVerifyBaseDataField\\\":\\\"false\\\",\\\"IsEntryBatchFill\\\":\\\"True\\\",\\\"ValidateFlag\\\":\\\"True\\\",\\\"NumberSearch\\\":\\\"True\\\",\\\"InterationFlags\\\":\\\"\\\",\\\"Model\\\":{\\\"FID\\\":0,\\\"FBillTypeID\\\":{\\\"FNUMBER\\\":\\\"XSCKD01_SYS\\\"},\\\"FDate\\\":\\\"2022-08-15 00:00:00\\\",\\\"FSaleOrgId\\\":{\\\"FNumber\\\":\\\"101\\\"},\\\"FCustomerID\\\":{\\\"FNumber\\\":\\\" JXYXB\\\"},\\\"FSaleDeptID\\\":{\\\"FNumber\\\":\\\"05.04\\\"},\\\"FStockOrgId\\\":{\\\"FNumber\\\":\\\"101\\\"},\\\"FReceiverID\\\":{\\\"FNumber\\\":\\\" JXYXB\\\"},\\\"FSettleID\\\":{\\\"FNumber\\\":\\\" JXYXB\\\"},\\\"FPayerID\\\":{\\\"FNumber\\\":\\\" JXYXB\\\"},\\\"FOwnerTypeIdHead\\\":\\\"BD_OwnerOrg\\\",\\\"FIsTotalServiceOrCost\\\":false,\\\"F_PAEZ_Assistant\\\":{\\\"FNumber\\\":\\\"00\\\"},\\\"SubHeadEntity\\\":{\\\"FSettleCurrID\\\":{\\\"FNumber\\\":\\\"PRE001\\\"},\\\"FSettleOrgID\\\":{\\\"FNumber\\\":\\\"101\\\"},\\\"FIsIncludedTax\\\":true,\\\"FLocalCurrID\\\":{\\\"FNumber\\\":\\\"PRE001\\\"},\\\"FExchangeTypeID\\\":{\\\"FNumber\\\":\\\"HLTX01_SYS\\\"},\\\"FExchangeRate\\\":1.0,\\\"FIsPriceExcludeTax\\\":true},\\\"FEntity\\\":[{\\\"FRowType\\\":\\\"Standard\\\",\\\"FMaterialID\\\":{\\\"FNumber\\\":\\\" JX091054\\\"},\\\"FUnitID\\\":{\\\"FNumber\\\":\\\"liang\\\"},\\\"FRealQty\\\":1.0,\\\"FIsFree\\\":false,\\\"FOwnerTypeID\\\":\\\"BD_OwnerOrg\\\",\\\"Flot\\\":{\\\"FNumber\\\":\\\"1233321\\\"},\\\"FOwnerID\\\":{\\\"FNumber\\\":\\\"101\\\"},\\\"FStockID\\\":{\\\"FNumber\\\":\\\"CK001\\\"},\\\"FStockStatusID\\\":{\\\"FNumber\\\":\\\"KCZT01_SYS\\\"},\\\"FSalUnitID\\\":{\\\"FNumber\\\":\\\"liang\\\"},\\\"FSALUNITQTY\\\":1.0,\\\"FSALBASEQTY\\\":1.0,\\\"FPRICEBASEQTY\\\":1.0,\\\"FOUTCONTROL\\\":false,\\\"FIsOverLegalOrg\\\":false,\\\"FARNOTJOINQTY\\\":1.0}]}}\"}";
log.info("ss-:{}",ss);*/
//StringEntity entity = new StringEntity(ss, "utf-8");
StringEntity entity = new StringEntity(jsonParam.getData(), "utf-8");
log.info(JSON.toJSONString(entity));
entity.setContentEncoding("UTF-8");

18
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/EntryBillCastToKingDeeBillFields.java → anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appayable/APPayableCastToKingDeeBillFields.java

@ -1,17 +1,11 @@
package com.yxt.anrui.fin.biz.kingdee.entrybill;
package com.yxt.anrui.fin.biz.kingdee.appayable;
import cn.hutool.core.io.FileUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.parser.Feature;
import com.yxt.anrui.fin.api.kingdee.kingdeedata.*;
import com.yxt.anrui.fin.api.kingdee.appayable.APPayable;
import com.yxt.anrui.fin.api.kingdee.appayable.kingdeedata.*;
import com.yxt.anrui.fin.biz.kingdee.KingDeeUtils;
import java.io.BufferedReader;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@ -20,7 +14,7 @@ import java.util.Map;
/**
* 封装转换的类
*/
public class EntryBillCastToKingDeeBillFields {
public class APPayableCastToKingDeeBillFields {
/**
* 构造金蝶需要的数据结构 并对字段赋值
*
@ -32,10 +26,10 @@ public class EntryBillCastToKingDeeBillFields {
/**
* 取模板
*/
String readJsonFile = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata.json");
String fEntityData_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata_data.json");
String fEntityModel_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata_model.json");
String fEntityDetail_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata_FEntityDetail.json");
String readJsonFile = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/appayable/data.json");
String fEntityData_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/appayable/data_data.json");
String fEntityModel_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/appayable/data_model.json");
String fEntityDetail_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/appayable/data_FEntityDetail.json");
//模板字符创转json
JSONObject jsonObj= JSONObject.parseObject(readJsonFile, Feature.OrderedField);

12
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/EntryBillService.java → anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appayable/APPayableService.java

@ -1,4 +1,4 @@
package com.yxt.anrui.fin.biz.kingdee.entrybill;
package com.yxt.anrui.fin.biz.kingdee.appayable;
import com.yxt.anrui.fin.api.kingdee.KingDeeBillId;
import com.yxt.anrui.fin.api.kingdee.appayable.APPayable;
@ -13,14 +13,14 @@ import java.util.List;
import java.util.Map;
@Service
public class EntryBillService extends FinKingDeeService {
public class APPayableService extends FinKingDeeService {
/**
* 保存入账申请接口生成的应付单的数据推送到金蝶的平台中
* @param aPPayable
* @return
*/
public ResultBean draftEntryBill(APPayable aPPayable) {
public ResultBean draftAPPayable(APPayable aPPayable) {
ResultBean rb=ResultBean.fireFail();
//业务表的主表数据集合
Map<String,String> map_fEntityModel_=new HashMap<>();
@ -36,11 +36,11 @@ public class EntryBillService extends FinKingDeeService {
map_fEntityModel_.put("FSUPPLIERID","010001");
List<APPayable.ScmApplyInboundVehicleDto> vehicleList = aPPayable.getVehicleList()==null?new ArrayList<>(): aPPayable.getVehicleList();
//准备 物料列表的数据 ForEntryBill
ResultBean<List<Map<String, String>>> vehicleListMap = createVehicleListsForEntryBill(vehicleList);
ResultBean<List<Map<String, String>>> vehicleListMap = createVehicleListsForAPPayable(vehicleList);
if(!vehicleListMap.getSuccess()){
return rb.setMsg(vehicleListMap.getMsg());
}
String kingDeeData = EntryBillCastToKingDeeBillFields.getKingDeeData(map_fEntityModel_,vehicleListMap.getData());
String kingDeeData = APPayableCastToKingDeeBillFields.getKingDeeData(map_fEntityModel_,vehicleListMap.getData());
try {
return saveBill(KingDeeBillId.AP_PAYABLE.getID(),kingDeeData);
} catch (Exception e) {
@ -51,7 +51,7 @@ public class EntryBillService extends FinKingDeeService {
/**
* 准备 物料列表的数据 ForEntryBill
*/
public ResultBean<List<Map<String, String>>> createVehicleListsForEntryBill(List<APPayable.ScmApplyInboundVehicleDto> vehicleList) {
public ResultBean<List<Map<String, String>>> createVehicleListsForAPPayable(List<APPayable.ScmApplyInboundVehicleDto> vehicleList) {
ResultBean<List<Map<String, String>>> rb=ResultBean.fireFail();
//物料的数组集合
List<Map<String,String>> vehicleListMap=new ArrayList<>();

0
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata.json → anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appayable/data.json

0
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata_FEntityDetail.json → anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appayable/data_FEntityDetail.json

0
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata_data.json → anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appayable/data_data.json

0
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata_model.json → anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appayable/data_model.json

0
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/remarks.txt → anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appayable/remarks.txt

0
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/testParams.txt → anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appayable/testParams.txt

0
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/应付单的参数必填备注.xlsx → anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appayable/应付单的参数必填备注.xlsx

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

@ -4,8 +4,6 @@ import cn.hutool.core.bean.BeanUtil;
import com.yxt.anrui.fin.api.kingdee.KingDeeBillId;
import com.yxt.anrui.fin.api.kingdee.appaybill.ApPayBill;
import com.yxt.anrui.fin.biz.kingdee.FinKingDeeService;
import com.yxt.anrui.fin.biz.kingdee.entrybill.EntryBillCastToKingDeeBillFields;
import com.yxt.common.base.utils.StringUtils;
import com.yxt.common.core.result.ResultBean;
import org.springframework.stereotype.Service;
@ -23,7 +21,7 @@ public class ApPayBillService extends FinKingDeeService {
* @return
*/
public ResultBean draftApPayBill(ApPayBill apPayBill) {
apPayBill=ApPayBill.createApPayBill();
// apPayBill=ApPayBill.createApPayBill();
ResultBean rb=ResultBean.fireFail();
//业务表的主表数据集合
Map<String,String> map_fEntityModel_=new HashMap<>();

2
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/purmrb/PurMrbService.java

@ -17,7 +17,7 @@ import java.util.Map;
public class PurMrbService extends FinKingDeeService {
/**
* 保存采购入库
* 保存采购退料
* @param purMrb
* @return
*/

10
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/receivablebill/ReceivableBillCastToKingDeeBillFields.java

@ -26,11 +26,11 @@ public class ReceivableBillCastToKingDeeBillFields {
/**
* 取模板
*/
String readJsonFile = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/receivablebill/receivablebilldata.json");
String fEntityData_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/receivablebill/receivablebilldata_data.json");
String fEntityModel_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/receivablebill/receivablebilldata_model.json");
String fEntityDetail_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/receivablebill/receivablebilldata_FEntityDetail.json");
String fEntityPlan_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/receivablebill/receivablebilldata_FEntityPlan.json");
String readJsonFile = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/receivablebill/data.json");
String fEntityData_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/receivablebill/data_data.json");
String fEntityModel_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/receivablebill/data_model.json");
String fEntityDetail_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/receivablebill/data_FEntityDetail.json");
String fEntityPlan_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/receivablebill/data_FEntityPlan.json");
//模板字符创转json
JSONObject jsonObj= JSONObject.parseObject(readJsonFile, Feature.OrderedField);

0
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/receivablebill/receivablebilldata.json → anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/receivablebill/data.json

0
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/receivablebill/receivablebilldata_FEntityDetail.json → anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/receivablebill/data_FEntityDetail.json

0
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/receivablebill/receivablebilldata_FEntityPlan.json → anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/receivablebill/data_FEntityPlan.json

0
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/receivablebill/receivablebilldata_data.json → anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/receivablebill/data_data.json

0
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/receivablebill/receivablebilldata_model.json → anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/receivablebill/data_model.json

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

@ -0,0 +1,66 @@
package com.yxt.anrui.fin.biz.kingdee.saloutstock;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.parser.Feature;
import com.yxt.anrui.fin.biz.kingdee.KingDeeUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* 封装转换的类
*/
public class SalOutStockCastToKingDeeBillFields {
private static Logger log=LoggerFactory.getLogger(SalOutStockCastToKingDeeBillFields.class);
/**
* 构造金蝶需要的数据结构 并对字段赋值
*
* @param map_fEntityModel_
* @param vehicleList
* @return
*/
public static String getKingDeeData(Map<String,String> map_fEntityModel_,List<Map<String,String>> vehicleList){
/**
* 取模板
*/
String readJsonFile = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/saloutstock/data.json");
String fEntityData_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/saloutstock/data_data.json");
String fEntityModel_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/saloutstock/data_model.json");
String fEntity_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/saloutstock/data_FEntity.json");
log.info("readJsonFile:{}",readJsonFile);
log.info("fEntityData_:{}",fEntityData_);
log.info("fEntityModel_:{}",fEntityModel_);
log.info("fEntity_:{}",fEntity_);
//模板字符创转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);
List<JSONObject> list_fEntityDetail_=new ArrayList<>();
//对模板字段赋值 根据传递进来的map数据的集合进行赋值
for(int i=0;i<vehicleList.size();i++){
Map<String,String> params=vehicleList.get(i);
Map<String,String> map_fEntityDetail_=new HashMap<>();
for (Map.Entry<String, String> entry : params.entrySet()) {
map_fEntityDetail_.put(entry.getKey(),entry.getValue());
}
fEntity_ =KingDeeUtils.replaceTemplateParams(fEntity_, map_fEntityDetail_);
list_fEntityDetail_.add(JSONObject.parseObject(fEntity_,Feature.OrderedField));
}
jsonFEntityModel_.put("FEntity", JSONArray.parseArray(JSON.toJSONString(list_fEntityDetail_)));
jsonFEntityData_.put("Model",JSONObject.parseObject(JSON.toJSONString(jsonFEntityModel_),Feature.OrderedField));
jsonObj.put("data",jsonFEntityData_.toJSONString());
return jsonObj.toJSONString();
}
}

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

@ -0,0 +1,80 @@
package com.yxt.anrui.fin.biz.kingdee.saloutstock;
import cn.hutool.core.bean.BeanUtil;
import com.yxt.anrui.fin.api.kingdee.KingDeeBillId;
import com.yxt.anrui.fin.api.kingdee.saloutstock.SalOutStock;
import com.yxt.anrui.fin.biz.kingdee.FinKingDeeService;
import com.yxt.common.core.result.ResultBean;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* 保存采购出库单
*/
@Service
public class SalOutStockService extends FinKingDeeService {
/**
* 保存采购出库单
* @param salOutStock
* @return
*/
public ResultBean draftSalOutStock(SalOutStock salOutStock) {
// salOutStock=SalOutStock.createSalOutStock();
ResultBean rb=ResultBean.fireFail();
//业务表的主表数据集合
Map<String,String> map_fEntityModel_=new HashMap<>();
//业务日期
Map<String, Object> stringObjectMap = BeanUtil.beanToMap(salOutStock);
List<SalOutStock.FEntity> fEntity = salOutStock.getFEntity();
for (Map.Entry<String, Object> entry : stringObjectMap.entrySet()) {
if (entry.getValue() instanceof String) {
map_fEntityModel_.put(entry.getKey(), (String) entry.getValue());
}else if(entry.getValue() instanceof Double){
map_fEntityModel_.put(entry.getKey(), entry.getValue().toString());
}
}
//准备 物料列表的数据 ForEntryBill
ResultBean<List<Map<String, String>>> vehicleListMap = createVehicleListsFEntity(fEntity);
if(!vehicleListMap.getSuccess()){
return rb.setMsg(vehicleListMap.getMsg());
}
String kingDeeData = SalOutStockCastToKingDeeBillFields.getKingDeeData(map_fEntityModel_,vehicleListMap.getData());
try {
return saveBill(KingDeeBillId.SAL_OUTSTOCK.getID(),kingDeeData);
} catch (Exception e) {
e.printStackTrace();
}
return rb;
}
/**
* 准备 物料列表的数据 StkInStock
*/
private ResultBean<List<Map<String, String>>>
createVehicleListsFEntity(List<SalOutStock.FEntity> vehicleList) {
ResultBean<List<Map<String, String>>> rb=ResultBean.fireFail();
//物料的数组集合
List<Map<String,String>> vehicleListMap=new ArrayList<>();
for(int i = 0; i< vehicleList.size(); i++){
SalOutStock.FEntity f= vehicleList.get(i);
Map<String,String> m=new HashMap<>();
Map<String, Object> stringObjectMap = BeanUtil.beanToMap(f);
for (Map.Entry<String, Object> entry : stringObjectMap.entrySet()) {
if (entry.getValue() instanceof String) {
log.info("String key:{},value:{}",entry.getKey(),(String) entry.getValue());
m.put(entry.getKey(), (String) entry.getValue());
}else if(entry.getValue() instanceof Double){
log.info("Double key:{},value:{}",entry.getKey(),entry.getValue());
m.put(entry.getKey(), entry.getValue().toString());
}
}
vehicleListMap.add(m);
}
return rb.success().setData(vehicleListMap);
}
}

4
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/data.json

@ -0,0 +1,4 @@
{
"formId": "SAL_OUTSTOCK",
"data": "@KD_data"
}

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

@ -0,0 +1,33 @@
{
"FRowType": "Standard",
"FMaterialID": {
"FNumber": "@KD_FMaterialID"
},
"FUnitID": {
"FNumber": "@KD_FUnitID"
},
"FRealQty": @KD_FRealQty,
"FIsFree": false,
"FOwnerTypeID": "BD_OwnerOrg",
"Flot": {
"FNumber": "@KD_Flot"
},
"FOwnerID": {
"FNumber": "@KD_FOwnerID"
},
"FStockID": {
"FNumber": "@KD_FStockID"
},
"FStockStatusID": {
"FNumber": "@KD_FStockStatusID"
},
"FSalUnitID": {
"FNumber": "@KD_FSalUnitID"
},
"FSALUNITQTY": @KD_FSALUNITQTY,
"FSALBASEQTY": @KD_FSALBASEQTY,
"FPRICEBASEQTY": @KD_FPRICEBASEQTY,
"FOUTCONTROL": false,
"FIsOverLegalOrg": false,
"FARNOTJOINQTY": @KD_FARNOTJOINQTY
}

13
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/data_data.json

@ -0,0 +1,13 @@
{
"Creator": "",
"NeedUpDateFields": [],
"NeedReturnFields": [],
"IsDeleteEntry": "True",
"SubSystemId": "",
"IsVerifyBaseDataField": "false",
"IsEntryBatchFill": "True",
"ValidateFlag": "True",
"NumberSearch": "True",
"InterationFlags": "",
"Model": {}
}

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

@ -0,0 +1,51 @@
{
"FID": 0,
"FBillTypeID": {
"FNUMBER": "XSCKD01_SYS"
},
"FDate": "@KD_FDate",
"FSaleOrgId": {
"FNumber": "@KD_FSaleOrgId"
},
"FCustomerID": {
"FNumber": "@KD_FCustomerID"
},
"FSaleDeptID": {
"FNumber": "@KD_FSaleDeptID"
},
"FStockOrgId": {
"FNumber": "@KD_FStockOrgId"
},
"FReceiverID": {
"FNumber": "@KD_FReceiverID"
},
"FSettleID": {
"FNumber": "@KD_FSettleID"
},
"FPayerID": {
"FNumber": "@KD_FPayerID"
},
"FOwnerTypeIdHead": "BD_OwnerOrg",
"FIsTotalServiceOrCost": false,
"F_PAEZ_Assistant": {
"FNumber": "@KD_F_PAEZ_Assistant"
},
"SubHeadEntity": {
"FSettleCurrID": {
"FNumber": "PRE001"
},
"FSettleOrgID": {
"FNumber": "@KD_FSettleOrgID"
},
"FIsIncludedTax": true,
"FLocalCurrID": {
"FNumber": "PRE001"
},
"FExchangeTypeID": {
"FNumber": "HLTX01_SYS"
},
"FExchangeRate": 1.0,
"FIsPriceExcludeTax": true
},
"FEntity": []
}

276
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/remarks.txt

@ -0,0 +1,276 @@
一、请求参数说明:
1.formid:业务对象表单Id,字符串类型(必录)
2.data:Json格式数据(详情参考Json格式数据)(必录)
2.1.Creator:创建者内码(非必录)
2.2.NeedUpDateFields:需要更新的字段,数组类型,格式:[key1,key2,...](非必录),注(更新单据体字段得加上单据体key)
2.3.NeedReturnFields:需返回结果的字段集合,数组类型,格式:[key,entitykey.key,...](非必录),注(返回单据体字段格式:entitykey.key)
2.4.IsDeleteEntry:是否删除已存在的分录,布尔类型,默认true(非必录)
2.5.SubSystemId:表单所在的子系统内码,字符串类型(非必录)
2.6.IsVerifyBaseDataField:是否验证所有的基础资料有效性,布尔类,默认false(非必录)
2.7.IsEntryBatchFill:是否批量填充分录,默认true(非必录)
2.8.ValidateFlag:是否验证标志,布尔类型,默认true(非必录)
2.9.NumberSearch:是否用编码搜索基础资料,布尔类型,默认true(非必录)
2.10.InterationFlags:交互标志集合,字符串类型,分号分隔,格式:"flag1;flag2;..."(非必录),例如(允许负库存标识:STK_InvCheckResult)
2.11.Model:表单数据包,Json类型(必录)
五、字段说明:
基本单位:FBaseUnitID
到货确认:FArrivalStatus
基本单位应发数量:FBaseMustQty
是否赠品:FIsFree
累计开票数量(计价基本):FBaseSumInvoicedQty
检验确认人:FValidateConfirmor
计价单位:FPriceUnitId
检验确认:FValidateStatus
到货确认人:FArrivalConfirmor
检验日期:FValidateDate
勾稽金额:FJoinedAmount
未勾稽金额:FUnJoinAmount
未勾稽数量:FUNJOINQTY
有效期至:FExpiryDate
勾稽数量:FJoinedQty
保质期单位:FExpiryPeriodUnit
保质期:FExpiryPeriod
批号:FLot
完全勾稽:FFullyJoined
行勾稽状态:FJoinStatus
计价数量:FPriceUnitQty
税额:FEntryTaxAmount
税额(本位币):FTaxAmount_LC
金额(本位币):FAmount_LC
折扣额:FDiscount
金额:FAmount
关联应收数量(计价基本):FBaseARJoinQty
到货日期:FArrivalDate
净价:FTaxNetPrice
价税合计:FAllAmount
价税合计(本位币):FAllAmount_LC
税率%:FEntryTaxRate
价格系数:FPriceCoefficient
税组合:FTaxCombination
单价:FPrice
含税单价:FTaxPrice
折前价税合计:FBefDisAllAmt
折扣率%:FDiscountRate
折前金额:FBefDisAmt
系统定价:FSysPrice
最低限价:FLimitDownPrice
货主:FOwnerID (必填项)
保管者类型:FKeeperTypeID
货主类型:FOwnerTypeID
仓库:FStockID
库存状态:FStockStatusID
库存基本数量:FBaseUnitQty
库存辅单位:FAuxUnitID
BOM版本:FBomID
保管者:FKeeperID
备注:FEntrynote
物料编码:FMaterialID
物料名称:FMaterialName
客户物料名称:FCustMatName
收货人电话:FReceiverPhone
客户物料编码:FCustMatID
应发数量:FMustQty
实发数量:FRealQty
库存单位:FUnitID (必填项)
规格型号:FMateriaModel
物料类别:FMateriaType
库存辅单位数量:FAuxUnitQty
订单单号:FSoorDerno
辅助属性:FAuxPropId
库存更新标识:FStockFlag
关联退货数量(基本单位):FBaseReturnQty
关联开票数量(基本单位):FBaseInvoicedQty
仓位:FStockLocID
生产日期:FProduceDate
累计退货数量(基本单位):FBaseSumRetstockQty
累计退货通知数量(销售基本):FBaseSumRetNoticeQty
源单类型:FSrcType
关联退货数量:FReturnQty
累计退货通知数量:FSumRetNoticeQty
总成本(本位币):FCostAmount_LC
成本价(本位币):FCostPrice
总成本:FEntryCostAmount
累计开票金额:FSumInvoicedAMT
累计收款金额:FSumReceivedAMT
累计应收数量(销售):FSumInvoicedQty
累计退货数量:FSumRetStockQty
累计开票数量:FInvoicedQty
业务流程:FBFLowId
父项标识:FParentRowId
签收数量:FSignQty
行标识:FRowId
产品类型:FRowType
父项产品:FParentMatId
排放标准:F_PAEZ_BaseProperty2
车辆类型:F_PAEZ_BaseProperty3
返利金额:F_PAEZ_Decimal
第三方单据分录ID:FThirdEntryId
单价折扣:FPriceDiscount
库存请检单EntryID:FQmEntryID
库存状态转换单ENTRYID:FConvertEntryID
未关联应收数量(计价单位):FARNOTJOINQTY
关联入库数量(采购基本):FPURBASEJOININSTOCKQTY
行价目表:FPriceListEntry
拆单数量(计价):FDisPriceQty
拆单前原计价数量:FBeforeDisPriceQty
预留锁库EntryId:FReserveEntryId
B2C订单明细Id:FB2CORDERDETAILID
销售订单EntryId:FSOEntryId
物料分组:F_PAEZ_BaseProperty4
备注:FSerialNote
物流公司:FLogComId
序列号:FSerialId
买方代扣代缴:FBuyerWithholding
序列号:FSerialNo
时间:FTraceTime
物流详情:FTraceDetail
发货时间:FDelTime
物流单号:FCarryBillNo (必填项)
物流状态:FTraceStatus
税率名称:FTaxRateId
税率%:FTaxRate
产品线:F_PAEZ_BaseProperty5
销售折让:F_PAEZ_Decimal3
赠送套餐:F_PAEZ_Decimal4
增值税:FVAT
卖方代扣代缴:FSellerWithholding
计入成本金额:FCostAmount
税额:FTaxAmount
计入成本比例%:FCostPercent
拒收数量:FRefuseQty
补货数量:FRepairQty
项目编号:FProjectNo
序列号单位数量:FSNQty
计划跟踪号:FMtoNo
关联退货数量(辅单位):FSECRETURNQTY
消耗汇总:FIsConsumeSum
关联入库数量(辅单位):FSECJOININSTOCKQTY
是否补货:FIsRepair
捡货部门:FPickDeptId
服务上下文:FServiceContext
销售成本价:FSalCostPrice
累计应收金额:FARAMOUNT
累计应收数量(销售基本):FBASEARQTY
关联应收金额:FARJOINAMOUNT
关联入库数量:FJoinInStockQty
序列号单位:FSNUnitID
关联入库数量(基本单位):FBaseJoinInStockQty
源单编号:FSrcBillNo
实收数量:FActQty
关联应收数量:FARJoinQty
关联应收数量(库存基本):FStockBaseARJoinQty
携带的主业务单位:FSRCBIZUNITID
累计退货数量(库存基本):FStockBaseSumRetStockQty
库存基本分母:FStockBaseDen
关联退货数量(库存基本):FStockBaseReturnQty
明细结算组织客户:FESettleCustomerId
关联应收数量(销售基本):FSalBaseARJoinQty
组织间结算跨法人标识:FIsOverLegalOrg
是否生成产品档案:FIsCreateProDoc
明细货主供应商:FEOwnerSupplierId
当前库存:FInventoryQty
销售单位:FSalUnitID
实发数量(辅单位):FExtAuxUnitQty
控制出库数量:FOUTCONTROL
辅单位:FExtAuxUnitId
质量类型:FQualifyType
销售基本分子:FSalBaseNum
计价基本数量:FPRICEBASEQTY
销售数量:FSALUNITQTY
销售基本数量:FSALBASEQTY
单据类型:FBillTypeID (必填项)
货主类型:FOwnerTypeIdHead
货主:FOwnerIdHead
业务类型:FBussinessType
信用检查结果:FCreditCheckResult
收货方地址:FReceiveAddress
交货地点:FHeadLocationId
运输单号:FCarriageNO
收货方:FReceiverID
承运商:FCarrierID
销售组:FSalesGroupID
销售员:FSalesManID
最后修改人:FModifierId
最后修改日期:FModifyDate
创建日期:FCreateDate
结算方:FSettleID
付款方:FPayerID
日期:FDate (必填项)
发货组织:FStockOrgId (必填项)
销售组织:FSaleOrgId (必填项)
单据编号:FBillNo
单据状态:FDocumentStatus
库存组:FStockerGroupID
仓管员:FStockerID
销售部门:FSaleDeptID (必填项)
客户:FCustomerID (必填项)
发货部门:FDeliveryDeptID
创建人:FCreatorId
作废人:FCancellerID
作废日期:FCancelDate
作废状态:FCancelStatus
审核人:FApproverID
审核日期:FApproveDate
价目表:FPriceListId
税额:FBillTaxAmount
税额(本位币):FBillTaxAmount_LC
金额(本位币):FBillAmount_LC
价税合计(本位币):FBillAllAmount_LC
跨组织结算生成:FISGENFORIOS
结算组织客户:FSETTLECustomerID
是否含税:FIsIncludedTax
价税合计:FBillAllAmount
金额:FBillAmount
汇率类型:FExchangeTypeID
汇率:FExchangeRate
本位币:FLocalCurrID
打印次数:F_PAEZ_PrintTimes
结算组织:FSettleOrgID (必填项)
总成本(本位币):FBillCostAmount_LC
收款条件:FReceiptConditionID
总成本:FBillCostAmount
结算币别:FSettleCurrID (必填项)
结算方式:FSettleTypeID
货主供应商:FOwnerSupplierID
收货人:FReceiverName
收货人手机:FReceiverMobile
会员名称:FBuyerNick
第三方系统来源:FThirdSrcType
工作流信用逾期超标额度:FCreChkOverAmount
收货人地区:FReceiverDistrict
收货人地址:FReceiverAddress
收货人城市:FReceiverCity
收货人国家:FReceiverCountry
收货人省份:FReceiverState
工作流信用超标金额:FCreChkAmount
审批流信用压批月结检查:FCrePreBatAndMonStatus
工作流信用检查状态:FCreChkStatus
折扣表:FDiscountListId
工作流信用超标天数:FCreChkDays
第三方单据编号:FThirdBillNo
第三方单据内码:FThirdBillId
价外税:FIsPriceExcludeTax
信用压批超标:FCrePreBatchOver
信用月结超标:FCreMonControlOver
序列号上传:FScanBox
跨组织业务类型:FTransferBizType
对应组织:FCorrespondOrgId
组织间结算跨法人标识:FIsInterLegalPerson
收货方联系人:FReceiverContactID
销售省:F_PAEZ_BaseProperty
销售城市:F_PAEZ_BaseProperty1
销售地:F_PAEZ_Base2
中介单位:F_PAEZ_Base
业务员:F_PAEZ_Base1
工时收入:F_PAEZ_Decimal1
开票金额:F_PAEZ_Decimal2
项目类别:F_PAEZ_Assistant (必填项)
发票号:F_PAEZ_Text
开票日期:F_PAEZ_Date
创建日期偏移量:FCDateOffsetValue
创建日期偏移单位:FCDateOffsetUnit
拆单新单标识:FDisassemblyFlag
备注:FNote
交货明细执行地址(后台用):FPlanRecAddress
整单服务或费用:FIsTotalServiceOrCost

0
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/testParams.txt

1
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/webapi测试的数据.txt

@ -0,0 +1 @@
{\"Creator\":\"\",\"NeedUpDateFields\":[],\"NeedReturnFields\":[],\"IsDeleteEntry\":\"True\",\"SubSystemId\":\"\",\"IsVerifyBaseDataField\":\"false\",\"IsEntryBatchFill\":\"True\",\"ValidateFlag\":\"True\",\"NumberSearch\":\"True\",\"InterationFlags\":\"\",\"Model\":{\"FID\":0,\"FBillTypeID\":{\"FNUMBER\":\"XSCKD01_SYS\"},\"FDate\":\"2022-08-15 00:00:00\",\"FSaleOrgId\":{\"FNumber\":\"101\"},\"FCustomerID\":{\"FNumber\":\" JXYXB\"},\"FSaleDeptID\":{\"FNumber\":\"05.04\"},\"FStockOrgId\":{\"FNumber\":\"101\"},\"FReceiverID\":{\"FNumber\":\" JXYXB\"},\"FSettleID\":{\"FNumber\":\" JXYXB\"},\"FPayerID\":{\"FNumber\":\" JXYXB\"},\"FOwnerTypeIdHead\":\"BD_OwnerOrg\",\"FIsTotalServiceOrCost\":false,\"F_PAEZ_Assistant\":{\"FNumber\":\"00\"},\"SubHeadEntity\":{\"FSettleCurrID\":{\"FNumber\":\"PRE001\"},\"FSettleOrgID\":{\"FNumber\":\"101\"},\"FIsIncludedTax\":true,\"FLocalCurrID\":{\"FNumber\":\"PRE001\"},\"FExchangeTypeID\":{\"FNumber\":\"HLTX01_SYS\"},\"FExchangeRate\":1.0,\"FIsPriceExcludeTax\":true},\"FEntity\":[{\"FRowType\":\"Standard\",\"FMaterialID\":{\"FNumber\":\" JX091054\"},\"FUnitID\":{\"FNumber\":\"liang\"},\"FRealQty\":1.0,\"FIsFree\":false,\"FOwnerTypeID\":\"BD_OwnerOrg\",\"Flot\":{\"FNumber\":\"1233321\"},\"FOwnerID\":{\"FNumber\":\"101\"},\"FStockID\":{\"FNumber\":\"CK001\"},\"FStockStatusID\":{\"FNumber\":\"KCZT01_SYS\"},\"FSalUnitID\":{\"FNumber\":\"liang\"},\"FSALUNITQTY\":1.0,\"FSALBASEQTY\":1.0,\"FPRICEBASEQTY\":1.0,\"FOUTCONTROL\":false,\"FIsOverLegalOrg\":false,\"FARNOTJOINQTY\":1.0}]}}

BIN
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/采购出库单的参数必填备注.xlsx

Binary file not shown.

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

@ -22,7 +22,7 @@ public class STKInStockService extends FinKingDeeService {
* @return
*/
public ResultBean draftStkInStock(StkInStock stkInStock) {
stkInStock=StkInStock.createStkInStock();
// stkInStock=StkInStock.createStkInStock();
ResultBean rb=ResultBean.fireFail();
//业务表的主表数据集合
Map<String,String> map_fEntityModel_=new HashMap<>();

5
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeign.java

@ -132,5 +132,8 @@ public interface SysStaffinfoFeign {
@PostMapping("/getUserList")
ResultBean<PagerVo<AppSysStaffVo>> getUserList(@RequestBody PagerQuery<AppSysStaffQuery> pagerQuery);
@ApiOperation("移动端-存放地点变更-获取人员列表")
@ResponseBody
@GetMapping("/getGressionUserList/{userSid}")
ResultBean<List<AppSysStaffVo>> getGressionUserList(@PathVariable("userSid") String userSid);
}

5
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeignFallback.java

@ -88,4 +88,9 @@ public class SysStaffinfoFeignFallback implements SysStaffinfoFeign {
return null;
}
@Override
public ResultBean<List<AppSysStaffVo>> getGressionUserList(String userSid) {
return null;
}
}

1
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java

@ -541,6 +541,7 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
appVer.put(appSid2, integers);
}
appVo.setType(type);
appVo.setMsgSid(f.getTaskId());
voList.get(i).setAppVariables(appVo);
}
// 循环取map:若为同一个app版本,则只查询一次

2
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.java

@ -120,4 +120,6 @@ public interface SysStaffinfoMapper extends BaseMapper<SysStaffinfo> {
List<Map<String, String>> getStaffNameByDeptSid(@Param(Constants.WRAPPER) Wrapper<Map<String, Object>> qw);
IPage<AppSysStaffVo> getUserList(IPage<SysStaffinfo> page, @Param(Constants.WRAPPER) QueryWrapper<AppSysStaffVo> qw, @Param("orgSid") String orgSid);
List<AppSysStaffVo> getGressionUserList(@Param("userOrgSid")String userOrgSid);
}

119
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml

@ -9,21 +9,21 @@
SELECT staff.sid, staff.name, staff.mobile, staff.pinYinName, staff.firstPinYinLabel, user.headImage
FROM sys_staffinfo staff
LEFT JOIN sys_user user
ON staff.sid = user.staffSid
ON staff.sid = user.staffSid
ORDER BY staff.firstPinYinLabel = '#', staff.firstPinYinLabel ASC, staff.pinYinName
</select>
<select id="searchAppContactsPageList"
resultType="com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoAppContactsSearchVo">
SELECT staff.sid,
staff.name,
staff.mobile,
staff.position,
user.headImage,
GROUP_CONCAT(org.orgName SEPARATOR '/') orgName
staff.name,
staff.mobile,
staff.position,
user.headImage,
GROUP_CONCAT(org.orgName SEPARATOR '/') orgName
FROM sys_staffinfo staff
LEFT JOIN sys_staff_org org ON org.staffSid = staff.sid
LEFT JOIN sys_user user ON staff.sid = user.staffSid
LEFT JOIN sys_staff_org org ON org.staffSid = staff.sid
LEFT JOIN sys_user user ON staff.sid = user.staffSid
WHERE 1 = 1
<if test="mobileStr != null and mobileStr != ''">
AND staff.mobile LIKE concat('%', #{mobileStr}, '%')
@ -49,8 +49,8 @@
GROUP_CONCAT(org.orgNamePath SEPARATOR '/') orgNamePath
FROM sys_staffinfo staff
LEFT JOIN sys_user user
ON staff.sid = user.staffSid
LEFT JOIN sys_staff_org org ON staff.sid = org.staffSid
ON staff.sid = user.staffSid
LEFT JOIN sys_staff_org org ON staff.sid = org.staffSid
WHERE staff.sid = #{staffSid}
GROUP BY staff.sid
</select>
@ -68,15 +68,14 @@
FROM sys_staff_org org
INNER JOIN sys_staffinfo staff ON org.staffSid = staff.sid
LEFT JOIN sys_user user
ON staff.sid = user.staffSid
ON staff.sid = user.staffSid
WHERE org.orgSid = #{sid}
</select>
<!--根据员工类型key查询员工工号的最大号-->
<select id="selectJobNumber" resultType="com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfo">
select *
from sys_staffinfo
order by jobNumber desc
limit 1
order by jobNumber desc limit 1
</select>
<!--根据手机号查询员工是否重复-->
<select id="selectByMobile" resultType="com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfo">
@ -105,24 +104,24 @@
DATE_FORMAT(si.joinCompnyDate, '%Y-%m-%d') AS joinCompnyDate,
<!--所在部门-->
(select GROUP_CONCAT(orgName SEPARATOR ',') orgName from sys_staff_org so where so.staffSid = si.sid) as
orgName,
orgName,
<!--所在部门sid-->
(select GROUP_CONCAT(orgSid SEPARATOR ',') orgSid from sys_staff_org so where so.staffSid = si.sid) as
orgSid,
orgSid,
<!--岗位-->
(select GROUP_CONCAT(sp.name SEPARATOR ',') postName
from sys_staff_post ssp
left join sys_post sp on
sp.sid =
ssp.postSid
where ssp.staffSid = si.sid
group by ssp.id) as postName
from sys_staff_post ssp
left join sys_post sp on
sp.sid =
ssp.postSid
where ssp.staffSid = si.sid
group by ssp.id) as postName
from sys_staffinfo si
LEFT JOIN sys_staff_org so
ON so.staffSid = si.sid
LEFT JOIN sys_staff_post ssp
ON ssp.staffSid = si.sid
${ew.customSqlSegment}
LEFT JOIN sys_staff_org so
ON so.staffSid = si.sid
LEFT JOIN sys_staff_post ssp
ON ssp.staffSid = si.sid
${ew.customSqlSegment}
</select>
<!--根据员工手机号和sid查询员工信息是否已存在-->
<select id="selectByMobileAndSid" resultType="com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfo">
@ -250,8 +249,8 @@
isHaveInsurance,
<!--意外险参保:1是,0否-->
case isHaveInsurance
when 1 then '是'
when 0 then '否' end as isHaveInsuranceValue,
when 1 then '是'
when 0 then '否' end as isHaveInsuranceValue,
<!--意外险参保时间-->
DATE_FORMAT(insuranceStartDate, '%Y-%m-%d') as insuranceStartDate,
<!--意外险参保终止日期-->
@ -262,26 +261,26 @@
isHaveAged,
<!--养老:1是,0否-->
case isHaveAged
when 1 then '是'
when 0 then '否' end as isHaveAgedValue,
when 1 then '是'
when 0 then '否' end as isHaveAgedValue,
<!--医疗:1是,0否-->
isHaveMedical,
<!--医疗:1是,0否-->
case isHaveMedical
when 1 then '是'
when 0 then '否' end as isHaveMedicalValue,
when 1 then '是'
when 0 then '否' end as isHaveMedicalValue,
<!--工伤:1是,0否-->
isHaveInjury,
<!--工伤:1是,0否-->
case isHaveInjury
when 1 then '是'
when 0 then '否' end as isHaveInjuryValue,
when 1 then '是'
when 0 then '否' end as isHaveInjuryValue,
<!--失业:1是,0否-->
isHaveUnemploy,
<!--失业:1是,0否-->
case isHaveUnemploy
when 1 then '是'
when 0 then '否' end as isHaveUnemployValue,
when 1 then '是'
when 0 then '否' end as isHaveUnemployValue,
<!--社保参保地-->
insuredPlace,
<!--纸质档案保管地-->
@ -329,24 +328,46 @@
</select>
<select id="getUserList" resultType="com.yxt.anrui.portal.api.sysstaffinfo.app.AppSysStaffVo">
select su.sid userSid,
si.name userName,
su.headImage,
si.mobile userMobile,
sso.orgName as department,
sp.name
select su.sid userSid,
si.name userName,
su.headImage,
si.mobile userMobile,
sso.orgName as department,
sp.name
from sys_staff_org sso
left join sys_staffinfo si on sso.staffSid = si.sid
left join sys_user su on si.sid = su.staffSid
left join sys_staff_post ssp on si.sid = ssp.staffSid
left join sys_post sp on sp.sid = ssp.postSid
left join sys_staffinfo si on sso.staffSid = si.sid
left join sys_user su on si.sid = su.staffSid
left join sys_staff_post ssp on si.sid = ssp.staffSid
left join sys_post sp on sp.sid = ssp.postSid
<where>
${ew.sqlSegment}
<if test="orgSid != null and orgSid != ''">
and find_in_set(#{orgSid}
, replace (sso.orgSidPath
, '/'
, ','))
, replace (sso.orgSidPath
, '/'
, ','))
</if>
</where>
</select>
<select id="getGressionUserList" resultType="com.yxt.anrui.portal.api.sysstaffinfo.app.AppSysStaffVo">
select su.sid as userSid,
si.name as userName,
su.headImage,
si.mobile as userMobile,
sso.orgName as department,
sp.name
from sys_staff_org sso
left join sys_staffinfo si on sso.staffSid = si.sid
left join sys_user su on si.sid = su.staffSid
left join sys_staff_post ssp on si.sid = ssp.staffSid
left join sys_post sp on sp.sid = ssp.postSid
<where>
<if test="userOrgSid != null and userOrgSid != ''">
and find_in_set(#{userOrgSid}
, replace (sso.orgSidPath
, '/'
, ','))
</if>
</where>
</select>

5
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoRest.java

@ -194,5 +194,10 @@ public class SysStaffinfoRest implements SysStaffinfoFeign {
return rb.success().setData(pv);
}
@Override
public ResultBean<List<AppSysStaffVo>> getGressionUserList(String userSid) {
return sysStaffinfoService.getGressionUserList(userSid);
}
}

7
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java

@ -633,4 +633,11 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
PagerVo<AppSysStaffVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public ResultBean<List<AppSysStaffVo>> getGressionUserList(String userSid) {
ResultBean<List<AppSysStaffVo>> rb = ResultBean.fireFail();
String userOrgSid = sysStaffOrgService.getPathSidByUserSid(userSid).getData();
List<AppSysStaffVo> list = baseMapper.getGressionUserList(userOrgSid);
return rb.success().setData(list);
}
}

10
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionDetailsVo.java

@ -31,6 +31,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
@ -91,9 +92,9 @@ public class AppScmVehicleGressionDetailsVo implements Vo {
@ApiModelProperty("用户sid")
private String userSid;
@ApiModelProperty("保单照片")
private List<String> policyImage;
private List<String> policyImage = new ArrayList<>();
@ApiModelProperty("现场照片")
private List<String> image;
private List<String> image = new ArrayList<>();
@ApiModelProperty("地址")
private String address;
@ApiModelProperty("经纬度")
@ -105,4 +106,9 @@ public class AppScmVehicleGressionDetailsVo implements Vo {
@ApiModelProperty("实例id")
private String procInstId;
@ApiModelProperty("调出方负责人名称")
private String staffName;
@ApiModelProperty("调出方负责人用户sid")
private String personUserSid;
}

5
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionDto.java

@ -96,4 +96,9 @@ public class AppScmVehicleGressionDto implements Dto {
@ApiModelProperty("保单照片")
private List<String> policyImage;
@ApiModelProperty("调出方负责人名称")
private String staffName;
@ApiModelProperty("调出方负责人用户sid")
private String personUserSid;
}

5
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionInfoVo.java

@ -104,4 +104,9 @@ public class AppScmVehicleGressionInfoVo implements Vo {
@ApiModelProperty("现场照片")
private List<String> image;
@ApiModelProperty("调出方负责人名称")
private String staffName;
@ApiModelProperty("调出方负责人用户sid")
private String personUserSid;
}

5
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGression.java

@ -106,4 +106,9 @@ public class ScmVehicleGression extends BaseEntity {
@ApiModelProperty(value = "任务id")
private String taskId;
@ApiModelProperty("调出方负责人名称")
private String staffName;
@ApiModelProperty("调出方负责人用户sid")
private String personUserSid;
}

25
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionDto.java

@ -51,25 +51,30 @@ public class ScmVehicleGressionDto implements Dto {
private String sid; // sid
@ApiModelProperty("车辆sid")
@ApiModelProperty("车辆sid")
private String vehicleSid; // 车辆sid
@ApiModelProperty("车架号")
@ApiModelProperty("车架号")
private String vinNo; // 车架号
@ApiModelProperty("申请编号")
@ApiModelProperty("申请编号")
private String applicantNo; // 申请编号
@ApiModelProperty("现存地点")
@ApiModelProperty("现存地点")
private String location; // 现存地点
@ApiModelProperty("目标地点")
@ApiModelProperty("目标地点")
private String targetLocation; // 目标地点
@ApiModelProperty("变更原因")
@ApiModelProperty("变更原因")
private String changeReason; // 变更原因
@ApiModelProperty("申请经费")
@ApiModelProperty("申请经费")
private String applicantFunds; // 申请经费
@ApiModelProperty("经办人")
@ApiModelProperty("经办人")
private String operator; // 经办人
@ApiModelProperty("保险状态")
@ApiModelProperty("保险状态")
private String InsuranceState; // 保险状态
@ApiModelProperty("临牌")
@ApiModelProperty("临牌")
private String temporaryCard; // 临牌
@ApiModelProperty("现存放地点负责人名称")
private String staffName;
@ApiModelProperty("先存放地点负责人用户sid")
private String personUserSid;
}

16
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java

@ -434,14 +434,18 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
List<String> image = new ArrayList<>();
AppScmVehicleGressionDetailsVo vo = baseMapper.getCarTransfer(sid);
List<ScmFile> scmFiles1 = scmFileService.selectByLinkSid(sid, type1);
for (ScmFile scmFile : scmFiles1) {
policyImage.add(fileUploadComponent.getUrlPrefix() + scmFile.getFilePath());
if (scmFiles1.size() > 0) {
for (ScmFile scmFile : scmFiles1) {
policyImage.add(fileUploadComponent.getUrlPrefix() + scmFile.getFilePath());
}
}
vo.setPolicyImage(policyImage);
List<ScmFile> scmFiles2 = scmFileService.selectByLinkSid(sid, type2);
for (ScmFile scmFile : scmFiles2) {
image.add(fileUploadComponent.getUrlPrefix() + scmFile.getFilePath());
if (scmFiles2.size() > 0) {
for (ScmFile scmFile : scmFiles2) {
image.add(fileUploadComponent.getUrlPrefix() + scmFile.getFilePath());
}
}
vo.setImage(image);
return vo;
@ -605,7 +609,7 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
if (scmVehicleGressionVos.size() > 0) {
if (StringUtils.isNotBlank(scmVehicleGressionVos.get(0).getNodeState())) {
if (!(scmVehicleGressionVos.get(0).getNodeState().contains("已办结") || scmVehicleGressionVos.get(0).getNodeState().contains("终止") || scmVehicleGressionVos.get(0).getNodeState().contains("申请"))) {
return rb.setMsg("该申请已存在,请重复提交!");
return rb.setMsg("该申请已存在,请重复提交!");
}
}
}
@ -635,6 +639,8 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
variables.put("app", appMap);
//流程定义id
bv.setModelId(ProcDefEnum.SCMCARTRANSFER.getProDefId());
//调出方负责人
// bv.setNextNodeUserSids(dto.getPersonUserSid());
if (r == 1) {
ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
UpdateFlowFieldVo ufVo = voResultBean.getData();

8
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java

@ -291,8 +291,12 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
scmVehicleInventory.setInventoryDate(new SimpleDateFormat("yyyy-MM-dd").format(new Date()));
String loginName = dto.getLoginName();
String loginSid = dto.getLoginSid();
inventoryName += "、" + loginName;
inventorySid += "," + loginSid;
if (StringUtils.isNotBlank(loginName)) {
inventoryName += "、" + loginName;
}
if (StringUtils.isNotBlank(loginSid)) {
inventorySid += "," + loginSid;
}
scmVehicleInventory.setCreateOrgSid(loginSid);
scmVehicleInventory.setInventoryName(inventoryName);
scmVehicleInventory.setInventorySid(inventorySid);

2
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetService.java

@ -283,7 +283,7 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
}
ScmVehiclePatrolinspectionsheet scmVehiclePatrolinspectionsheet = new ScmVehiclePatrolinspectionsheet();
String sid = scmVehiclePatrolinspectionsheet.getSid();
BeanUtil.copyProperties(dto, scmVehiclePatrolinspectionsheet);
BeanUtil.copyProperties(dto, scmVehiclePatrolinspectionsheet,"sid");
scmVehiclePatrolinspectionsheet.setCreateOrgSid(useOrgSid);
scmFileService.deleteByLinkSidAndType(scmVehiclePatrolinspectionsheet.getSid(), type1);
List<String> images = dto.getImages();

22
anrui-scm/anrui-scm-ui/src/api/cheliang/basevehicle.js

@ -55,7 +55,6 @@ export function basefinbankExportExcel(data) {
})
}
// 车辆详细配置
export function selectConfig(data) {
return request({
@ -141,7 +140,7 @@ export function getUserByOrgSid(data) {
return request({
url: '/portal/v1/sysuser/getUserByOrgSid',
method: 'get',
params: data,
params: data
})
}
@ -161,4 +160,23 @@ export function vehicleBuyBreakInfo(data) {
method: 'get'
})
}
// 条件查询--车辆配件更换记录列表
export function listPage(data) {
return request({
url: '/base/v1/basevehreplacepart/listPage',
data,
method: 'post',
headers: { 'Content-Type': 'application/json' }
})
}
// 车辆配件更换记录--新增保存
export function save(data) {
return request({
url: '/base/v1/basevehreplacepart/save',
method: 'post',
data: data,
headers: { 'Content-Type': 'application/json' }
})
}

19
anrui-scm/anrui-scm-ui/src/api/cheliang/dictcommons.js

@ -42,7 +42,7 @@ export function fetchBySid(sid) {
})
}
// 根据当前登录用户的sid和分公司sid获取本分公司下除去当前用户的其余用户信息
// 根据当前登录用户的sid和分公司sid获取本分公司下除去当前用户的其余用户信息(包含姓名-部门-岗位)
export function getUserByOrgSid(data) {
return request({
url: 'portal/v1/sysuser/getUserByOrgSid',
@ -50,6 +50,16 @@ export function getUserByOrgSid(data) {
params: data
})
}
// 根据当前登录用户分公司sid获取所有用户
export function getGressionUserList(data) {
return request({
url: 'portal/v1/sysstaffinfo/getGressionUserList/' + data,
method: 'get'
})
}
// 根据当前登录用户分公司sid获取本分公司下存放地点
export function fetchByUseOrgSid(data) {
return request({
@ -59,3 +69,10 @@ export function fetchByUseOrgSid(data) {
})
}
// 根据当前登录用户分公司sid获取本分公司下车架号
export function fetchVinNoAndVehSid(data) {
return request({
url: '/base/v1/basevehreplacepart/fetchVinNoAndVehSid/' + data,
method: 'get'
})
}

335
anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangpeijianchange/cheliangpeijian.vue

@ -0,0 +1,335 @@
<template>
<div class="app-container">
<!-- Start 列表页面 -->
<div>
<button-bar view-title="车辆配件更换记录" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
<div class="main-content" style="padding-top: 10px">
<!-- <div class="searchcon">-->
<!-- <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>-->
<!-- <div v-show="isSearchShow" class="search">-->
<!-- <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="110px" class="tab-header">-->
<!-- <el-form-item label="认款日期">-->
<!-- <div class="block" style="float: left;">-->
<!-- <el-date-picker v-model="listQuery.params.subscriptionStartDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>-->
<!-- </div>-->
<!-- <div style="float: left;margin: 0px 10px"></div>-->
<!-- <div class="block" style="float: left;">-->
<!-- <el-date-picker v-model="listQuery.params.subscriptionEndDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>-->
<!-- </div>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="申请编号">-->
<!-- <el-input v-model="listQuery.params.proSchAppNo" placeholder="请输入排产申请编号" clearable/>-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<!-- <div class="btn" style="text-align: center;">-->
<!-- <el-button type="primary" icon="el-icon-search" @click="handleFilter" size="small">查询</el-button>-->
<!-- <el-button type="primary" icon="el-icon-refresh" @click="handleReset" size="small">重置</el-button>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<div class="listtop">
<div class="tit">车辆配件更换记录列表</div>
<pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
</div>
<div class="">
<el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;">
<el-table-column fixed width="60px" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column label="来源车架号" align="center">
<template slot-scope="scope">
<span>{{ scope.row.sourceVinNo }}</span>
</template>
</el-table-column>
<el-table-column label="配件" align="center">
<template slot-scope="scope">
<span>{{ scope.row.partName }}</span>
</template>
</el-table-column>
<el-table-column label="安装至车架号" align="center">
<template slot-scope="scope">
<span>{{ scope.row.installVinNo }}</span>
</template>
</el-table-column>
<el-table-column label="费用" align="center">
<template slot-scope="scope">
<span>{{ scope.row.money }}</span>
</template>
</el-table-column>
<el-table-column label="备注" header-align="center" align="left">
<template slot-scope="scope">
<span>{{ scope.row.remarks }}</span>
</template>
</el-table-column>
</el-table>
</div>
<div class="pages">
<!-- 翻页 -->
<pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
</div>
</div>
</div>
<!-- End 列表页面 -->
<el-dialog center :visible.sync="dialogVisible" width="60%">
<el-form v-model="formobj" ref="form_obj" class="formadd">
<el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="4" class="tleftb">
<span>来源车架号</span>
</el-col>
<el-col :span="8">
<el-form-item><span>{{ formobj.sourceVinNo }}</span></el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span>配件</span>
</el-col>
<el-col :span="8">
<el-form-item><el-input v-model="formobj.partName" placeholder="" clearable class="addinputw"/></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<span>安装至车架号</span>
</el-col>
<el-col :span="8">
<el-form-item>
<el-select v-model="formobj.installVinNo" class="addinputw" clearable placeholder="" @change="cahngeInstallVinNo" filterable>
<el-option v-for="item in installVinNo_list" :key="item.installSid" :label="item.installVinNo" :value="item.installVinNo"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span>费用</span>
</el-col>
<el-col :span="8">
<el-form-item><el-input v-model="formobj.money" placeholder="" clearable class="addinputw"/></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<span>备注</span>
</el-col>
<el-col :span="20">
<el-form-item><el-input v-model="formobj.remarks" placeholder="" clearable class="addinputw"/></el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="handleCancel" size="small"> </el-button>
<el-button type="primary" @click="handleConfirm" size="small"> </el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listPage, save } from '@/api/cheliang/basevehicle'
import { getPathSidByUserSid, fetchBySid, fetchVinNoAndVehSid } from '@/api/cheliang/dictcommons'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import ButtonBar from '@/components/ButtonBar'
export default {
name: 'changjiaxitongrenkuan',
components: {
Pagination,
pageye,
ButtonBar
},
data() {
return {
btndisabled: false,
dialogVisible: false,
installVinNo_list: [],
formobj: {
createOrgName: '',
createOrgSid: '',
installSid: '',
installVinNo: '',
money: '',
partName: '',
sid: '',
sourceVehSid: '',
sourceVinNo: '',
useOrgName: '',
useOrgSid: '',
remarks: ''
},
btnList: [
{
type: 'primary',
size: 'small',
icon: 'plus',
btnKey: 'toAdd',
btnLabel: '新增'
},
{
type: 'info',
size: 'small',
icon: 'cross',
btnKey: 'doClose',
btnLabel: '关闭'
}
],
isSearchShow: false,
searchxianshitit: '显示查询条件',
// -----------
tableKey: 0,
list: [],
FormLoading: false,
listLoading: false,
listQuery: {
params: {
sourceVehSid: '',
createOrgSid: ''
},
current: 1,
size: 5,
total: 0
},
rules: {}
}
},
created() {
//
this.init()
},
mounted() {
this.$refs['btnbar'].setButtonList(this.btnList)
},
methods: {
//
clicksearchShow() {
this.isSearchShow = !this.isSearchShow
if (this.isSearchShow) {
this.searchxianshitit = '隐藏查询条件'
} else {
this.searchxianshitit = '显示查询条件'
}
},
btnHandle(btnKey) {
console.log('XXXXXXXXXXXXXXX ' + btnKey)
switch (btnKey) {
case 'toAdd':
this.toAdd()
break
case 'doClose':
this.doClose()
break
default:
break
}
},
init(value) {
if (value !== undefined && value !== null) {
for (var i = 0; i < value.length; i++) {
this.formobj.sourceVinNo = value[i].vinNo
this.formobj.sourceVehSid = value[i].sid
this.listQuery.params.sourceVehSid = value[i].sid
}
}
getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
if (res.success) {
this.listQuery.params.createOrgSid = res.data
this.formobj.createOrgSid = res.data
this.formobj.useOrgSid = res.data
fetchVinNoAndVehSid(this.formobj.createOrgSid).then((response) => {
if (response.success) {
this.installVinNo_list = response.data
}
})
fetchBySid(this.formobj.createOrgSid).then((resp) => {
if (resp.success) {
this.formobj.createOrgName = resp.data.name
this.formobj.useOrgName = resp.data.name
this.getList()
}
})
}
})
},
//
indexMethod(index) {
var pagestart = (this.listQuery.current - 1) * this.listQuery.size
var pageindex = index + 1 + pagestart
return pageindex
},
//
getList() {
this.listLoading = true
listPage(this.listQuery).then((response) => {
console.log('列表查询结果:', response)
this.listLoading = false
if (
response.code === '200' &&
response.data &&
response.data.total > 0
) {
this.list = response.data.records
this.listQuery.total = response.data.total
} else {
this.list = []
this.listQuery.total = 0
}
})
},
//
handleFilter() {
this.listQuery.current = 1
this.getList()
},
handleReset() {
this.listQuery = {
params: {
state: 0,
paymentState: '',
subscriptionStartDate: '',
subscriptionEndDate: '',
proSchAppNo: '',
applyTypeKey: '',
createOrgSid: ''
},
current: 1,
size: 5,
total: 0
}
this.init()
},
toAdd() {
this.dialogVisible = true
},
cahngeInstallVinNo(value) {
let bb = null
this.installVinNo_list.forEach((e) => {
if (e.installVinNo === value) {
bb = {
value: e.installVinNo,
sid: e.installSid
}
}
})
this.formobj.installVinNo = bb.value
this.formobj.installSid = bb.sid
},
handleConfirm() {
save(this.formobj).then((resp) => {
if (resp.success) {
this.$message({ showClose: true,type: 'success', message: resp.msg })
this.handleCancel()
this.getList()
}
})
},
handleCancel() {
this.dialogVisible = false
this.formobj.money = ''
this.formobj.partName = ''
this.formobj.installVinNo = ''
this.formobj.installSid = ''
this.formobj.remarks = ''
},
doClose() {
this.$emit('doback')
}
}
}
</script>
<style scoped>
</style>

30
anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue

@ -115,6 +115,8 @@
<cheliangtaizhang-mai v-show="viewState == 7" ref="divMai" @doback="resetState" @reloadlist="getList"/>
<!-- 买断详情 -->
<cheliangtaizhang-mai-info v-show="viewState == 8" ref="divMaiInfo" @doback="resetState"/>
<!-- 车辆配件更换记录列表 -->
<cheliangpeijian v-show="viewState == 9" ref="divPeiJian" @doback="resetState"/>
</div>
</template>
@ -139,6 +141,7 @@ import { getPathSidByUserSid } from '@/api/cheliang/basevehiclemodel'
import cheliangtaizhangChu from '@/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangChu'
import cheliangtaizhangMai from '@/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangMai'
import cheliangtaizhangMaiInfo from '@/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangMaiInfo'
import cheliangpeijian from './cheliangpeijianchange/cheliangpeijian'
export default {
name: 'cheliangtaizhang',
@ -153,7 +156,8 @@ export default {
vehicleconfiguration,
cheliangtaizhangChu,
cheliangtaizhangMai,
cheliangtaizhangMaiInfo
cheliangtaizhangMaiInfo,
cheliangpeijian
},
data() {
return {
@ -198,6 +202,13 @@ export default {
btnKey: 'doMaiduan',
btnLabel: '买断'
},
{
type: 'primary',
size: 'small',
icon: '',
btnKey: 'doChange',
btnLabel: '车辆配件更换记录'
},
{
type: 'success',
size: 'small',
@ -310,6 +321,9 @@ export default {
case 'doMaiduan':
this.doMaiduan()
break
case 'doChange':
this.doChange()
break
case 'doExport':
this.doExport()
break
@ -334,7 +348,7 @@ export default {
},
getUseOrg() {
const userSid = window.sessionStorage.getItem('userSid')
getUseOrgByUserSid({userSid: userSid}).then((res) => {
getUseOrgByUserSid({ userSid: userSid }).then((res) => {
if (res.success) {
this.useOrgName = res.data.name
this.useOrg = res.data.sid
@ -522,6 +536,18 @@ export default {
})
}
},
doChange() {
if (this.multipleSelection.length === 0) {
this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行编辑' })
return
}
if (this.multipleSelection.length > 1) {
this.$message({ showClose: true, type: 'error', message: '只能选择一条记录进行编辑' })
return
}
this.viewState = 9
this.$refs['divPeiJian'].init(this.multipleSelection)
},
//
createData() {
// console.log('' + JSON.stringify(this.temp))

80
anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangeng.vue

@ -10,18 +10,10 @@
<div v-show="isSearchShow" class="search">
<el-form :inline="true" class="tab-header">
<el-form-item label="申请日期">
<el-date-picker
v-model="listQuery.params.applyDateStart"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期">
<el-date-picker v-model="listQuery.params.applyDateStart" type="date" value-format="yyyy-MM-dd" placeholder="选择日期">
</el-date-picker>
<span style="padding: 0 8px"></span>
<el-date-picker
v-model="listQuery.params.applyDateEnd"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期">
<el-date-picker v-model="listQuery.params.applyDateEnd" type="date" value-format="yyyy-MM-dd" placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item label="车架号">
@ -37,21 +29,17 @@
<!--Start 项目列表头部-->
<div class="listtop">
<div class="tit">存放地点变更申请列表</div>
<pageye v-show="dataList.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
:limit.sync="listQuery.size" class="pagination" @pagination="loadList"/>
<pageye v-show="dataList.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="loadList"/>
</div>
<!--End 项目列表头部-->
<!--Start 项目列表-->
<div class="">
<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%"
@selection-change="handleSelectionChange">
<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" @selection-change="handleSelectionChange">
<el-table-column width="50px" type="selection" align="center"/>
<el-table-column width="80px" fixed label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column label="操作" fixed align="center" width="160px" class-name="small-padding fixed-width">
<template slot-scope="{row}"><!-- row.state !== '待提交' || '移库申请' -->
<el-button size="mini" type="primary"
:disabled="row.state == '待提交' ? false:row.state == '移库申请'?false : true"
@click="handleEdit(row)">办理
<el-button size="mini" type="primary" :disabled="row.state == '待提交' ? false : row.state == '移库申请' ? false : true" @click="handleEdit(row)">办理
</el-button>
<el-button size="mini" type="primary" @click="handleCheck(row)">查看</el-button>
</template>
@ -59,8 +47,7 @@
<el-table-column width="180px" prop="state" label="状态" header-align="center" align="left">
<template slot-scope="scope">
<span v-if="scope.row.state=='待提交'" type="primary" size="mini">待提交</span>
<span v-else @click="flowRecord(scope.row)"
style="color: #018ad2;cursor: pointer;">{{ scope.row.state }}</span>
<span v-else @click="flowRecord(scope.row)" style="color: #018ad2;cursor: pointer;">{{ scope.row.state }}</span>
</template>
</el-table-column>
<el-table-column width="220px" prop="applyId" label="申请编号" align="center"/>
@ -74,8 +61,7 @@
<el-table-column width="180px" label="现场照片" align="center">
<template slot-scope="{row}"> <!-- row.state == '已办结' -->
<div class="upload_img" v-show="row.state == '已办结' && row.images.length < 1">
<upload ref="uploadMoreImg" v-model="imgList" bucket="map" @eett="getList"
:upload-data="{type:'0001',sid: row.sid}"/>
<upload ref="uploadMoreImg" v-model="imgList" bucket="map" @eett="getList" :upload-data="{type:'0001',sid: row.sid}"/>
</div>
<!-- <el-button size="mini" type="primary" @click="handleUpload(row)">上传</el-button>-->
<el-button size="mini" type="primary" @click="handleCheckImg(row)">查看</el-button>
@ -93,20 +79,12 @@
<div class="pages">
<div class="tit"/>
<!-- 翻页 -->
<pagination
v-show="dataList.length > 0"
:total="listQuery.total"
:page.sync="listQuery.current"
:limit.sync="listQuery.size"
class="pagination"
@pagination="loadList"
/>
<pagination v-show="dataList.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="loadList"/>
</div>
</div>
</div>
<!-- 照片弹窗 -->
<el-dialog :visible.sync="dialogImgVisible" width="1000px"
:close-on-click-modal="false">
<el-dialog :visible.sync="dialogImgVisible" width="1000px" :close-on-click-modal="false">
<div class="result-cont">
<el-carousel indicator-position="outside" style="height: 500px;">
<el-carousel-item v-for="item in srcList" :key="item" style="height: 500px;">
@ -116,21 +94,11 @@
</div>
</el-dialog>
<!--流程图-->
<el-dialog
title=""
:visible.sync="centerDialogVisible"
width="78%"
height="1%"
:before-close="closeIt"
center>
<iframe frameborder="0" id="iframe"
style="width:100%;"
:src="this.centerDialogVisible === true ? url :''"
></iframe>
<el-dialog title="" :visible.sync="centerDialogVisible" width="78%" height="1%" :before-close="closeIt" center>
<iframe frameborder="0" id="iframe" style="width:100%;" :src="this.centerDialogVisible === true ? url :''"></iframe>
</el-dialog>
<!-- 临时出门证 -->
<el-dialog :visible.sync="isExitPermit" :title="formList.orgName + '出门证'" center width="1000px"
:close-on-click-modal="false">
<el-dialog :visible.sync="isExitPermit" :title="formList.orgName + '出门证'" center width="1000px" :close-on-click-modal="false">
<el-form ref="dataForm" :model="formList" label-position="right" class="formadd">
<el-row class="dialogRow">
<el-col :span="3">
@ -241,8 +209,7 @@
<!-- <el-image v-for="item in srcList" :key="item" style="width: 100px; height: 100px" :src="item"-->
<!-- :preview-src-list="srcList"/>-->
<!-- </el-dialog>-->
<cunfangdidianbiangeng-add v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState"
@reloadlist="getList"/>
<cunfangdidianbiangeng-add v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="getList"/>
<cunfangdidianbiangeng-info v-show="viewState == 4" ref="divinfo" @doback="resetState"/>
</div>
</template>
@ -343,11 +310,14 @@ export default {
},
methods: {
async handleMessage(event) {
var code = event.data.params.code
if (code == 1) {
var code = ''
if (event.data.params !== null && event.data.params !== undefined) {
code = event.data.params.code
}
if (code === 1) {
this.init()
this.centerDialogVisible = false
} else if (code == 2) {
} else if (code === 2) {
this.dialogHeight = event.data.params.data
this.setIframeHeight(document.getElementById('iframe'))
}
@ -357,7 +327,7 @@ export default {
this.centerDialogVisible = false
},
setIframeHeight(iframe) {
iframe.height = this.dialogHeight//iframeWin.document.documentElement.scrollHeight || iframeWin.document.body.scrollHeight;
iframe.height = this.dialogHeight // iframeWin.document.documentElement.scrollHeight || iframeWin.document.body.scrollHeight;
},
flowRecord(row) {
this.centerDialogVisible = true
@ -430,9 +400,9 @@ export default {
deleteCarTransfer(this.sids).then(resp => {
if (resp.success) {
loading.close()
_this.$message({ type: 'success', message: resp.msg, showClose: true })
_this.$message({type: 'success', message: resp.msg, showClose: true})
_this.loadList()
}else {
} else {
loading.close()
}
}).catch(e => {
@ -525,10 +495,10 @@ export default {
// //
// xhr.send()
},
getExitPermitInfo(sid){
getExitPermitInfo(sid) {
const userSid = window.sessionStorage.getItem('userSid')
temporaryExitPermitInfo({ sid,userSid }).then((res) => {
if (res.success){
temporaryExitPermitInfo({ sid, userSid }).then((res) => {
if (res.success) {
this.formList = res.data
}
})

Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save