diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareService.java
index 49acd8a4c8..7030ca14f7 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareService.java
@@ -310,10 +310,7 @@ public class BaseManufacturerRetwareService extends MybatisBaseService<BaseManuf
          * 批号:FLot
          */
         fp.setFLot(baseVehicle.getVinNo());
-        /**
-         * 实退数量:FRMREALQTY
-         */
-       // fp.setFRMREALQTY(1.0);
+
         /**
          * 仓库:FSTOCKID
          */
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java
index e0e0a7418b..03ec5259bd 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java
@@ -98,4 +98,8 @@ public interface FinKingDeeFeign {
     @GetMapping("/getKingDataInfoByNumber/{formId}/{number}")
     @ResponseBody
     ResultBean<String> getKingDataInfoByNumber(@PathVariable("formId") String formId, @PathVariable("number") String number);
+    @ApiOperation("单据查询")
+    @GetMapping("/executeBillQuery/{formId}/{number}")
+    @ResponseBody
+    ResultBean<String> executeBillQuery();
 }
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeignFallBack.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeignFallBack.java
index a6b93a5442..368988617c 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeignFallBack.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeignFallBack.java
@@ -83,4 +83,9 @@ implements FinKingDeeFeign{
         return null;
     }
 
+    @Override
+    public ResultBean<String> executeBillQuery() {
+        return null;
+    }
+
 }
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java
index fbd798fcdb..f988d7c32f 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java
@@ -187,4 +187,12 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
         return bdCustomerService.getKingDataInfoByNumber(formId,number);
     }
 
+    @ApiOperation("单据查询")
+    @PostMapping("/executeBillQuery")
+    @ResponseBody
+    @Override
+    public ResultBean<String> executeBillQuery() {
+        return bdCustomerService.getKingBillDataInfoList("","");
+    }
+
 }
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeService.java
index 6200909aaf..426d0b672d 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeService.java
@@ -256,7 +256,7 @@ public class FinKingDeeService {
     }
 
     public ResultBean<String> getKingBillDataInfoList(String formId,String jsonParam) {
-       /* String jsonParam="{\\\"FormId\\\":\\\""+KingDeeBillId.BD_MATERIAL+"\\\"," +
+         /*String jsonParam="{\\\"FormId\\\":\\\""+KingDeeBillId.BD_MATERIAL+"\\\"," +
                 "\\\"FieldKeys\\\":\\\"\\\",\\\"FilterString\\\":\\\"FName=''\\\",\\\"OrderString\\\":\\\"\\\"," +
                 "\\\"TopRowCount\\\":\\\"0\\\",\\\"StartRow\\\":\\\"0\\\",\\\"Limit\\\":\\\"0\\\"}";*/
         KingDeeParams kdp = getKingDeeParams(formId, jsonParam);
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/KingDeeSaveSKD.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/KingDeeSaveSKD.java
index aa33a0d6f3..bfdd65acdc 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/KingDeeSaveSKD.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/KingDeeSaveSKD.java
@@ -292,7 +292,7 @@ public class KingDeeSaveSKD {
             //采购入库单保存参数
             log.info("jsonParam:{}",JSON.toJSON(jsonParam.getData()));
             //StringEntity entity = new StringEntity(jsonParam.getData(), "utf-8");"{\\\"FormId\\\":\\\"BD_MATERIAL\\\",\\\"TopRowCount\\\":0,\\\"Limit\\\":10,\\\"StartRow\\\":0,\\\"FilterString\\\":\\\"FNumber=' JX091054'\\\",\\\"OrderString\\\":\\\"FID ASC\\\",\\\"FieldKeys\\\":\\\"FUseOrgId,FNumber\\\"}"
-            StringEntity entity = new StringEntity("{\\\"FormId\\\":\\\"BD_MATERIAL\\\",\\\"FieldKeys\\\":\\\"FName\\\",\\\"FilterString\\\":\\\"\\\",\\\"OrderString\\\":\\\"\\\",\\\"TopRowCount\\\":\\\"0\\\",\\\"StartRow\\\":\\\"0\\\",\\\"Limit\\\":\\\"10\\\"}", "utf-8");
+            StringEntity entity = new StringEntity(jsonParam.getData(), "utf-8");
             log.info(JSON.toJSONString(entity));
             entity.setContentEncoding("UTF-8");
             entity.setContentType("application/json");
@@ -370,8 +370,8 @@ public class KingDeeSaveSKD {
             //登录请求参数
             Map<String,String> loginParams=new HashMap<>();
             loginParams.put("acctID",acctID);
-            loginParams.put("userName",userName);
-            loginParams.put("password",password);
+            loginParams.put("userName",userName_administrator);
+            loginParams.put("password",password_administrator);
             loginParams.put("lcid",lcid);
             String jsonParamdl=JSON.toJSONString(loginParams);
             StringEntity entity = new StringEntity(jsonParamdl, "utf-8");
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkinstock/STKInStockService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkinstock/STKInStockService.java
index 03bc2dbc57..19ddcb3f0e 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkinstock/STKInStockService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkinstock/STKInStockService.java
@@ -1,6 +1,7 @@
 package com.yxt.anrui.fin.biz.kingdee.stkinstock;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.yxt.anrui.fin.api.kingdee.KingDeeBillId;
 import com.yxt.anrui.fin.api.kingdee.KingDeeResult;
@@ -53,22 +54,36 @@ public class STKInStockService extends FinKingDeeService {
                 JSONObject result2 = (JSONObject)result.get("Result");
                 Integer Id = (Integer)result2.get("Id");
                 log.info("Id:{}",Id);
-                String jsonParam="{\\\"FormId\\\":\\\""+KingDeeBillId.BD_MATERIAL+"\\\"," +
+               /* String jsonParam="{\\\"FormId\\\":\\\""+KingDeeBillId.BD_MATERIAL+"\\\"," +
                         "\\\"FieldKeys\\\":\\\"FUseOrgId\\\",\\\"FilterString\\\":\\\"FNumber='"+f.getFMaterialId()+"'\\\",\\\"OrderString\\\":\\\"\\\"," +
-                        "\\\"TopRowCount\\\":\\\"0\\\",\\\"StartRow\\\":\\\"0\\\",\\\"Limit\\\":\\\"100\\\"}";
+                        "\\\"TopRowCount\\\":\\\"0\\\",\\\"StartRow\\\":\\\"0\\\",\\\"Limit\\\":\\\"100\\\"}";*/
+                String jsonParam="{\"data\":\"{\\\"FormId\\\":\\\""+KingDeeBillId.BD_MATERIAL+"\\\"," +
+                        "\\\"FieldKeys\\\":\\\"FName,FNumber,FUseOrgId\\\",\\\"FilterString\\\":\\\"FNumber='"+f.getFMaterialId()+"'\\\"," +
+                        "\\\"OrderString\\\":\\\"\\\",\\\"TopRowCount\\\":\\\"0\\\",\\\"StartRow\\\":\\\"0\\\",\\\"Limit\\\":\\\"20\\\"}\"}";
                 ResultBean<String> kingBillDataInfoList = getKingBillDataInfoList(KingDeeBillId.BD_MATERIAL.getID(), jsonParam);
-                //if(kingBillDataInfoList.getData().indexOf(stkInStock.getTOrgId())<0){
+                String data1 = kingBillDataInfoList.getData();
+                JSONArray jSONArray = JSONArray.parseArray(data1);
+                boolean b=true;
+                for(int i=0;i<jSONArray.size();i++){
+                    JSONArray ja = (JSONArray) jSONArray.get(i);
+                    int o =(int) ja.get(2);
+                    String tOrgId = stkInStock.getTOrgId();
+                    if(tOrgId!=null&tOrgId.equals(o+"")){
+                        b=false;
+                    }
+                }
+                if(b){
                     String data="{\"formId\":\""+KingDeeBillId.BD_MATERIAL.getID()+"\"," +
                             "\"data\":\"{\\\"PkIds\\\":\\\""+Id+"\\\",\\\"TOrgIds\\\":\\\""+stkInStock.getTOrgId()+"\\\"," +
                             "\\\"IsAutoSubmitAndAudit\\\":\\\"true\\\"}\"}";
                     ResultBean<List<KingDeeResult>> resultBean3 =allocateKingDeeBillData(KingDeeBillId.BD_MATERIAL.getID(),data);// allocateKingDeeBillData(KingDeeBillId.BD_MATERIAL.getID(), allocate);
                     if(!resultBean3.getSuccess()){
                         log.info("物料分配失败!");
-                       // return resultBean3.setMsg("物料分配失败!");
+                        // return resultBean3.setMsg("物料分配失败!");
                     }
                     log.info("物料分配成功!");
                     log.info("resultBean3:{}",resultBean3);
-              //  }
+                }
             }
         }
        // ResultBean<String> kingBillDataInfoList = bdMaterialService.getKingBillDataInfoList(KingDeeBillId.BD_MATERIAL, "");