1

zrg

2024-12-02 fca3696d4d50adddbfd58267e95849ba45aefe7d

1

 APSM/bin/Release/APSM.dll

Binary files differ

 APSM/bin/Release/APSM.pdb

Binary files differ

 APSM/bin/Release/BLL.dll

Binary files differ

 APSM/bin/Release/BLL.pdb

Binary files differ

 APSM/bin/Release/BaseSet.dll

Binary files differ

 APSM/bin/Release/BaseSet.pdb

Binary files differ

 APSM/bin/Release/DAL.dll

Binary files differ

 APSM/bin/Release/DAL.pdb

Binary files differ

 APSM/bin/Release/DBUtility.dll

Binary files differ

 APSM/bin/Release/DBUtility.pdb

Binary files differ

 APSM/bin/Release/Model.dll

Binary files differ

 APSM/bin/Release/Model.pdb

Binary files differ

 APSM/bin/Release/PlanM.dll

Binary files differ

 APSM/bin/Release/PlanM.pdb

Binary files differ

 APSM/bin/Release/Pub_Class.dll

Binary files differ

 APSM/bin/Release/Pub_Class.pdb

Binary files differ

 APSM/bin/Release/Pub_Control.dll

Binary files differ

 APSM/bin/Release/Pub_Control.pdb

Binary files differ

 APSM/bin/Release/SQLHelper.dll

Binary files differ

 APSM/bin/Release/SQLHelper.pdb

Binary files differ

 APSM/bin/Release/WarM.dll

Binary files differ

 APSM/bin/Release/WarM.pdb

Binary files differ

 APSM/bin/Release/WorkM.dll

Binary files differ

 APSM/bin/Release/WorkM.pdb

Binary files differ

 BLL/bin/Release/BLL.dll

Binary files differ

 BLL/bin/Release/BLL.pdb

Binary files differ

 BLL/bin/Release/DAL.dll

Binary files differ

 BLL/bin/Release/DAL.pdb

Binary files differ

 BLL/bin/Release/DBUtility.dll

Binary files differ

 BLL/bin/Release/DBUtility.pdb

Binary files differ

 BLL/bin/Release/Model.dll

Binary files differ

 BLL/bin/Release/Model.pdb

Binary files differ

 BLL/bin/Release/Pub_Class.dll

Binary files differ

 BLL/bin/Release/Pub_Class.pdb

Binary files differ

 BLL/bin/Release/Pub_Control.dll

Binary files differ

 BLL/bin/Release/Pub_Control.pdb

Binary files differ

 BLL/bin/Release/SQLHelper.dll

Binary files differ

 BLL/bin/Release/SQLHelper.pdb

Binary files differ

 BaseSet/bin/Release/BLL.dll

Binary files differ

 BaseSet/bin/Release/BLL.pdb

Binary files differ

 BaseSet/bin/Release/BaseSet.dll

Binary files differ

 BaseSet/bin/Release/BaseSet.pdb

Binary files differ

 BaseSet/bin/Release/DAL.dll

Binary files differ

 BaseSet/bin/Release/DAL.pdb

Binary files differ

 BaseSet/bin/Release/DBUtility.dll

Binary files differ

 BaseSet/bin/Release/DBUtility.pdb

Binary files differ

 BaseSet/bin/Release/Model.dll

Binary files differ

 BaseSet/bin/Release/Model.pdb

Binary files differ

 BaseSet/bin/Release/Pub_Class.dll

Binary files differ

 BaseSet/bin/Release/Pub_Class.pdb

Binary files differ

 BaseSet/bin/Release/Pub_Control.dll

Binary files differ

 BaseSet/bin/Release/Pub_Control.pdb

Binary files differ

 BaseSet/bin/Release/SQLHelper.dll

Binary files differ

 BaseSet/bin/Release/SQLHelper.pdb

Binary files differ

 DAL/bin/Release/DAL.dll

Binary files differ

 DAL/bin/Release/DAL.pdb

Binary files differ

 DAL/bin/Release/DBUtility.dll

Binary files differ

 DAL/bin/Release/DBUtility.pdb

Binary files differ

 DAL/bin/Release/Model.dll

Binary files differ

 DAL/bin/Release/Model.pdb

Binary files differ

 DAL/bin/Release/Pub_Class.dll

Binary files differ

 DAL/bin/Release/Pub_Class.pdb

Binary files differ

 DAL/bin/Release/Pub_Control.dll

Binary files differ

 DAL/bin/Release/Pub_Control.pdb

Binary files differ

 DAL/bin/Release/SQLHelper.dll

Binary files differ

 DAL/bin/Release/SQLHelper.pdb

Binary files differ

 DBUtility/bin/Release/DBUtility.dll

Binary files differ

 DBUtility/bin/Release/DBUtility.pdb

Binary files differ

 DBUtility/bin/Release/Pub_Class.dll

Binary files differ

 DBUtility/bin/Release/Pub_Class.pdb

Binary files differ

 DBUtility/bin/Release/Pub_Control.dll

Binary files differ

 DBUtility/bin/Release/Pub_Control.pdb

Binary files differ

 DBUtility/bin/Release/SQLHelper.dll

Binary files differ

 DBUtility/bin/Release/SQLHelper.pdb

Binary files differ

 DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache

Binary files differ

 DBUtility/obj/Release/DBUtility.dll

Binary files differ

 DBUtility/obj/Release/DBUtility.pdb

Binary files differ

 Model/bin/Release/DBUtility.dll

Binary files differ

 Model/bin/Release/DBUtility.pdb

Binary files differ

 Model/bin/Release/Model.dll

Binary files differ

 Model/bin/Release/Model.pdb

Binary files differ

 Model/bin/Release/Pub_Class.dll

Binary files differ

 Model/bin/Release/Pub_Class.pdb

Binary files differ

 Model/bin/Release/Pub_Control.dll

Binary files differ

 Model/bin/Release/Pub_Control.pdb

Binary files differ

 Model/bin/Release/SQLHelper.dll

Binary files differ

 Model/bin/Release/SQLHelper.pdb

Binary files differ

 Model/obj/Release/Model.csproj.AssemblyReference.cache

Binary files differ

 Model/obj/Release/Model.dll

Binary files differ

 Model/obj/Release/Model.pdb

Binary files differ

 Model/²Ö¿â¹ÜÀí/ClsKf_StepFoldInBillMain.cs

@@ -22,6 +22,8 @@
        public string HExplanation; //        varchar(200)    --ÕªÒª 
        public string HInnerBillNo; //       varchar(50)        --内部单据号

        public Int64 HProjectID;        //-项目

        public Int64 HCurID;
    }
}

 Model/²Ö¿â¹ÜÀí/ClsKf_StepFoldOutBillMain.cs

@@ -24,5 +24,7 @@
        public Int64 HCurID;
        public Int64 HPSStyleID;

        public Int64 HProjectID;        //-项目

    }
}

 PlanM/bin/Release/BLL.dll

Binary files differ

 PlanM/bin/Release/BLL.pdb

Binary files differ

 PlanM/bin/Release/DAL.dll

Binary files differ

 PlanM/bin/Release/DAL.pdb

Binary files differ

 PlanM/bin/Release/DBUtility.dll

Binary files differ

 PlanM/bin/Release/DBUtility.pdb

Binary files differ

 PlanM/bin/Release/Model.dll

Binary files differ

 PlanM/bin/Release/Model.pdb

Binary files differ

 PlanM/bin/Release/PlanM.dll

Binary files differ

 PlanM/bin/Release/PlanM.pdb

Binary files differ

 PlanM/bin/Release/Pub_Class.dll

Binary files differ

 PlanM/bin/Release/Pub_Class.pdb

Binary files differ

 PlanM/bin/Release/Pub_Control.dll

Binary files differ

 PlanM/bin/Release/Pub_Control.pdb

Binary files differ

 PlanM/bin/Release/SQLHelper.dll

Binary files differ

 PlanM/bin/Release/SQLHelper.pdb

Binary files differ

 Pub_Class/bin/Release/Pub_Class.dll

Binary files differ

 Pub_Class/bin/Release/Pub_Class.pdb

Binary files differ

 Pub_Control/bin/Release/Pub_Class.dll

Binary files differ

 Pub_Control/bin/Release/Pub_Class.pdb

Binary files differ

 Pub_Control/bin/Release/Pub_Control.dll

Binary files differ

 Pub_Control/bin/Release/Pub_Control.pdb

Binary files differ

 SQLHelper/bin/Release/Pub_Class.dll

Binary files differ

 SQLHelper/bin/Release/Pub_Class.pdb

Binary files differ

 SQLHelper/bin/Release/SQLHelper.dll

Binary files differ

 SQLHelper/bin/Release/SQLHelper.pdb

Binary files differ

 SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache

Binary files differ

 SQLHelper/obj/Release/SQLHelper.dll

Binary files differ

 SQLHelper/obj/Release/SQLHelper.pdb

Binary files differ

 SyntacticSugar/bin/Debug/SyntacticSugar.dll

Binary files differ

 SyntacticSugar/bin/Debug/SyntacticSugar.pdb

Binary files differ

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

@@ -1,12 +1,15 @@
<<<<<<< HEAD
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
=======
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.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
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
D:\智云迈思\MES\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
D:\智云迈思\MES\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
D:\智云迈思\MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
D:\智云迈思\MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
D:\智云迈思\MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
D:\智云迈思\MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
>>>>>>> b75c484393ae95535edada81e805d05c56652931

 SyntacticSugar/obj/Debug/SyntacticSugar.dll

Binary files differ

 SyntacticSugar/obj/Debug/SyntacticSugar.pdb

Binary files differ

 SyntacticSugar/obj/Release/.NETFramework,Version=v4.5.AssemblyAttributes.cs

New file
@@ -0,0 +1,4 @@
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.5", FrameworkDisplayName = ".NET Framework 4.5")]

 SyntacticSugar/obj/Release/SyntacticSugar.csproj.AssemblyReference.cache

Binary files differ

 SyntacticSugar/obj/Release/SyntacticSugar.csproj.CoreCompileInputs.cache

New file
@@ -0,0 +1 @@
5dd9c82feb12f833c78ecebea7d9a46c99f29e3f

 SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt

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

 SyntacticSugar/obj/Release/SyntacticSugar.dll

Binary files differ

 SyntacticSugar/obj/Release/SyntacticSugar.pdb

Binary files differ

 WarM/bin/Release/BLL.dll

Binary files differ

 WarM/bin/Release/BLL.pdb

Binary files differ

 WarM/bin/Release/DAL.dll

Binary files differ

 WarM/bin/Release/DAL.pdb

Binary files differ

 WarM/bin/Release/DBUtility.dll

Binary files differ

 WarM/bin/Release/DBUtility.pdb

Binary files differ

 WarM/bin/Release/Model.dll

Binary files differ

 WarM/bin/Release/Model.pdb

Binary files differ

 WarM/bin/Release/Pub_Class.dll

Binary files differ

 WarM/bin/Release/Pub_Class.pdb

Binary files differ

 WarM/bin/Release/Pub_Control.dll

Binary files differ

 WarM/bin/Release/Pub_Control.pdb

Binary files differ

 WarM/bin/Release/SQLHelper.dll

Binary files differ

 WarM/bin/Release/SQLHelper.pdb

Binary files differ

 WarM/bin/Release/WarM.dll

Binary files differ

 WarM/bin/Release/WarM.pdb

Binary files differ

 WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs

@@ -38,7 +38,7 @@
            try
            {

                ds = oCN.RunProcReturn("select * from h_v_IF_POInStockBillList where hmainid=" + HInterID, "h_v_IF_POInStockBillList");
                ds = oCN.RunProcReturn("select * from h_v_IF_POInStockBillEdit where hmainid=" + HInterID, "h_v_IF_POInStockBillList");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";

 WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs

@@ -1338,7 +1338,7 @@
            try
            {
                
                ds = oCN.RunProcReturn("select * from h_v_IF_POOrderBillList where hmainid =" + HInterID, "h_v_IF_POOrderBillList");
                ds = oCN.RunProcReturn("select * from h_v_IF_POOrderBillEdit where hmainid =" + HInterID, "h_v_IF_POOrderBillList");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";

 WebAPI/Controllers/CGGL/Kf_POStockInBillController.cs

@@ -631,7 +631,7 @@
            try
            {

                ds = oCN.RunProcReturn("select * from h_v_Kf_POStockInBillList where hmainid =" + HInterID, "h_v_Kf_POStockInBillList");
                ds = oCN.RunProcReturn("select * from h_v_Kf_POStockInBillEdit where hmainid =" + HInterID, "h_v_Kf_POStockInBillList");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";

 WebAPI/Controllers/CGGL/YF_PayMentBillController.cs

@@ -402,7 +402,7 @@
        {
            try
            {
                ds = oCN.RunProcReturn("select * from h_v_YF_PayMentBillList where hmainid=" + HInterID, "h_v_YF_PayMentBillList");
                ds = oCN.RunProcReturn("select * from h_v_YF_PayMentBillEdit where hmainid=" + HInterID, "h_v_YF_PayMentBillList");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";

 WebAPI/Controllers/CJGL/Sc_OEEReportController.cs

New file
@@ -0,0 +1,79 @@
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Web.Http;
using WebAPI.Models;
using System.IO;
using System.Web;
using WebAPI.Controllers.SCGL.日计划管理;

namespace WebAPI.Controllers
{
    //期初余额报表Controller
    public class Sc_OEEReportController : ApiController
    {
        //获取系统参数
        Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
        public DBUtility.ClsPub.Enum_BillStatus BillStatus;

        private json objJsonResult = new json();
        SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
        DataSet ds;

        #region OEE报表 æŸ¥è¯¢
        /// <summary>
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("Sc_OEEReport/list")]
        [HttpGet]
        public object getSc_OEEReport(string sWhere, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                ////查看权限
                if (!DBUtility.ClsPub.Security_Log("Sc_OEEReport", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无查看权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                string sql = "exec h_p_Sc_OEEReport " + sWhere;
                ds = oCN.RunProcReturn(sql, "h_p_Sc_OEEReport");

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
    }
}

 WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs

@@ -938,6 +938,79 @@
        }
        #endregion

        #region æŠ¥å·¥å¹³å°å¼€å·¥å• åˆ·å¡ä¿å­˜åˆ·å¡äºº
        /// <summary>
        /// å¼€å·¥å•
        /// </summary>
        /// <param name="msg"></param>
        /// <returns></returns>
        [Route("Sc_MESBeginWorkBill/AddHCardswiper")]
        [HttpPost]
        public object AddHCardswiper([FromBody] JObject msg)
        {

            var _value = msg["msg"].ToString();
            string msg1 = _value.ToString();
            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string msg2 = sArray[0].ToString();

            ListModels oListModels = new ListModels();
            try
            {
                oCN.BeginTran();
                DLL.ClsSc_MESBeginWorkBill oBill = new DLL.ClsSc_MESBeginWorkBill();
                List<Models.ClsSc_MESBeginWorkBillSub> lsmain = new List<Models.ClsSc_MESBeginWorkBillSub>();
                msg2 = msg2.Replace("\\", "");
                msg2 = msg2.Replace("\n", "");  //\n
                lsmain = oListModels.getObjectByJson_Sc_MESBeginWorkBillSub(msg2);

                foreach (Models.ClsSc_MESBeginWorkBillSub oItemSub in lsmain)
                {
                    oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
                    oItemSub.HCloseType = false;   //关闭类型

                    oBill.DetailColl.Add(oItemSub);
                }
                ds = oCN.RunProcReturn("select * from Sc_MESBeginWorkBillSub where HInterID<0 order by HInterID", "Sc_MESBeginWorkBillSub");
                string HInterID = "-1";
                if (ds.Tables[0].Rows.Count>0) {
                    HInterID = (int.Parse(ds.Tables[0].Rows[0]["HInterID"].ToString()) - 1).ToString();
                }
                //msg3 = msg3.Substring(1, msg3.Length - 2);
                //msg3 = msg3.Replace("\\", "");
                //msg3 = msg3.Replace("\n", "");  //\n

                //保存
                foreach (Models.ClsSc_MESBeginWorkBillSub oSub in oBill.DetailColl)
                {
                    ds = oCN.RunProcReturn("select * from Sc_MESBeginWorkBillSub where HBillNo_bak='" + oSub.HBillNo_bak + "'", "Sc_MESBeginWorkBillSub");
                    string subSql = "insert into Sc_MESBeginWorkBillSub " +
                        "(HInterID, HEntryID,HBillNo_bak,HCloseMan,HEntryCloseDate,HCloseType, HSourceInterID, HSourceEntryID" +
                        ",HRelationQty,HRelationMoney, HSourceBillNo, HSourceBillType, HRemark,HCardswiperMan,HCardswiperDate,HEmpID) " +
                        "values(" +
                        "'" + HInterID + "','" + (ds.Tables[0].Rows.Count + 1) + "','" + oSub.HBillNo_bak + "','','" + oSub.HEntryCloseDate + "','" + oSub.HCloseType + "','',''," +
                        "0,0,'','','','" + oSub.HCardswiperMan + "',getdate(),'" + oSub.HEmpID + "')";
                    oCN.RunProc(subSql);
                }
                oCN.Commit();

                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "保存成功！";
                objJsonResult.data = 1;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = e.Message;
                objJsonResult.data = 1;
                return objJsonResult;
            }
        }
        #endregion

        public DataTable getInfodatanow(string hsoucreID)
        {
            SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();

 WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs

@@ -1451,7 +1451,7 @@
            try
            {

                ds = oCN.RunProcReturn("select * from h_v_IF_SeOrderBillList where hmainid =" + HInterID + " order by hsubid asc", "h_v_IF_SeOrderBillList");
                ds = oCN.RunProcReturn("select * from h_v_IF_SeOrderBillEdit where hmainid =" + HInterID + " order by hsubid asc", "h_v_IF_SeOrderBillList");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";

 WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs

@@ -37,7 +37,7 @@
            try
            {

                ds = oCN.RunProcReturn("select * from h_v_IF_SeOutStockBillList where hmainid=" + HInterID, "h_v_IF_SeOutStockBillList");
                ds = oCN.RunProcReturn("select * from h_v_IF_SeOutStockBillEdit where hmainid=" + HInterID, "h_v_IF_SeOutStockBillList");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";

 WebAPI/Controllers/²Ö´æ¹ÜÀí/ÁìÁÏ·¢»õ/Kf_StepFoldOutBillController.cs

@@ -246,9 +246,10 @@
                string HCloseMan = mainList[0].HCloseMan;
                string HCloseDate = mainList[0].HCloseDate;
                long HCurID = mainList[0].HCurID;
                long HProjectID = mainList[0].HProjectID;        //-项目

                //进行 ä¼šè®¡æœŸé—´ ç»“è´¦ çš„判断和控制
                string s = "";
        //进行 ä¼šè®¡æœŸé—´ ç»“è´¦ çš„判断和控制
        string s = "";
                int sYear = 0;
                int sPeriod = 0;
                if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
@@ -267,12 +268,12 @@
                        ,HSupID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID,HKeeperID,HDeptID
                        ,HMaker,HMakeDate,HChecker,HUpDater
                        ,HDeleteMan,HCloseMan
                        ,HRemark,HExplanation,HInnerBillNo,HCurID)
                        ,HRemark,HExplanation,HInnerBillNo,HCurID,HProjectID)
                        values(" + HInterID + ",'" + HBillNo + "','" + HDate + "','" + 1250 + "','" +
                    1250 + "'," + HBillStatus + "," + DateTime.Now.Year + "," + DateTime.Now.Month + "," + HSupID +
                    "," + HWHID + "," + HSCWHID + "," + HEmpID + "," + HManagerID + "," + HSecManagerID +
                    "," + HKeeperID + "," + HDeptID + ",'" + HMaker + "','" + HMakeDate + "','" + HChecker + "','" + HUpDater + "','" + HDeleteMan + "','" + HCloseMan + "','"
                    + HRemark + "','" + HExplanation + "','" + HInnerBillNo + "'," + HCurID + "" + ")");
                    + HRemark + "','" + HExplanation + "','" + HInnerBillNo + "'," + HCurID + "," + HProjectID + "" + ")");
                }
                else if (OperationType == 3 || ds.Tables[0].Rows.Count != 0)
                { //修改
@@ -300,7 +301,7 @@
                    String sql="update Kf_ICStockBillMain   set " +
                                    "HRemark='" + HRemark + "', HUpDater='" + HMaker + "', HUpDateDate=getdate()" +
                                 ",HSupID=" + HSupID + ",HWHID=" + HWHID + ",HSCWHID=" + HSCWHID + ", HEmpID=" + HEmpID + ",HManagerID=" + HManagerID + ",HSecManagerID = " + HSecManagerID
                                 + ",HKeeperID=" + HKeeperID + ",HDeptID=" + HDeptID + "  where HInterID=" + HInterID;
                                 + ",HKeeperID=" + HKeeperID + ",HDeptID=" + HDeptID + ",HProjectID=" + HProjectID + "  where HInterID=" + HInterID;

                    oCn.RunProc(sql);
                    //删除子表

 WebAPI/Controllers/²Ö´æ¹ÜÀí/ÑéÊÕÈë¿â/Kf_StepFoldinBillController.cs

@@ -258,6 +258,7 @@
                string HCloseMan = mainList[0].HCloseMan;
                string HCloseDate = mainList[0].HCloseDate;
                long HCurID = mainList[0].HCurID;
                long HProjectID = mainList[0].HProjectID;        //-项目

                //进行 ä¼šè®¡æœŸé—´ ç»“è´¦ çš„判断和控制
                string s = "";
@@ -279,12 +280,12 @@
                        ,HSupID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID,HKeeperID,HDeptID
                        ,HMaker,HMakeDate,HChecker,HUpDater
                        ,HDeleteMan,HCloseMan
                        ,HRemark,HExplanation,HInnerBillNo,HCurID)
                        ,HRemark,HExplanation,HInnerBillNo,HCurID,HProjectID)
                        values(" + HInterID + ",'" + HBillNo + "','" + HDate + "','" + 1251 + "','" +
                    1251 + "'," + HBillStatus + "," + DateTime.Now.Year + "," + DateTime.Now.Month + "," + HSupID +
                    "," + HWHID + "," + HSCWHID + "," + HEmpID + "," + HManagerID + "," + HSecManagerID +
                    "," + HKeeperID + "," + HDeptID + ",'" + HMaker + "','" + HMakeDate + "','" + HChecker + "','" + HUpDater + "','" + HDeleteMan + "','" + HCloseMan + "','"
                    + HRemark + "','" + HExplanation + "','" + HInnerBillNo + "'," + HCurID + "" + ")");
                    + HRemark + "','" + HExplanation + "','" + HInnerBillNo + "'," + HCurID + "," + HProjectID + "" + ")");
                }
                else if (OperationType == 3 || ds.Tables[0].Rows.Count != 0)
                { //修改
@@ -311,7 +312,7 @@
                    String sql = "update Kf_ICStockBillMain   set " +
                               "HRemark='" + HRemark + "', HUpDater='" + HMaker + "', HUpDateDate=getdate()" +
                                 ",HSupID=" + HSupID + ",HWHID=" + HWHID + ",HSCWHID=" + HSCWHID + ", HEmpID=" + HEmpID + ",HManagerID=" + HManagerID + ",HSecManagerID = " + HSecManagerID
                                 + ",HKeeperID=" + HKeeperID + ",HDeptID=" + HDeptID + "  where HInterID=" + HInterID;
                                 + ",HKeeperID=" + HKeeperID + ",HDeptID=" + HDeptID + ",HProjectID=" + HProjectID + "  where HInterID=" + HInterID;

                    oCN.RunProc(sql);


 WebAPI/ListModels.cs

@@ -3472,6 +3472,18 @@
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Models.ClsSc_MESBeginWorkBillSub> getObjectByJson_Sc_MESBeginWorkBillSub(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Models.ClsSc_MESBeginWorkBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSc_MESBeginWorkBillSub>>(jsonString);
            return list;
        }

        /// <summary>
        /// æŠ¥å·¥å¹³å°å¼€å·¥å•å­è¡¨json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Models.ClsSc_MESBeginWorkBillSub_RelationBill> getObjectByJson_Sc_MESBeginWorkBillSub_RelationBill(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";

 WebAPI/Models/ClsSc_MESBeginWorkBillSub.cs

@@ -5,7 +5,9 @@
namespace WebAPI.Models
{
    public class ClsSc_MESBeginWorkBillSub : DBUtility.ClsXt_BaseBillSub
    { 
        
    {
        public string HCardswiperMan { get; set; }
        public DateTime HCardswiperDate { get; set; }
        public long HEmpID { get; set; }
    }
}

 WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user

@@ -4,7 +4,7 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <History>True|2024-11-20T02:16:03.7893118Z;False|2024-11-20T10:15:23.2632533+08:00;True|2024-11-20T09:06:55.2799108+08:00;False|2024-11-20T09:05:45.8751214+08:00;True|2024-11-15T10:50:02.2079520+08:00;False|2024-11-15T10:49:22.4156447+08:00;True|2024-11-11T16:53:33.6615343+08:00;False|2024-11-11T16:52:17.7499691+08:00;False|2024-11-06T11:32:23.8339166+08:00;True|2024-10-24T20:08:16.1196372+08:00;True|2024-10-24T14:53:21.0804405+08:00;False|2024-10-24T14:50:14.4659302+08:00;</History>
    <History>True|2024-12-02T06:57:10.0773563Z;False|2024-12-02T14:56:35.6440156+08:00;True|2024-11-26T08:55:53.9125170+08:00;True|2024-11-26T08:24:31.3112433+08:00;False|2024-11-26T08:23:46.0894924+08:00;True|2024-11-20T10:16:03.7893118+08:00;False|2024-11-20T10:15:23.2632533+08:00;True|2024-11-20T09:06:55.2799108+08:00;False|2024-11-20T09:05:45.8751214+08:00;True|2024-11-15T10:50:02.2079520+08:00;False|2024-11-15T10:49:22.4156447+08:00;True|2024-11-11T16:53:33.6615343+08:00;False|2024-11-11T16:52:17.7499691+08:00;False|2024-11-06T11:32:23.8339166+08:00;True|2024-10-24T20:08:16.1196372+08:00;True|2024-10-24T14:53:21.0804405+08:00;False|2024-10-24T14:50:14.4659302+08:00;</History>
    <_PublishTargetUrl>D:\网站发布\智云MESWMS\API</_PublishTargetUrl>
  </PropertyGroup>
  <ItemGroup>
@@ -45,28 +45,28 @@
      <publishTime>02/22/2013 16:43:40</publishTime>
    </File>
    <File Include="bin/BLL.dll">
      <publishTime>11/11/2024 16:52:40</publishTime>
      <publishTime>11/26/2024 08:55:11</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>11/11/2024 16:52:40</publishTime>
      <publishTime>11/26/2024 08:55:11</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>11/11/2024 16:52:36</publishTime>
      <publishTime>11/26/2024 08:55:07</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>11/11/2024 16:52:36</publishTime>
      <publishTime>11/26/2024 08:55:07</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 22:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>11/04/2024 14:38:08</publishTime>
      <publishTime>11/26/2024 08:23:55</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>11/04/2024 14:38:08</publishTime>
      <publishTime>11/26/2024 08:23:55</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>11/11/2024 16:52:30</publishTime>
      <publishTime>11/26/2024 08:55:02</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>11/11/2024 16:52:30</publishTime>
      <publishTime>11/26/2024 08:55:02</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>04/06/2023 15:57:02</publishTime>
@@ -147,34 +147,34 @@
      <publishTime>10/23/2021 17:07:54</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
      <publishTime>11/04/2024 14:38:05</publishTime>
      <publishTime>11/26/2024 08:23:53</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>11/04/2024 14:38:05</publishTime>
      <publishTime>11/26/2024 08:23:53</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>11/04/2024 14:38:07</publishTime>
      <publishTime>11/26/2024 08:23:55</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>11/04/2024 14:38:07</publishTime>
      <publishTime>11/26/2024 08:23:55</publishTime>
    </File>
    <File Include="bin/RestSharp.dll">
      <publishTime>08/31/2012 06:22:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>11/04/2024 14:38:07</publishTime>
      <publishTime>11/26/2024 08:23:55</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>11/04/2024 14:38:07</publishTime>
      <publishTime>11/26/2024 08:23:55</publishTime>
    </File>
    <File Include="bin/Swashbuckle.Core.dll">
      <publishTime>02/16/2015 01:57:08</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.dll">
      <publishTime>11/04/2024 14:38:03</publishTime>
      <publishTime>11/26/2024 08:23:52</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.pdb">
      <publishTime>11/04/2024 14:38:03</publishTime>
      <publishTime>11/26/2024 08:23:52</publishTime>
    </File>
    <File Include="bin/System.Buffers.dll">
      <publishTime>07/19/2017 18:01:28</publishTime>
@@ -285,22 +285,22 @@
      <publishTime>05/09/2023 10:43:40</publishTime>
    </File>
    <File Include="bin/TopSdk.dll">
      <publishTime>11/11/2024 16:52:35</publishTime>
      <publishTime>11/26/2024 08:23:57</publishTime>
    </File>
    <File Include="bin/TopSdk.pdb">
      <publishTime>11/11/2024 16:52:35</publishTime>
      <publishTime>11/26/2024 08:23:57</publishTime>
    </File>
    <File Include="bin/WebActivatorEx.dll">
      <publishTime>11/24/2014 19:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>11/20/2024 10:15:54</publishTime>
      <publishTime>12/02/2024 14:57:01</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>11/20/2024 10:15:54</publishTime>
      <publishTime>12/02/2024 14:57:01</publishTime>
    </File>
    <File Include="bin/WebAPI.XmlSerializers.dll">
      <publishTime>11/20/2024 10:16:02</publishTime>
      <publishTime>12/02/2024 14:57:08</publishTime>
    </File>
    <File Include="bin/WebGrease.dll">
      <publishTime>07/18/2013 01:03:52</publishTime>
@@ -495,7 +495,7 @@
      <publishTime>05/06/2024 13:47:57</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>11/11/2024 16:53:32</publishTime>
      <publishTime>11/26/2024 08:24:30</publishTime>
    </File>
  </ItemGroup>
</Project>

 WebAPI/Web.config

@@ -35,7 +35,7 @@
        <!--<add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx"/> --> <!--测试服务器-->
        <!--<add key="surl" value="http://localhost:8082/webs/webservice1.asmx"/>    æœ¬åœ°-->
        <!--<add key="sUrl" value="http://192.168.110.57:81/WEBS/WebService1.asmx"/>-->    <!--陈雯静本地配置-->
        <!--<add key="surl" value="http://localhost/webs-web/webservice1.asmx" />-->    <!--翁涛涛本地配置-->
        <add key="surl" value="http://localhost/webs-web/webservice1.asmx" />    <!--翁涛涛本地配置-->
        <!--<add key="sUrl" value="http://192.168.1.57:8082/WEBS-WMS/WebService1.asmx"/>九菱-->
        <!--<add key="sUrl" value="http://61.130.182.102:18181/WEBSCS/WebService1.asmx"/>--><!--斯莫尔-->
        

 WebAPI/WebAPI.csproj

@@ -439,6 +439,7 @@
    <Compile Include="Controllers\CJGL\Mes_OrderProcFlowAllReportController.cs" />
    <Compile Include="Controllers\CJGL\Gy_MaterPreventErrMouldBillController.cs" />
    <Compile Include="Controllers\CJGL\Sc_KeyElementBindingController.cs" />
    <Compile Include="Controllers\CJGL\Sc_OEEReportController.cs" />
    <Compile Include="Controllers\CKGL\TMZD\Gy_BarCodeBillListController.cs" />
    <Compile Include="Controllers\Xt_DefineBillMainSetController.cs" />
    <Compile Include="Controllers\MJGL\Sc_MouldBatchWorkCheckBillController.cs" />

 WorkM/bin/Release/BLL.dll

Binary files differ

 WorkM/bin/Release/BLL.pdb

Binary files differ

 WorkM/bin/Release/DAL.dll

Binary files differ

 WorkM/bin/Release/DAL.pdb

Binary files differ

 WorkM/bin/Release/DBUtility.dll

Binary files differ

 WorkM/bin/Release/DBUtility.pdb

Binary files differ

 WorkM/bin/Release/Model.dll

Binary files differ

 WorkM/bin/Release/Model.pdb

Binary files differ

 WorkM/bin/Release/Pub_Class.dll

Binary files differ

 WorkM/bin/Release/Pub_Class.pdb

Binary files differ

 WorkM/bin/Release/Pub_Control.dll

Binary files differ

 WorkM/bin/Release/Pub_Control.pdb

Binary files differ

 WorkM/bin/Release/SQLHelper.dll

Binary files differ

 WorkM/bin/Release/SQLHelper.pdb

Binary files differ

 WorkM/bin/Release/WarM.dll

Binary files differ

 WorkM/bin/Release/WarM.pdb

Binary files differ

 WorkM/bin/Release/WorkM.dll

Binary files differ

 WorkM/bin/Release/WorkM.pdb

Binary files differ

 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

@@ -1,6 +1,15 @@
<<<<<<< HEAD
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
=======
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.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
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
>>>>>>> b75c484393ae95535edada81e805d05c56652931

 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.AssemblyReference.cache

Binary files differ

 sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.CoreCompileInputs.cache

New file
@@ -0,0 +1 @@
eb64bc61f5da8fdd8ad56e04c391e3a377d8ca59

 sdk_dingding/TopSdk/obj/Release/TopSdk.dll

Binary files differ

 sdk_dingding/TopSdk/obj/Release/TopSdk.pdb

Binary files differ