Browse Source

Merge remote-tracking branch 'origin/master'

master
yunuo970428 3 years ago
parent
commit
9576816f7e
  1. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java
  2. 7
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java
  3. 17
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  4. 15
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml
  5. 15
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceService.java
  6. 4
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
  7. 2
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java
  8. 2
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appayable/APPayableCastToKingDeeBillFields.java
  9. 10
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/ApPayBillCastToKingDeeBillFields.java
  10. 2
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/ApPayBillService.java
  11. 0
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/data.json
  12. 0
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/data_FPAYBILLENTRY.json
  13. 0
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/data_data.json
  14. 0
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/data_model.json
  15. 0
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/remarks.txt
  16. 0
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/webapi测试的数据.txt
  17. 0
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/~$付款单的参数必填备注.xlsx
  18. 0
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/付款单的参数必填备注.xlsx
  19. 7
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/purmrb/PurMrbCastToKingDeeBillFields.java
  20. 4
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/receivablebill/ReceivableBillCastToKingDeeBillFields.java
  21. 6
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/SalOutStockCastToKingDeeBillFields.java
  22. 6
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkinstock/STKInStockCastToKingDeeBillFields.java
  23. 2
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkinstock/data_FInStockEntry.json
  24. 7
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/StkTransferDirectCastToKingDeeBillFields.java
  25. 2
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/data_FBillEntry.json

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

@ -423,7 +423,7 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
/**
* //采购组织:FPurchaseOrgId (必填项)
*/
stkInStock.setFPurchaseOrgId("100012");
stkInStock.setFPurchaseOrgId("102");
/**
* // 供应商:FSupplierId (必填项)
*/

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

@ -188,7 +188,8 @@ public class BaseVehicleRest implements BaseVehicleFeign {
}
//入账生成台账 //外采入库生成台账
try{
if (eventType.equals(OperVehicleState.EventType.RZ_SAVEVEH.getCode())||eventType.equals(OperVehicleState.EventType.WC_SAVEVEH.getCode())){
if (eventType.equals(OperVehicleState.EventType.RZ_SAVEVEH.getCode())||
eventType.equals(OperVehicleState.EventType.WC_SAVEVEH.getCode())){
StkInStock stkInStock=new StkInStock();
/**
* // 入库日期:FDate (必填项)
@ -201,7 +202,7 @@ public class BaseVehicleRest implements BaseVehicleFeign {
/**
* //采购组织:FPurchaseOrgId (必填项)
*/
stkInStock.setFPurchaseOrgId("100012");
stkInStock.setFPurchaseOrgId("102");
/**
* // 供应商:FSupplierId (必填项)
*/
@ -209,7 +210,7 @@ public class BaseVehicleRest implements BaseVehicleFeign {
/**
* //分配目标组织:TOrgId (必填项)
*/
stkInStock.setTOrgId("100012");
stkInStock.setTOrgId("102");
/**
* // 物料列表:FInStockEntry (必填项)
*/

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

@ -1550,9 +1550,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
}
vo.setOrderInfo(orderInfo);
vo.setState(type);
if(StringUtils.isNotBlank(orderInfo.getPrice())){
vo.setPrice(String.valueOf((int)Math.floor(Double.valueOf(orderInfo.getPrice()))));
}
vo.setPrice(orderInfo.getPrice());
}
@ -1648,14 +1646,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
//订单选择的采购订单列表
orderInfo.setReadyCarList(appReadyCarLists);
if("1".equals(busSalesOrder.getPayTypeKey())){//全款
if(StringUtils.isNotBlank(data.getPrice())){
Double doublePrice = Double.valueOf(data.getPrice());
vo.setPrice(String.valueOf((int)Math.floor(doublePrice)));
}
vo.setPrice(data.getPrice());
}else{
if(StringUtils.isNotBlank(data.getManufactorSettlementPrice())){
vo.setPrice(String.valueOf((int)Math.floor(Double.valueOf(data.getManufactorSettlementPrice()))));
}
vo.setPrice(data.getManufactorSettlementPrice());
}
}
@ -1939,8 +1932,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
if (!isDeposit) {
return rb.setMsg("请完善订金信息");
}
if(StringUtils.isNotBlank(busSalesOrder.getIsInsurance())){
return rb.setMsg("请完善保险信息");
if(StringUtils.isBlank(busSalesOrder.getIsInsurance())){
return rb.setMsg("请完善保险信息");
}else{
if("0".equals(busSalesOrder.getIsInsurance())){
BusSalesOrderInsuranceDetailsVo busSalesOrderInsurance = busSalesOrderInsuranceService.details(sid);

15
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml

@ -63,13 +63,22 @@
NULL),
IF(LENGTH(trim(GROUP_CONCAT(overallDimension))) > 0, GROUP_CONCAT('外廓尺寸:', overallDimension),
NULL),
IF(LENGTH(trim(GROUP_CONCAT(color))) > 0, GROUP_CONCAT('颜色:', color),
NULL),
IF(LENGTH(trim(GROUP_CONCAT(plateMaterial))) > 0, GROUP_CONCAT('板材材质:', plateMaterial),
NULL),
IF(LENGTH(trim(GROUP_CONCAT(plateThickness))) > 0, GROUP_CONCAT('板材厚度:', plateThickness),
NULL),
IF(LENGTH(trim(GROUP_CONCAT(announcementModel))) > 0, GROUP_CONCAT('公告型号:', announcementModel),
NULL), IF(LENGTH(trim(GROUP_CONCAT(topPrice))) > 0, GROUP_CONCAT('上装价格:', topPrice),
NULL),
IF(LENGTH(trim(GROUP_CONCAT(tarpaulinSlide))) > 0, GROUP_CONCAT('篷布滑道:', tarpaulinSlide),
NULL),
IF(LENGTH(trim(GROUP_CONCAT(refirgerator))) > 0, GROUP_CONCAT('冷藏冷机:', refirgerator),
NULL),
IF(LENGTH(trim(GROUP_CONCAT(selfUnHyCoPl))) > 0, GROUP_CONCAT('自卸液压盖版:', selfUnHyCoPl),
NULL),
IF(LENGTH(trim(GROUP_CONCAT(floorHeating))) > 0, GROUP_CONCAT('底板加热:', floorHeating),
NULL),
IF(LENGTH(trim(GROUP_CONCAT(topPrice))) > 0, GROUP_CONCAT('上装价格:', topPrice, '元'),
NULL),
IF(LENGTH(trim(GROUP_CONCAT(moreConfig))) > 0, GROUP_CONCAT('更多配置:', moreConfig),
NULL),
IF(LENGTH(trim(GROUP_CONCAT(remarks))) > 0, GROUP_CONCAT('备注:', remarks),

15
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceService.java

@ -156,21 +156,6 @@ public class BusSalesOrderPriceService extends MybatisBaseService<BusSalesOrderP
vo.setOverallPrice(bigDecimalFinalPrice.toString());
}
vo.setSaleOrderSid(sid);
if(StringUtils.isNotBlank(vo.getGuidancePrice())){
vo.setGuidancePrice(String.valueOf((int)Math.floor(Double.valueOf(vo.getGuidancePrice()))));
}
if(StringUtils.isNotBlank(vo.getTransactionPrice())){
vo.setTransactionPrice(String.valueOf((int)Math.floor(Double.valueOf(vo.getTransactionPrice()))));
}
if(StringUtils.isNotBlank(vo.getOverallPrice())){
vo.setOverallPrice(String.valueOf((int)Math.floor(Double.valueOf(vo.getOverallPrice()))));
}
if(StringUtils.isNotBlank(vo.getTopAndTrailerPrice())){
vo.setTopAndTrailerPrice(String.valueOf((int)Math.floor(Double.valueOf(vo.getTopAndTrailerPrice()))));
}
if(StringUtils.isNotBlank(vo.getTotalPrice())){
vo.setTotalPrice(String.valueOf((int)Math.floor(Double.valueOf(vo.getTotalPrice()))));
}
return rb.success().setData(vo);
}

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

@ -37,7 +37,7 @@ import com.yxt.anrui.fin.api.finpaymentrecord.*;
import com.yxt.anrui.fin.api.kingdee.appaybill.ApPayBill;
import com.yxt.anrui.fin.biz.finpaymentapply.FinPaymentapplyService;
import com.yxt.anrui.fin.biz.kingdee.FinKingDeeService;
import com.yxt.anrui.fin.biz.kingdee.saloutstock.appaybill.ApPayBillService;
import com.yxt.anrui.fin.biz.kingdee.appaybill.ApPayBillService;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
@ -219,6 +219,8 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
//结算方式
if("承兑".equals(finPaymentrecord.getPayWayValue())){
fpaybillentry.setFSETTLETYPEID("09");
}else{
fpaybillentry.setFSETTLETYPEID("02");
}
FPAYBILLENTRYs.add(fpaybillentry);
}

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

@ -13,7 +13,7 @@ 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.api.kingdee.stktransferdirect.StkTransferDirect;
import com.yxt.anrui.fin.biz.kingdee.saloutstock.appaybill.ApPayBillService;
import com.yxt.anrui.fin.biz.kingdee.appaybill.ApPayBillService;
import com.yxt.anrui.fin.biz.kingdee.appayable.APPayableService;
import com.yxt.anrui.fin.biz.kingdee.bdcustomer.BdCustomerService;
import com.yxt.anrui.fin.biz.kingdee.bdmaterial.BdMaterialService;

2
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appayable/APPayableCastToKingDeeBillFields.java

@ -29,7 +29,6 @@ public class APPayableCastToKingDeeBillFields {
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);
@ -41,6 +40,7 @@ public class APPayableCastToKingDeeBillFields {
//对模板字段赋值 根据传递进来的map数据的集合进行赋值
for(int i=0;i<vehicleList.size();i++){
String fEntityDetail_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/appayable/data_FEntityDetail.json");
Map<String,String> params=vehicleList.get(i);
Map<String,String> map_fEntityDetail_=new HashMap<>();
for (Map.Entry<String, String> entry : params.entrySet()) {

10
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/appaybill/ApPayBillCastToKingDeeBillFields.java → anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/ApPayBillCastToKingDeeBillFields.java

@ -1,4 +1,4 @@
package com.yxt.anrui.fin.biz.kingdee.saloutstock.appaybill;
package com.yxt.anrui.fin.biz.kingdee.appaybill;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
@ -26,10 +26,10 @@ public class ApPayBillCastToKingDeeBillFields {
/**
* 取模板
*/
String readJsonFile = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/saloutstock/appaybill/data.json");
String fEntityData_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/saloutstock/appaybill/data_data.json");
String fEntityModel_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/saloutstock/appaybill/data_model.json");
String fPAYBILLENTRY_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/saloutstock/appaybill/data_FPAYBILLENTRY.json");
String readJsonFile = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/appaybill/data.json");
String fEntityData_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/appaybill/data_data.json");
String fEntityModel_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/appaybill/data_model.json");
String fPAYBILLENTRY_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/appaybill/data_FPAYBILLENTRY.json");
//模板字符创转json
JSONObject jsonObj= JSONObject.parseObject(readJsonFile, Feature.OrderedField);

2
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/appaybill/ApPayBillService.java → anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/ApPayBillService.java

@ -1,4 +1,4 @@
package com.yxt.anrui.fin.biz.kingdee.saloutstock.appaybill;
package com.yxt.anrui.fin.biz.kingdee.appaybill;
import com.yxt.anrui.fin.api.kingdee.KingDeeBillId;
import com.yxt.anrui.fin.api.kingdee.KingDeeBillUrl;

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

0
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/appaybill/data_FPAYBILLENTRY.json → anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/data_FPAYBILLENTRY.json

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

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

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

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

0
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/appaybill/~$付款单的参数必填备注.xlsx → anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/~$付款单的参数必填备注.xlsx

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

7
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/purmrb/PurMrbCastToKingDeeBillFields.java

@ -32,11 +32,10 @@ public class PurMrbCastToKingDeeBillFields {
String readJsonFile = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/purmrb/data.json");
String fEntityData_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/purmrb/data_data.json");
String fEntityModel_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/purmrb/data_model.json");
String fPURMRBENTRY_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/purmrb/data_FPURMRBENTRY.json");
log.info("readJsonFile:{}",readJsonFile);
log.info("readJsonFile:{}",readJsonFile);
log.info("fEntityData_:{}",fEntityData_);
log.info("fEntityModel_:{}",fEntityModel_);
log.info("fPURMRBENTRY_:{}",fPURMRBENTRY_);
//模板字符创转json
JSONObject jsonObj= JSONObject.parseObject(readJsonFile, Feature.OrderedField);
@ -48,6 +47,8 @@ public class PurMrbCastToKingDeeBillFields {
//对模板字段赋值 根据传递进来的map数据的集合进行赋值
for(int i=0;i<vehicleList.size();i++){
String fPURMRBENTRY_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/purmrb/data_FPURMRBENTRY.json");
log.info("fPURMRBENTRY_:{}",fPURMRBENTRY_);
Map<String,String> params=vehicleList.get(i);
Map<String,String> map_fEntityDetail_=new HashMap<>();
for (Map.Entry<String, String> entry : params.entrySet()) {

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

@ -29,8 +29,7 @@ public class ReceivableBillCastToKingDeeBillFields {
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");
String fEntityPlan_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/receivablebill/data_FEntityPlan.json");
//模板字符创转json
JSONObject jsonObj= JSONObject.parseObject(readJsonFile, Feature.OrderedField);
@ -43,6 +42,7 @@ public class ReceivableBillCastToKingDeeBillFields {
//对模板字段赋值 根据传递进来的map数据的集合进行赋值
for(int i=0;i<vehicleList.size();i++){
String fEntityDetail_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/receivablebill/data_FEntityDetail.json");
Map<String,String> params=vehicleList.get(i);
Map<String,String> map_fEntityDetail_=new HashMap<>();
for (Map.Entry<String, String> entry : params.entrySet()) {

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

@ -32,11 +32,9 @@ public class SalOutStockCastToKingDeeBillFields {
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("readJsonFile:{}",readJsonFile);
log.info("fEntityData_:{}",fEntityData_);
log.info("fEntityModel_:{}",fEntityModel_);
log.info("fEntity_:{}",fEntity_);
//模板字符创转json
JSONObject jsonObj= JSONObject.parseObject(readJsonFile, Feature.OrderedField);
@ -48,6 +46,8 @@ public class SalOutStockCastToKingDeeBillFields {
//对模板字段赋值 根据传递进来的map数据的集合进行赋值
for(int i=0;i<vehicleList.size();i++){
String fEntity_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/saloutstock/data_FEntity.json");
log.info("fEntity_:{}",fEntity_);
Map<String,String> params=vehicleList.get(i);
Map<String,String> map_fEntityDetail_=new HashMap<>();
for (Map.Entry<String, String> entry : params.entrySet()) {

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

@ -32,11 +32,11 @@ public class STKInStockCastToKingDeeBillFields {
String readJsonFile = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/stkinstock/data.json");
String fEntityData_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/stkinstock/data_data.json");
String fEntityModel_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/stkinstock/data_model.json");
String fInStockEntry_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/stkinstock/data_FInStockEntry.json");
log.info("readJsonFile:{}",readJsonFile);
log.info("fEntityData_:{}",fEntityData_);
log.info("fEntityModel_:{}",fEntityModel_);
log.info("fInStockEntry_:{}",fInStockEntry_);
//模板字符创转json
JSONObject jsonObj= JSONObject.parseObject(readJsonFile, Feature.OrderedField);
@ -48,6 +48,8 @@ public class STKInStockCastToKingDeeBillFields {
//对模板字段赋值 根据传递进来的map数据的集合进行赋值
for(int i=0;i<vehicleList.size();i++){
String fInStockEntry_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/stkinstock/data_FInStockEntry.json");
log.info("fInStockEntry_:{}",fInStockEntry_);
Map<String,String> params=vehicleList.get(i);
Map<String,String> map_fEntityDetail_=new HashMap<>();
for (Map.Entry<String, String> entry : params.entrySet()) {

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

@ -11,7 +11,7 @@
"FNumber": "liang"
},
"FLot": {
"FNumber": "@KD_Flot"
"FNumber": "@KD_FLot"
},
"FStockId": {
"FNumber": "@KD_FStockId"

7
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/StkTransferDirectCastToKingDeeBillFields.java

@ -32,11 +32,10 @@ public class StkTransferDirectCastToKingDeeBillFields {
String readJsonFile = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/stktransferdirect/data.json");
String fEntityData_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/stktransferdirect/data_data.json");
String fEntityModel_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/stktransferdirect/data_model.json");
String fBillEntry_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/stktransferdirect/data_FBillEntry.json");
log.info("readJsonFile:{}",readJsonFile);
log.info("readJsonFile:{}",readJsonFile);
log.info("fEntityData_:{}",fEntityData_);
log.info("fEntityModel_:{}",fEntityModel_);
log.info("FBillEntry_:{}",fBillEntry_);
//模板字符创转json
JSONObject jsonObj= JSONObject.parseObject(readJsonFile, Feature.OrderedField);
@ -48,6 +47,8 @@ public class StkTransferDirectCastToKingDeeBillFields {
//对模板字段赋值 根据传递进来的map数据的集合进行赋值
for(int i=0;i<vehicleList.size();i++){
String fBillEntry_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/stktransferdirect/data_FBillEntry.json");
log.info("FBillEntry_:{}",fBillEntry_);
Map<String,String> params=vehicleList.get(i);
Map<String,String> map_fEntityDetail_=new HashMap<>();
for (Map.Entry<String, String> entry : params.entrySet()) {

2
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/data_FBillEntry.json

@ -9,7 +9,7 @@
"FNumber": "@KD_FDestLot"
},
"FLot": {
"FNumber": "@KD_Flot"
"FNumber": "@KD_FLot"
},
"FQty": 1.0,
"FSrcStockId": {

Loading…
Cancel
Save