zzr99
2022-07-25 ec7d09fe32374d45ec3d25a8c64e59d9d5e6a901
WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs
@@ -7,6 +7,7 @@
using System.Net;
using System.Net.Http;
using System.Web.Http;
using ViewAPI;
using WebAPI.Models;
namespace WebAPI.Controllers.MJGL
@@ -28,6 +29,7 @@
        {
            try
            {
                Log.LogInfo("成功!"); //记录提交数据
                //编辑权限
                if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdInBillList", 1, false, user))
                {
@@ -37,24 +39,25 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                Log.LogInfo("有权限");
                ds = Sc_GetMouldProdInHouseBill(sWhere,Organization);
                if (ds == null)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "查询数据异常,请与管理员联系!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "返回记录成功!";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
                //if (ds.Tables[0].Rows.Count != 0 || ds != null)
                //{
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess!";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
                //}
                //else
                //{
                //objJsonResult.code = "0";
                //objJsonResult.count = 0;
                //objJsonResult.Message = "无数据";
                //objJsonResult.data = null;
                //return objJsonResult;
                //}
            }
            catch (Exception ex)
            {
@@ -68,14 +71,16 @@
        public static DataSet Sc_GetMouldProdInHouseBill(string sWhere, string Organization)
        {
            LogService.Write(sWhere+";"+ Organization);
            string sql1 = string.Format(@"select * from h_v_Sc_MouldProdInHouseBillList where 库存组织='" + Organization + "'");
            if (sWhere == null || sWhere.Equals(""))
            {
                return new SQLHelper.ClsCN().RunProcReturn(sql1+ sWhere + "order by 日期 desc", "h_v_Sc_MouldProdInHouseBillList");
                return new SQLHelper.ClsCN().RunProcReturn(sql1+ sWhere + "order by hmainid desc", "h_v_Sc_MouldProdInHouseBillList");
            }
            else
            {
                string sql = sql1 + sWhere+ "order by 日期 desc";
                string sql = sql1 + sWhere+ "order by hmainid desc";
                Log.LogInfo(sql);
                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldProdInHouseBillList");
            }
        }
@@ -630,7 +635,16 @@
                if (bResult)
                {
                    string sql = $"exec h_p_Sc_MouldChangeFileStatus  'in','{oBill.omodel.HInterID.ToString()}' ";
                    oCn.RunProc(sql);
                    DataSet db=oCn.RunProcReturn(sql, "h_p_Sc_MouldChangeFileStatus");
                    if (db.Tables[0].Rows[0]["issuccess"].ToString()=="0")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "器具位置同步失败!";
                        //WebAPIController.Add_Log("送货单下推", UserName, "生成送货单");
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "保存成功!";