合并分支

chenhaozhe

2026-04-16 82b57de13d9449c48944db91d7f17b477169c324

 WebAPI/Controllers/Sc_EmployeeSignInNoteBillController.cs

@@ -23,7 +23,7 @@
        SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();


        #region 分页列表
        #region 员工签到记录单 分页列表
        [Route("Sc_EmployeeSignInNoteBillController/GetListPage")]
        [HttpGet]
        public object GetListPage(string sWhere, string user)
@@ -126,7 +126,7 @@
        #endregion


        #region  保存/编辑
        #region 员工签到记录单   保存/编辑

        [Route("Sc_EmployeeSignInNoteBillController/SaveBill")]
        [HttpPost]
@@ -237,7 +237,7 @@
        #endregion


        #region[编辑时获取数据]
        #region[员工签到记录单 编辑时获取数据]
        [Route("Sc_EmployeeSignInNoteBillController/Sc_EmployeeSignInNoteBilldetail")]
        [HttpGet]
        public ApiResult<DataSet> Sc_EmployeeSignInNoteBilldetail(string HID)
@@ -356,7 +356,7 @@
        {
            DataSet ds = oCN.RunProcReturn("select  * from h_v_Gy_EquipFileBill_KeyDown_PDA where 条形码= '" + HBarCode+"'", "h_v_Gy_EquipFileBill_KeyDown_PDA");    

            if (ds != null || ds.Tables.Count > 0)
            if (ds != null && ds.Tables.Count > 0 && ds.Tables[0].Rows.Count > 0)
            {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
@@ -381,7 +381,7 @@
        {
            DataSet ds = oCN.RunProcReturn("exec  h_p_SB_HEquipHMould_Query '" + HInterID + "'", "h_p_SB_HEquipHMould_Query");

            if (ds != null || ds.Tables.Count > 0)
            if (ds != null && ds.Tables.Count > 0 && ds.Tables[0].Rows.Count > 0)
            {
                objJsonResult.code = "1";
                objJsonResult.count = 1;
@@ -406,7 +406,7 @@
        {
            DataSet ds = oCN.RunProcReturn("exec  h_p_Sc_ICMOBillStatus_Tmp_QD '" + HInterID + "'", "h_p_Sc_ICMOBillStatus_Tmp_QD");

            if (ds != null || ds.Tables.Count > 0)
            if (ds != null && ds.Tables.Count > 0 && ds.Tables[0].Rows.Count > 0)
            {
                objJsonResult.code = "1";
                objJsonResult.count = 1;
@@ -419,7 +419,7 @@
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "当前设备无模具信息！";
                objJsonResult.Message = "当前设备无工单信息！";
                objJsonResult.data = null;
                return objJsonResult;
            }