陈镐哲 2025/4/22 提交

chenhaozhe

2 天以前 d7f3369550e06d123fc959f8da3549535c2a5afe

陈镐哲 2025/4/22 提交

 DAL/ÏúÊÛ¹ÜÀí/ClsXs_SeOrderBill.cs

@@ -106,6 +106,7 @@
                ",HWHID='" + omodel.HWHID + "'" +
                ",HProjectID='" + omodel.HProjectID + "'" +
                ",HLinkPhone='" + omodel.HLinkPhone + "'" +
                ",HProductType='" + omodel.HProductType + "'" +
                " where HInterID=" + lngBillKey.ToString();

                oCn.RunProc(mainSql);
@@ -283,7 +284,7 @@
                string mainSql = "Insert Into Xs_SeOrderBillMain" +
                    "(HYear,HPeriod,HBillType,HBillSubType,HBillStatus,HExplanation" +
                    ",HInterID,HBillNo,HDate,HInnerBillNo,HAddress,HDeptID,HCusID,HEmpID,HCurID,HExRate,HEarnestRate,HManagerID,HSellSID,HSSID,HSSDate,HPayCusID,HRemark,HOrgID,HMaker,HMakeDate,HLinkMan,HLinkPhone" +
                    ",HERPInterID,HERPBillType,HSALEORGID,HSALEGROUPID,HRECEIVEID,HSETTLEID,HCHARGEID,HHEADLOCID,HRECCONTACTID,HCORRESPONDORGID,HBUSINESSTYPE,HProjectID,HWHID) " +
                    ",HERPInterID,HERPBillType,HSALEORGID,HSALEGROUPID,HRECEIVEID,HSETTLEID,HCHARGEID,HHEADLOCID,HRECCONTACTID,HCORRESPONDORGID,HBUSINESSTYPE,HProjectID,HWHID,HProductType) " +
                    "values(" +
                    "" + omodel.HYear +
                    "," + omodel.HPeriod +
@@ -330,6 +331,7 @@

                    "','" + omodel.HProjectID +
                    "','" + omodel.HWHID +
                    "','" + omodel.HProductType +
                    "')";
                    
                oCn.RunProc(mainSql);
@@ -496,6 +498,7 @@

                omodel.HLinkMan = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HLinkMan"]);
                omodel.HLinkPhone = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HLinkPhone"]);
                omodel.HProductType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HProductType"]);
                //

                //循环

 DBUtility/bin/Release/DBUtility.dll

Binary files differ

 Model/ÏúÊÛ¹ÜÀí/ClsXs_SeOrderBillMain.cs

@@ -63,6 +63,7 @@

        public int HProjectID;  //int --工程项目
        public int HWHID;   //int --仓库  
        public string HProductType;     //varchar       äº§å“ç±»åž‹


    }

 SyntacticSugar/bin/Debug/SyntacticSugar.dll

Binary files differ

 SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt

@@ -5,7 +5,6 @@
D:\工作代码\智云迈思\MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb

 SyntacticSugar/obj/Debug/SyntacticSugar.dll

Binary files differ

 SyntacticSugar/obj/Debug/SyntacticSugar.pdb.BASE.pdb

Binary files differ

 WebAPI/Controllers/BaseSet/Gy_MaterialController.cs

@@ -570,6 +570,7 @@
                    oItem.HShortNumber = sShortNumber;//短代码
                    oItem.HEndFlag = true;//末级标志
                    oItem.HLevel = DBUtility.ClsPub.GetLevel(oItem.HNumber.Trim()); //等级
                    oItem.HMakeEmp = msg2;
                    oBill.oModel = oItem;
                }
                //保存

 WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs

@@ -26,6 +26,7 @@
        public DAL.ClsGy_Process_View oProcHlp = new DAL.ClsGy_Process_View();
        DAL.ClsGy_WorkCenter_View oCenHlp = new DAL.ClsGy_WorkCenter_View();
        DAL.ClsGy_Warehouse_View oCenWare = new DAL.ClsGy_Warehouse_View();
        DAL.ClsGy_Source_View oSourceHlp = new DAL.ClsGy_Source_View();
        Gy_RoutingBill_temporary omdelMian = new Gy_RoutingBill_temporary();
        public string BillType = "3301";
        Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
@@ -1413,6 +1414,598 @@
        }
        #endregion

        #region å·¥è‰ºè·¯çº¿_孙表 æ–‡ä»¶ä¸Šä¼ 
        [Route("Gy_RoutingBill/Gy_RoutingBillimport_WorkQty")]
        [HttpPost]
        public object Gy_RoutingBillimport_WorkQty()
        {
            try
            {
                var WorkBookName = HttpContext.Current.Request["WorkBookName"];
                DBUtility.ClsPub.HOrgID = long.Parse(HttpContext.Current.Request["HOrgID"]);
                Int64 HOrgID = long.Parse(HttpContext.Current.Request["HOrgID"]);
                //获取文件名称
                var file = HttpContext.Current.Request.Files[0];
                //获取文件物理路径
                string ExcelPath = HttpContext.Current.Server.MapPath("~/" + file.FileName);
                //保存文件
                file.SaveAs(ExcelPath);

                NpoiHelper np = new NpoiHelper();
                DataSet ExcelDs = np.ReadExcel(ExcelPath, 1, 2, WorkBookName);

                //删除文件
                File.Delete(ExcelPath);

                //创建临时表
                DataTable tb2 = new DataTable("dt2");
                DataTable tb3 = new DataTable("dt3");

                //添加列名
                for (int i = 0; i < ExcelDs.Tables[0].Columns.Count; i++)
                {
                    tb2.Columns.Add(ExcelDs.Tables[0].Rows[0][i].ToString());
                }

                //添加数据
                for (int i = 1; i < ExcelDs.Tables[0].Rows.Count; i++)
                {
                    DataRow row = tb2.NewRow();
                    for (int j = 0; j < ExcelDs.Tables[0].Columns.Count; j++)
                    {
                        row[j] = ExcelDs.Tables[0].Rows[i][j].ToString();
                    }
                    tb2.Rows.Add(row);
                }


                var error = "";

                //查询工艺路线没有的列
                if (!tb2.Columns.Contains("产品代码"))
                    error += "没有找到【产品代码】的标题,";

                if (!tb2.Columns.Contains("工序序号"))
                    error += "没有找到【工序序号】的标题,";

                if (!tb2.Columns.Contains("工序"))
                    error += "没有找到【工序】的标题,";

                if (!tb2.Columns.Contains("加工数量"))
                    error += "没有找到【加工数量】的标题,";

                //if (!tb2.Columns.Contains("工作中心"))
                //    error += "没有找到【工作中心】的标题,";

                //if (!tb2.Columns.Contains("本道开工余量"))
                //    error += "没有找到【本道开工余量】的标题,";

                //if (!tb2.Columns.Contains("本道固定开工天数"))
                //    error += "没有找到【本道固定开工天数】的标题,";

                //if (!tb2.Columns.Contains("班产定额"))
                //    error += "没有找到【班产定额】的标题,";

                //if (!tb2.Columns.Contains("工序工价"))
                //    error += "没有找到【工序工价】的标题,";

                //if (!tb2.Columns.Contains("工艺参数"))
                //    error += "没有找到【工艺参数】的标题,";

                //if (!tb2.Columns.Contains("图纸编号"))
                //    error += "没有找到【图纸编号】的标题,";

                //if (!tb2.Columns.Contains("本工序确认记录"))
                //    error += "没有找到【本工序确认记录】的标题,";

                //if (!tb2.Columns.Contains("图号版本"))
                //    error += "没有找到【图号版本】的标题,";

                //if (!tb2.Columns.Contains("总装图号"))
                //    error += "没有找到【总装图号】的标题,";

                //if (!tb2.Columns.Contains("材质"))
                //    error += "没有找到【材质】的标题,";

                //if (!tb2.Columns.Contains("成品编号"))
                //    error += "没有找到【成品编号】的标题,";

                //if (!tb2.Columns.Contains("版本"))
                //    error += "没有找到【版本】的标题,";

                //if (!tb2.Columns.Contains("模具编号"))
                //    error += "没有找到【模具编号】的标题,";

                //if (!tb2.Columns.Contains("程序号"))
                //    error += "没有找到【程序号】的标题,";

                //if (!tb2.Columns.Contains("良率"))
                //    error += "没有找到【良率】的标题";

                //if (!tb2.Columns.Contains("不良品仓"))
                //    error += "没有找到【不良品仓】的标题";

                //if (!tb2.Columns.Contains("报废品仓"))
                //    error += "没有找到【报废品仓】的标题";

                //if (!tb2.Columns.Contains("良品仓"))
                //    error += "没有找到【良品仓】的标题";

                if (!tb2.Columns.Contains("生产资源代码"))
                    error += "没有找到【生产资源代码】的标题,";

                //if (!tb2.Columns.Contains("生产资源"))
                //    error += "没有找到【生产资源】的标题,";

                if (error.Length > 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = $"Excel模板存在错误,{error}\r\n";
                    objJsonResult.data = null;
                    return objJsonResult;
                }


                //数据校验
                objJsonResult = (json)Checkdata_WorkQty(tb2);
                if (objJsonResult.code == "0")
                {
                    return objJsonResult;
                }

                //删除临时表数据
                oCN.RunProc("delete from diyipi_WorkQty");

                //临时表添加数据
                for (int i = 0; i < tb2.Rows.Count; i++)
                {
                    string sql_temp = "insert into diyipi_WorkQty(工艺路线代码,工艺路线名称, äº§å“ä»£ç ,产品名称,工序序号,工序代码,工序,工作中心,加工数量" +
                                //", è‰¯çŽ‡, å·¥åºå·¥ä»·, ä¸åˆæ ¼å•ä»·, æŠ¥åºŸå•ä»·, æœ¬é“固定开工天数, æœ¬é“开工余量, ä¸Šé“等待天数" +
                                //", ä¸Šé“循环周期, è‡ªåŠ¨è½¬ç§», å¤–协标记, ä¾›åº”商代码, ä¾›åº”商, å·¥è‰ºå‚æ•°, å›¾çº¸ç¼–号" +
                                //", æœ¬å·¥åºç¡®è®¤è®°å½•, å¤‡æ³¨, å›¾å·ç‰ˆæœ¬, æ€»è£…图号, æè´¨, æˆå“ç¼–号, ç‰ˆæœ¬" +
                                //", æ¨¡å…·ç¼–号, ç¨‹åºå·, ç­äº§å®šé¢, æ—¶é—´å•ä½,不良品仓,报废品仓,良品仓" +
                                ",生产资源代码,HOrgID" +
                                ") " +
                                " values(" +
                                "'" + tb2.Rows[i]["工艺路线代码"].ToString() + "'" +
                                ",'" + tb2.Rows[i]["工艺路线名称"].ToString() + "'" +
                                ",'" + tb2.Rows[i]["产品代码"].ToString() + "'" +
                                ",'" + tb2.Rows[i]["产品名称"].ToString() + "'" +
                                ",'" + tb2.Rows[i]["工序序号"].ToString() + "'" +
                                ",'" + tb2.Rows[i]["工序代码"].ToString() + "'" +
                                ",'" + tb2.Rows[i]["工序"].ToString() + "'" +
                                ",'" + tb2.Rows[i]["工作中心"].ToString() + "'" +
                                ",'" + tb2.Rows[i]["加工数量"].ToString() + "'" +
                                //",'" + tb2.Rows[i]["良率"].ToString() + "'" +
                                //",'" + (tb2.Rows[i]["工序工价"].ToString() == "" ? "0" : tb2.Rows[i]["工序工价"].ToString()) + "'" +
                                //",'" + tb2.Rows[i]["不合格单价"].ToString() + "'" +
                                //",'" + tb2.Rows[i]["报废单价"].ToString() + "'" +
                                //",'" + tb2.Rows[i]["本道固定开工天数"].ToString() + "'" +
                                //",'" + tb2.Rows[i]["本道开工余量"].ToString() + "'" +
                                //",'" + tb2.Rows[i]["上道等待天数"].ToString() + "'" +
                                //",'" + tb2.Rows[i]["上道循环周期"].ToString() + "'" +
                                //",'" + tb2.Rows[i]["自动转移"].ToString() + "'" +
                                //",'" + tb2.Rows[i]["外协标记"].ToString() + "'" +
                                //",'" + tb2.Rows[i]["供应商代码"].ToString() + "'" +
                                //",'" + tb2.Rows[i]["供应商"].ToString() + "'" +
                                //",'" + tb2.Rows[i]["工艺参数"].ToString() + "'" +
                                //",'" + tb2.Rows[i]["图纸编号"].ToString() + "'" +
                                //",'" + tb2.Rows[i]["本工序确认记录"].ToString() + "'" +
                                //",'" + tb2.Rows[i]["备注"].ToString() + "'" +
                                //",'" + tb2.Rows[i]["图号版本"].ToString() + "'" +
                                //",'" + tb2.Rows[i]["总装图号"].ToString() + "'" +
                                //",'" + tb2.Rows[i]["材质"].ToString() + "'" +
                                //",'" + tb2.Rows[i]["成品编号"].ToString() + "'" +
                                //",'" + tb2.Rows[i]["版本"].ToString() + "'" +
                                //",'" + tb2.Rows[i]["模具编号"].ToString() + "'" +
                                //",'" + tb2.Rows[i]["程序号"].ToString() + "'" +
                                //",'" + tb2.Rows[i]["班产定额"].ToString() + "'" +
                                //",'" + tb2.Rows[i]["时间单位"].ToString() + "'" +
                                //",'" + tb2.Rows[i]["不良品仓"].ToString() + "'" +
                                //",'" + tb2.Rows[i]["报废品仓"].ToString() + "'" +
                                //",'" + tb2.Rows[i]["良品仓"].ToString() + "'" +
                                ",'" + tb2.Rows[i]["生产资源代码"].ToString() + "'" +
                                "," + HOrgID + "" +
                                ")";
                    oCN.RunProc(sql_temp);
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = error;
                objJsonResult.data = tb2;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }


        //数据检验
        private object Checkdata_WorkQty(DataTable dt)
        {
            bool b = false;
            string sErrMsg = "";
            string sMsg = "";
            for (int i = 0; i <= dt.Rows.Count - 1; i++)
            {
                string sHNumber = "";
                string sHNamePoc = "";
                string sHNumberCen = "";
                Single sWorkQty = 0;
                Single sHPassRate = 0;
                string sHNumberSource = "";

                sHNumber = DBUtility.ClsPub.isStrNull(dt.Rows[i]["产品代码"].ToString());
                sHNamePoc = DBUtility.ClsPub.isStrNull(dt.Rows[i]["工序序号"].ToString());
                sHNamePoc = DBUtility.ClsPub.isStrNull(dt.Rows[i]["工序"].ToString());
                sWorkQty = DBUtility.ClsPub.isSingle(dt.Rows[i]["加工数量"].ToString());

                //sHNumberCen = DBUtility.ClsPub.isStrNull(dt.Rows[i]["工作中心"].ToString());
                //sHPassRate = DBUtility.ClsPub.isSingle(dt.Rows[i]["良率"].ToString());

                sHNumberSource = DBUtility.ClsPub.isStrNull(dt.Rows[i]["生产资源代码"].ToString());

                if (sHNumber != "")
                {
                    //记录检验数据的所在行
                    int index = i + 1;

                    //得到物料内码
                    if (!oMaterHlp.GetInfoByNumber(sHNumber))
                    {
                        sMsg = "[" + sHNumber + "]物料不存在";
                        if (sErrMsg.Contains(sMsg) == false)
                        {
                            sErrMsg = sErrMsg + "[" + sHNumber + "]物料不存在\r\n";
                        }
                        b = true;
                    }

                    //得到工序内码
                    if (!oProcHlp.GetInfoByName(sHNamePoc))
                    {
                        sMsg = "[" + sHNamePoc + "]工序不存在";
                        if (sErrMsg.Contains(sMsg) == false)
                        {
                            sErrMsg = sErrMsg + "[" + sHNamePoc + "]工序不存在\r\n";
                        }
                        b = true;
                    }

                    //加工数量不能小于等于零
                    if (sWorkQty < 0)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "第" + index + "行加工数量不能小于等于零！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }

                    ////良率不能小于等于零
                    //if (sHPassRate <= 0)
                    //{
                    //    objJsonResult.code = "0";
                    //    objJsonResult.count = 0;
                    //    objJsonResult.Message = "第" + index + "行良率不能小于等于零！";
                    //    objJsonResult.data = null;
                    //    return objJsonResult;
                    //}

                    ////审核代码是否合理
                    //if (!DBUtility.ClsPub.AllowNumber(sHNumber))
                    //{
                    //    objJsonResult.code = "0";
                    //    objJsonResult.count = 0;
                    //    objJsonResult.Message = "物料代码中不能出现连续‘.’并且首位末位不能为‘.’！";
                    //    objJsonResult.data = null;
                    //    return objJsonResult;
                    //}


                    ////得到工作中心内码
                    //if (!oCenHlp.GetInfoByName(sHNumberCen))
                    //{
                    //    sMsg = "[" + sHNumberCen + "]工作中心不存在";
                    //    if (sErrMsg.Contains(sMsg) == false)
                    //    {
                    //        sErrMsg = sErrMsg + "[" + sHNumberCen + "]工作中心不存在\r\n";
                    //    }
                    //    b = true;
                    //}


                    //拆分【生产资源代码】，并逐个验证
                    if (sHNumberSource != "")
                    {
                        char[] delimiter = new char[] { ',' };
                        string[] sHNumberSourceList = sHNumberSource.Split(delimiter, StringSplitOptions.RemoveEmptyEntries);
                        for (int t = 0; t < sHNumberSourceList.Length; t++)
                        {
                            if (!oSourceHlp.GetInfoByNumber(sHNumberSourceList[t]))
                            {
                                sMsg = "[" + sHNumberSourceList[t] + "]生产资源不存在";
                                if (sErrMsg.Contains(sMsg) == false)
                                {
                                    sErrMsg = sErrMsg + "[" + sHNumberSourceList[t] + "]生产资源不存在\r\n";
                                }
                                b = true;
                            }
                        }
                    }
                }
            }
            if (b == true)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = sErrMsg;
                objJsonResult.data = null;
                return objJsonResult;
            }
            else
            {
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = sErrMsg;
                objJsonResult.data = null;
                return objJsonResult;
            }

        }
        #endregion

        #region å·¥è‰ºè·¯çº¿_孙表 å¯¼å…¥(保存)
        [Route("Gy_RoutingBill/Gy_RoutingBill_WorkQty_btnSave")]
        [HttpPost]
        public object Gy_RoutingBill_WorkQty_btnSave([FromBody] JObject sMainSub)
        {
            var _value = sMainSub["sMainSub"].ToString();
            string msg1 = _value.ToString();
            oCN.BeginTran();

            //保存主表
            objJsonResult = RoutAddBillMain_WorkQty(msg1);

            if (objJsonResult.code == "0")
            {
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = objJsonResult.Message;
                objJsonResult.data = null;
                return objJsonResult;
            }

            oCN.Commit();
            objJsonResult.code = "1";
            objJsonResult.count = 1;
            objJsonResult.Message = objJsonResult.Message;
            objJsonResult.data = null;
            return objJsonResult;
        }

        public json RoutAddBillMain_WorkQty(string msg1)
        {
            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string msg2 = sArray[0].ToString();
            string msg3 = sArray[1].ToString();
            string user = sArray[2].ToString();

            try
            {
                if (!DBUtility.ClsPub.Security_Log("Gy_RoutingBill_Edit", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无保存权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                //表头字段
                omdelMian = Newtonsoft.Json.JsonConvert.DeserializeObject<Gy_RoutingBill_temporary>(msg2);

                string finalErrMsg = "";

                //获取导入表中的最新数据
                DataSet dsMain = oCN.RunProcReturn("select  distinct äº§å“ä»£ç  from  diyipi_WorkQty", "diyipi_WorkQty");
                if (dsMain.Tables[0].Rows.Count > 0)
                {
                    for(int i=0;i< dsMain.Tables[0].Rows.Count; i++)
                    {
                        string HMaterNumber = DBUtility.ClsPub.isStrNull(dsMain.Tables[0].Rows[0]["产品代码"]);
                        if (!oMaterHlp.GetInfoByNumber(HMaterNumber))
                        {
                            string sMsg = "物料【" + HMaterNumber + "】不存在！";
                            if (finalErrMsg.Contains(sMsg) == false)
                            {
                                finalErrMsg = finalErrMsg + "物料【" + HMaterNumber + "】不存在！\r\n";
                            }
                            continue;
                        }

                        //获取该物料导入的数据中是否存在多个工艺路线，如果存在，则报错
                        string HBillNo = "";
                        Int64 HInterID = 0;
                        DataSet dsHBillNo = oCN.RunProcReturn("select  distinct å·¥è‰ºè·¯çº¿ä»£ç ,工艺路线名称 from  diyipi_WorkQty where äº§å“ä»£ç  = '" + HMaterNumber + "'", "diyipi_WorkQty");
                        if (dsHBillNo.Tables[0].Rows.Count > 1)
                        {
                            string sMsg = "物料【" + HMaterNumber + "】存在多组【工艺路线代码，工艺路线名称】！";
                            if (finalErrMsg.Contains(sMsg) == false)
                            {
                                finalErrMsg = finalErrMsg + "物料【" + HMaterNumber + "】存在多组【工艺路线代码，工艺路线名称】！\r\n";
                            }
                            continue;
                        }
                        else                                                     //物料对应工艺路线唯一，获取工艺路线主内码与工艺路线代码
                        {
                            //生成唯一的工艺路线代码
                            HBillNo = DBUtility.ClsPub.isStrNull(dsHBillNo.Tables[0].Rows[0]["工艺路线代码"]);
                            if (HBillNo == "")
                            {
                                DataSet dataSet = oCN.RunProcReturn($"select HBillNo  from  Gy_RoutingBillMain where HBillNo='1' ", "Gy_RoutingBillMain");
                                while (1 == 1)
                                {
                                    if (HBillNo != "")
                                    {
                                        if (dataSet.Tables[0].Rows.Count == 0)
                                        {
                                            break;
                                        }
                                    }
                                    HBillNo = DBUtility.ClsPub.CreateBillCode(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);
                                    dataSet = oCN.RunProcReturn($"select HBillNo  from  Gy_RoutingBillMain where HBillNo='{HBillNo}' ", "Gy_RoutingBillMain");
                                }
                            }

                            //生成唯一的工艺路线内码
                            if (HInterID == 0)
                            {
                                while (1 == 1)
                                {
                                    HInterID = DBUtility.ClsPub.CreateBillID_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo);//获得一个新的id
                                    DataSet dataSet = oCN.RunProcReturn("select * from Gy_RoutingBillMain where HInterID=" + HInterID, "Gy_RoutingBillMain");
                                    if (dataSet.Tables[0].Rows.Count == 0)
                                    {
                                        break;
                                    }
                                }
                            }
                        }

                        //拼接主表插入语句
                        string sqlMain = "insert into Gy_RoutingBillMain" +
                            "(HInterID,HYear,HPeriod,HBillType,HBillNo,HName,HDate,HMaker,HMakeDate,HRemark,HOrgID" +
                            ",HMaterID,HMaterNumber,HUnitID,HUnitNumber,HStandard,HRoutingGroupID) " +
                            "values(" +
                            "" + HInterID + "" +
                            "," + DateTime.Now.Year + "" +
                            "," + DateTime.Now.Month + "" +
                            ",'" + BillType + "'" +
                            ",'" + HBillNo + "'" +
                            ", ''" +
                            "," + "convert(varchar(100),getdate(),23)" + "" +
                            ",'" + user + "'" +
                            ", getdate()" +
                            ",'" + "批量导入(包含孙表)" + "'" +
                            "," + omdelMian.HOrgID +
                            "," + oMaterHlp.omodel.HItemID + "" +
                            ",'" + oMaterHlp.omodel.HNumber + "'" +
                            "," + oMaterHlp.omodel.HUnitID + "" +
                            ",'" + oMaterHlp.omodel.HUnitNumber + "'" +
                            "," + 1 + "" +
                            "," + 0 + "" +
                            ")";

                        //获取该物料的工艺路线信息子表数据
                        DataSet dsSub = oCN.RunProcReturn("select * from diyipi_WorkQty where äº§å“ä»£ç  = '" + HMaterNumber + "' order by å·¥åºåºå·", "diyipi_WorkQty");
                        for(int j = 0; j < dsSub.Tables[0].Rows.Count; j++)
                        {
                            string HProcNumber = DBUtility.ClsPub.isStrNull(dsSub.Tables[0].Rows[j]["工序代码"]);
                            //得到工序内码
                            if (!oProcHlp.GetInfoByNumber(HProcNumber))
                            {
                                string sMsg = "工序【" + HProcNumber + "】不存在！";
                                if (finalErrMsg.Contains(sMsg) == false)
                                {
                                    finalErrMsg = finalErrMsg + "工序【" + HProcNumber + "】不存在！\r\n";
                                }
                                continue;
                            }
                            else
                            {
                                string sqlSub = "insert into Gy_RoutingBillSub" +
                                    "(HInterID,HEntryID,HProcNo,HProcID,HCenterID,HWorkQty,HSortProcFlag,HRemark,HTimeUnit,HReadyTime,HQueueTime,HMoveTime) " +
                                    "values(" +
                                    "" + HInterID + "" +
                                    "," + (j + 1) + "" +
                                    "," + DBUtility.ClsPub.isLong(dsSub.Tables[0].Rows[j]["工序序号"]) +
                                    "," + oProcHlp.omodel.HItemID + "" +
                                    "," + 0 + "" +
                                    "," + DBUtility.ClsPub.isDoule(dsSub.Tables[0].Rows[j]["加工数量"]) +
                                    ",1" + 
                                    ",'批量导入(包括孙表)'" +
                                    ", 0" +
                                    ", 0" +
                                    ", 0" +
                                    ", 0" +
                                    ")";

                                char[] delimiter = new char[] { ',' };
                                string HSourceNumberList = DBUtility.ClsPub.isStrNull(dsSub.Tables[0].Rows[j]["生产资源代码"]);
                                string[] sHNumberSourceList = HSourceNumberList.Split(delimiter, StringSplitOptions.RemoveEmptyEntries);
                                for(int t = 0; t < sHNumberSourceList.Length; t++)
                                {
                                    //得到生产资源内码
                                    if (!oSourceHlp.GetInfoByNumber(sHNumberSourceList[t]))
                                    {
                                        string sMsg = "生产资源【" + HProcNumber + "】不存在！";
                                        if (finalErrMsg.Contains(sMsg) == false)
                                        {
                                            finalErrMsg = finalErrMsg + "生产资源【" + HProcNumber + "】不存在！\r\n";
                                        }
                                        continue;
                                    }
                                    else
                                    {
                                        string sqlSub_WorkQty = "insert into Gy_RoutingBillSub_WorkQty" +
                                            "(HInterID,HEntryID,HEntrySubID,HRemark,HSourceID) " +
                                            "values(" +
                                            "" + HInterID + "" +
                                            "," + (j+1) + "" +
                                            "," + (t+1) + "" +
                                            ", '批量导入(包括孙表)'" +
                                            "," + oSourceHlp.omodel.HItemID + "" +
                                            ")";

                                        oCN.RunProc(sqlSub_WorkQty);
                                    }
                                }
                                oCN.RunProc(sqlSub);
                            }
                        }
                        oCN.RunProc(sqlMain);
                        oCN.RunProc("update Gy_RoutingBillMain set HStandard = 0 where HMaterID = " + oMaterHlp.omodel.HItemID + " and HInterID <>" + HInterID);
                    }
                }

                if (finalErrMsg.Length > 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = finalErrMsg;
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                oCN.RunProc("delete from diyipi_WorkQty");

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "导入完成,共" + dsMain.Tables[0].Rows.Count + "个工艺路线";
                objJsonResult.data = null;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region  å·¥è‰ºè·¯çº¿ å®¡æ ¸ã€åå®¡æ ¸
        /// <summary>
        /// 

 WebAPI/Controllers/MateOutController.cs

@@ -10,10 +10,12 @@
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Text.RegularExpressions;
using System.Web;
using System.Web.Http;
using WebAPI;
using WebAPI.Code;
using WebAPI.Controllers.SCGL.日计划管理;
using WebAPI.Models;
using static WebAPI.Controllers.基础资料.基础资料.Gy_DutyBillController;

@@ -2764,7 +2766,301 @@
                objJsonResult.data = null;
                return objJsonResult;
            }
        }        
        }
        #endregion

        #region å·¥åŽ‚日历 æ–‡ä»¶ä¸Šä¼ 
        [Route("Gy_PlanShifts/Gy_PlanShifts_Excel")]
        [HttpPost]
        public object Gy_PlanShifts_Excel()
        {
            try
            {
                //var WorkBookName = HttpContext.Current.Request["WorkBookName"];
                //DBUtility.ClsPub.HOrgID = long.Parse(HttpContext.Current.Request["HOrgID"]);
                //获取文件名称
                var file = HttpContext.Current.Request.Files[0];
                //获取文件物理路径
                string ExcelPath = HttpContext.Current.Server.MapPath("~/" + file.FileName);
                //保存文件
                file.SaveAs(ExcelPath);

                NpoiHelper np = new NpoiHelper();
                DataSet ExcelDs = np.ReadExcel(ExcelPath, 1, 1, "0");

                //删除文件
                File.Delete(ExcelPath);

                //创建临时表
                DataTable tb2 = new DataTable("dt2");

                //添加列名
                for (int i = 0; i < ExcelDs.Tables[0].Columns.Count; i++)
                {
                    tb2.Columns.Add(ExcelDs.Tables[0].Rows[0][i].ToString());
                }

                //模板缺少列 ä½†éœ€è¦ä»Žæ•°æ®åº“中查询出来显示在页面的字段
                tb2.Columns.Add("HOrgID", typeof(Int32));//组织ID
                tb2.Columns.Add("HSourceID", typeof(Int32));//生产资源ID

                //添加数据
                for (int i = 1; i < ExcelDs.Tables[0].Rows.Count; i++)
                {
                    DataRow row = tb2.NewRow();
                    for (int j = 0; j < ExcelDs.Tables[0].Columns.Count; j++)
                    {
                        row[j] = ExcelDs.Tables[0].Rows[i][j].ToString();
                    }
                    //如果表格第i行的第一列为空，则判断为这一行的数据为空，跳出循环并且不把数据写入 tb2
                    if (ExcelDs.Tables[0].Rows[i][0].ToString() == "")
                    {
                        continue;
                    }
                    else
                    {
                        tb2.Rows.Add(row);
                    }
                }


                var error = "";

                //查询工艺路线没有的列
                if (!tb2.Columns.Contains("组织编码"))
                    error += "没有找到【组织编码】的标题,";

                if (!tb2.Columns.Contains("组织"))
                    error += "没有找到【组织】的标题,";

                if (!tb2.Columns.Contains("生产资源代码"))
                    error += "没有找到【生产资源代码】的标题,";

                if (!tb2.Columns.Contains("生产资源"))
                    error += "没有找到【生产资源】的标题,";

                if (!tb2.Columns.Contains("日期"))
                    error += "没有找到【日期】的标题,";

                if (!tb2.Columns.Contains("工时"))
                    error += "没有找到【工时】的标题,";


                if (error.Length > 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = $"Excel模板存在错误,{error}\r\n";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                for (int i = 0; i <= tb2.Rows.Count - 1; i++)
                {
                    string HORGNumber = "";
                    string HORGName = "";
                    string HSourceNumer = "";
                    string HSourceName = "";
                    string HDate = "";
                    string HOverTimes = "";

                    HORGNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["组织编码"].ToString());
                    HORGName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["组织"].ToString());
                    HSourceNumer = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["生产资源代码"].ToString());
                    HSourceName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["生产资源"].ToString());
                    HDate = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["日期"].ToString());
                    HOverTimes = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["工时"].ToString());

                    //检查物料
                    int index = i + 1;

                    if (HORGNumber != "")
                    {


                        //查询组织
                        ds = oCN.RunProcReturn("select * from Xt_ORGANIZATIONS where  HNumber='" + HORGNumber + "' and Hname='" + HORGName + "'", "Xt_ORGANIZATIONS");

                        if (ds.Tables[0].Rows.Count == 0)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "第" + index + "行,组织不存在！";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        else
                        {
                            tb2.Rows[i]["HOrgID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
                        }
                        string HORGid = ds.Tables[0].Rows[0]["HItemID"].ToString();


                        //查询生产资源
                        ds = oCN.RunProcReturn("select * from Gy_Source where  HNumber='" + HSourceNumer + "'  and HUSEORGID=" + HORGid + "", "Gy_Department");

                        if (ds.Tables[0].Rows.Count == 0)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "第" + index + "行,该" + HORGName + "组织,生产资源:" + HSourceName + ",不存在！";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        else
                        {
                            tb2.Rows[i]["HSourceID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
                        }

                        //日期
                        if (HDate == "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "第" + index + "行,日期为空！";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }else if(!Regex.IsMatch(HDate, @"^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])$"))
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "第" + index + "行,日期不为“yyyy-MM-dd”格式！";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }

                        //工时
                        if (HOverTimes == "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "第" + index + "行,工时为空！";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        //else if (!Regex.IsMatch(HWorkTime, @"/^\d+(\.\d+)?$/"))
                        //{
                        //    objJsonResult.code = "0";
                        //    objJsonResult.count = 0;
                        //    objJsonResult.Message = "第" + index + "行,工时不为非负数格式！";
                        //    objJsonResult.data = null;
                        //    return objJsonResult;
                        //}
                    }
                    else
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "第" + index + "行,组织代码为空";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = error;
                objJsonResult.data = tb2;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region å·¥åŽ‚日历 å¯¼å…¥(保存)
        [Route("Gy_PlanShifts/Gy_PlanShifts_btnSave")]
        [HttpPost]
        public object Gy_PlanShifts_btnSave([FromBody] JObject sMainSub)
        {
            var _value = sMainSub["sMainSub"].ToString();
            string msg1 = _value.ToString();
            string[] sArray = msg1.Split(new string[] { "&和" }, StringSplitOptions.RemoveEmptyEntries);
            string msg2 = sArray[0].ToString();
            string user = sArray[1].ToString();
            try
            {
                if (!DBUtility.ClsPub.Security_Log("Gy_PlanShifts_Edit", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无保存权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                List<object> Excel = Newtonsoft.Json.JsonConvert.DeserializeObject<List<object>>(msg2);
                List<Dictionary<string, string>> list = new List<Dictionary<string, string>>();

                foreach (JObject item in Excel)
                {
                    Dictionary<string, string> dic = new Dictionary<string, string>();
                    foreach (var itm in item.Properties())
                    {
                        dic.Add(itm.Name, itm.Value.ToString());
                    }
                    list.Add(dic);
                }

                oCN.BeginTran();
                int i = 1;
                foreach (Dictionary<string, string> item in list)
                {
                    string HSourceID = item["HSourceID"].ToString();//生产资源ID
                    string HOrgID = item["HOrgID"].ToString();//组织ID
                    string HDate = item["日期"].ToString();
                    string HOverTimes = item["工时"].ToString();

                    ds = oCN.RunProcReturn("select * from Gy_PlanShifts where HSourceID=" + HSourceID + " and convert(varchar(100),HDate,23)='" + HDate + "'", "Gy_PlanShifts");

                    if (ds.Tables[0].Rows.Count == 0)
                    {
                        string sql = "insert into Gy_PlanShifts(HDate,HSourceID,HShiftsID,HOverTimes,HClassCount,HRemark,HUseFlag) " +
                            "values(" +
                            "'" + HDate + "'" +
                            "," + HSourceID + "" +
                            ",0" +
                            "," + HOverTimes + "" +
                            ",1" +
                            ",''" +
                            ",''" + 
                            ")";

                        //主表
                        oCN.RunProc(sql);
                    }
                    else
                    {
                        oCN.RunProc("update Gy_PlanShifts set HOverTimes = " + HOverTimes + " where HSourceID=" + HSourceID + " and convert(varchar(100),HDate,23)='" + HDate + "'");
                    }

                    i++;
                }

                oCN.Commit();

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "导入成功!";
                objJsonResult.data = null;
                return objJsonResult;
            }
            catch (Exception e)
            {
                LogService.Write(e);
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region  åˆ¶æˆçŽ‡æ˜Žç»†æŠ¥è¡¨

 WebAPI/Controllers/SCGL/Èռƻ®¹ÜÀí/JIT_DayPlanPlatFormBillController.cs

@@ -254,7 +254,7 @@
                            }
                        }
                        ds = oCN.RunProcReturn($"select HInterID,HICMOBillNo from Sc_WorkBillSortBillMain with(nolock) where HMainSourceInterID={HMainSourceInterID}" +
                            $" and HMainSourceEntryID={HMainSourceEntryID} and HICMOBillNo='{HICMOBillNo}' and HICMOEntrySEQ={HICMOEntrySEQ} and HSourceID={HSourceID}", "Sc_WorkBillSortBillMain");
                            $" and HMainSourceEntryID={HMainSourceEntryID} and HICMOBillNo='{HICMOBillNo}' and HICMOEntrySEQ={HICMOEntrySEQ} and HSourceID={HSourceID} and ISNULL(HDeleteMan,'')=''", "Sc_WorkBillSortBillMain");

                        if (ds.Tables[0].Rows.Count > 0)
                        {
@@ -470,13 +470,13 @@
                        else
                        {
                            ds = oCN.RunProcReturn($"select HInterID,HICMOBillNo from Sc_WorkBillSortBillMain with(nolock) where HMainSourceInterID={HMainSourceInterID}" +
                             $" and HMainSourceEntryID={HMainSourceEntryID} and HICMOBillNo='{HICMOBillNo}' and HICMOEntrySEQ={HICMOEntrySEQ} and HSourceID={HSourceID}", "Sc_WorkBillSortBillMain");
                             $" and HMainSourceEntryID={HMainSourceEntryID} and HICMOBillNo='{HICMOBillNo}' and HICMOEntrySEQ={HICMOEntrySEQ} and HSourceID={HSourceID} and ISNULL(HDeleteMan,'') = ''", "Sc_WorkBillSortBillMain");

                            if (ds.Tables[0].Rows.Count > 1)
                            {
                                LogService.CustomWriteLog("第" + i + 1 + "行生产资源有重复,请修改", DateTime.Now.ToString("yyyy-MM-dd"));
                                LogService.CustomWriteLog($"select * from  Sc_WorkBillSortBillMain where HMainSourceInterID={HMainSourceInterID}" +
                                  $" and HMainSourceEntryID={HMainSourceEntryID} and HICMOBillNo='{HICMOBillNo}' and HICMOEntrySEQ={HICMOEntrySEQ} and HSourceID={HSourceID}", DateTime.Now.ToString("yyyy-MM-dd"));
                                  $" and HMainSourceEntryID={HMainSourceEntryID} and HICMOBillNo='{HICMOBillNo}' and HICMOEntrySEQ={HICMOEntrySEQ} and HSourceID={HSourceID} and ISNULL(HDeleteMan,'')=''", DateTime.Now.ToString("yyyy-MM-dd"));
                                objJsonResult.code = "0";
                                objJsonResult.count = 0;
                                objJsonResult.Message = $"第{i + 1}行生产资源有重复,请修改!";

 WebAPI/Controllers/SCGL/Èռƻ®¹ÜÀí/JIT_DayPlanPlatFormImportController.cs

@@ -181,7 +181,10 @@
                    {
                        tb2.Rows[i]["hmainid"] = ds.Tables[0].Rows[0]["hmainid"].ToString();
                        tb2.Rows[i]["单据号"] = ds.Tables[0].Rows[0]["单据号"].ToString();
                        tb2.Rows[i]["优先级"] = ds.Tables[0].Rows[0]["优先级"].ToString();
                        if (oSystemParameter.omodel.WMS_CampanyName != "宝工")
                        {
                            tb2.Rows[i]["优先级"] = ds.Tables[0].Rows[0]["优先级"].ToString();
                        }
                        tb2.Rows[i]["HSourceID"] = ds.Tables[0].Rows[0]["HSourceID"].ToString();
                        tb2.Rows[i]["HEmpID"] = ds.Tables[0].Rows[0]["HEmpID"].ToString();
                        tb2.Rows[i]["员工编码"] = ds.Tables[0].Rows[0]["职员代码"].ToString();
@@ -500,5 +503,286 @@
            return objJsonResult;
        }
        #endregion

        #region ç”Ÿäº§æ—¥è®¡åˆ’(三升导入) æ–‡ä»¶ä¸Šä¼ 
        [Route("JIT_DayPlanPlatFormImport/JIT_DayPlanPlatFormImport_SS")]
        [HttpPost]
        public object JIT_DayPlanPlatFormImport_SS()
        {
            try
            {
                //获取文件名称
                var file = HttpContext.Current.Request.Files[0];
                //获取文件物理路径
                string ExcelPath = HttpContext.Current.Server.MapPath("~/" + file.FileName);
                //保存文件
                file.SaveAs(ExcelPath);

                NpoiHelper np = new NpoiHelper();
                DataSet ExcelDs = np.ReadExcel(ExcelPath, 1, 1, "0");

                //删除文件
                File.Delete(ExcelPath);

                //创建临时表
                DataTable tb2 = new DataTable("dt2");

                //添加列名
                for (int i = 0; i < ExcelDs.Tables[0].Columns.Count; i++)
                {
                    tb2.Columns.Add(ExcelDs.Tables[0].Rows[0][i].ToString());
                }
                //模板缺少列 ä½†éœ€è¦ä»Žæ•°æ®åº“中查询出来显示在页面的字段
                tb2.Columns.Add("hmainid", typeof(Int32));
                tb2.Columns.Add("HMaterID", typeof(Int32));
                tb2.Columns.Add("ICMOBillHInterID", typeof(Int32));
                tb2.Columns.Add("ICMOBillHEntryID", typeof(Int32));
                //获取系统参数
                string Ret = "";
                oSystemParameter.ShowBill(ref Ret);

                LogService.Write("excel值：" + ExcelDs.Tables[0].Rows[1][1].ToString());//2024-11-26
                //添加数据
                for (int i = 1; i < ExcelDs.Tables[0].Rows.Count; i++)
                {
                    DataRow row = tb2.NewRow();
                    for (int j = 0; j < ExcelDs.Tables[0].Columns.Count; j++)
                    {
                        row[j] = ExcelDs.Tables[0].Rows[i][j].ToString();
                    }
                    //如果表格第i行的第一列为空，则判断为这一行的数据为空，跳出循环并且不把数据写入 tb2
                    if (ExcelDs.Tables[0].Rows[i][0].ToString() == "" && ExcelDs.Tables[0].Rows[i][1].ToString() == "")
                    {
                        continue;
                    }
                   
                    else
                    {
                        tb2.Rows.Add(row);
                    }
                }

                var error = "";
                var ErrorResult = "";

                //查询生产订单表判断有没有生产订单信息
                for (int i = 0; i < tb2.Rows.Count; i++)
                {
                    //if (tb2.Rows[i]["计划结束日期"].ToString() == "")
                    //    error += "计划结束日期不能为空;";
                    if (tb2.Rows[i]["客户订单号"].ToString() == "")
                        error += "客户订单号不能为空;";
                    if (tb2.Rows[i]["物料编码"].ToString() == "")
                        error += "物料编码不能为空;";

                    if (error.Length > 0)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = ErrorResult += $"Excel模板存在错误，行数{i + 1}:{error}\r\n"; ;
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    //查找是否存在对应生产订单
                    string sql1 = string.Format("select * from h_v_IF_ICMOBillList where å®¢æˆ·è®¢å•å·='{0}' and äº§å“ä»£ç ='{1}' and çŠ¶æ€ in ('计划确认','开工')",
                        tb2.Rows[i]["客户订单号"].ToString(), tb2.Rows[i]["物料编码"].ToString());
                    ds = oCN.RunProcReturn(sql1, "h_v_IF_ICMOBillList");

                    if (ds.Tables[0].Rows.Count == 0)
                    {
                        error += $"没有符合条件得生产订单信息，客户订单号:{ tb2.Rows[i]["客户订单号"].ToString()},产品代码:{tb2.Rows[i]["物料编码"].ToString()}";
                    }

                    if (error.Length > 0)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = ErrorResult += $"Excel模板存在错误，行数{i + 1}:{error}\r\n"; ;
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    else
                    {
                        tb2.Rows[i]["HMaterID"] = ds.Tables[0].Rows[0]["HMaterID"].ToString();
                        tb2.Rows[i]["ICMOBillHInterID"] = ds.Tables[0].Rows[0]["hmainid"].ToString();//生产订单主id
                        tb2.Rows[i]["ICMOBillHEntryID"] = ds.Tables[0].Rows[0]["HEntryID"].ToString();//生产订单子id
                    }
                    //查找是否存在对应日计划工单
                    var dt = oCN.RunProcReturn($"select * from  h_v_JIT_Sc_WorkBillSortBillList where æºå•ä¸»å†…码 in({ds.Tables[0].Rows[0]["hmainid"].ToString()}) and  æºå•å­å†…码 in({ds.Tables[0].Rows[0]["HEntryID"].ToString()})", "h_v_JIT_Sc_WorkBillSortBillList");
                    if (dt.Tables[0].Rows.Count > 0)
                    {
                        tb2.Rows[i]["hmainid"] = dt.Tables[0].Rows[0]["hmainid"].ToString();
                    }

                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = ErrorResult;
                objJsonResult.data = tb2;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region ç”Ÿäº§æ—¥è®¡åˆ’三升 å¯¼å…¥(保存)
        [Route("JIT_DayPlanPlatFormImport/JIT_DayPlanPlatFormImport_btnSave_SS")]
        [HttpPost]
        public object JIT_DayPlanPlatFormImport_btnSave_SS([FromBody] JObject sMainSub)
        {
            var _value = sMainSub["sMainSub"].ToString();
            string msg1 = _value.ToString();
            oCN.BeginTran();
            //保存主表
            objJsonResult = AddBillMain_SS(msg1);
            if (objJsonResult.code == "0")
            {
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = objJsonResult.Message;
                objJsonResult.data = null;
                return objJsonResult;
            }
            oCN.Commit();
            objJsonResult.code = "1";
            objJsonResult.count = 1;
            objJsonResult.Message = "单据保存成功！";
            objJsonResult.data = null;
            return objJsonResult;
        }

        public json AddBillMain_SS(string msg1)
        {
            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string msg2 = sArray[0].ToString();
            string msg3 = sArray[1].ToString();
            string user = sArray[2].ToString();

            try
            {
                if (!DBUtility.ClsPub.Security_Log("Sc_WorkBillSortBill_Edit", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无保存权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                //表头字段
                omdelMian = Newtonsoft.Json.JsonConvert.DeserializeObject<Sc_WorkBillSortBillMain>(msg2);

                //JSON序列化转换字典集合
                List<Dictionary<string, string>> list = new List<Dictionary<string, string>>();
                List<object> jb = JsonConvert.DeserializeObject<List<object>>(msg3);
                foreach (JObject item in jb)
                {
                    Dictionary<string, string> dic = new Dictionary<string, string>();
                    foreach (var itm in item.Properties())
                    {
                        dic.Add(itm.Name, itm.Value.ToString());
                    }
                    list.Add(dic);
                }




                for (int i = 0; i < list.Count; i++)
                {
                    long HInterID = 0;
                    var HBillNo = "";
                    if (list[i]["hmainid"].ToString() == "")
                    {
                        HBillNo = DBUtility.ClsPub.CreateBillCode_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);//获得一个新的单据号
                        HInterID = DBUtility.ClsPub.CreateBillID_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo);//获得一个新的id
                        var HMainSourceInterID = list[i]["ICMOBillHInterID"].ToString();
                        var HMainSourceEntryID = list[i]["ICMOBillHEntryID"].ToString();
                        var HPlanEndDate = list[i]["计划结束日期"].ToString();
                        //获取对应订单信息
                        ds = oCN.RunProcReturn($"exec h_p_ICMOBillList_PrimarySubTable '{HMainSourceInterID}','{HMainSourceEntryID}'", "h_p_ICMOBillList_PrimarySubTable");
                        if (ds.Tables[0].Rows.Count == 0)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = $"没找到对应符合条件得订单信息，行数{i + 1}\r\n"; ;
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        var HICMOBillNo = ds.Tables[0].Rows[0]["生产订单号"].ToString();
                        var HICMOEntrySEQ = ds.Tables[0].Rows[0]["生产订单明细行号"].ToString();
                        var HProdORGID = ds.Tables[0].Rows[0]["HProdORGID"].ToString();
                        var HWorkShopID = ds.Tables[0].Rows[0]["HWorkShopID"].ToString();
                        var HSourceID = ds.Tables[0].Rows[0]["HSourceID"].ToString();
                        var HWorkQty = DBUtility.ClsPub.isDoule(ds.Tables[0].Rows[0]["小时产能"].ToString());
                        var HYX = ds.Tables[0].Rows[0]["优先级"].ToString();
                        var HEmpID = ds.Tables[0].Rows[0]["操作工"].ToString();
                        var HMaterID = ds.Tables[0].Rows[0]["HMaterID"].ToString();
                        var HMaterName = ds.Tables[0].Rows[0]["物料名称"].ToString();
                        var HMaterModel = ds.Tables[0].Rows[0]["规格型号"].ToString();
                        var HUnitID = ds.Tables[0].Rows[0]["HUnitID"].ToString();
                        var HBatchNo = "";//批次号
                        var HSeOrderBillQty = ds.Tables[0].Rows[0]["销售订单数量"].ToString();
                        var HPlanQty = ds.Tables[0].Rows[0]["计划数量"].ToString();
                        var HCompleteQty = "";//总齐套数量
                        var HOrderType = omdelMian.HOrderType;
                        var HDate = omdelMian.HDate;
                        var HSeOrderBillNo = ds.Tables[0].Rows[0]["销售订单号"].ToString();
                        //主表
                        oCN.RunProc("insert into Sc_WorkBillSortBillMain(HInterID,HBillNo,HYear,HPeriod,HBillType," +
                            "HBillSubType,HDate,HBillStatus,HMaker,HMakeDate,HICMOBillNo,HOrderType," +
                            "HICMOEntrySEQ,HWorkShopID,HSourceID, HYX,HWorkQty, HEmpID," +
                            " HMaterID, HMaterName, HMaterModel, HUnitID, HBatchNo," +
                            " HSeOrderBillQty, HPlanQty, HCompleteQty,HPreparatDate," +
                            "HMainSourceInterID,HMainSourceEntryID,HICMOInterID,HICMOEntryID,HProdORGID,HICMOInterID_Sec,HICMOEntryID_Sec" +
                            ",HSeOrderBillNo,HPlanEndDate)values" +
                            $"({HInterID},'{HBillNo}',{DateTime.Now.Year},{DateTime.Now.Month},'{BillType}'," +
                            $"'{BillType}',GETDATE(),1,'{user}','{HDate}','{HICMOBillNo}','{HOrderType}'," +
                            $"{(HICMOEntrySEQ == "" ? 0.ToString() : HICMOEntrySEQ)},{(HWorkShopID == "" ? 0.ToString() : HWorkShopID)},{(HSourceID == "" ? 0.ToString() : HSourceID)}, {(HYX == "" ? 0.ToString() : HYX)},{(HWorkQty)}, {(HEmpID == "" ? 0.ToString() : HEmpID)}," +
                            $" {(HMaterID == "" ? 0.ToString() : HMaterID)}, '{HMaterName}', '{HMaterModel}', {(HUnitID == "" ? 0.ToString() : HUnitID)}, '{HBatchNo}'," +
                            $" {(HSeOrderBillQty == "" ? 0.ToString() : HSeOrderBillQty)}, {(HPlanQty == "" ? 0.ToString() : HPlanQty)}, {(HCompleteQty == "" ? 0.ToString() : HCompleteQty)},getdate()," +
                            $" {HMainSourceInterID},{HMainSourceEntryID},{HMainSourceInterID},{HMainSourceEntryID},{HProdORGID}, {HMainSourceInterID},{HMainSourceEntryID}" +
                            $",'{HSeOrderBillNo}','{HPlanEndDate}')");
                        //插入子表数据
                        objJsonResult = AddBillSub(HInterID.ToString(), HBillNo, DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd").ToString()), 0);
                    }//如果已存在日计划工单更新对应计划结束日期
                    else
                    {
                        var hmainid = list[i]["hmainid"].ToString();
                        var HPlanEndDate = list[i]["计划结束日期"].ToString();
                        //主表
                        oCN.RunProc($"update Sc_WorkBillSortBillMain set HPlanEndDate = '{HPlanEndDate}' where HInterID ={hmainid}" );
                    }

                }



                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = null;
                objJsonResult.data = null;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

    }
}

 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());
@@ -807,66 +807,82 @@
                            tb2.Rows[i]["HUnitID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
                        }

                        //JIT物料分类
                        if (JITType == "")
                        string msg = "";
                        oSystemParameter.ShowBill(ref msg);
                        if (oSystemParameter.omodel.WMS_CampanyName == "宝工")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "第" + index + "行,JIT物料分类为空！";
                            objJsonResult.data = null;
                            return objJsonResult;
                            //JIT供货提前期（天）
                            if (JISLT == "")
                            {
                                objJsonResult.code = "0";
                                objJsonResult.count = 0;
                                objJsonResult.Message = "第" + index + "行,JIT供货提前期（天）为空！";
                                objJsonResult.data = null;
                                return objJsonResult;
                            }
                        }

                        //JIT提货经济批量
                        if (JIPEB == "")
                        else
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "第" + index + "行,JIT提货经济批量为空！";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                            //JIT物料分类
                            if (JITType == "")
                            {
                                objJsonResult.code = "0";
                                objJsonResult.count = 0;
                                objJsonResult.Message = "第" + index + "行,JIT物料分类为空！";
                                objJsonResult.data = null;
                                return objJsonResult;
                            }

                        //JIT供货提前期（天）
                        if (JISLT == "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "第" + index + "行,JIT供货提前期（天）为空！";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                            //JIT提货经济批量
                            if (JIPEB == "")
                            {
                                objJsonResult.code = "0";
                                objJsonResult.count = 0;
                                objJsonResult.Message = "第" + index + "行,JIT提货经济批量为空！";
                                objJsonResult.data = null;
                                return objJsonResult;
                            }

                        //JIT到货前置期（天）
                        if (JIDLT == "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "第" + index + "行,JIT到货前置期（天）为空！";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                            //JIT供货提前期（天）
                            if (JISLT == "")
                            {
                                objJsonResult.code = "0";
                                objJsonResult.count = 0;
                                objJsonResult.Message = "第" + index + "行,JIT供货提前期（天）为空！";
                                objJsonResult.data = null;
                                return objJsonResult;
                            }

                        //JIT最小起送量
                        if (JIMLC == "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "第" + index + "行,JIT最小起送量为空！";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                            //JIT到货前置期（天）
                            if (JIDLT == "")
                            {
                                objJsonResult.code = "0";
                                objJsonResult.count = 0;
                                objJsonResult.Message = "第" + index + "行,JIT到货前置期（天）为空！";
                                objJsonResult.data = null;
                                return objJsonResult;
                            }

                        //审核代码是否合理
                        if (!DBUtility.ClsPub.AllowNumber(HMaterNumer))
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "第" + index + "行,物料代码中不能出现连续‘.’并且首位末位不能为‘.’！";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                            //JIT最小起送量
                            if (JIMLC == "")
                            {
                                objJsonResult.code = "0";
                                objJsonResult.count = 0;
                                objJsonResult.Message = "第" + index + "行,JIT最小起送量为空！";
                                objJsonResult.data = null;
                                return objJsonResult;
                            }

                            //审核代码是否合理
                            if (!DBUtility.ClsPub.AllowNumber(HMaterNumer))
                            {
                                objJsonResult.code = "0";
                                objJsonResult.count = 0;
                                objJsonResult.Message = "第" + index + "行,物料代码中不能出现连续‘.’并且首位末位不能为‘.’！";
                                objJsonResult.data = null;
                                return objJsonResult;
                            }
                        }
                    }
                    else
                    {
@@ -967,7 +983,7 @@
                       "HLeadTime, HLeadTime_Sec, HDeliveryMode, HDeliveryDaysCtrl,HUnitID,HJITMinDeliveryQty)values" +
                       $"({HInterID}, 1, '{HRemark}', {(HSupID == "" ? "0" : HSupID)}, '{HSupplierName}', {(HMaterID == "" ? "0" : HMaterID)}," +
                       $" '{HMaterName}', '{HMaterModel}', '{JITType}', {(JITPSL == "" ? "0" : JITPSL)}, {(JITMDSC == "" ? "0" : JITMDSC)},{(JIPEB == "" ? "0" : JIPEB)},{(JITPBCC == "" ? "0" : JITPBCC)}," +
                       $" {(JISLT == "" ? "0" : JISLT)}, {(JIDLT == "" ? "0" : JIDLT)}, '', {(JITDCD == "" ? "0" : JITDCD)} ,{HUnitID},{JIMLC})";
                       $" {(JISLT == "" ? "0" : JISLT)}, {(JIDLT == "" ? "0" : JIDLT)}, '', {(JITDCD == "" ? "0" : JITDCD)} ,{HUnitID},{(JIMLC==""?"0": JIMLC)})";
                        //主表
                        oCN.RunProc(sql);
                        //子表
@@ -1283,6 +1299,433 @@
        }
        #endregion

        #region ææ–™è®¡åˆ’信息 æ–‡ä»¶ä¸Šä¼ 
        [Route("Sc_JIT_ComplementGoodBill/Sc_JIT_ComplementGoodBill_Excel")]
        [HttpPost]
        public object Sc_JIT_ComplementGoodBill_Excel()
        {
            try
            {
                //var WorkBookName = HttpContext.Current.Request["WorkBookName"];
                //DBUtility.ClsPub.HOrgID = long.Parse(HttpContext.Current.Request["HOrgID"]);
                //获取文件名称
                var file = HttpContext.Current.Request.Files[0];
                //获取文件物理路径
                string ExcelPath = HttpContext.Current.Server.MapPath("~/" + file.FileName);
                //保存文件
                file.SaveAs(ExcelPath);

                NpoiHelper np = new NpoiHelper();
                DataSet ExcelDs = np.ReadExcel(ExcelPath, 1, 1, "0");

                //删除文件
                File.Delete(ExcelPath);

                //创建临时表
                DataTable tb2 = new DataTable("dt2");

                //添加列名
                for (int i = 0; i < ExcelDs.Tables[0].Columns.Count; i++)
                {
                    tb2.Columns.Add(ExcelDs.Tables[0].Rows[0][i].ToString());
                }

                //模板缺少列 ä½†éœ€è¦ä»Žæ•°æ®åº“中查询出来显示在页面的字段
                tb2.Columns.Add("HOrgID", typeof(Int32));//组织ID
                tb2.Columns.Add("HWorkShopID", typeof(Int32));//供应商
                tb2.Columns.Add("HMaterID", typeof(Int32));//物料ID

                //添加数据
                for (int i = 1; i < ExcelDs.Tables[0].Rows.Count; i++)
                {
                    DataRow row = tb2.NewRow();
                    for (int j = 0; j < ExcelDs.Tables[0].Columns.Count; j++)
                    {
                        row[j] = ExcelDs.Tables[0].Rows[i][j].ToString();
                    }
                    //如果表格第i行的第一列为空，则判断为这一行的数据为空，跳出循环并且不把数据写入 tb2
                    if (ExcelDs.Tables[0].Rows[i][0].ToString() == "")
                    {
                        continue;
                    }
                    else
                    {
                        tb2.Rows.Add(row);
                    }
                }


                var error = "";

                //查询工艺路线没有的列
                if (!tb2.Columns.Contains("组织编码"))
                    error += "没有找到【组织编码】的标题,";

                if (!tb2.Columns.Contains("组织"))
                    error += "没有找到【组织】的标题,";

                if (!tb2.Columns.Contains("车间代码"))
                    error += "没有找到【车间代码】的标题,";

                if (!tb2.Columns.Contains("车间"))
                    error += "没有找到【车间】的标题,";

                if (!tb2.Columns.Contains("物料代码"))
                    error += "没有找到【物料代码】的标题,";

                if (!tb2.Columns.Contains("物料名称"))
                    error += "没有找到【物料名称】的标题,";

                if (!tb2.Columns.Contains("规格型号"))
                    error += "没有找到【规格型号】的标题,";

                if (!tb2.Columns.Contains("JIT物料分类"))
                    error += "没有找到【JIT物料分类】的标题,";

                if (!tb2.Columns.Contains("JIT拉动安全库存量"))
                    error += "没有找到【JIT拉动安全库存量】的标题,";

                if (!tb2.Columns.Contains("JIT物料需求供货周期"))
                    error += "没有找到【JIT物料需求供货周期】的标题,";

                if (!tb2.Columns.Contains("JIT提货批量"))
                    error += "没有找到【JIT提货批量】的标题,";

                if (!tb2.Columns.Contains("JIT提货批量对应周期（天）"))
                    error += "没有找到【JIT提货批量对应周期（天）】的标题,";

                if (!tb2.Columns.Contains("JIT供货提前期（天）"))
                    error += "没有找到【JIT供货提前期（天）】的标题,";

                if (!tb2.Columns.Contains("JIT到货前置期（天）"))
                    error += "没有找到【JIT到货前置期（天）】的标题,";

                if (!tb2.Columns.Contains("JIT送货控制天数"))
                    error += "没有找到【JIT送货控制天数】的标题,";

                if (!tb2.Columns.Contains("JIT送货方式"))
                    error += "没有找到【JIT送货方式】的标题,";

                if (!tb2.Columns.Contains("备注"))
                    error += "没有找到【备注】的标题,";

                if (error.Length > 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = $"Excel模板存在错误,{error}\r\n";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                for (int i = 0; i <= tb2.Rows.Count - 1; i++)
                {
                    string HORGNumber = "";
                    string HORGName = "";
                    string HWorkShopNumer = "";
                    string HWorkShopName = "";
                    string HMaterNumer = "";
                    string HMaterName = "";
                    string HMaterModel = "";
                    string HUntilName = "";

                    string JITType = "";//JIT物料分类
                    string JIPEB = ""; //JIT提货经济批量
                    string JISLT = ""; //JIT供货提前期（天）
                    string JIDLT = ""; //JIT到货前置期（天）
                    string JIMLC = ""; //JIT最小起送量

                    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()).Replace("'", "");
                    HWorkShopName = 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());

                    JITType = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["JIT物料分类"].ToString());
                    JIPEB = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["JIT提货批量"].ToString());
                    JISLT = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["JIT供货提前期（天）"].ToString());
                    JIDLT = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["JIT到货前置期（天）"].ToString());
                    JIMLC = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["JIT送货方式"].ToString());

                    //检查物料
                    int index = i + 1;

                    if (HORGNumber != "")
                    {


                        //查询组织
                        ds = oCN.RunProcReturn("select * from Xt_ORGANIZATIONS where  HNumber='" + HORGNumber + "' and Hname='" + HORGName + "'", "Xt_ORGANIZATIONS");

                        if (ds.Tables[0].Rows.Count == 0)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "第" + index + "行,组织不存在！";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        else
                        {
                            tb2.Rows[i]["HOrgID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
                        }
                        string HORGid = ds.Tables[0].Rows[0]["HItemID"].ToString();


                        //查询供应商
                        ds = oCN.RunProcReturn("select * from Gy_Department where  HNumber='" + HWorkShopNumer + "'  and HUSEORGID=" + HORGid + "", "Gy_Department");

                        if (ds.Tables[0].Rows.Count == 0)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "第" + index + "行,该" + HORGName + "组织,车间:" + HWorkShopName + ",不存在！";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        else
                        {
                            tb2.Rows[i]["HWorkShopID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
                        }

                        //查询物料
                        ds = oCN.RunProcReturn("select * from Gy_Material where  HNumber='" + HMaterNumer + "' and HUSEORGID=" + HORGid + "", "Gy_Material");

                        if (ds.Tables[0].Rows.Count == 0)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "第" + index + "行,该" + HORGName + "组织,物料:" + HMaterName + ",物料代码:" + HMaterNumer + ",不存在！";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        else
                        {
                            tb2.Rows[i]["HMaterID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
                        }

                        string msg = "";
                        oSystemParameter.ShowBill(ref msg);
                        if (oSystemParameter.omodel.WMS_CampanyName == "宝工")
                        {
                            //JIT供货提前期（天）
                            if (JISLT == "")
                            {
                                objJsonResult.code = "0";
                                objJsonResult.count = 0;
                                objJsonResult.Message = "第" + index + "行,JIT供货提前期（天）为空！";
                                objJsonResult.data = null;
                                return objJsonResult;
                            }

                            //JIT到货前置期（天）
                            if (JIDLT == "")
                            {
                                objJsonResult.code = "0";
                                objJsonResult.count = 0;
                                objJsonResult.Message = "第" + index + "行,JIT到货前置期（天）为空！";
                                objJsonResult.data = null;
                                return objJsonResult;
                            }
                        }
                        else
                        {
                            //JIT物料分类
                            if (JITType == "")
                            {
                                objJsonResult.code = "0";
                                objJsonResult.count = 0;
                                objJsonResult.Message = "第" + index + "行,JIT物料分类为空！";
                                objJsonResult.data = null;
                                return objJsonResult;
                            }

                            //JIT提货批量
                            if (JIPEB == "")
                            {
                                objJsonResult.code = "0";
                                objJsonResult.count = 0;
                                objJsonResult.Message = "第" + index + "行,JIT提货批量为空！";
                                objJsonResult.data = null;
                                return objJsonResult;
                            }

                            //JIT供货提前期（天）
                            if (JISLT == "")
                            {
                                objJsonResult.code = "0";
                                objJsonResult.count = 0;
                                objJsonResult.Message = "第" + index + "行,JIT供货提前期（天）为空！";
                                objJsonResult.data = null;
                                return objJsonResult;
                            }

                            //JIT到货前置期（天）
                            if (JIDLT == "")
                            {
                                objJsonResult.code = "0";
                                objJsonResult.count = 0;
                                objJsonResult.Message = "第" + index + "行,JIT到货前置期（天）为空！";
                                objJsonResult.data = null;
                                return objJsonResult;
                            }

                            //JIT最小起送量
                            if (JIMLC == "")
                            {
                                objJsonResult.code = "0";
                                objJsonResult.count = 0;
                                objJsonResult.Message = "第" + index + "行,JIT送货方式为空！";
                                objJsonResult.data = null;
                                return objJsonResult;
                            }

                            //审核代码是否合理
                            if (!DBUtility.ClsPub.AllowNumber(HMaterNumer))
                            {
                                objJsonResult.code = "0";
                                objJsonResult.count = 0;
                                objJsonResult.Message = "第" + index + "行,物料代码中不能出现连续‘.’并且首位末位不能为‘.’！";
                                objJsonResult.data = null;
                                return objJsonResult;
                            }
                        }
                    }
                    else
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "第" + index + "行,组织代码为空";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = error;
                objJsonResult.data = tb2;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region è¦æ–™è®¡åˆ’信息 å¯¼å…¥(保存)
        [Route("Sc_JIT_ComplementGoodBill/Sc_JIT_ComplementGoodBill_btnSave")]
        [HttpPost]
        public object Sc_JIT_ComplementGoodBill_btnSave([FromBody] JObject sMainSub)
        {
            var _value = sMainSub["sMainSub"].ToString();
            string msg1 = _value.ToString();
            string[] sArray = msg1.Split(new string[] { "&和" }, StringSplitOptions.RemoveEmptyEntries);
            string msg2 = sArray[0].ToString();
            string user = sArray[1].ToString();
            try
            {
                if (!DBUtility.ClsPub.Security_Log("JIT_NeedMaterPlanConfigBill_Edit", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无保存权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                List<object> Excel = Newtonsoft.Json.JsonConvert.DeserializeObject<List<object>>(msg2);
                List<Dictionary<string, string>> list = new List<Dictionary<string, string>>();

                foreach (JObject item in Excel)
                {
                    Dictionary<string, string> dic = new Dictionary<string, string>();
                    foreach (var itm in item.Properties())
                    {
                        dic.Add(itm.Name, itm.Value.ToString());
                    }
                    list.Add(dic);
                }

                oCN.BeginTran();
                int i = 1;
                foreach (Dictionary<string, string> item in list)
                {
                    string HWorkShopID = item["HWorkShopID"].ToString();//车间
                    string HMaterID = item["HMaterID"].ToString();//物料ID
                    string HOrgID = item["HOrgID"].ToString();//组织ID
                    string HWorkShopName = item["车间"].ToString();
                    string HMaterName = item["物料名称"].ToString();
                    string HMaterModel = item["规格型号"].ToString();
                    string JITType = item["JIT物料分类"].ToString();
                    string JITPSL = item["JIT拉动安全库存量"].ToString();
                    string JITMDSC = item["JIT物料需求供货周期"].ToString();
                    string JIPEB = item["JIT提货批量"].ToString();
                    string JITPBCC = item["JIT提货批量对应周期（天）"].ToString();
                    string JISLT = item["JIT供货提前期（天）"].ToString();
                    string JIDLT = item["JIT到货前置期（天）"].ToString();
                    string JITDCD = item["JIT送货控制天数"].ToString();
                    string JIMLC = item["JIT送货方式"].ToString();
                    string HRemark = item["备注"].ToString();

                    ds = oCN.RunProcReturn("select * from JIT_NeedMaterPlanConfigBillSub where HMaterID=" + HMaterID + " and HWorkShopID=" + HWorkShopID, "JIT_NeedMaterPlanConfigBillSub");

                    if (ds.Tables[0].Rows.Count == 0)
                    {

                        long HInterID = DBUtility.ClsPub.CreateBillID_Prod("4615", ref DBUtility.ClsPub.sExeReturnInfo);//获得一个新的id
                        string HBillNo = DBUtility.ClsPub.CreateBillCode_Prod("4615", ref DBUtility.ClsPub.sExeReturnInfo, true);//获得一个新的单据号


                        string sql = "insert into JIT_NeedMaterPlanConfigBillMain" +
                            "(HInterID,HBillNo,HYear,HPeriod,HBillType,HBillSubType,HDate,HBillStatus,HMaker,HMakeDate,HOrgId)" +
                            $"values({HInterID}, '{HBillNo}',{DateTime.Now.Year}, {DateTime.Now.Month}, '4615', '4615', GETDATE(), 1, '{user}', GETDATE(), {HOrgID})";
                        string sql1 = "insert into JIT_NeedMaterPlanConfigBillSub(HInterID,HEntryID,HRemark,HWorkShopID,HWorkShopName,HMaterID," +
                       "HMaterName, HMaterModel, HJITMaterGroup, HJITSafeStock, HJITMaterDemand, HJITBatchQty, HDeliveryPeriod, " +
                       "HLeadTime, HLeadTime_Sec, HDeliveryDaysCtrl, HDeliveryMode) values" +
                       $"({HInterID}, 1, '{HRemark}', {(HWorkShopID == "" ? "0" : HWorkShopID)}, '{HWorkShopName}', {(HMaterID == "" ? "0" : HMaterID)}," +
                       $" '{HMaterName}', '{HMaterModel}', '{JITType}', {(JITPSL == "" ? "0" : JITPSL)}, {(JITMDSC == "" ? "0" : JITMDSC)},{(JIPEB == "" ? "0" : JIPEB)},{(JITPBCC == "" ? "0" : JITPBCC)}," +
                       $" {(JISLT == "" ? "0" : JISLT)}, {(JIDLT == "" ? "0" : JIDLT)}, {(JITDCD == "" ? "0" : JITDCD)}, '{(JIMLC == "" ? "" : JIMLC)}')";

                        //主表
                        oCN.RunProc(sql);
                        //子表
                        oCN.RunProc(sql1);
                    }
                    else
                    {
                        oCN.RunProc("    update  JIT_NeedMaterPlanConfigBillMain set HLeadTime=" + JISLT + ",HLeadTime_Sec=" + JIDLT + "  where HMaterID=" + HMaterID + " and HWorkShopID = " + HWorkShopID);
                    }

                    i++;
                }

                oCN.Commit();

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "导入成功!";
                objJsonResult.data = null;
                return objJsonResult;
            }
            catch (Exception e)
            {
                LogService.Write(e);
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
        #endregion



 WebAPI/DLL/ClsGy_Material_Ctl.cs

@@ -30,7 +30,7 @@
                    ",HMaterRuleType,HColorNo,HPieceMaxQty,HCommonUseFlag,HAvgStockPrice,HFootPrice,HTaxCost,HNoTaxCost,HOnceRightRate" +
                    ",HHeight_M,HInches_M,HAl1Long_M,HDensity_M,HTela_M,HUnderTela_M,HSizing_M,HQtyDec,HPriceDec,HMoneyDec,HTaxRate,HProfitRate" +
                    ",HLotcardQty" +
                    ",HProjectBillMainID,HDivisionID,HCubicleQty" +
                    ",HProjectBillMainID,HDivisionID,HCubicleQty,HMakeEmp" +
                    ") " +
                    " Values('" + oModel.HNumber + "','" + oModel.HName + "','" + oModel.HHelpCode + "','" + oModel.HShortNumber + "'," + oModel.HParentID.ToString() +
                    ", " + oModel.HLevel.ToString() + "," + Convert.ToString(oModel.HEndFlag ? 1 : 0) + "," + Convert.ToString(oModel.HStopflag ? 1 : 0) + ",'" + oModel.HRemark + "'" +
@@ -57,6 +57,7 @@
                       ",'" + oModel.HProjectBillMainID +
                       "','" + oModel.HDivisionID +
                       "','" + oModel.HCubicleQty +
                       "','" + oModel.HMakeEmp +
                       "')", ref DBUtility.ClsPub.sExeReturnInfo);
                //修改上级为非末级代码
                oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);

 WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user

@@ -4,7 +4,7 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <History>True|2025-04-08T01:10:05.3755564Z;True|2025-04-07T09:32:09.4220262+08:00;True|2025-04-02T10:07:49.7129656+08:00;True|2025-04-02T09:28:18.3104138+08:00;False|2025-04-02T09:28:06.8644783+08:00;True|2025-04-02T09:03:43.1765932+08:00;False|2025-04-02T09:03:36.6874678+08:00;True|2025-03-26T08:15:22.1038130+08:00;True|2025-03-25T17:13:07.6600191+08:00;True|2025-03-25T16:53:58.9214849+08:00;False|2025-03-25T16:53:46.3315797+08:00;True|2025-03-24T15:53:51.6757690+08:00;True|2025-03-24T14:18:37.5668299+08:00;True|2025-03-21T15:06:33.1307351+08:00;True|2025-03-21T15:04:11.9681650+08:00;True|2025-03-21T14:14:59.1591046+08:00;True|2025-03-21T10:25:57.3452453+08:00;True|2025-03-21T09:07:23.5814841+08:00;True|2025-03-20T16:42:24.9342284+08:00;False|2025-03-20T16:42:17.5165982+08:00;True|2025-03-20T16:34:56.3337544+08:00;True|2025-03-20T16:29:15.1683525+08:00;True|2025-03-20T16:23:42.5038047+08:00;True|2025-03-19T20:24:10.0975063+08:00;True|2025-03-18T09:34:22.6164243+08:00;True|2025-03-17T21:47:20.2930413+08:00;True|2025-03-17T19:41:02.3815065+08:00;False|2025-03-17T19:40:55.9908892+08:00;True|2025-03-17T19:19:49.8872115+08:00;True|2025-03-17T18:58:03.6903198+08:00;True|2025-03-17T14:26:34.9258043+08:00;True|2025-03-14T15:40:57.9378742+08:00;False|2025-03-14T15:40:46.0132033+08:00;False|2025-03-14T12:34:38.6551944+08:00;True|2025-03-05T14:35:44.7812995+08:00;True|2025-03-05T12:57:06.2539555+08:00;True|2025-03-05T11:19:01.3450138+08:00;True|2025-03-04T15:25:38.6174966+08:00;True|2025-03-04T14:54:41.4026832+08:00;True|2025-03-04T11:08:16.5619007+08:00;True|2025-03-04T10:01:43.5782535+08:00;True|2025-03-04T08:42:48.4526420+08:00;False|2025-03-04T08:42:42.2828130+08:00;True|2025-02-27T15:13:52.3469275+08:00;True|2025-02-27T10:59:33.6194212+08:00;False|2025-02-27T10:59:25.0394841+08:00;True|2025-02-27T10:44:18.9014583+08:00;True|2025-02-26T14:27:14.6049136+08:00;False|2025-02-26T14:27:02.9843524+08:00;True|2025-02-25T15:20:23.1640745+08:00;True|2025-02-25T14:48:55.2842125+08:00;False|2025-02-25T14:48:42.2715748+08:00;True|2025-02-11T10:10:05.6068846+08:00;True|2025-02-11T09:45:52.5312134+08:00;False|2025-02-11T09:42:54.6560039+08:00;False|2025-02-11T09:42:44.7260867+08:00;True|2025-02-10T15:18:16.8537767+08:00;True|2025-02-10T15:11:21.0436532+08:00;True|2025-02-10T13:51:35.4452640+08:00;True|2025-02-10T13:22:03.2907876+08:00;True|2025-02-10T11:04:24.1824725+08:00;True|2025-02-10T10:28:28.1308553+08:00;False|2025-02-10T10:25:56.3141700+08:00;True|2025-02-10T10:20:23.8683188+08:00;False|2025-02-10T10:20:11.3293731+08:00;True|2025-01-10T16:40:52.1666611+08:00;False|2025-01-10T16:40:46.4916510+08:00;True|2025-01-07T14:28:51.8669083+08:00;True|2025-01-07T13:07:29.9052541+08:00;True|2025-01-07T12:56:00.2870613+08:00;True|2025-01-07T12:43:45.7885867+08:00;True|2025-01-07T11:09:19.5063011+08:00;True|2025-01-07T11:00:06.9697471+08:00;True|2025-01-07T09:56:02.2879532+08:00;True|2025-01-07T09:45:19.5462835+08:00;True|2025-01-07T09:42:50.9089289+08:00;False|2025-01-07T09:42:40.4271324+08:00;True|2025-01-04T15:46:13.8527906+08:00;True|2025-01-04T15:39:45.2037219+08:00;False|2025-01-04T15:39:22.4930686+08:00;True|2025-01-04T13:31:08.6975632+08:00;True|2025-01-04T13:29:16.6440831+08:00;True|2025-01-04T13:13:10.1452466+08:00;True|2025-01-03T14:15:46.7252901+08:00;True|2025-01-03T10:09:32.6319841+08:00;False|2025-01-03T10:09:25.9409250+08:00;True|2024-12-31T15:30:13.0841451+08:00;True|2024-12-31T15:20:44.4779893+08:00;False|2024-12-31T15:20:38.3464087+08:00;True|2024-12-30T19:31:50.5186513+08:00;True|2024-12-30T19:26:51.9369903+08:00;True|2024-12-30T19:03:43.0165721+08:00;True|2024-12-30T17:03:44.6035503+08:00;True|2024-12-30T16:59:37.4694911+08:00;True|2024-12-30T15:14:16.7657186+08:00;False|2024-12-30T15:14:09.9136437+08:00;True|2024-12-28T14:22:43.5822832+08:00;True|2024-12-28T14:10:54.9885289+08:00;True|2024-12-28T13:56:42.0405943+08:00;True|2024-12-28T13:18:42.1604585+08:00;True|2024-12-28T10:48:49.0559287+08:00;False|2024-12-28T10:48:41.8813560+08:00;True|2024-12-27T16:41:50.4368711+08:00;True|2024-12-27T14:31:25.7129706+08:00;True|2024-12-27T11:24:16.6524093+08:00;False|2024-12-27T11:23:25.9617516+08:00;True|2024-12-18T08:34:56.1537647+08:00;True|2024-12-17T13:56:47.7915112+08:00;True|2024-12-17T11:13:27.2665832+08:00;True|2024-12-16T16:01:15.5110052+08:00;True|2024-12-16T15:53:18.1111331+08:00;True|2024-12-16T15:13:43.9719840+08:00;True|2024-12-16T15:08:49.2287341+08:00;True|2024-12-16T14:59:21.3003410+08:00;True|2024-12-16T10:16:34.6636364+08:00;True|2024-12-16T10:12:38.1827164+08:00;False|2024-12-16T10:12:16.1621752+08:00;True|2024-12-13T15:44:29.9921182+08:00;False|2024-12-13T15:43:36.1775569+08:00;True|2024-12-11T09:06:23.2065068+08:00;True|2024-12-11T09:02:10.9767948+08:00;True|2024-12-11T08:26:16.2292105+08:00;True|2024-12-10T16:17:47.2702447+08:00;True|2024-12-10T14:47:18.4352590+08:00;True|2024-12-10T14:10:37.0165625+08:00;True|2024-12-10T13:59:25.4712057+08:00;True|2024-12-10T13:46:02.3070111+08:00;True|2024-12-10T13:39:19.2434918+08:00;True|2024-12-10T10:42:47.3763447+08:00;True|2024-12-10T10:28:20.0524748+08:00;True|2024-12-09T11:01:35.7691980+08:00;True|2024-12-09T09:20:22.9742701+08:00;True|2024-12-09T08:47:26.0470083+08:00;True|2024-12-06T13:13:33.9776030+08:00;True|2024-12-05T14:33:41.1542437+08:00;True|2024-12-05T14:21:02.3120095+08:00;True|2024-12-05T14:13:09.2733831+08:00;True|2024-12-05T13:27:25.9831554+08:00;True|2024-12-05T13:23:25.4183580+08:00;True|2024-12-05T11:27:26.9609695+08:00;True|2024-12-05T09:20:29.4596887+08:00;True|2024-12-05T08:47:57.2553570+08:00;True|2024-12-05T08:41:06.4860297+08:00;True|2024-12-05T08:32:16.9785572+08:00;True|2024-12-04T15:54:19.4995372+08:00;True|2024-12-04T11:10:12.2273624+08:00;True|2024-12-04T10:21:44.8769236+08:00;False|2024-12-04T10:20:59.8206595+08:00;True|2024-12-04T09:52:03.8506923+08:00;True|2024-12-03T15:09:48.8710712+08:00;False|2024-12-03T15:08:46.8904626+08:00;True|2024-11-28T10:42:45.3823067+08:00;True|2024-11-28T09:58:38.0983021+08:00;True|2024-11-27T16:16:28.4276838+08:00;True|2024-11-27T16:09:08.0834912+08:00;True|2024-11-27T14:32:21.1684294+08:00;True|2024-11-27T13:24:51.2115157+08:00;True|2024-11-27T13:16:51.5888615+08:00;True|2024-11-26T10:47:18.1958719+08:00;False|2024-11-26T10:46:22.2016963+08:00;False|2024-11-25T10:22:55.3420353+08:00;True|2024-11-20T09:08:48.6293480+08:00;True|2024-11-19T17:01:27.8454996+08:00;True|2024-11-19T08:20:49.6371464+08:00;True|2024-11-18T15:27:25.3419580+08:00;True|2024-11-18T15:19:07.4691728+08:00;True|2024-11-18T14:57:25.8637252+08:00;True|2024-11-18T14:52:10.6158576+08:00;True|2024-11-18T14:46:03.5051743+08:00;True|2024-11-18T13:42:14.5146469+08:00;True|2024-11-18T13:27:53.4498275+08:00;True|2024-11-18T11:26:05.8168670+08:00;True|2024-11-18T11:04:00.4711300+08:00;True|2024-11-18T10:54:15.6267907+08:00;True|2024-11-18T10:45:29.5275370+08:00;True|2024-11-15T16:58:39.1926238+08:00;True|2024-11-15T16:45:12.0168760+08:00;True|2024-11-15T16:37:11.8513587+08:00;True|2024-11-15T16:31:13.0430714+08:00;True|2024-11-15T16:27:45.3575015+08:00;False|2024-11-15T16:26:49.5306586+08:00;True|2024-11-15T16:16:54.0542122+08:00;True|2024-11-15T15:51:41.6920560+08:00;False|2024-11-15T15:50:37.8798414+08:00;True|2024-11-06T14:13:46.3129972+08:00;False|2024-11-06T14:12:47.9022879+08:00;False|2024-11-05T20:45:28.3960353+08:00;True|2024-11-05T19:04:11.0417788+08:00;False|2024-11-05T19:03:03.9263878+08:00;True|2024-11-05T15:54:24.8374699+08:00;False|2024-11-05T15:53:24.4214141+08:00;True|2024-10-25T16:51:46.3066612+08:00;True|2024-10-25T12:16:27.8737941+08:00;True|2024-10-25T10:12:38.8056269+08:00;False|2024-10-25T10:11:44.1117608+08:00;True|2024-10-25T09:54:06.8572059+08:00;True|2024-10-25T08:21:42.6333993+08:00;True|2024-10-24T17:56:19.5319332+08:00;True|2024-10-24T17:50:10.0801119+08:00;False|2024-10-24T17:49:21.0726954+08:00;True|2024-10-24T17:40:46.0577697+08:00;False|2024-10-24T17:39:53.3743103+08:00;True|2024-10-24T14:57:00.6752320+08:00;True|2024-10-24T10:08:39.8269595+08:00;False|2024-10-24T10:07:47.3834032+08:00;True|2024-10-22T10:33:10.1961964+08:00;True|2024-10-21T08:43:54.1422810+08:00;False|2024-10-21T08:43:00.6574201+08:00;True|2024-10-18T14:56:55.6749850+08:00;True|2024-10-18T14:47:05.1073813+08:00;True|2024-10-18T11:24:23.9069952+08:00;True|2024-10-18T11:14:57.8486575+08:00;False|2024-10-18T11:14:07.5289704+08:00;True|2024-10-18T10:57:00.2425175+08:00;False|2024-10-18T10:56:04.8949960+08:00;True|2024-10-15T16:44:32.6189434+08:00;True|2024-10-15T14:38:49.8658311+08:00;True|2024-10-15T09:49:55.2197004+08:00;False|2024-10-15T09:49:14.8790668+08:00;False|2024-10-12T15:28:24.1303695+08:00;True|2024-10-10T10:59:36.7878419+08:00;False|2024-10-10T10:58:40.9900315+08:00;True|2024-10-03T10:57:02.9299524+08:00;True|2024-10-03T10:02:10.1156720+08:00;True|2024-09-30T11:07:22.5376794+08:00;True|2024-09-30T10:15:40.3990343+08:00;True|2024-09-30T10:04:38.1942221+08:00;True|2024-09-29T19:22:01.5340857+08:00;False|2024-09-29T19:21:12.2387012+08:00;True|2024-09-26T09:50:22.2637977+08:00;True|2024-09-25T20:44:33.3994634+08:00;True|2024-09-25T16:07:23.2747063+08:00;True|2024-09-25T14:55:37.9194143+08:00;True|2024-09-24T20:03:43.9841995+08:00;True|2024-09-24T19:42:48.7479102+08:00;True|2024-09-24T19:38:31.5777012+08:00;True|2024-09-24T16:26:58.5969765+08:00;True|2024-09-24T15:31:00.7140362+08:00;True|2024-09-24T10:17:46.7830753+08:00;True|2024-09-24T09:40:19.5788062+08:00;False|2024-09-24T09:39:27.4521802+08:00;True|2024-09-23T19:35:55.3572583+08:00;True|2024-09-23T18:53:15.4480118+08:00;False|2024-09-23T18:52:22.0135173+08:00;True|2024-09-20T09:59:12.9943442+08:00;False|2024-09-20T09:58:18.6945854+08:00;True|2024-09-12T20:40:58.7161451+08:00;False|2024-09-12T20:40:00.0672966+08:00;True|2024-09-12T16:47:22.7671323+08:00;True|2024-09-12T16:34:18.5850144+08:00;True|2024-09-12T16:13:32.1929032+08:00;True|2024-09-12T09:12:54.4456999+08:00;False|2024-09-12T09:12:06.1002866+08:00;False|2024-09-11T21:06:15.4423786+08:00;True|2024-09-10T15:26:48.7055081+08:00;True|2024-09-10T09:26:36.8509916+08:00;True|2024-09-09T19:51:32.6059511+08:00;True|2024-09-09T19:05:47.5349922+08:00;True|2024-09-09T09:26:23.2022383+08:00;False|2024-09-09T09:25:27.3736749+08:00;True|2024-09-06T15:32:52.1865278+08:00;True|2024-09-06T15:16:01.1405794+08:00;True|2024-09-06T14:21:05.7482343+08:00;True|2024-09-06T14:09:17.1494566+08:00;True|2024-09-06T13:49:56.4128481+08:00;True|2024-09-06T13:11:53.0863947+08:00;True|2024-09-06T09:34:54.5934463+08:00;True|2024-09-06T08:47:19.9744092+08:00;True|2024-09-05T15:01:38.6968629+08:00;True|2024-09-05T14:56:09.3505818+08:00;True|2024-09-05T14:49:56.8774757+08:00;True|2024-09-05T08:14:13.2359921+08:00;False|2024-09-05T08:13:11.8797534+08:00;True|2024-09-03T16:52:02.8227375+08:00;False|2024-09-03T16:51:32.4250926+08:00;True|2024-09-03T16:33:05.7269609+08:00;True|2024-09-03T16:00:15.0288548+08:00;True|2024-08-29T08:06:32.4732067+08:00;False|2024-08-29T08:06:02.4801886+08:00;True|2024-08-26T10:17:08.7733750+08:00;False|2024-08-26T10:11:05.1864217+08:00;False|2024-08-26T09:50:31.1539306+08:00;False|2024-08-26T09:47:37.4351309+08:00;True|2024-08-16T16:55:32.0918962+08:00;True|2024-08-16T16:53:23.3505641+08:00;False|2024-08-16T16:49:30.4579212+08:00;False|2024-08-16T16:47:01.9799743+08:00;</History>
    <History>True|2025-04-21T07:28:15.2307697Z;True|2025-04-21T15:17:17.5682286+08:00;True|2025-04-21T15:12:16.8982275+08:00;True|2025-04-21T14:53:26.4605418+08:00;True|2025-04-21T14:49:48.8960696+08:00;True|2025-04-21T14:35:59.4591551+08:00;False|2025-04-21T14:35:46.2281772+08:00;True|2025-04-08T13:10:52.8749775+08:00;True|2025-04-08T09:10:05.3755564+08:00;True|2025-04-07T09:32:09.4220262+08:00;True|2025-04-02T10:07:49.7129656+08:00;True|2025-04-02T09:28:18.3104138+08:00;False|2025-04-02T09:28:06.8644783+08:00;True|2025-04-02T09:03:43.1765932+08:00;False|2025-04-02T09:03:36.6874678+08:00;True|2025-03-26T08:15:22.1038130+08:00;True|2025-03-25T17:13:07.6600191+08:00;True|2025-03-25T16:53:58.9214849+08:00;False|2025-03-25T16:53:46.3315797+08:00;True|2025-03-24T15:53:51.6757690+08:00;True|2025-03-24T14:18:37.5668299+08:00;True|2025-03-21T15:06:33.1307351+08:00;True|2025-03-21T15:04:11.9681650+08:00;True|2025-03-21T14:14:59.1591046+08:00;True|2025-03-21T10:25:57.3452453+08:00;True|2025-03-21T09:07:23.5814841+08:00;True|2025-03-20T16:42:24.9342284+08:00;False|2025-03-20T16:42:17.5165982+08:00;True|2025-03-20T16:34:56.3337544+08:00;True|2025-03-20T16:29:15.1683525+08:00;True|2025-03-20T16:23:42.5038047+08:00;True|2025-03-19T20:24:10.0975063+08:00;True|2025-03-18T09:34:22.6164243+08:00;True|2025-03-17T21:47:20.2930413+08:00;True|2025-03-17T19:41:02.3815065+08:00;False|2025-03-17T19:40:55.9908892+08:00;True|2025-03-17T19:19:49.8872115+08:00;True|2025-03-17T18:58:03.6903198+08:00;True|2025-03-17T14:26:34.9258043+08:00;True|2025-03-14T15:40:57.9378742+08:00;False|2025-03-14T15:40:46.0132033+08:00;False|2025-03-14T12:34:38.6551944+08:00;True|2025-03-05T14:35:44.7812995+08:00;True|2025-03-05T12:57:06.2539555+08:00;True|2025-03-05T11:19:01.3450138+08:00;True|2025-03-04T15:25:38.6174966+08:00;True|2025-03-04T14:54:41.4026832+08:00;True|2025-03-04T11:08:16.5619007+08:00;True|2025-03-04T10:01:43.5782535+08:00;True|2025-03-04T08:42:48.4526420+08:00;False|2025-03-04T08:42:42.2828130+08:00;True|2025-02-27T15:13:52.3469275+08:00;True|2025-02-27T10:59:33.6194212+08:00;False|2025-02-27T10:59:25.0394841+08:00;True|2025-02-27T10:44:18.9014583+08:00;True|2025-02-26T14:27:14.6049136+08:00;False|2025-02-26T14:27:02.9843524+08:00;True|2025-02-25T15:20:23.1640745+08:00;True|2025-02-25T14:48:55.2842125+08:00;False|2025-02-25T14:48:42.2715748+08:00;True|2025-02-11T10:10:05.6068846+08:00;True|2025-02-11T09:45:52.5312134+08:00;False|2025-02-11T09:42:54.6560039+08:00;False|2025-02-11T09:42:44.7260867+08:00;True|2025-02-10T15:18:16.8537767+08:00;True|2025-02-10T15:11:21.0436532+08:00;True|2025-02-10T13:51:35.4452640+08:00;True|2025-02-10T13:22:03.2907876+08:00;True|2025-02-10T11:04:24.1824725+08:00;True|2025-02-10T10:28:28.1308553+08:00;False|2025-02-10T10:25:56.3141700+08:00;True|2025-02-10T10:20:23.8683188+08:00;False|2025-02-10T10:20:11.3293731+08:00;True|2025-01-10T16:40:52.1666611+08:00;False|2025-01-10T16:40:46.4916510+08:00;True|2025-01-07T14:28:51.8669083+08:00;True|2025-01-07T13:07:29.9052541+08:00;True|2025-01-07T12:56:00.2870613+08:00;True|2025-01-07T12:43:45.7885867+08:00;True|2025-01-07T11:09:19.5063011+08:00;True|2025-01-07T11:00:06.9697471+08:00;True|2025-01-07T09:56:02.2879532+08:00;True|2025-01-07T09:45:19.5462835+08:00;True|2025-01-07T09:42:50.9089289+08:00;False|2025-01-07T09:42:40.4271324+08:00;True|2025-01-04T15:46:13.8527906+08:00;True|2025-01-04T15:39:45.2037219+08:00;False|2025-01-04T15:39:22.4930686+08:00;True|2025-01-04T13:31:08.6975632+08:00;True|2025-01-04T13:29:16.6440831+08:00;True|2025-01-04T13:13:10.1452466+08:00;True|2025-01-03T14:15:46.7252901+08:00;True|2025-01-03T10:09:32.6319841+08:00;False|2025-01-03T10:09:25.9409250+08:00;True|2024-12-31T15:30:13.0841451+08:00;True|2024-12-31T15:20:44.4779893+08:00;False|2024-12-31T15:20:38.3464087+08:00;True|2024-12-30T19:31:50.5186513+08:00;True|2024-12-30T19:26:51.9369903+08:00;True|2024-12-30T19:03:43.0165721+08:00;True|2024-12-30T17:03:44.6035503+08:00;True|2024-12-30T16:59:37.4694911+08:00;True|2024-12-30T15:14:16.7657186+08:00;False|2024-12-30T15:14:09.9136437+08:00;True|2024-12-28T14:22:43.5822832+08:00;True|2024-12-28T14:10:54.9885289+08:00;True|2024-12-28T13:56:42.0405943+08:00;True|2024-12-28T13:18:42.1604585+08:00;True|2024-12-28T10:48:49.0559287+08:00;False|2024-12-28T10:48:41.8813560+08:00;True|2024-12-27T16:41:50.4368711+08:00;True|2024-12-27T14:31:25.7129706+08:00;True|2024-12-27T11:24:16.6524093+08:00;False|2024-12-27T11:23:25.9617516+08:00;True|2024-12-18T08:34:56.1537647+08:00;True|2024-12-17T13:56:47.7915112+08:00;True|2024-12-17T11:13:27.2665832+08:00;True|2024-12-16T16:01:15.5110052+08:00;True|2024-12-16T15:53:18.1111331+08:00;True|2024-12-16T15:13:43.9719840+08:00;True|2024-12-16T15:08:49.2287341+08:00;True|2024-12-16T14:59:21.3003410+08:00;True|2024-12-16T10:16:34.6636364+08:00;True|2024-12-16T10:12:38.1827164+08:00;False|2024-12-16T10:12:16.1621752+08:00;True|2024-12-13T15:44:29.9921182+08:00;False|2024-12-13T15:43:36.1775569+08:00;True|2024-12-11T09:06:23.2065068+08:00;True|2024-12-11T09:02:10.9767948+08:00;True|2024-12-11T08:26:16.2292105+08:00;True|2024-12-10T16:17:47.2702447+08:00;True|2024-12-10T14:47:18.4352590+08:00;True|2024-12-10T14:10:37.0165625+08:00;True|2024-12-10T13:59:25.4712057+08:00;True|2024-12-10T13:46:02.3070111+08:00;True|2024-12-10T13:39:19.2434918+08:00;True|2024-12-10T10:42:47.3763447+08:00;True|2024-12-10T10:28:20.0524748+08:00;True|2024-12-09T11:01:35.7691980+08:00;True|2024-12-09T09:20:22.9742701+08:00;True|2024-12-09T08:47:26.0470083+08:00;True|2024-12-06T13:13:33.9776030+08:00;True|2024-12-05T14:33:41.1542437+08:00;True|2024-12-05T14:21:02.3120095+08:00;True|2024-12-05T14:13:09.2733831+08:00;True|2024-12-05T13:27:25.9831554+08:00;True|2024-12-05T13:23:25.4183580+08:00;True|2024-12-05T11:27:26.9609695+08:00;True|2024-12-05T09:20:29.4596887+08:00;True|2024-12-05T08:47:57.2553570+08:00;True|2024-12-05T08:41:06.4860297+08:00;True|2024-12-05T08:32:16.9785572+08:00;True|2024-12-04T15:54:19.4995372+08:00;True|2024-12-04T11:10:12.2273624+08:00;True|2024-12-04T10:21:44.8769236+08:00;False|2024-12-04T10:20:59.8206595+08:00;True|2024-12-04T09:52:03.8506923+08:00;True|2024-12-03T15:09:48.8710712+08:00;False|2024-12-03T15:08:46.8904626+08:00;True|2024-11-28T10:42:45.3823067+08:00;True|2024-11-28T09:58:38.0983021+08:00;True|2024-11-27T16:16:28.4276838+08:00;True|2024-11-27T16:09:08.0834912+08:00;True|2024-11-27T14:32:21.1684294+08:00;True|2024-11-27T13:24:51.2115157+08:00;True|2024-11-27T13:16:51.5888615+08:00;True|2024-11-26T10:47:18.1958719+08:00;False|2024-11-26T10:46:22.2016963+08:00;False|2024-11-25T10:22:55.3420353+08:00;True|2024-11-20T09:08:48.6293480+08:00;True|2024-11-19T17:01:27.8454996+08:00;True|2024-11-19T08:20:49.6371464+08:00;True|2024-11-18T15:27:25.3419580+08:00;True|2024-11-18T15:19:07.4691728+08:00;True|2024-11-18T14:57:25.8637252+08:00;True|2024-11-18T14:52:10.6158576+08:00;True|2024-11-18T14:46:03.5051743+08:00;True|2024-11-18T13:42:14.5146469+08:00;True|2024-11-18T13:27:53.4498275+08:00;True|2024-11-18T11:26:05.8168670+08:00;True|2024-11-18T11:04:00.4711300+08:00;True|2024-11-18T10:54:15.6267907+08:00;True|2024-11-18T10:45:29.5275370+08:00;True|2024-11-15T16:58:39.1926238+08:00;True|2024-11-15T16:45:12.0168760+08:00;True|2024-11-15T16:37:11.8513587+08:00;True|2024-11-15T16:31:13.0430714+08:00;True|2024-11-15T16:27:45.3575015+08:00;False|2024-11-15T16:26:49.5306586+08:00;True|2024-11-15T16:16:54.0542122+08:00;True|2024-11-15T15:51:41.6920560+08:00;False|2024-11-15T15:50:37.8798414+08:00;True|2024-11-06T14:13:46.3129972+08:00;False|2024-11-06T14:12:47.9022879+08:00;False|2024-11-05T20:45:28.3960353+08:00;True|2024-11-05T19:04:11.0417788+08:00;False|2024-11-05T19:03:03.9263878+08:00;True|2024-11-05T15:54:24.8374699+08:00;False|2024-11-05T15:53:24.4214141+08:00;True|2024-10-25T16:51:46.3066612+08:00;True|2024-10-25T12:16:27.8737941+08:00;True|2024-10-25T10:12:38.8056269+08:00;False|2024-10-25T10:11:44.1117608+08:00;True|2024-10-25T09:54:06.8572059+08:00;True|2024-10-25T08:21:42.6333993+08:00;True|2024-10-24T17:56:19.5319332+08:00;True|2024-10-24T17:50:10.0801119+08:00;False|2024-10-24T17:49:21.0726954+08:00;True|2024-10-24T17:40:46.0577697+08:00;False|2024-10-24T17:39:53.3743103+08:00;True|2024-10-24T14:57:00.6752320+08:00;True|2024-10-24T10:08:39.8269595+08:00;False|2024-10-24T10:07:47.3834032+08:00;True|2024-10-22T10:33:10.1961964+08:00;True|2024-10-21T08:43:54.1422810+08:00;False|2024-10-21T08:43:00.6574201+08:00;True|2024-10-18T14:56:55.6749850+08:00;True|2024-10-18T14:47:05.1073813+08:00;True|2024-10-18T11:24:23.9069952+08:00;True|2024-10-18T11:14:57.8486575+08:00;False|2024-10-18T11:14:07.5289704+08:00;True|2024-10-18T10:57:00.2425175+08:00;False|2024-10-18T10:56:04.8949960+08:00;True|2024-10-15T16:44:32.6189434+08:00;True|2024-10-15T14:38:49.8658311+08:00;True|2024-10-15T09:49:55.2197004+08:00;False|2024-10-15T09:49:14.8790668+08:00;False|2024-10-12T15:28:24.1303695+08:00;True|2024-10-10T10:59:36.7878419+08:00;False|2024-10-10T10:58:40.9900315+08:00;True|2024-10-03T10:57:02.9299524+08:00;True|2024-10-03T10:02:10.1156720+08:00;True|2024-09-30T11:07:22.5376794+08:00;True|2024-09-30T10:15:40.3990343+08:00;True|2024-09-30T10:04:38.1942221+08:00;True|2024-09-29T19:22:01.5340857+08:00;False|2024-09-29T19:21:12.2387012+08:00;True|2024-09-26T09:50:22.2637977+08:00;True|2024-09-25T20:44:33.3994634+08:00;True|2024-09-25T16:07:23.2747063+08:00;True|2024-09-25T14:55:37.9194143+08:00;True|2024-09-24T20:03:43.9841995+08:00;True|2024-09-24T19:42:48.7479102+08:00;True|2024-09-24T19:38:31.5777012+08:00;True|2024-09-24T16:26:58.5969765+08:00;True|2024-09-24T15:31:00.7140362+08:00;True|2024-09-24T10:17:46.7830753+08:00;True|2024-09-24T09:40:19.5788062+08:00;False|2024-09-24T09:39:27.4521802+08:00;True|2024-09-23T19:35:55.3572583+08:00;True|2024-09-23T18:53:15.4480118+08:00;False|2024-09-23T18:52:22.0135173+08:00;True|2024-09-20T09:59:12.9943442+08:00;False|2024-09-20T09:58:18.6945854+08:00;True|2024-09-12T20:40:58.7161451+08:00;False|2024-09-12T20:40:00.0672966+08:00;True|2024-09-12T16:47:22.7671323+08:00;True|2024-09-12T16:34:18.5850144+08:00;True|2024-09-12T16:13:32.1929032+08:00;True|2024-09-12T09:12:54.4456999+08:00;False|2024-09-12T09:12:06.1002866+08:00;False|2024-09-11T21:06:15.4423786+08:00;True|2024-09-10T15:26:48.7055081+08:00;True|2024-09-10T09:26:36.8509916+08:00;True|2024-09-09T19:51:32.6059511+08:00;True|2024-09-09T19:05:47.5349922+08:00;True|2024-09-09T09:26:23.2022383+08:00;False|2024-09-09T09:25:27.3736749+08:00;True|2024-09-06T15:32:52.1865278+08:00;True|2024-09-06T15:16:01.1405794+08:00;True|2024-09-06T14:21:05.7482343+08:00;True|2024-09-06T14:09:17.1494566+08:00;True|2024-09-06T13:49:56.4128481+08:00;True|2024-09-06T13:11:53.0863947+08:00;True|2024-09-06T09:34:54.5934463+08:00;True|2024-09-06T08:47:19.9744092+08:00;True|2024-09-05T15:01:38.6968629+08:00;True|2024-09-05T14:56:09.3505818+08:00;True|2024-09-05T14:49:56.8774757+08:00;True|2024-09-05T08:14:13.2359921+08:00;False|2024-09-05T08:13:11.8797534+08:00;True|2024-09-03T16:52:02.8227375+08:00;False|2024-09-03T16:51:32.4250926+08:00;True|2024-09-03T16:33:05.7269609+08:00;True|2024-09-03T16:00:15.0288548+08:00;True|2024-08-29T08:06:32.4732067+08:00;False|2024-08-29T08:06:02.4801886+08:00;True|2024-08-26T10:17:08.7733750+08:00;False|2024-08-26T10:11:05.1864217+08:00;False|2024-08-26T09:50:31.1539306+08:00;False|2024-08-26T09:47:37.4351309+08:00;True|2024-08-16T16:55:32.0918962+08:00;True|2024-08-16T16:53:23.3505641+08:00;False|2024-08-16T16:49:30.4579212+08:00;False|2024-08-16T16:47:01.9799743+08:00;</History>
    <_PublishTargetUrl>G:\issWeb\网站发布\API</_PublishTargetUrl>
  </PropertyGroup>
  <ItemGroup>
@@ -45,28 +45,28 @@
      <publishTime>02/22/2013 16:43:40</publishTime>
    </File>
    <File Include="bin/BLL.dll">
      <publishTime>04/08/2025 09:09:19</publishTime>
      <publishTime>04/21/2025 15:27:39</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>04/08/2025 09:09:19</publishTime>
      <publishTime>04/21/2025 15:27:39</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>04/08/2025 09:09:17</publishTime>
      <publishTime>04/21/2025 15:27:37</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>04/08/2025 09:09:17</publishTime>
      <publishTime>04/21/2025 15:27:37</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 22:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>04/08/2025 09:09:12</publishTime>
      <publishTime>04/21/2025 15:27:31</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>04/08/2025 09:09:12</publishTime>
      <publishTime>04/21/2025 15:27:31</publishTime>
    </File>
    <File Include="bin/Grpc.Core.Api.dll">
      <publishTime>03/22/2022 13:17:26</publishTime>
@@ -111,10 +111,10 @@
      <publishTime>07/25/2012 19:48:56</publishTime>
    </File>
    <File Include="bin/Model.dll">
      <publishTime>04/08/2025 09:09:13</publishTime>
      <publishTime>04/21/2025 15:27:32</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>04/08/2025 09:09:13</publishTime>
      <publishTime>04/21/2025 15:27:32</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>04/15/2024 12:55:45</publishTime>
@@ -147,34 +147,34 @@
      <publishTime>10/23/2021 17:07:54</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
      <publishTime>04/08/2025 09:09:10</publishTime>
      <publishTime>04/21/2025 15:27:29</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>04/08/2025 09:09:10</publishTime>
      <publishTime>04/21/2025 15:27:29</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>04/08/2025 09:09:11</publishTime>
      <publishTime>04/21/2025 15:27:30</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>04/08/2025 09:09:11</publishTime>
      <publishTime>04/21/2025 15:27:30</publishTime>
    </File>
    <File Include="bin/RestSharp.dll">
      <publishTime>08/31/2012 06:22:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>04/08/2025 09:09:11</publishTime>
      <publishTime>04/21/2025 15:27:31</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>04/08/2025 09:09:11</publishTime>
      <publishTime>04/21/2025 15:27:31</publishTime>
    </File>
    <File Include="bin/Swashbuckle.Core.dll">
      <publishTime>02/16/2015 01:57:08</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.dll">
      <publishTime>04/08/2025 09:09:08</publishTime>
      <publishTime>04/21/2025 15:27:26</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.pdb">
      <publishTime>04/08/2025 09:09:08</publishTime>
      <publishTime>04/21/2025 15:27:26</publishTime>
    </File>
    <File Include="bin/System.Buffers.dll">
      <publishTime>07/19/2017 18:01:28</publishTime>
@@ -285,19 +285,19 @@
      <publishTime>05/09/2023 10:43:40</publishTime>
    </File>
    <File Include="bin/TopSdk.dll">
      <publishTime>04/08/2025 09:09:13</publishTime>
      <publishTime>04/21/2025 15:27:33</publishTime>
    </File>
    <File Include="bin/TopSdk.pdb">
      <publishTime>04/08/2025 09:09:13</publishTime>
      <publishTime>04/21/2025 15:27:33</publishTime>
    </File>
    <File Include="bin/WebActivatorEx.dll">
      <publishTime>11/24/2014 19:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>04/08/2025 09:09:27</publishTime>
      <publishTime>04/21/2025 15:27:46</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>04/08/2025 09:09:27</publishTime>
      <publishTime>04/21/2025 15:27:46</publishTime>
    </File>
    <File Include="bin/WebAPI.XmlSerializers.dll">
      <publishTime>08/16/2024 16:55:28</publishTime>
@@ -495,7 +495,7 @@
      <publishTime>04/29/2024 08:30:03</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>04/08/2025 09:10:04</publishTime>
      <publishTime>04/21/2025 15:28:13</publishTime>
    </File>
  </ItemGroup>
</Project>

 WebAPI/WebAPI.csproj.user

@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <LastActiveSolutionConfig>Debug|x86</LastActiveSolutionConfig>
    <NameOfLastUsedPublishProfile>D:\WorkBench\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile1.pubxml</NameOfLastUsedPublishProfile>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\智云迈思\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\工作代码\智云迈思\MES\MES-WEB-API\WebAPI\Properties\PublishProfiles\JFAPI.pubxml</NameOfLastUsedPublishProfile>
    <UseIISExpress>true</UseIISExpress>
    <Use64BitIISExpress>
    </Use64BitIISExpress>
    <Use64BitIISExpress />
    <IISExpressSSLPort />
    <IISExpressAnonymousAuthentication>enabled</IISExpressAnonymousAuthentication>
    <IISExpressWindowsAuthentication>disabled</IISExpressWindowsAuthentication>

 sdk_dingding/TopSdk/bin/Debug/TopSdk.dll

Binary files differ

 sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb

Binary files differ

 sdk_dingding/TopSdk/bin/Release/TopSdk.dll

Binary files differ

 sdk_dingding/TopSdk/bin/Release/TopSdk.pdb

Binary files differ

 sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt

@@ -6,7 +6,6 @@
D:\工作代码\智云迈思\MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb

 sdk_dingding/TopSdk/obj/Debug/TopSdk.dll

Binary files differ

 sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb

Binary files differ

 sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt

@@ -1,6 +1,6 @@
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.dll
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.pdb
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.AssemblyReference.cache
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.CoreCompileInputs.cache
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.dll
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.pdb
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.AssemblyReference.cache

 sdk_dingding/TopSdk/obj/Release/TopSdk.dll

Binary files differ

 sdk_dingding/TopSdk/obj/Release/TopSdk.pdb

Binary files differ