1

zrg

2024-12-24 95c834bf684f49720368d8f36615125d812a9080

1

 SyntacticSugar/bin/Debug/SyntacticSugar.dll

Binary files differ

 SyntacticSugar/bin/Debug/SyntacticSugar.pdb

Binary files differ

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

@@ -4,8 +4,8 @@
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
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.CoreCompileInputs.cache
D:\智云迈思\MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
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.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

Binary files differ

 WebAPI/Controllers/LMESController.cs

@@ -3832,7 +3832,7 @@
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据已反关闭!不需要再反关闭!";
                            objJsonResult.Message = "单据未手动关闭!需要先关闭";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
@@ -3856,6 +3856,17 @@
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    //获取系统参数设置失效时间
                    string Ret = "";
                    if (oSystemParameter.ShowBill(ref Ret))
                    {
                        //判断客户
                        if (oSystemParameter.omodel.WMS_CampanyName == "添康科技") //系统参数                      
                        {
                            //刷新失效时间
                            oCN.RunProc("update Gy_RoutingBillMain set HEndDate = '9999-12-31',HBeginDate = CONVERT(date, GETDATE()) where HInterID = " + HInterID);
                        }
                    }
                }

                oCN.Commit();//提交事务

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

@@ -180,10 +180,13 @@
        {
            public int? HORGID;//组织
            public int? HMATERIALID;//物料
            public int? HDeptID;//生产车间
            public string HDeptID;//生产车间
            public int? HSCZYID;//生产资源
            public string HXQD;//需求单号
            public string HMOBILLNO;//生产订单号
            public string HBeginDate; //排产计划日期（开始时间）
            public string HEndDate; //排产计划日期（结束时间）
            public string HMaterAtt; //物料属性
        }
        /// <summary>
        /// 
@@ -198,7 +201,7 @@

                ReportMOMaterReadysBill Report = JsonConvert.DeserializeObject<ReportMOMaterReadysBill>(sWhere);

                ds = oCN.RunProcReturn($"exec  PR_Complete_Report '{Report.HXQD}','{Report.HMOBILLNO}',{Report.HORGID},{Report.HDeptID},{Report.HSCZYID},{Report.HMATERIALID}", "PR_Complete_Report");
                ds = oCN.RunProcReturn($"exec  PR_Complete_Report '{Report.HXQD}','{Report.HMOBILLNO}',{Report.HORGID},'{Report.HDeptID}',{Report.HSCZYID},{Report.HMATERIALID},'{Report.HBeginDate}','{Report.HEndDate}','{Report.HMaterAtt}'", "PR_Complete_Report");

                objJsonResult.code = "1";
                objJsonResult.count = 1;

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

@@ -804,6 +804,19 @@
                //LogService.Write("齐套分析sql:" + sql);
                List<PRD_PPBOM> BomList = new List<PRD_PPBOM>();
                DataTable resulTable = ds.Tables[0];

                if (ds.Tables[0].Rows.Count < 1 || ds == null)
                {
                    //释放齐套操作 é¿å…å¤šäººåŒæ—¶è¿›è¡Œé½å¥—分析
                    oCN.RunProc($"update T_PRD_QTFX set FSTATUS = 0 where FPRDORGID ={omdelMian.HProdORGID} and FSTATUS = 1 ");

                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "没有需要进行齐套分析的数据";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (resulTable.Rows[0][0].ToString().Contains("失败"))
                {
                    //释放齐套操作 é¿å…å¤šäººåŒæ—¶è¿›è¡Œé½å¥—分析

 WebAPI/Controllers/ÌõÂë¹ÜÀí/WEBSController.cs

@@ -4487,8 +4487,6 @@
            string sJXCode = "";
            if (oSystemParameter.ShowBill(ref sErrMsg) == true)
            {
                LogService.Write("森楷扫码参数值，客户：" + oSystemParameter.omodel.WMS_CampanyName + " ,源单类型：" + HSourceBillType);

                if (oSystemParameter.omodel.WMS_CampanyName == "安瑞") //系统参数  å®¢æˆ·å®šåˆ¶åŒ–名称     ç©ºç™½ä¸ºé€šç”¨
                {
                    sJXCode = POStockInBillController.JX_Json(sBarCode, HInterID, HBillType, HStockOrgID, HBillNo, HMaker);

 WebAPI/Controllers/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillController.cs

@@ -1230,6 +1230,11 @@
                            err = "所选生产订单为已作废状态，不允许下推生成工序流转卡！\n";
                        }

                        if (ds.Tables[0].Rows[0]["状态"].ToString() != "下达" && ds.Tables[0].Rows[0]["状态"].ToString() != "开工")
                        {
                            err = "所选生产订单不为下达或开工状态，不允许下推生成工序流转卡！\n";
                        }

                        ds = oCN.RunProcReturn("select * from h_v_S_Sc_ICMOBillList where hmainid=" + hmainid + " and HEntryID=" + HEntryID + " and HSTOCKINORGID='" + OrganizationID + "'", "h_v_S_Sc_ICMOBillList");

                        if (double.Parse(ds.Tables[0].Rows[0]["流转卡数量"].ToString()) == 0)

 WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user

@@ -45,28 +45,28 @@
      <publishTime>02/22/2013 16:43:40</publishTime>
    </File>
    <File Include="bin/BLL.dll">
      <publishTime>12/18/2024 08:34:23</publishTime>
      <publishTime>12/20/2024 16:25:53</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>12/18/2024 08:34:23</publishTime>
      <publishTime>12/20/2024 16:25:53</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>12/18/2024 08:34:21</publishTime>
      <publishTime>12/20/2024 16:25:51</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>12/18/2024 08:34:21</publishTime>
      <publishTime>12/20/2024 16:25:51</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 22:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>12/13/2024 15:43:49</publishTime>
      <publishTime>12/20/2024 16:25:45</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>12/13/2024 15:43:49</publishTime>
      <publishTime>12/20/2024 16:25:45</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>12/18/2024 08:34:17</publishTime>
      <publishTime>12/20/2024 16:25:46</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>12/18/2024 08:34:17</publishTime>
      <publishTime>12/20/2024 16:25:46</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>12/13/2024 15:43:46</publishTime>
      <publishTime>12/20/2024 16:25:43</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>12/13/2024 15:43:46</publishTime>
      <publishTime>12/20/2024 16:25:43</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>12/13/2024 15:43:47</publishTime>
      <publishTime>12/20/2024 16:25:44</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>12/13/2024 15:43:47</publishTime>
      <publishTime>12/20/2024 16:25:44</publishTime>
    </File>
    <File Include="bin/RestSharp.dll">
      <publishTime>08/31/2012 06:22:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>12/13/2024 15:43:47</publishTime>
      <publishTime>12/20/2024 16:25:44</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>12/13/2024 15:43:47</publishTime>
      <publishTime>12/20/2024 16:25:44</publishTime>
    </File>
    <File Include="bin/Swashbuckle.Core.dll">
      <publishTime>02/16/2015 01:57:08</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.dll">
      <publishTime>12/11/2024 09:03:39</publishTime>
      <publishTime>12/20/2024 16:23:35</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.pdb">
      <publishTime>12/11/2024 09:03:39</publishTime>
      <publishTime>12/20/2024 16:23:35</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>12/11/2024 09:03:45</publishTime>
      <publishTime>12/20/2024 16:23:41</publishTime>
    </File>
    <File Include="bin/TopSdk.pdb">
      <publishTime>12/11/2024 09:03:45</publishTime>
      <publishTime>12/20/2024 16:23:41</publishTime>
    </File>
    <File Include="bin/WebActivatorEx.dll">
      <publishTime>11/24/2014 19:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>12/18/2024 13:22:45</publishTime>
      <publishTime>12/20/2024 16:26:26</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>12/18/2024 13:22:45</publishTime>
      <publishTime>12/20/2024 16:26:26</publishTime>
    </File>
    <File Include="bin/WebAPI.XmlSerializers.dll">
      <publishTime>08/16/2024 16:55:28</publishTime>

 sdk_dingding/TopSdk/bin/Debug/TopSdk.dll

Binary files differ

 sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb

Binary files differ

 sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache

Binary files differ

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

@@ -4,3 +4,8 @@
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

 sdk_dingding/TopSdk/obj/Debug/TopSdk.dll

Binary files differ

 sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb

Binary files differ