Merge remote-tracking branch 'origin/master'

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

@@ -479,7 +479,7 @@
         SELECT bvm.vehicleAlias                                        AS modelName,
                bvm.brandName,
                bvm.vehicleVersionValue,
-               CONCAT(MIN(bvc.guidedPrice), '-', MAX(bvc.guidedPrice)) AS price,
+               if(MIN(bvc.guidedPrice)=MAX(bvc.guidedPrice),convert(MAX(bvc.guidedPrice)/10000,decimal(10,2)),CONCAT(convert(MIN(bvc.guidedPrice)/10000,decimal(10,2)), '-', convert(MAX(bvc.guidedPrice)/10000,decimal(10,2)))) AS price,
                bvm.vehicleTypeValue,
                bvm.productLineValue,
                bvm.powerValue,
@@ -520,7 +520,7 @@
                bmc.independentSources,
                bmc.fuelTank,
                bmc.multimedia,
-               bvc.guidedPrice               as price,
+               convert(bvc.guidedPrice/10000,decimal(10,2))               as price,
                bvc.priceValidity,
                bvm.sid                       as modelSid,
                bvm.vehicleAlias              as modelName,
@@ -694,7 +694,7 @@
                bmc.independentSources,
                bmc.fuelTank,
                bmc.multimedia,
-               bvc.guidedPrice               as price,
+               convert(bvc.guidedPrice/10000,decimal(10,2))               as price,
                bvc.priceValidity,
                bvc.manufactorSettlementPrice,
                bvm.sid                       as modelSid,

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

@@ -487,9 +487,9 @@
         bvm.vehicleVersionValue AS versionValue,
         bvm.fuelTypeValue,
         bvm.gearboxTypeValue,
-        (SELECT if(MIN(bvc.guidedPrice) = MAX(bvc.guidedPrice), MAX(bvc.guidedPrice),
-        CONCAT(MIN(bvc.guidedPrice), '-',
-        MAX(bvc.guidedPrice)))
+        (SELECT if(MIN(bvc.guidedPrice) = MAX(bvc.guidedPrice), convert(MAX(bvc.guidedPrice)/10000,decimal(10,2)),
+        CONCAT(convert(MIN(bvc.guidedPrice)/10000,decimal(10,2)), '-',
+        convert(MAX(bvc.guidedPrice)/10000,decimal(10,2))))
         FROM base_vehmodel_config bvc
         WHERE bvc.modelSid
         = bvm.sid
@@ -540,7 +540,7 @@
 
     <select id="getAppModelConfig"
             resultType="com.yxt.anrui.base.api.basevehicle.AppCurrentCarDetailConfigVo">
-        SELECT bvc.guidedPrice   AS price,
+        SELECT convert(bvc.guidedPrice/10000,decimal(10,2))  AS price,
                bvc.priceValidity AS `date`,
                bvm.vehicleAlias  AS model,
                bvm.brandName     AS brand,

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

@@ -23,7 +23,7 @@ public class FinKingDeeFeignService  {
     public String readJsonFile(String Filename) { //#传文件的路径
         String jsonStr = "";
         try {
-            File file = ResourceUtils.getFile("classpath:kingdeetemplete/entrybilldata.json");
+            File file = ResourceUtils.getFile("classpath:"+Filename);
             FileInputStream fis = new FileInputStream(file);
             InputStreamReader isr = new InputStreamReader(fis);
             BufferedReader br = new BufferedReader(isr);
@@ -44,21 +44,110 @@ public class FinKingDeeFeignService  {
     }
     /**
      * 保存入账申请接口生成的应付单的数据，推送到金蝶的平台中
-     * @param APPayable
+     * @param aPPayable
      * @return
      */
-    public ResultBean draftEntryBill(APPayable APPayable) {
+    public ResultBean draftEntryBill(APPayable aPPayable) {
         ResultBean rb=ResultBean.fireFail();
-        Data data=new Data();
-      //  EntryBillCastToKingDeeBillFields.cast(APPayable,data);
-        String readJsonFile = readJsonFile("src/main/resources/kingdeetemplete/entrybilldata.json");
+        String readJsonFile = readJsonFile("kingdeetemplete/entrybilldata.json");
         log.info(readJsonFile);
         readJsonFile = readJsonFile.replace("@KD_Creator", "zs");
+        //单据类型:FBillTypeID  (必填项)
+        readJsonFile = readJsonFile.replace("@KD_FBillTypeID", "YFD01_SYS");
+        //业务日期:FDATE  (必填项)
+        readJsonFile = readJsonFile.replace("@KD_FDATE", aPPayable.getApplicationDate());
+        //单据状态:FDOCUMENTSTATUS  (必填项)
+        readJsonFile = readJsonFile.replace("@KD_FDOCUMENTSTATUS", "Z");
+        //供应商:FSUPPLIERID  (必填项)
+        readJsonFile = readJsonFile.replace("@KD_FSUPPLIERID", "010001");
+        //币别:FCURRENCYID  (必填项)
+        readJsonFile = readJsonFile.replace("@KD_FCURRENCYID", "PRE001");
+        //付款条件:FPayConditon
+        readJsonFile = readJsonFile.replace("@KD_FPayConditon", "");
+        //业务类型:FBUSINESSTYPE  (必填项)
+        readJsonFile = readJsonFile.replace("@KD_FBUSINESSTYPE", "CG");
+        //结算组织:FSETTLEORGID  (必填项)
+        readJsonFile = readJsonFile.replace("@KD_FSETTLEORGID", "101");
+        //付款组织:FPAYORGID  (必填项)
+        readJsonFile = readJsonFile.replace("@KD_FPAYORGID", "101");
+        //采购部门:FPURCHASEDEPTID  (必填项)
+        readJsonFile = readJsonFile.replace("@KD_FPURCHASEDEPTID", "01");
+        //作废状态:FCancelStatus  (必填项)
+        readJsonFile = readJsonFile.replace("@KD_FCancelStatus", "A");
         log.info(readJsonFile);
-        JSONObject jsonObject = JSONObject.parseObject(readJsonFile);
+        String fEntityDetail_ = readJsonFile("kingdeetemplete/entrybilldata_FEntityDetail.json");
+        StringBuilder sb=new StringBuilder();
+        for(int i=0;i<1;i++){
+            String fEntityDetail=fEntityDetail_.toString();
+            log.info(fEntityDetail);
+            //物料编码:FMATERIALID
+            fEntityDetail = fEntityDetail.replace("@KD_FMATERIALID", " JX091054");
+            //物料说明:FMaterialDesc
+            fEntityDetail = fEntityDetail.replace("@KD_FMaterialDesc", "X牵引6*4-550超");
+            //计价单位:FPRICEUNITID
+            fEntityDetail = fEntityDetail.replace("@KD_FPRICEUNITID", " liang");
+            //单价:FPrice
+            fEntityDetail = fEntityDetail.replace("@KD_FPrice", "312500.0");
+            //计价数量:FPriceQty
+            fEntityDetail = fEntityDetail.replace("@KD_FPriceQty", "2.0");
+            //含税单价:FTaxPrice
+            fEntityDetail = fEntityDetail.replace("@KD_FMATERIALID", "350000.0");
+            //含税净价:FPriceWithTax
+            fEntityDetail = fEntityDetail.replace("@KD_FMATERIALID", "346500.0");
+            //税率(%):FEntryTaxRate
+            fEntityDetail = fEntityDetail.replace("@KD_FMATERIALID", "12.0");
+            //运输编号:F_PMZC_Assistant
+            fEntityDetail = fEntityDetail.replace("@KD_F_PMZC_Assistant", "1904110789");
+            //物流车辆:F_PMZC_Base
+            fEntityDetail = fEntityDetail.replace("@KD_F_PMZC_Base", "0001F");
+            //物流项目:F_PMZC_Base1
+            fEntityDetail = fEntityDetail.replace("@KD_F_PMZC_Base1", "01.001");
+            //折扣率(%):FEntryDiscountRate
+            fEntityDetail = fEntityDetail.replace("@KD_FEntryDiscountRate", "1.0");
+            //折扣额:FDISCOUNTAMOUNTFOR
+            fEntityDetail = fEntityDetail.replace("@KD_FDISCOUNTAMOUNTFOR", "7000.0");
+            //不含税金额:FNoTaxAmountFor_D
+            fEntityDetail = fEntityDetail.replace("@KD_FNoTaxAmountFor_D", "618750.0");
+            //税额:FTAXAMOUNTFOR_D
+            fEntityDetail = fEntityDetail.replace("@KD_FTAXAMOUNTFOR_D", "74250.0");
+            //价税合计:FALLAMOUNTFOR_D
+            fEntityDetail = fEntityDetail.replace("@KD_F_PMZC_Base1", "693000.0");
+            //库存单位:FStockUnitId
+            fEntityDetail = fEntityDetail.replace("@KD_FStockUnitId", "liang");
+            //库存数量:FStockQty
+            fEntityDetail = fEntityDetail.replace("@KD_FStockQty", "2.0");
+            //库存基本数量:FStockBaseQty
+            fEntityDetail = fEntityDetail.replace("@KD_F_PMZC_Base1", "2.0");
+            //计价基本分母:FPriceBaseDen
+            fEntityDetail = fEntityDetail.replace("@KD_FPriceBaseDen", "1.0");
+            //库存基本分子:FStockBaseNum
+            fEntityDetail = fEntityDetail.replace("@KD_FStockBaseNum", "1.0");
+
+            log.info(fEntityDetail);
+            sb.append(fEntityDetail).append(",");
+        }
+        String sbs=sb.substring(0,sb.length()-1);
+        readJsonFile.replace("@KD_FEntityDetail",sbs);
+
+        String fEntityPlan_ = readJsonFile("kingdeetemplete/entrybilldata_FEntityPlan.json");
+        StringBuilder sb_fEntityPlan=new StringBuilder();
+        for(int i=0;i<1;i++){
+            String fEntityPlan=fEntityPlan_.toString();
+            log.info(fEntityPlan);
+            //应付金额:FPAYAMOUNTFOR
+            fEntityPlan = fEntityPlan.replace("@KD_FPAYAMOUNTFOR", "693000.00");
+            //应付比例(%):FPAYRATE
+            fEntityPlan = fEntityPlan.replace("@KD_FPAYRATE", "100.00000");
+            //表头计划 - 到期日:FENDDATE
+            fEntityPlan = fEntityPlan.replace("@KD_FENDDATE", "2022-07-22 00:00:00");
+            log.info(fEntityPlan);
+            sb_fEntityPlan.append(fEntityPlan).append(",");
+        }
+        String sb_fEntityPlans=sb_fEntityPlan.substring(0,sb_fEntityPlan.length()-1);
+        readJsonFile.replace("@KD_FEntityPlan",sb_fEntityPlans);
+
         try {
-           // return saveBill(KingDeeBillId.AP_PAYABLE.getID(),readJsonFile);
-            return saveBill(KingDeeBillId.AP_PAYABLE.getID(),jsonObject);
+            return saveBill(KingDeeBillId.AP_PAYABLE.getID(),readJsonFile);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -87,7 +176,7 @@ public class FinKingDeeFeignService  {
      * @param data
      * @return
      */
-    private ResultBean saveBill(String formId,JSONObject data) throws Exception {
+    private ResultBean saveBill(String formId,String data) throws Exception {
         KingDeeParams kdp=new KingDeeParams();
         kdp.setData(data);
         kdp.setFormId(formId);
@@ -99,13 +188,13 @@ public class FinKingDeeFeignService  {
      */
     class KingDeeParams{
         private String formId;
-        private JSONObject data;
+        private String data;
 
         public void setFormId(String formId) {
             this.formId = formId;
         }
 
-        public void setData(JSONObject data) {
+        public void setData(String data) {
             this.data = data;
         }
 
@@ -113,7 +202,7 @@ public class FinKingDeeFeignService  {
             return formId;
         }
 
-        public JSONObject getData() {
+        public String getData() {
             return data;
         }
     }

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

@@ -131,14 +131,14 @@ public class KingDeeSaveSKD {
             HttpPost method = new HttpPost(save_uri);
             //采购入库单保存参数
 
-            System.out.println(jsonParam);
+            System.out.println(jsonParam.getData());
            // 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\\\":\\\"2021-12-31 00:00:00\\\",\\\"FSaleOrgId\\\":{\\\"FNumber\\\":\\\"100\\\"},\\\"FCustomerID\\\":{\\\"FNumber\\\":\\\"  田拥涛\\\"},\\\"FSaleDeptID\\\":{\\\"FNumber\\\":\\\"03\\\"},\\\"FStockOrgId\\\":{\\\"FNumber\\\":\\\"100\\\"},\\\"FReceiverID\\\":{\\\"FNumber\\\":\\\"  田拥涛\\\"},\\\"FSettleID\\\":{\\\"FNumber\\\":\\\"  田拥涛\\\"},\\\"FPayerID\\\":{\\\"FNumber\\\":\\\"  田拥涛\\\"},\\\"FOwnerTypeIdHead\\\":\\\"BD_OwnerOrg\\\",\\\"FIsTotalServiceOrCost\\\":false,\\\"F_PAEZ_Assistant\\\":{\\\"FNumber\\\":\\\"00\\\"},\\\"SubHeadEntity\\\":{\\\"FSettleCurrID\\\":{\\\"FNumber\\\":\\\"PRE001\\\"},\\\"FSettleOrgID\\\":{\\\"FNumber\\\":\\\"100\\\"},\\\"FIsIncludedTax\\\":true,\\\"FLocalCurrID\\\":{\\\"FNumber\\\":\\\"PRE001\\\"},\\\"FExchangeTypeID\\\":{\\\"FNumber\\\":\\\"HLTX01_SYS\\\"},\\\"FExchangeRate\\\":1.0,\\\"FIsPriceExcludeTax\\\":true},\\\"FEntity\\\":[{\\\"FRowType\\\":\\\"Standard\\\",\\\"FMaterialID\\\":{\\\"FNumber\\\":\\\" JX064673\\\"},\\\"Flot\\\":{\\\"FNumber\\\":\\\"11111djz\\\"},\\\"FUnitID\\\":{\\\"FNumber\\\":\\\"liang\\\"},\\\"FRealQty\\\":1.0,\\\"FIsFree\\\":false,\\\"FOwnerTypeID\\\":\\\"BD_OwnerOrg\\\",\\\"FOwnerID\\\":{\\\"FNumber\\\":\\\"100\\\"},\\\"FStockID\\\":{\\\"FNumber\\\":\\\"CK002\\\"},\\\"FStockStatusID\\\":{\\\"FNumber\\\":\\\"KCZT01_SYS\\\"},\\\"FSalUnitID\\\":{\\\"FNumber\\\":\\\"liang\\\"},\\\"FSALUNITQTY\\\":1.0,\\\"FSALBASEQTY\\\":1.0,\\\"FPRICEBASEQTY\\\":1.0,\\\"FOUTCONTROL\\\":false,\\\"FIsOverLegalOrg\\\":false,\\\"FARNOTJOINQTY\\\":1.0}],\\\"FOutStockTrace\\\":[{\\\"FLogComId\\\":{\\\"FCODE\\\":\\\"a2u\\\"},\\\"FDelTime\\\":\\\"2021-12-31 00:00:00\\\",\\\"FCarryBillNo\\\":\\\"2121122112\\\"}]}}\\n\"}";
           //  String ff=  "{\"formid\":\"AR_receivable\",\"data\":\"{\\\"Creator\\\":\\\"\\\",\\\"NeedUpDateFields\\\":[],\\\"NeedReturnFields\\\":[],\\\"IsDeleteEntry\\\":\\\"True\\\",\\\"SubSystemId\\\":\\\"\\\",\\\"IsVerifyBaseDataField\\\":\\\"false\\\",\\\"IsEntryBatchFill\\\":\\\"True\\\",\\\"ValidateFlag\\\":\\\"True\\\",\\\"NumberSearch\\\":\\\"True\\\",\\\"InterationFlags\\\":\\\"\\\",\\\"Model\\\":{\\\"FID\\\":0,\\\"FBillTypeID\\\":{\\\"FNUMBER\\\":\\\"YSD01_SYS\\\"},\\\"FDATE\\\":\\\"2022-01-07 00:00:00\\\",\\\"FISINIT\\\":false,\\\"FENDDATE_H\\\":\\\"2022-01-07 00:00:00\\\",\\\"FCUSTOMERID\\\":{\\\"FNumber\\\":\\\" JXYXB\\\"},\\\"FCURRENCYID\\\":{\\\"FNumber\\\":\\\"PRE001\\\"},\\\"FISPRICEEXCLUDETAX\\\":true,\\\"FSETTLEORGID\\\":{\\\"FNumber\\\":\\\"101\\\"},\\\"FPAYORGID\\\":{\\\"FNumber\\\":\\\"101\\\"},\\\"FSALEORGID\\\":{\\\"FNumber\\\":\\\"101\\\"},\\\"FISTAX\\\":true,\\\"FCancelStatus\\\":\\\"A\\\",\\\"FBUSINESSTYPE\\\":\\\"BZ\\\",\\\"FSetAccountType\\\":\\\"1\\\",\\\"FISHookMatch\\\":false,\\\"FISINVOICEARLIER\\\":false,\\\"F_PMZC_Assistant2\\\":{\\\"FNumber\\\":\\\"01\\\"},\\\"FsubHeadSuppiler\\\":{\\\"FORDERID\\\":{\\\"fNumber\\\":\\\" JXYXB\\\"},\\\"FTRANSFERID\\\":{\\\"fNumber\\\":\\\" JXYXB\\\"},\\\"FChargeId\\\":{\\\"fNumber\\\":\\\" JXYXB\\\"}},\\\"FsubHeadFinc\\\":{\\\"FACCNTTIMEJUDGETIME\\\":\\\"2022-01-07 00:00:00\\\",\\\"FMAINBOOKSTDCURRID\\\":{\\\"fNumber\\\":\\\"PRE001\\\"},\\\"FEXCHANGETYPE\\\":{\\\"fNumber\\\":\\\"HLTX01_SYS\\\"},\\\"FExchangeRate\\\":1.0},\\\"FEntityDetail\\\":[{\\\"FMATERIALID\\\":{\\\"FNumber\\\":\\\" JX091054\\\"},\\\"FMaterialDesc\\\":\\\"X牵引6*4-550超\\\",\\\"FPRICEUNITID\\\":{\\\"FNumber\\\":\\\"liang\\\"},\\\"FDeliveryControl\\\":false,\\\"FStockUnitId\\\":{\\\"FNumber\\\":\\\"liang\\\"},\\\"FIsFree\\\":false,\\\"FSalUnitId\\\":{\\\"FNumber\\\":\\\"liang\\\"},\\\"FPriceBaseDen\\\":1.0,\\\"FSalBaseNum\\\":1.0,\\\"FStockBaseNum\\\":1.0}]}}\"}";
            // String s = "{\"data\":\"\"{\\\"Creator\\\":\\\"\\\",\\\"InterationFlags\\\":\\\"\\\",\\\"IsDeleteEntry\\\":true,\\\"IsEntryBatchFill\\\":true,\\\"IsVerifyBaseDataField\\\":false,\\\"Model\\\":{\\\"FBillTypeID\\\":{\\\"FNUMBER\\\":\\\"XSCKD01_SYS\\\"},\\\"FDate\\\":\\\"2021-12-30 00:00:00\\\",\\\"FDeliveryDeptID\\\":{\\\"FNumber\\\":\\\"\\\"},\\\"FEntity\\\":[{\\\"FARNOTJOINQTY\\\":1,\\\"FEntrynote\\\":\\\"\\\",\\\"FIsFree\\\":false,\\\"FIsOverLegalOrg\\\":false,\\\"FMaterialID\\\":{\\\"FNumber\\\":\\\" JX064673\\\"},\\\"FOUTCONTROL\\\":false,\\\"FOwnerID\\\":{\\\"FNumber\\\":\\\"100\\\"},\\\"FOwnerTypeID\\\":\\\"BD_OwnerOrg\\\",\\\"FPRICEBASEQTY\\\":1,\\\"FPrice\\\":0,\\\"FRealQty\\\":1,\\\"FRowType\\\":\\\"Standard\\\",\\\"FSALBASEQTY\\\":1,\\\"FSALUNITQTY\\\":1,\\\"FSalUnitID\\\":{\\\"FNumber\\\":\\\"liang\\\"},\\\"FStockID\\\":{\\\"FNumber\\\":\\\"CK002\\\"},\\\"FStockStatusID\\\":{\\\"FNumber\\\":\\\"KCZT01_SYS\\\"},\\\"FTaxPrice\\\":0,\\\"FUnitID\\\":{\\\"FNumber\\\":\\\"liang\\\"},\\\"F_PAEZ_Decimal\\\":0,\\\"F_PAEZ_Decimal3\\\":0,\\\"F_PAEZ_Decimal4\\\":0,\\\"Flot\\\":{\\\"FNumber\\\":\\\"111\\\"}}],\\\"FID\\\":0,\\\"FIsTotalServiceOrCost\\\":false,\\\"FOutStockTrace\\\":[{\\\"FCarryBillNo\\\":\\\"1111111\\\",\\\"FDelTime\\\":1640933876112,\\\"FLogComId\\\":{\\\"FCODE\\\":\\\"a2u\\\"}}],\\\"FOwnerTypeIdHead\\\":\\\"BD_OwnerOrg\\\",\\\"FPayerID\\\":{\\\"FNumber\\\":\\\"  田拥涛\\\"},\\\"FReceiverID\\\":{\\\"FNumber\\\":\\\"  田拥涛\\\"},\\\"FSaleOrgId\\\":{\\\"FNumber\\\":\\\"100\\\"},\\\"FSettleID\\\":{\\\"FNumber\\\":\\\"  田拥涛\\\"},\\\"FStockOrgId\\\":{\\\"FNumber\\\":\\\"100\\\"},\\\"F_PAEZ_Assistant\\\":{\\\"FNumber\\\":\\\"00\\\"},\\\"F_PAEZ_Base\\\":{},\\\"F_PAEZ_Base1\\\":{},\\\"F_PAEZ_Date\\\":1640933876112,\\\"F_PAEZ_Decimal1\\\":0,\\\"F_PAEZ_Decimal2\\\":1,\\\"F_PAEZ_Text\\\":\\\"\\\",\\\"SubHeadEntity\\\":{\\\"FExchangeRate\\\":1,\\\"FExchangeTypeID\\\":{\\\"FNumber\\\":\\\"HLTX01_SYS\\\"},\\\"FIsIncludedTax\\\":true,\\\"FIsPriceExcludeTax\\\":true,\\\"FLocalCurrID\\\":{\\\"FNumber\\\":\\\"PRE001\\\"},\\\"FSettleCurrID\\\":{\\\"FNumber\\\":\\\"PRE001\\\"},\\\"FSettleOrgID\\\":{\\\"FNumber\\\":\\\"100\\\"}}},\\\"NeedReturnFields\\\":[],\\\"NeedUpDateFields\\\":[],\\\"NumberSearch\\\":true,\\\"SubSystemId\\\":\\\"\\\",\\\"ValidateFlag\\\":true}\"\",\"formid\":\"SAL_OUTSTOCK\"}";
           //  System.out.println(ss);
          //   System.out.println(ff);
             String ss="{\"formId\":\"AP_Payable\",\"data\":\"{  \\\"Creator\\\":\\\"zs\\\",  \\\"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-22 00:00:00\\\",    \\\"FENDDATE_H\\\":\\\"2022-07-22 00: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-22 00: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-22 00:00:00\\\",        \\\"FPAYAMOUNTFOR\\\":99.0,        \\\"FPAYRATE\\\":100.0      }    ]  }}}";
-            StringEntity entity = new StringEntity(ss, "utf-8");
+            StringEntity entity = new StringEntity(jsonParam.getData(), "utf-8");
             //StringEntity entity = new StringEntity(JSON.toJSONString( jsonParam), "utf-8");
             System.out.println(JSON.toJSON(entity));
             entity.setContentEncoding("UTF-8");

anrui-fin/anrui-fin-biz/src/main/resources/kingdeetemplete/entrybilldata.json

@@ -1,2 +1 @@
-{"Creator":"","NeedUpDateFields":[],"NeedReturnFields":[],"IsDeleteEntry":"True","SubSystemId":"","IsVerifyBaseDataField":"false","IsEntryBatchFill":"True","ValidateFlag":"True","NumberSearch":"True","InterationFlags":"","Model":{"FID":0,"FBillTypeID":{"FNUMBER":"@KD_FBillTypeID"},"FISINIT":false,"FDATE":"@KD_FDATE","FENDDATE_H":"","FDOCUMENTSTATUS":"@KD_FDOCUMENTSTATUS","FSUPPLIERID":{"FNumber":"@KD_FSUPPLIERID"},"FCURRENCYID":{"FNumber":"@KD_FCURRENCYID"},"FPayConditon":{"FNumber":"FKTJ01_SYS"},"FISPRICEEXCLUDETAX":true,"FBUSINESSTYPE":"@KD_FBUSINESSTYPE","FISTAX":true,"FSETTLEORGID":{"FNumber":"@KD_FSETTLEORGID"},"FPAYORGID":{"FNumber":"@KD_FPAYORGID"},"FSetAccountType":"","FISTAXINCOST":false,"FAP_Remark":"","FISHookMatch":false,"FPURCHASEDEPTID":{"FNumber":"@KD_FPURCHASEDEPTID"},"FCancelStatus":"@KD_FCancelStatus","FISBYIV":false,"FISGENHSADJ":false,"FISINVOICEARLIER":false,"F_PAEZ_Text":"","F_PMZC_Assistant1":{"FNumber":""},"FsubHeadSuppiler":{"FORDERID":{"FNumber":""},"FTRANSFERID":{"FNumber":""},"FChargeId":{"FNumber":""}},"FsubHeadFinc":{"FACCNTTIMEJUDGETIME":"","FMAINBOOKSTDCURRID":{"FNumber":""},"FEXCHANGETYPE":{"FNumber":""},"FExchangeRate":1.0,"FTaxAmountFor":0,"FNoTaxAmountFor":0},"FEntityDetail":[@KD_FEntityDetail],"FEntityPlan":[{"FENDDATE":"2022-07-22 00:00:00","FPAYAMOUNTFOR":693000.00,"FPAYRATE":100.00000}]}}
-[{"FMATERIALID":{"FNumber":" JX091054"},"FMaterialDesc":"X牵引6*4-550超","FPRICEUNITID":{"FNumber":"liang"},"FPrice":312500.0,"FPriceQty":2.0,"FTaxPrice":350000.0,"FPriceWithTax":346500.00,"FEntryTaxRate":12.0,"F_PMZC_Assistant":{"FNumber":"1904110789"},"F_PMZC_Base":{"FNUMBER":"0001F"},"F_PMZC_Base1":{"FNUMBER":"01.001"},"FEntryDiscountRate":1.0,"FDISCOUNTAMOUNTFOR":7000.00,"FNoTaxAmountFor_D":618750.0,"FTAXAMOUNTFOR_D":74250.0,"FALLAMOUNTFOR_D":693000.0,"FINCLUDECOST":false,"FISOUTSTOCK":false,"FIsFree":false,"FStockUnitId":{"FNumber":"liang"},"FStockQty":2.0,"FStockBaseQty":2.0,"FPriceBaseDen":1.0,"FStockBaseNum":1.0}]
+{"Creator":"","NeedUpDateFields":[],"NeedReturnFields":[],"IsDeleteEntry":"True","SubSystemId":"","IsVerifyBaseDataField":"false","IsEntryBatchFill":"True","ValidateFlag":"True","NumberSearch":"True","InterationFlags":"","Model":{"FID":0,"FBillTypeID":{"FNUMBER":"@KD_FBillTypeID"},"FISINIT":false,"FDATE":"@KD_FDATE","FENDDATE_H":"","FDOCUMENTSTATUS":"@KD_FDOCUMENTSTATUS","FSUPPLIERID":{"FNumber":"@KD_FSUPPLIERID"},"FCURRENCYID":{"FNumber":"@KD_FCURRENCYID"},"FPayConditon":{"FNumber":"@KD_FPayConditon"},"FISPRICEEXCLUDETAX":true,"FBUSINESSTYPE":"@KD_FBUSINESSTYPE","FISTAX":true,"FSETTLEORGID":{"FNumber":"@KD_FSETTLEORGID"},"FPAYORGID":{"FNumber":"@KD_FPAYORGID"},"FSetAccountType":"","FISTAXINCOST":false,"FAP_Remark":"","FISHookMatch":false,"FPURCHASEDEPTID":{"FNumber":"@KD_FPURCHASEDEPTID"},"FCancelStatus":"@KD_FCancelStatus","FISBYIV":false,"FISGENHSADJ":false,"FISINVOICEARLIER":false,"F_PAEZ_Text":"","F_PMZC_Assistant1":{"FNumber":""},"FsubHeadSuppiler":{"FORDERID":{"FNumber":""},"FTRANSFERID":{"FNumber":""},"FChargeId":{"FNumber":""}},"FsubHeadFinc":{"FACCNTTIMEJUDGETIME":"","FMAINBOOKSTDCURRID":{"FNumber":""},"FEXCHANGETYPE":{"FNumber":""},"FExchangeRate":1.0,"FTaxAmountFor":0,"FNoTaxAmountFor":0},"FEntityDetail":[@KD_FEntityDetail],"FEntityPlan": [@KD_FEntityPlan]}}

anrui-fin/anrui-fin-biz/src/main/resources/kingdeetemplete/entrybilldata_FEntityDetail.json

@@ -0,0 +1 @@
+[{"FMATERIALID":{"FNumber":"@KD_FMATERIALID"},"FMaterialDesc":"@KD_FMaterialDesc","FPRICEUNITID":{"FNumber":"@KD_FPRICEUNITID"},"FPrice":@KD_FPrice,"FPriceQty":@KD_FPriceQty,"FTaxPrice":@KD_FTaxPrice,"FPriceWithTax":@KD_FPriceWithTax,"FEntryTaxRate":@KD_FEntryTaxRate,"F_PMZC_Assistant":{"FNumber":"@KD_F_PMZC_Assistant"},"F_PMZC_Base":{"FNUMBER":"@KD_F_PMZC_Base"},"F_PMZC_Base1":{"FNUMBER":"@KD_F_PMZC_Base1"},"FEntryDiscountRate":@KD_FEntryDiscountRate,"FDISCOUNTAMOUNTFOR":@KD_FDISCOUNTAMOUNTFOR,"FNoTaxAmountFor_D":@KD_FNoTaxAmountFor_D,"FTAXAMOUNTFOR_D":@KD_FTAXAMOUNTFOR_D,"FALLAMOUNTFOR_D":@KD_FALLAMOUNTFOR_D,"FINCLUDECOST":false,"FISOUTSTOCK":false,"FIsFree":false,"FStockUnitId":{"FNumber":"@KD_FStockUnitId"},"FStockQty":@KD_FStockQty,"FStockBaseQty":@KD_FStockBaseQty,"FPriceBaseDen":@KD_FPriceBaseDen,"FStockBaseNum":@KD_FStockBaseNum}]

anrui-fin/anrui-fin-biz/src/main/resources/kingdeetemplete/entrybilldata_FEntityPlan.json

@@ -0,0 +1 @@
+{"FENDDATE":"@KD_FENDDATE","FPAYAMOUNTFOR":@KD_FPAYAMOUNTFOR,"FPAYRATE":@KD_FPAYRATE}

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

@@ -508,10 +508,17 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
             ResultBean<SysProUrlVo> resultBean1 = sysProUrlFeign.selectUrlByKey(procDefId, taskDefKey, "1");
             AppVo appVo = new AppVo();
             appVo.setJson(json);
-            appVo.setModuleAction(resultBean1.getData().getUrl());
-            String appSid = resultBean1.getData().getModulePluginName();
+            String appSid = "";
+            String type = "";
+            if(resultBean1.getData() != null){
+                appVo.setModuleAction(resultBean1.getData().getUrl());
+                appSid = resultBean1.getData().getModulePluginName();
+            }
+
             //根据appSid查询最新版本的app插件包:以及类型：2插件，1框架
-            String type = Arrays.asList(appSid.split("#")).get(1);
+            if(StringUtils.isNotBlank(appSid)){
+                type = Arrays.asList(appSid.split("#")).get(1);
+            }
             if ("1".equals(type)) {
 
             } else if ("2".equals(type)) {

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

@@ -95,7 +95,7 @@
               <span><span class="icon">*</span>厂家合同价</span>
             </el-col>
             <el-col :span="9" class="trightb">
-              <el-form-item v-show="formobj.externalMiningTypeKey==1" prop="manufactorSettlementPrice"><el-input size="small"  v-model="formobj.manufactorSettlementPrice" placeholder="厂家合同价" class="addinputw" clearable /></el-form-item>
+              <el-form-item v-show="formobj.externalMiningTypeKey==1" prop="manufactorSettlementPrice"> {{formobj.manufactorSettlementPrice}}</el-form-item>
               <el-form-item  v-show="formobj.externalMiningTypeKey==2" prop="manufactorSettlementPrice">{{formobj.manufactorSettlementPrice}}</el-form-item>
             </el-col>
           </el-row>
@@ -397,9 +397,6 @@ export default {
           req.fetchOrgBySid(res.data).then((ress)=>{
             this.formobj.useOrgName=ress.data.name;
           })
-         /* this.useOrg = res.data
-          this.getList()
-          this.getBrand(res.data)*/
         }
       })
     },

anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangguanli.vue

@@ -7,6 +7,7 @@
           <el-button type="info" size="small">关闭</el-button>
         </div>
       </div>
+      <div  class="main-content">
       <div class="searchcon">
         <el-button size="small" class="searchbtn" @click="isSearchShow = !isSearchShow">{{ isSearchShow ? '隐藏查询条件' : '显示查询条件' }}
         </el-button>
@@ -53,12 +54,16 @@
               <el-button type="primary" size="small" @click="toInfo(scope.row)">查看</el-button>
             </template>
           </el-table-column>
-          <el-table-column width="150" prop="nodeState" label="状态" align="center"/>
-          <el-table-column width="200" prop="applicationCode" label="申请编号" align="center"/>
+          <el-table-column width="130" prop="nodeState" label="状态" align="center"/>
+         <!-- <el-table-column width="200" prop="applicationCode" label="申请编号" align="center"/>-->
           <el-table-column width="100" prop="applicationDate" label="申请日期" align="center"/>
-          <el-table-column width="200" prop="purchaseOrderNo" label="采购订单编号" align="center"/>
+          <el-table-column width="180" prop="purchaseOrderNo" label="采购订单编号" align="center"/>
           <el-table-column prop="modelName" label="车型" align="center"/>
           <el-table-column width="80" prop="vehicleNum" fit label="台数" align="center"/>
+          <el-table-column width="100" prop="contractPrice" fit label="厂家合同价" align="center"/>
+          <el-table-column width="100" prop="moneyCount" fit label="政策金额合计" align="center"/>
+          <el-table-column width="100" prop="costPrice" fit label="厂家结算价" align="center"/>
+          <el-table-column width="100" prop="departureDate" fit label="发车日期" align="center"/>
         </el-table>
       </div>
       <!--End 项目列表-->
@@ -66,6 +71,7 @@
         <!-- 翻页 -->
         <pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="loadList"/>
       </div>
+        </div>
     </div>
     <!--End 查询和其列表部分-->
 

anrui-scm/anrui-scm-ui/src/views/supplychain/diaochekaipiaoshenqingguanli/diaocheshenqingAdd.vue

@@ -94,32 +94,30 @@
                   </template>
                 </el-table-column>
                 <el-table-column width="200" label="发票类型" align="center">
-                  <template slot-scope="scope">
+                  <template slot-scope="scope"><!-- :disabled="scope.row.isAvailable || dialogStatus == 'edit'" -->
                     <!--                    <span>{{ scope.row.invoiceTypeValue }}</span>-->
                     <el-select v-model="scope.row.invoiceTypeKey" placeholder="请选择" clearable class="addinputw"
                                @change="invoiceTypeChange(scope.row,scope.row.invoiceTypeKey)"
-                               :disabled="scope.row.isAvailable || dialogStatus == 'edit'">
+                               >
                       <el-option v-for="item in invoiceType_list" :key="item.dictKey" :label="item.dictValue"
                                  :value="item.dictKey"/>
                     </el-select>
                   </template>
                 </el-table-column>
                 <el-table-column width="130" label="开票金额" align="center">
-                  <template slot-scope="scope"><!-- 由发票类型决定,增值税票:开票金额=内销价格 -->
+                  <template slot-scope="scope"><!-- 由发票类型决定,增值税票:开票金额=内销价格  :disabled="scope.row.invoiceTypeKey == '02'"-->
                     <el-input
                       v-model="scope.row.invoiceTypeKey == '02' ? scope.row.witPinMoney :scope.row.invoicinMoney"
                       placeholder="请输入" class="addinputw"
-                      :disabled="scope.row.invoiceTypeKey == '02'"
                       @keyup.native="scope.row.invoicinMoney = oninput(scope.row.invoicinMoney,2)"
                     />
                   </template>
                 </el-table-column>
                 <el-table-column width="180" label="开票单位" align="center">
-                  <template slot-scope="scope"><!-- 由发票类型决定,增值税票:开票单位=调入公司 -->
+                  <template slot-scope="scope"><!-- 由发票类型决定,增值税票:开票单位=调入公司 :disabled="scope.row.invoiceTypeKey == '02'"-->
                     <el-input
                       v-model="scope.row.invoiceTypeKey == '02' ? temp.callInOrgName :scope.row.invoicinCompanyName"
-                      placeholder="请输入" class="addinputw"
-                      :disabled="scope.row.invoiceTypeKey == '02'"/>
+                      placeholder="请输入" class="addinputw" />
                   </template>
                 </el-table-column>
                 <el-table-column width="180" label="开票信息图片" align="center">

anrui-scm/anrui-scm-ui/src/views/workFlow/tiaochekaipiaoshenqingFlow/tiaochekaipiaoshenqing.vue

@@ -277,6 +277,7 @@ export default {
     // 点击同意
     openAgree(val) {
       this.operation = val
+      this.dialogList.comment = '同意'
       this.currentLink = true // 控制当前环节一行的显示隐藏
       // const formVariables = {
       //   businessSid: this.agreeList.businessSid
@@ -293,6 +294,7 @@ export default {
     // 点击驳回
     openReject(val) {
       this.operation = val
+      this.dialogList.comment = ''
       this.currentLink = true // 控制当前环节一行的显示隐藏
       // const formVariables = {
       //   businessSid: this.regectList.businessSid
@@ -309,6 +311,7 @@ export default {
     // 点击终止
     openStop(val) {
       this.operation = val
+      this.dialogList.comment = ''
       this.currentLink = false // 控制当前环节一行的显示隐藏
       this.nodeDialogVisible = true
     },
@@ -325,6 +328,14 @@ export default {
     /** 同意任务 */
     handleAgree() {
       this.agreeList.comment = this.dialogList.comment
+      if (this.agreeList.comment == '') {
+        this.$message({
+          showClose: true,
+          message: '请填写同意意见！',
+          type: 'error'
+        })
+        return
+      }
       req.agreeTask(this.agreeList).then((response) => {
         if (response.success) {
           this.$message({
@@ -347,6 +358,14 @@ export default {
     /** 驳回任务 */
     handleReject() {
       this.regectList.comment = this.dialogList.comment
+      if (this.regectList.comment == '') {
+        this.$message({
+          showClose: true,
+          message: '请填写驳回意见！',
+          type: 'error'
+        })
+        return
+      }
       req.rejectTask(this.regectList).then((response) => {
         if (response.success) {
           this.$message({
@@ -369,6 +388,14 @@ export default {
     /** 终止任务 */
     handleStop() {
       this.stopList.comment = this.dialogList.comment
+      if (this.stopList.comment == '') {
+        this.$message({
+          showClose: true,
+          message: '请填写终止意见！',
+          type: 'error'
+        })
+        return
+      }
       req.breakTask(this.stopList).then((response) => {
         if (response.success) {
           this.$message({

anrui-scm/anrui-scm-ui/src/views/workFlow/tiaochekaipiaoshenqingFlow/tiaochekaipiaoshenqingCallInToCallOut.vue

@@ -277,6 +277,7 @@ export default {
     // 点击同意
     openAgree(val) {
       this.operation = val
+      this.dialogList.comment = '同意'
       this.currentLink = true // 控制当前环节一行的显示隐藏
       // const formVariables = {
       //   businessSid: this.agreeList.businessSid
@@ -293,6 +294,7 @@ export default {
     // 点击驳回
     openReject(val) {
       this.operation = val
+      this.dialogList.comment = ''
       this.currentLink = true // 控制当前环节一行的显示隐藏
       // const formVariables = {
       //   businessSid: this.regectList.businessSid
@@ -309,6 +311,7 @@ export default {
     // 点击终止
     openStop(val) {
       this.operation = val
+      this.dialogList.comment = ''
       this.currentLink = false // 控制当前环节一行的显示隐藏
       this.nodeDialogVisible = true
     },
@@ -325,6 +328,14 @@ export default {
     /** 同意任务 */
     handleAgree() {
       this.agreeList.comment = this.dialogList.comment
+      if (this.agreeList.comment == '') {
+        this.$message({
+          showClose: true,
+          message: '请填写同意意见！',
+          type: 'error'
+        })
+        return
+      }
       req.agreeTaskCallInToCallOut(this.agreeList).then((response) => {
         if (response.success) {
           this.$message({
@@ -347,6 +358,14 @@ export default {
     /** 驳回任务 */
     handleReject() {
       this.regectList.comment = this.dialogList.comment
+      if (this.regectList.comment == '') {
+        this.$message({
+          showClose: true,
+          message: '请填写驳回意见！',
+          type: 'error'
+        })
+        return
+      }
       req.rejectTask(this.regectList).then((response) => {
         if (response.success) {
           this.$message({
@@ -369,6 +388,14 @@ export default {
     /** 终止任务 */
     handleStop() {
       this.stopList.comment = this.dialogList.comment
+      if (this.stopList.comment == '') {
+        this.$message({
+          showClose: true,
+          message: '请填写终止意见！',
+          type: 'error'
+        })
+        return
+      }
       req.breakTask(this.stopList).then((response) => {
         if (response.success) {
           this.$message({