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

yusijie

2024-04-25 0709c335d0a3692962ddac55c133de0d24126eba

 WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs

@@ -3474,5 +3474,112 @@
            }
        }
        #endregion

        #region  当前工单(赋码汇报) 根据生产订单查询数据
        [Route("Cj_StationOutBill_CodingReport/get_ICMOProcessExchangeBillList")]
        [HttpGet]
        public object get_ICMOProcessExchangeBillList(string sWhere, string user, int HOrgID)
        {
            try
            {
                ds = oCN.RunProcReturn("select * from h_v_Sc_ICMOProcessExchangeBillList WITH(NOLOCK) where 1=1 " + sWhere, "h_v_Sc_ICMOProcessExchangeBillList");

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
            }
            catch (Exception e)
            {

                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region  当前工单(赋码汇报) 查询当前用户今天生成条码的数据
        [Route("Cj_StationOutBill_CodingReport/get_BarCodeBillList")]
        [HttpGet]
        public object get_BarCodeBillList(string sWhere, string user, int HOrgID)
        {
            try
            {
                ds = oCN.RunProcReturn("select * from h_v_IF_BarCodeBillList WITH(NOLOCK) where 1=1 " + sWhere, "h_v_IF_BarCodeBillList");

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
            }
            catch (Exception e)
            {

                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region 当前工单(扫码汇报) 删除出站数据
        [Route("Cj_StationOutBill_CodingReport/DelBarCodeBill_SN")]
        [HttpGet]
        public object DelBarCodeBill_SN(int HInterID, string HDeleteMan, string HBillSubType)
        {
            try
            {
                //判断是否有查询权限
                if (!DBUtility.ClsPub.Security_Log("Gy_BarCodeBillList_Edit", 1, false, HDeleteMan))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无删除权限!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                ds = oCN.RunProcReturn("select * from h_v_IF_BarCodeBillList WITH(NOLOCK) where hmainid = " + HInterID, "h_v_IF_BarCodeBillList");

                if (ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "查无数据！";
                    objJsonResult.data = null;
                }

                oCN.BeginTran();

                string sql = "";
                sql = "delete from Gy_BarCodeBill where HItemID = " + HInterID;
                oCN.RunProc(sql);

                oCN.Commit();

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = null;
                return objJsonResult;
            }
            catch (Exception e)
            {
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
    }
}