Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

yusijie

2024-10-11 7fb7d4671613b115d14e2c570b088b31b86c0b75

Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

 DAL/¹¤×ʹÜÀí/ClsPay_WorkTimesBill.cs

@@ -146,9 +146,7 @@
                    oCn.RollBack();
                    return false;
                }
                sReturn = "单据号："+ omodel.HBillNo+ " ä¿®æ”¹æˆåŠŸï¼";
                oCn.Commit();
                return true;
            }
            catch (Exception e)
            {
@@ -156,7 +154,37 @@
                oCn.RollBack();
                throw (e);
            }

            //审核单据
            //获取系统参数
            Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
            if (oSystemParameter.ShowBillByOrgID(omodel.HSTOCKORGID, ref sReturn) == false)
            {
                sReturn = "单据号：" + omodel.HBillNo + " ä¿®æ”¹æˆåŠŸï¼Œåˆ¤æ–­æ˜¯å¦è‡ªåŠ¨å®¡æ ¸æ—¶èŽ·å–系统参数失败！ " + sReturn;
                return true;
            }

            if (oSystemParameter.omodel.Pay_WorkTimesBill_AutoCheck.ToUpper() == "Y") //系统参数  è‡ªåŠ¨å®¡æ ¸ 
            {
                //审核单据
                if (!CheckBill(omodel.HInterID, omodel.HBillNo, "h_p_Pay_WorkTimesBill_AfterCheckCtrl", DBUtility.ClsPub.CurUserName, ref DBUtility.ClsPub.sExeReturnInfo))
                {
                    sReturn = "单据号：" + omodel.HBillNo + " ä¿®æ”¹æˆåŠŸï¼Œå®¡æ ¸å¤±è´¥ï¼";
                    return true;
                }
                else
                {
                    sReturn = "单据号：" + omodel.HBillNo + " ä¿®æ”¹å®¡æ ¸æˆåŠŸï¼";
                    return true;
                }
            }
            else
            {
                sReturn = "单据号：" + omodel.HBillNo + " ä¿®æ”¹æˆåŠŸï¼";
                return true;
            }
        }

        //新增单据
        public override bool AddBill(ref string sReturn)
        {
@@ -211,9 +239,7 @@
                    oCn.RollBack();
                    return false;
                }
                sReturn = "单据号：" + omodel.HBillNo + " æ–°å¢žæˆåŠŸï¼";
                oCn.Commit();
                return true;
            }
            catch (Exception e)
            {
@@ -221,6 +247,35 @@
                oCn.RollBack();
                throw (e);
            }

            //审核单据
            //获取系统参数
            Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
            if (oSystemParameter.ShowBillByOrgID(omodel.HSTOCKORGID, ref sReturn) == false)
            {
                sReturn = "单据号：" + omodel.HBillNo + " æ–°å¢žæˆåŠŸï¼Œåˆ¤æ–­æ˜¯å¦è‡ªåŠ¨å®¡æ ¸æ—¶èŽ·å–系统参数失败！ " + sReturn;
                return true;
            }

            if (oSystemParameter.omodel.Pay_WorkTimesBill_AutoCheck.ToUpper() == "Y") //系统参数  è‡ªåŠ¨å®¡æ ¸ 
            {
                //审核单据
                if (!CheckBill(omodel.HInterID, omodel.HBillNo, "h_p_Pay_WorkTimesBill_AfterCheckCtrl", DBUtility.ClsPub.CurUserName, ref DBUtility.ClsPub.sExeReturnInfo))
                {
                    sReturn = "单据号：" + omodel.HBillNo + " æ–°å¢žæˆåŠŸï¼Œå®¡æ ¸å¤±è´¥ï¼";
                    return true;
                }
                else
                {
                    sReturn = "单据号：" + omodel.HBillNo + " æ–°å¢žå®¡æ ¸æˆåŠŸï¼";
                    return true;
                }
            }
            else
            {
                sReturn = "单据号：" + omodel.HBillNo + " æ–°å¢žæˆåŠŸï¼";
                return true;
            }
        }
        //显示单据
        public override bool ShowBill(Int64 lngBillKey, ref string sReturn)

 Pub_Class/CustomerCls/ClsXt_SystemParameter.cs

@@ -3759,7 +3759,14 @@
                        omodel.MES_StationEntrustOutBill_DeleteCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }

                    


                    //工资系统参数
                    //==============================考勤汇报单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Pay_WorkTimesBill_AutoCheck")
                    {
                        omodel.Pay_WorkTimesBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }


                    //=======JIT系统参数

 SyntacticSugar/bin/Debug/SyntacticSugar.dll

Binary files differ

 SyntacticSugar/bin/Debug/SyntacticSugar.pdb

Binary files differ

 SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache

Binary files differ

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

@@ -1,21 +1,6 @@
D:\vs\项目代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
D:\vs\项目代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
D:\vs\项目代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
D:\vs\项目代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
D:\vs\项目代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
D:\vs\项目代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
E:\智云mes\mes\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
E:\智云mes\mes\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
E:\智云mes\mes\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
E:\智云mes\mes\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
E:\智云mes\mes\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
<<<<<<< HEAD
E:\智云mes\mes\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
>>>>>>> 9ebf0d1329b78732aa2f8d0ae0ebaf03d13ccb26
D:\GIT仓库\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
D:\GIT仓库\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
D:\GIT仓库\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
D:\GIT仓库\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
D:\GIT仓库\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
D:\GIT仓库\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/BaseSet/Gy_GroupController.cs

@@ -46,6 +46,11 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                //根据用户对应班组的关系，过滤条件中增加只显示对应的班组
                DataSet dsHitemID = oCN.RunProcReturn("exec h_p_Gy_GetSQLGroupByUser '" + user + "'", "h_p_Gy_GetSQLGroupByUser");
                sWhere = sWhere + DBUtility.ClsPub.isStrNull(dsHitemID.Tables[0].Rows[0]["HBack"]);

                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_GroupList " + sWhere+ " order by ç­ç»„代码 ", "h_v_GroupList");

 WebAPI/Controllers/WebAPIController.cs

@@ -1537,6 +1537,52 @@
        }

        /// <summary>
        /// èŽ·å–班组列表  æ ¹æ®ç”¨æˆ·å¯¹åº”班组关系，获取用户对应的班组
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("Web/GetGroupListByUser_Json")]
        [HttpGet]
        public object GetGroupListByUser_Json(string sWhere, string user)
        {
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();

                //根据用户对应班组的关系，过滤条件中增加只显示对应的班组
                DataSet dsHitemID = oCN.RunProcReturn("exec h_p_Gy_GetSQLGroupByUser '" + user + "'", "h_p_Gy_GetSQLGroupByUser");
                sWhere = sWhere + DBUtility.ClsPub.isStrNull(dsHitemID.Tables[0].Rows[0]["HBack"]);

                DataSet ds = oCN.RunProcReturn("Select HItemID,班组代码 ç­ç»„代码,班组名称 ç­ç»„ from h_v_GroupList where 1=1 " + sWhere + " Order by HItemID ", "h_v_GroupList");
                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {
                    objjson.code = "0";
                    objjson.count = 0;
                    objjson.Message = "获取失败";
                    objjson.data = null;
                    return objjson;
                }
                else
                {
                    objjson.code = "0";
                    objjson.count = 1;
                    objjson.Message = "获取成功!";
                    objjson.data = ds.Tables[0];
                    return objjson;
                }
            }
            catch (Exception e)
            {

                objjson.code = "0";
                objjson.count = 0;
                objjson.Message = "获取失败" + e.ToString();
                objjson.data = null;
                return objjson;
            }
        }

        /// <summary>
        /// èŽ·å–部门列表
        /// </summary>
        /// <returns></returns>

 WebAPI/Controllers/¹¤×ʹÜÀí/Pay_WorkTimesBillController.cs

@@ -14,7 +14,6 @@

    public class Pay_WorkTimesBillController : ApiController
    {
        Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();//系统变量
        public DBUtility.ClsPub.Enum_BillStatus BillStatus;
        public const string ModName = "2203";                   //单据类型
        public const string ModCaption = "考勤汇报单";          //单据名称
@@ -749,14 +748,6 @@

                if (bResult)
                {
                    string sReturn = "";
                    if (oSystemParameter.ShowBill(ref sReturn) == true)
                    {
                        if (oSystemParameter.omodel.MES_StationOutBill_AutoCheck == "Y") //系统参数  è‡ªåŠ¨å®¡æ ¸ 
                        {
                            object objResult = GetPay_WorkTimesBill_Check_Json(lsmain[0].HInterID,1, HMaker);
                        }
                    }
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;  //成功！

 WebAPI/Web.config

@@ -22,7 +22,7 @@
        <!--<add key="FileIP" value="http://localhost:8082/LuBaoAPI"/>-->
        <!--<add key="FileIP" value="http://localhost:8080/" />-->
        <!--<add key="sUrl" value="http://183.129.128.86:9090/WEBS-WMSTest/WebService1.asmx"/>    -->
        <!--<add key="sUrl" value="http://192.168.0.11/WEBS-WMS/WebService1.asmx" />-->    <!--颜台式机-->
        <add key="sUrl" value="http://192.168.0.11/WEBS-WMS/WebService1.asmx" />    <!--颜台式机-->
        <!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> å¤å®-->
        <!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> -->
        <!--<add key="sUrl" value="http://10.10.130.181/WEBS-WMS/WebService1.asmx"/>    åšæ—¥ç§‘技-->
@@ -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"/>--><!--斯莫尔-->
        
@@ -106,13 +106,13 @@
            </basicHttpBinding>
        </bindings>
        <client>
            <endpoint address="http://localhost/webs-web/webservice1.asmx" binding="basicHttpBinding" bindingConfiguration="WebService1Soap" contract="Webs1.WebService1Soap" name="WebService1Soap" />
            <endpoint address="http://192.168.0.11/WEBS-WMS/WebService1.asmx" binding="basicHttpBinding" bindingConfiguration="WebService1Soap" contract="Webs1.WebService1Soap" name="WebService1Soap" />
        </client>
    </system.serviceModel>
    <applicationSettings>
        <WebAPI.Properties.Settings>
            <setting name="WebAPI_WebS_WebService1" serializeAs="String">
                <value>http://localhost/webs-web/webservice1.asmx</value>
                <value>http://192.168.0.11/WEBS-WMS/WebService1.asmx</value>
            </setting>
        </WebAPI.Properties.Settings>
    </applicationSettings>