智云MES后端API代码
parent: 74f3a827 | 补丁 | 提交 | ignore whitespace
yangle
2022-08-09 88bb69435005d4fb19ac431e9d4dff851df2e1b6 
Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
2个文件已修改
58 ■■■■■ 已修改文件
WebAPI/Config/kdapi.config 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/POStockInBillController.cs 53 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 WebAPI/Config/kdapi.config


@@ -4,6 +4,7 @@


        <add key="DbId" value="6204a70eba35fc"></add>


        <add key="UserName" value="Administrator"></add>


        <add key="PassWord" value="qaz!@#123"></add>


        <add key="KDApiUrl" value="http://localhost/K3Cloud/"></add>


    </appSettings>


    <add key="KDApiUrl" value="http://47.96.97.237/K3Cloud/"></add>


    <add key="DataBaseName" value="AIS20210811135644"></add>


  </appSettings>


</configuration>




 WebAPI/Controllers/POStockInBillController.cs


@@ -1058,7 +1058,7 @@


                    string FCusName = oSystemParameter.GetSingleSystemParameter("WMS_CampanyName", ref DBUtility.ClsPub.sExeReturnInfo);


                    DataTable dt = new DataTable();


                    List<string> fidList = new List<string>();


                    if (FCusName == "瑞与祺")


                    if (FCusName == "瑞与祺" || FCusName == "")


                    {


                        sql = string.Format(@"


SELECT T3.FNAME AS FTYPENAME,M.HBILLNO,B.HINTERID,B.HENTRYID,C.FID,C.FENTRYID, D.FBILLNO,B.HQTY,CD.FRECEIVEORGID,CDOO.FNUMBER AS FRECEIVENUMBER


@@ -1076,7 +1076,7 @@


LEFT JOIN {0}..T_ORG_ORGANIZATIONS CROO ON CR.FSETTLEORGID = CROO.FORGID


LEFT JOIN {0}..T_PUR_POORDER D ON C.FID =D.FID


LEFT JOIN {0}..T_BAS_BILLTYPE T2 ON D.FBILLTYPEID = T2.FBILLTYPEID


LEFT JOIN {0}..T_BAS_BILLTYPE_L T3 ON T2.FBILLTYPEID = T3.FBILLTYPEID


LEFT JOIN {0}..T_BAS_BILLTYPE_L T3 ON T2.FBILLTYPEID = T3.FBILLTYPEID and FLOCALEID=2052


LEFT JOIN  {0}..V_BD_BUYER T4 ON D.FPURCHASERID =T4.FID


LEFT JOIN {0}..T_BD_SUPPLIER DS ON D.FSUPPLIERID = DS.FSUPPLIERID


LEFT JOIN {0}..T_ORG_ORGANIZATIONS DOO ON D.FPURCHASEORGID = DOO.FORGID


@@ -1118,10 +1118,8 @@


                                model.Add("FPurOrgId", new JObject() { ["Fnumber"] = dr["FPURCHASEORGNUMBER"].ToString() }); //采购组织


                                model.Add("FSupplierId", new JObject() { ["Fnumber"] = dr["FSUPPLIERNUMBER"].ToString() }); //供应商


                                model.Add("FPURCHASERID", new JObject() { ["Fnumber"] = dr["FPURCHASERNUMBER"].ToString() }); //采购员


                                                                                                                              //model.Add("F_xbkf_Base", new JObject() { ["Fnumber"] = dr["FRECEIVEMENNUMBER"].ToString() }); //收料员


                                model.Add("FOwnerTypeIdHead", "BD_Supplier");//  货主类型


                                model.Add("FOwnerIdHead", new JObject() { ["Fnumber"] = dr["FSUPPLIERNUMBER"].ToString() });//货主 供应商 


                                                                                                                            //model.Add("F_XBKF_COMBO", dr["F_xbkf_Combo1"].ToString());//是否有票 


                                JArray Fentity = new JArray();


                                foreach (var item in drs)


                                {


@@ -1174,7 +1172,7 @@


                                };


                                var loginRet = InvokeHelper.Login();


                                var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();


                                if (isSuccess == 0)


                                if (isSuccess <= 0)


                                {


                                    objjson.code = "0";


                                    objjson.count = 0;


@@ -1231,8 +1229,8 @@


JOIN {0}..T_PUR_POORDERENTRY_F CR ON    C.FENTRYID = CR.FENTRYID


LEFT JOIN {0}..T_ORG_ORGANIZATIONS CROO ON CR.FSETTLEORGID = CROO.FORGID


LEFT JOIN {0}..T_PUR_POORDER D ON C.FID =D.FID


LEFT JOIN {0}..T_BAS_BILLTYPE T2 ON D.FBILLTYPEID = T2.FBILLTYPEID


LEFT JOIN {0}..T_BAS_BILLTYPE_L T3 ON T2.FBILLTYPEID = T3.FBILLTYPEID


LEFT JOIN {0}..T_BAS_BILLTYPE T2 ON D.FBILLTYPEID = T2.FBILLTYPEID 


LEFT JOIN {0}..T_BAS_BILLTYPE_L T3 ON T2.FBILLTYPEID = T3.FBILLTYPEID  and FLOCALEID=2052


LEFT JOIN  {0}..V_BD_BUYER T4 ON D.FPURCHASERID =T4.FID


LEFT JOIN  {0}..T_HR_EMPINFO T5 ON D.F_XBKF_BASE1 = T5.FID


LEFT JOIN {0}..T_BD_SUPPLIER DS ON D.FSUPPLIERID = DS.FSUPPLIERID


@@ -1371,7 +1369,7 @@


                        }


                    }


                }


                var check = Get_ReciveBillCheckDate(HBillNo);


                var check = Exec_ReciveBillCheck(HBillNo);


                if (check.code == "0")


                    return check;


                //if(check)


@@ -1438,7 +1436,7 @@


                    else


                    {


                        objjson.code = "0";


                        objjson.count = 0; 


                        objjson.count = 0;


                        objjson.Message = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRemark"]);


                        objjson.data = null;


                        return objjson;


@@ -1452,15 +1450,16 @@


                objjson.Message = "没有返回任何记录！" + e.ToString();


                objjson.data = null;


                return objjson;


               




            }


        }




        //收料通知单审核 审核提交


        [Route("POStockInBillList/Exec_ReciveBillCheck")]


        [HttpGet]


        public object Exec_ReciveBillCheck(string HBarCode)


        public json Exec_ReciveBillCheck(string HBarCode)


        {


            json objjson = new json();


            try


            {


                //修改金蝶生产单的状态


@@ -1470,11 +1469,11 @@




                if (isSuccess == 0)


                {


                    objJsonResult.code = "0";


                    objJsonResult.count = 0;


                    objJsonResult.Message = "操作失败,金蝶账号登录异常。" + loginRet;


                    objJsonResult.data = null;


                    return objJsonResult;


                    objjson.code = "0";


                    objjson.count = 0;


                    objjson.Message = "操作失败,金蝶账号登录异常。" + loginRet;


                    objjson.data = null;


                    return objjson;


                }


                var json = new


                {


@@ -1499,25 +1498,25 @@


                //判断审核是否成功


                if (JObject.Parse(result2)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")


                {


                    objJsonResult.code = "0";


                    objJsonResult.count = 0;


                    objJsonResult.Message = "审核收料通知单失败！单据号：" + HBarCode;


                    objJsonResult.data = null;


                    return objJsonResult;


                    objjson.code = "0";


                    objjson.count = 0;


                    objjson.Message = "审核收料通知单失败！单据号：" + HBarCode;


                    objjson.data = null;


                    return objjson;


                }


                objJsonResult.code = "1";


                objJsonResult.count = 1;


                objJsonResult.Message = "审核成功！";


                objJsonResult.data = 1;


                return objJsonResult;


                return objjson;


            }


            catch (Exception e)


            {


                objJsonResult.code = "0";


                objJsonResult.count = 0;


                objJsonResult.Message = "没有返回任何记录！" + e.ToString();


                objJsonResult.data = null;


                return objJsonResult;


                objjson.code = "0";


                objjson.count = 0;


                objjson.Message = "没有返回任何记录！" + e.ToString();


                objjson.data = null;


                return objjson;


            }




        }