yxj
10 天以前 ae36a4639fff74935c27c8e7bb0ce6b39ad039a5
WebAPI/Controllers/SCGL/Èռƻ®¹ÜÀí/Sc_JIT_ComplementGoodBillController.cs
@@ -719,11 +719,11 @@
                    string JIDLT = ""; //JIT到货前置期(天)
                    string JIMLC = ""; //JIT最小起送量
                    HORGNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["组织编码"].ToString());
                    HORGNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["组织编码"].ToString()).Replace("'", "");
                    HORGName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["组织"].ToString());
                    HSupNumer = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["供应商代码"].ToString());
                    HSupNumer = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["供应商代码"].ToString()).Replace("'", "");
                    HSupName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["供应商"].ToString());
                    HMaterNumer = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["物料代码"].ToString());
                    HMaterNumer = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["物料代码"].ToString()).Replace("'", "");
                    HMaterName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["物料名称"].ToString());
                    HMaterModel = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["规格型号"].ToString());
                    HUntilName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["计量单位"].ToString());
@@ -809,7 +809,7 @@
                        string msg = "";
                        oSystemParameter.ShowBill(ref msg);
                        if (oSystemParameter.omodel.WMS_CampanyName == "宝工")
                        if (oSystemParameter.omodel.WMS_CampanyName == "宝工"|| oSystemParameter.omodel.WMS_CampanyName == "三升")
                        {
                            //JIT供货提前期(天)
                            if (JISLT == "")
@@ -1028,6 +1028,7 @@
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //查询权限
                if (!DBUtility.ClsPub.Security_Log_second("JIT_NeedMaterPlanConfigBill_Query", 1, false, user))
                {
@@ -1040,10 +1041,19 @@
                ds = oCN.RunProcReturn("select * from h_v_JIT_NeedMaterPlanConfigBillList where 1=1 " + sWhere + " order by hmainid desc ", "h_v_JIT_NeedMaterPlanConfigBillList");
                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess!";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception e)
@@ -1435,11 +1445,11 @@
                    string JIDLT = ""; //JIT到货前置期(天)
                    string JIMLC = ""; //JIT最小起送量
                    HORGNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["组织编码"].ToString());
                    HORGNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["组织编码"].ToString()).Replace("'","");
                    HORGName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["组织"].ToString());
                    HWorkShopNumer = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["车间代码"].ToString());
                    HWorkShopNumer = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["车间代码"].ToString()).Replace("'", "");
                    HWorkShopName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["车间"].ToString());
                    HMaterNumer = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["物料代码"].ToString());
                    HMaterNumer = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["物料代码"].ToString()).Replace("'", "");
                    HMaterName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["物料名称"].ToString());
                    HMaterModel = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["规格型号"].ToString());
@@ -1508,7 +1518,7 @@
                        string msg = "";
                        oSystemParameter.ShowBill(ref msg);
                        if (oSystemParameter.omodel.WMS_CampanyName == "宝工")
                        if (oSystemParameter.omodel.WMS_CampanyName == "宝工"|| oSystemParameter.omodel.WMS_CampanyName == "三升")
                        {
                            //JIT供货提前期(天)
                            if (JISLT == "")
@@ -1701,7 +1711,7 @@
                    }
                    else
                    {
                        oCN.RunProc("   update  JIT_NeedMaterPlanConfigBillMain set HLeadTime=" + JISLT + ",HLeadTime_Sec=" + JIDLT + "  where HMaterID=" + HMaterID + " and HWorkShopID = " + HWorkShopID);
                        oCN.RunProc("   update  JIT_NeedMaterPlanConfigBillSub set HLeadTime=" + JISLT + ",HLeadTime_Sec=" + JIDLT + "  where HMaterID=" + HMaterID + " and HWorkShopID = " + HWorkShopID);
                    }
                    i++;