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

杨乐

2022-01-12 94323a38801dee4c9320edd33698208c5f760d55

 WebAPI/Controllers/SCGL/Sc_PackUnionBillController.cs

@@ -75,7 +75,7 @@
                objJsonResult.data = null;
                return objJsonResult;
            }
            DLL.ClsKf_MateOutBackBill oBill = new DLL.ClsKf_MateOutBackBill();
            DAL.ClsSc_PackUnionBill oBill = new DAL.ClsSc_PackUnionBill();
            if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
            {
                if (oBill.omodel.HBillStatus > 1)
@@ -182,5 +182,32 @@
            return new ApiResult<DataSet> { code = 1, msg = "查询成功", data = dataSet };
        }
        #endregion

        #region 标准工时单列表

        [Route("Sc_PackUnionBill/GetSc_StationInBillList")]
        [HttpGet]
        public object GetSc_StationInBillList(string sWhere)
        {
            try
            {
                ds = oCn.RunProcReturn("select * from h_v_Sc_StationInBillListMain order by hmainid desc", "h_v_Sc_StationInBillListMain");
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "返回记录成功！";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
            }
            catch (Exception ex)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录！" + ex.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }

        #endregion
    }
}