chenhaozhe
8 天以前 3bb24c2bc665a8070b87aef27de7d2145ef798d3
调整 鉴权标签
13个文件已修改
1 文件已重命名
48 ■■■■ 已修改文件
DAL/质检管理/ClsQC_TakeSampleCheckBill.cs 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Pub_Class/CustomerCls/ClsXt_SystemParameter.cs 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/App_Start/WebApiConfig.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/品质管理/检验取样还样单/QC_TakeSampleCheckBillController.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Utility/PermissionAttribute.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/WebAPI.csproj 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/bin/Debug/TopSdk.dll 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/obj/Debug/TopSdk.dll 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb 补丁 | 查看 | 原始文档 | blame | 历史
DAL/Öʼì¹ÜÀí/ClsQC_TakeSampleCheckBill.cs
@@ -241,6 +241,8 @@
                sReturn = e.Message;
                throw (e);
            }
        }
        }
    }
}
Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
@@ -2810,6 +2810,12 @@
                    {
                        omodel.Gy_BarCodeBill_Rework_Ctrl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    // å–样单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "QC_TakeSampleCheckBill_AutoCheck")
                    {
                        omodel.QC_TakeSampleCheckBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                }
                sReturn = "显示单据成功!";
                return true;
@@ -5559,6 +5565,11 @@
                    {
                        omodel.HR_PostSkillBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "QC_TakeSampleCheckBill_AutoCheck")
                    {
                        omodel.QC_TakeSampleCheckBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                }
                sReturn = "显示单据成功!";
                return true;
Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
@@ -877,6 +877,9 @@
        //返修条码
        public string Gy_BarCodeBill_Rework_Ctrl;  //生成物料条码时,机型码不允许为空
        // å–样单
        public string QC_TakeSampleCheckBill_AutoCheck; // ç”Ÿæˆå–样单时,是否自动审核
    }
}
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
@@ -10,3 +10,8 @@
C:\Users\19858\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
C:\Users\19858\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
C:\Users\19858\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
D:\WorkBench\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
D:\WorkBench\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
WebAPI/App_Start/WebApiConfig.cs
@@ -31,10 +31,10 @@
            );
            // å…¨å±€å¯ç”¨ JWT è®¤è¯
            config.Filters.Add(new JwtAuthorizeAttribute());
            // config.Filters.Add(new JwtAuthorizeAttribute());
            // å¯ç”¨JWT响应拦截器,自动刷新JWT
            config.MessageHandlers.Add(new TokenAppendHandler());
            // config.MessageHandlers.Add(new TokenAppendHandler());
        }
    }
}
WebAPI/Controllers/Æ·ÖʹÜÀí/¼ìÑéÈ¡Ñù»¹Ñùµ¥/QC_TakeSampleCheckBillController.cs
@@ -263,7 +263,7 @@
                   
                    bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
                    string sReturn = "";
                    if (oSystemParameter.ShowBill(ref sReturn) == true)
                    if (oSystemParameter.ShowBill(ref DBUtility.ClsPub.sExeReturnInfo) == true)
                    {
                        if (oSystemParameter.omodel.WMS_CampanyName == "华舟")
                        {
@@ -282,7 +282,15 @@
                            }
                        }
                        // é€šè¿‡ç³»ç»Ÿå‚数判断是否需要自动审核
                        if(oSystemParameter.omodel.QC_TakeSampleCheckBill_AutoCheck == "Y")
                        {
                            bResult = oBill.CheckBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
                        }
                    }
                }
                else if (refSav == "Update")
                {
WebAPI/Utility/PermissionAttribute.cs
File was renamed from WebAPI/Utility/ModOperateAttribute.cs
@@ -10,8 +10,9 @@
    {
        public string HModName { get; }
        public string Operate { get; }
        public PermissionAttribute(string operate)
        public PermissionAttribute(string hModName,string operate)
        {
            HModName = hModName;
            Operate = operate;
        }
    }
WebAPI/WebAPI.csproj
@@ -1250,7 +1250,7 @@
      <DependentUpon>Barcode.ashx</DependentUpon>
    </Compile>
    <Compile Include="Utility\JWTHelper.cs" />
    <Compile Include="Utility\ModOperateAttribute.cs" />
    <Compile Include="Utility\PermissionAttribute.cs" />
    <Compile Include="Utility\ServerTools.cs" />
    <Compile Include="Service\TokenAppendHandler.cs" />
    <Compile Include="Utility\Util.cs" />
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
@@ -10,3 +10,9 @@
C:\Users\19858\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
C:\Users\19858\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
C:\Users\19858\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
D:\WorkBench\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