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

yxj

2023-08-31 02dabb543b5e1699d0e1ad7d1283dd7a3beafb8e

 WebAPI/Controllers/Æ·ÖʹÜÀí/²úÏß·µÐÞƽ̨/Sc_SourceLineRepairBillController.cs

@@ -19,7 +19,7 @@
        private json objJsonResult = new json();
        public DataSet ds = new DataSet();
        public SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
        public DAL.ClsSc_ICMOBillQualityStatus_Tmp BillOld = new DAL.ClsSc_ICMOBillQualityStatus_Tmp();
        public DAL.ClsSc_SourceLineRepairBill BillOld = new DAL.ClsSc_SourceLineRepairBill();
        string user_LongShan = "";
        string HName_LongShan = "";

@@ -29,9 +29,9 @@
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("Sc_ICMOBillQualityStatus_Tmp/AddICMOBillQualityStatus_Tmp")]
        [Route("Sc_SourceLineRepairBillSub/AddSourceLineRepairBill")]
        [HttpPost]
        public object AddICMOBillQualityStatus_Tmp([FromBody] JObject sMainSub)
        public object AddSourceLineRepairBill([FromBody] JObject sMainSub)
        {
            try
            {
@@ -40,8 +40,9 @@
                string msg1 = _value.ToString();
                string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
                string msg2 = sArray[0].ToString();                     //表头数据
                int HSaveType = int.Parse(sArray[1].ToString());        //保存类型 1:不良品保存 2:报废保存
                string user = sArray[2].ToString();                     //操作用户的用户名
                string msg3 = sArray[1].ToString();
                string msg4 = sArray[2].ToString();
                string user = sArray[3].ToString();                     //操作用户的用户名
                string HComputerName = SystemInformation.ComputerName;  //设备名称

                ////判断是否有新增权限
@@ -55,18 +56,18 @@
                //}

                msg2 = "[" + msg2.ToString() + "]";
                List<Model.ClsSc_ICMOBillQualityStatus_Tmp> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ICMOBillQualityStatus_Tmp>>(msg2);
                List<Model.ClsSc_SourceLineRepairBillMain> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_SourceLineRepairBillMain>>(msg2);
                BillOld.omodel = mainList[0];
                if (HSaveType == 1)
                {
                    BillOld.omodel.HSaveType = "不良品保存";
                }
                else if (HSaveType == 2)
                {
                    BillOld.omodel.HSaveType = "报废品保存";
                }

                if (!BillOld.AddBill1(ref DBUtility.ClsPub.sExeReturnInfo))
                msg3 = "[" + msg3.ToString() + "]";
                List<Model.ClsSc_SourceLineRepairBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_SourceLineRepairBillSub>>(msg3);
                BillOld.DetailColl = subList;

                //msg4 = "[" + msg4.ToString() + "]";
                List<Model.ClsSc_SourceLineRepairBillSub_Mater> subMaterList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_SourceLineRepairBillSub_Mater>> (msg4);
                BillOld.DetailMaterColl = subMaterList;

                if (!BillOld.AddBill(ref DBUtility.ClsPub.sExeReturnInfo))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -92,8 +93,8 @@
        }
        #endregion

        #region äº§çº¿è´¨æ£€å¹³å° èŽ·å–表头信息
        [Route("Sc_ICMOBillQualityStatus_Tmp/getMainInfo")]
        #region äº§çº¿è¿”修平台 èŽ·å–表头信息
        [Route("Sc_SourceLineRepairBill/getMainInfo")]
        [HttpGet]
        public object getMainInfo(string Czybm, string user)
        {
@@ -149,10 +150,10 @@
        }
        #endregion

        #region äº§çº¿è´¨æ£€å¹³å° èŽ·å–子表信息
        [Route("Sc_ICMOBillQualityStatus_Tmp/getSubInfo")]
        #region äº§çº¿è¿”修平台 èŽ·å–子表1信息
        [Route("Sc_SourceLineRepairBill/getSubInfo")]
        [HttpGet]
        public object getSubInfo(string HSplitNo, string user)
        public object getSubInfo(Int64 HSourceInterID, Int64 HSourceEntryID, string HDate, string user)
        {
            try
            {
@@ -167,13 +168,14 @@
                //    return objJsonResult;
                //}

                string sql = @"select 
                            a.HInterID, a.HDate æ—¥æœŸ, a.HMaterID, b.HName äº§å“åç§°, a.HBarCode æ¡å½¢ç , a.HBadReasonID, c.HName ä¸è‰¯åŽŸå› , a.HResult åˆ¤æ–­ç»“æžœ
                            from Sc_ICMOBillQualityStatus_Tmp AS a
                            LEFT OUTER JOIN Gy_Material AS b on a.HMaterID = b.HItemID
                            LEFT OUTER JOIN Gy_BadReason AS c on a.HBadReasonID = c.HItemID
                            where a.HSplitNo = '" + HSplitNo + "' order by a.HDate desc, a.HInterID desc" ;
                ds = oCN.RunProcReturn(sql, "h_p_Sc_ICMOBillQualityStatus_Tmp_Init");
                string sql = @"select b.HInterID, b.HEntryID, a.HDate æ—¥æœŸ, c.HName äº§å“åç§°, a.HBarCode SN码, d.HName ä¸è‰¯åŽŸå› , b.HRepairResult ç»´ä¿®ç»“æžœ
                            from Sc_SourceLineRepairBillMain AS a
                            inner join Sc_SourceLineRepairBillSub AS b on a.HInterID = b.HInterID
                            LEFT OUTER JOIN Gy_Material AS c on a.HMaterID = c.HItemID 
                            LEFT OUTER JOIN Gy_BadReason AS d on b.HBadReasonID = d.HItemID
                            where b.HSourceInterID = " + HSourceInterID + "and HSourceEntryID = " + HSourceEntryID + " and CONVERT(varchar(100),a.HDate, 23) = '" + HDate + "' " + 
                            "order by a.HDate desc, b.HInterID desc, b.HEntryID desc";
                ds = oCN.RunProcReturn(sql, "Sc_SourceLineRepairBill");

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
@@ -201,10 +203,10 @@
        }
        #endregion

        #region äº§çº¿è´¨æ£€å¹³å° å­è¡¨åˆ é™¤
        [Route("Sc_ICMOBillQualityStatus_Tmp/deleteSubInfo")]
        #region äº§çº¿è¿”修平台 å­è¡¨1删除
        [Route("Sc_SourceLineRepairBill/deleteSubInfo")]
        [HttpGet]
        public object deleteSubInfo(int HInterID, string user)
        public object deleteSubInfo(int HInterID, int HEntryID, string user)
        {
            try
            {
@@ -218,7 +220,11 @@
                //    return objJsonResult;
                //}

                string sql = @"delete from Sc_ICMOBillQualityStatus_Tmp where HInterID = " + HInterID ;
                string sql = "delete from Sc_SourceLineRepairBillMain where HInterID = " + HInterID;
                oCN.RunProc(sql);
                sql = "delete from Sc_SourceLineRepairBillSub where HInterID = " + HInterID  + " and HEntryID = " + HEntryID;
                oCN.RunProc(sql);
                sql = "delete from Sc_SourceLineRepairBillSub_Mater where HInterID = " + HInterID;
                oCN.RunProc(sql);

                objJsonResult.code = "1";
@@ -238,10 +244,10 @@
        }
        #endregion

        #region äº§çº¿è´¨æ£€å¹³å° èŽ·å–不良率占比分析图数据
        [Route("Sc_ICMOBillQualityStatus_Tmp/getBadReasonRateInfo")]
        #region äº§çº¿è¿”修平台 èŽ·å–不良率占比分析图数据
        [Route("Sc_SourceLineRepairBill/getBadReasonRateInfo")]
        [HttpGet]
        public object getBadReasonRateInfo(int HICMOInterID, int HICMOEntryID)
        public object getBadReasonRateInfo(int HSourceInterID, int HSourceEntryID)
        {
            try
            {
@@ -256,15 +262,11 @@
                //    return objJsonResult;
                //}

                string sql = @"select
                            a.HBadReasonID
                            ,b.HName HBadReasonName
                            , COUNT(a.HBadReasonID) HBadReasonQty
                            from Sc_ICMOBillQualityStatus_Tmp AS a
                            LEFT OUTER JOIN Gy_BadReason as b on a.HBadReasonID = b.HItemID " +
                            "where a.HICMOInterID = " + HICMOInterID + " and a.HICMOEntryID = " + HICMOEntryID +
                            " and ISNULL(a.HBadReasonID,0)<> 0" +
                            " group by a.HBadReasonID,b.HName order by COUNT(a.HBadReasonID) desc";
                string sql = @"select a.HBadReasonID, b.HName HBadReasonName, count(a.HBadReasonID) HBadReasonQty
                            from Sc_SourceLineRepairBillSub AS a
                            LEFT OUTER JOIN Gy_BadReason AS b on a.HBadReasonID = b.HItemID
                            where a.HSourceInterID = " + HSourceInterID + " and HSourceEntryID = " + HSourceEntryID + " and ISNULL(a.HBadReasonID,0)<>0 " +
                            "group by a.HBadReasonID,b.HName order by COUNT(a.HBadReasonID) desc";

                ds = oCN.RunProcReturn(sql, "getBadReasonRateInfo");

@@ -294,8 +296,8 @@
        }
        #endregion

        #region äº§çº¿è´¨æ£€å¹³å° æ ¹æ®æ¡å½¢ç èŽ·å–信息
        [Route("Sc_ICMOBillQualityStatus_Tmp/getBarCodeInfo")]
        #region äº§çº¿è¿”修平台 æ ¹æ®æ¡å½¢ç èŽ·å–信息
        [Route("Sc_SourceLineRepairBill/getBarCodeInfo")]
        [HttpGet]
        public object getBarCodeInfo(string HBarCode)
        {
@@ -320,7 +322,13 @@
                    return objJsonResult;
                }

                string sql = "select * from Gy_BarCodeBill where HBarCode = '" + HBarCode + "'";
                string sql = @"select a.*, b.HNumber HMaterNumber, b.HName HMaterName 
                            from Gy_BarCodeBill AS a 
                            LEFT OUTER JOIN Gy_Material AS b on a.HMaterID = b.HItemID
                            where HBarCode = '" + HBarCode + "'";



                ds = oCN.RunProcReturn(sql, "Gy_BarCodeBill");

                if(ds == null || ds.Tables[0].Rows.Count == 0)