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

yusijie

2024-07-29 97267e65bbdef1192a075401a18beea13f7676ea

 WebAPI/Controllers/Éú²ú¹ÜÀí/ÖÊÁ¿»ã±¨µ¥/Sc_QualityReportBillController.cs

@@ -631,7 +631,7 @@
        #region æäº¤ä¿å­˜ï¼Œå­˜ä¸»å­è¡¨åŠæ˜Žç»†è¡¨
        [Route("Sc_QualityReportBill/set_SaveBill")]
        [HttpGet]
        public object set_SaveBill(long HInterID,string HBillNo, string HChecker,string HBadReasonHQty)
        public object set_SaveBill(long HInterID,string HBillNo, string HChecker)
        {
            try
            {
@@ -658,8 +658,18 @@
                    return objJsonResult;
                }
                //=========================================================
                //保存
                oCN.RunProc("exec h_p_save_Sc_QualityReportBill " + HInterID+",'"+ HBadReasonHQty +"'");
                //保存  æ‰¹é‡ä¿å­˜å…ˆçœ‹å­è¡¨æ˜¯å¦æœ‰æ•°æ®,有数据就进 å­˜å…¥ä¸»è¡¨  æ˜Žç»†è¡¨    æ²¡æœ‰å°±å­˜å‚¨ä¸»å­æ˜Žç»†è¡¨
                string sql = "select * from Sc_QualityReportBillSub where HInterID = '" + HInterID + "'";
                ds = oCN.RunProcReturn(sql, "Sc_QualityReportBillSub");
                if (ds.Tables[0].Rows.Count>0)
                {
                    oCN.RunProc("exec h_p_save_Sc_QualityReportBillSum " + HInterID + "");
                }
                else
                {
                    oCN.RunProc("exec h_p_save_Sc_QualityReportBill " + HInterID + "");
                }
                
                //判断是否允许保存，不允许则回滚
                ds = oCN.RunProcReturn("exec h_p_JIT_ICMOBillQualityStatus_SaveCtrl", "h_p_JIT_ICMOBillQualityStatus_SaveCtrl");
                if (ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) == "2")
@@ -773,56 +783,53 @@
                int i = 0;
                foreach (Model.ClsSc_QualityReportBillSub oSub in ls)
                {
                  
                   
                    oSub.HMakeDate = DateTime.Now;
                    int qty = Convert.ToInt32(oSub.HQty);
                    for (int j = 0; j < qty; j++)
                    {
                        i++;
                        oSub.HEntryID = i;
                        string subSql = "Insert into Sc_QualityReportBillSub " +
                     " (HInterID,HEntryID,HBillNo_bak,HRemark" +
                     ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
                     ",HMaterID,HUnitID,HQty,HResult,HEmpID,HSourceID,HBadReasonID" +
                     ",HICMOInterID,HICMOEntryID,HICMOBillNo,HProcExchInterID,HProcExchEntryID,HProcExchBillNo" +
                     ",HBarCode,HReportType" +
                     ",HAddr,HMaker,HMakeDate" +
                     ") values(" +
                     "" + oSub.HInterID.ToString() + "" +
                     "," + oSub.HEntryID.ToString() + "" +
                     ",'" + oSub.HBillNo_bak + "'" +
                     ",'" + oSub.HRemark + "'" +
                     "," + oSub.HSourceInterID.ToString() + "" +
                     "," + oSub.HSourceEntryID.ToString() + "" +
                     ",'" + oSub.HSourceBillNo + "'" +
                     ",'" + oSub.HSourceBillType + "'" +
                     "," + oSub.HRelationQty.ToString() + "" +
                     "," + oSub.HRelationMoney.ToString() +

                     "," + oSub.HMaterID.ToString() + "" +
                     "," + oSub.HUnitID.ToString() + "" +
                     ",'" + 1 +
                     "','" + oSub.HResult + "'" +
                     "," + oSub.HEmpID.ToString() + "" +
                     "," + oSub.HSourceID.ToString() + "" +
                     "," + oSub.HBadReasonID.ToString() + "" +
                    i++;
                    oSub.HMakeDate = DateTime.Now;                   
                    oSub.HEntryID = i;
                    string subSql = "Insert into Sc_QualityReportBillSub " +
                 " (HInterID,HEntryID,HBillNo_bak,HRemark" +
                 ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
                 ",HMaterID,HUnitID,HQty,HResult,HEmpID,HSourceID,HBadReasonID,HBadReasonNumber,HGroupID" +
                 ",HICMOInterID,HICMOEntryID,HICMOBillNo,HProcExchInterID,HProcExchEntryID,HProcExchBillNo" +
                 ",HBarCode,HReportType" +
                 ",HAddr,HMaker,HMakeDate" +
                 ") values(" +
                 "" + oSub.HInterID.ToString() + "" +
                 "," + oSub.HEntryID.ToString() + "" +
                 ",'" + oSub.HBillNo_bak + "'" +
                 ",'" + oSub.HRemark + "'" +
                 "," + oSub.HSourceInterID.ToString() + "" +
                 "," + oSub.HSourceEntryID.ToString() + "" +
                 ",'" + oSub.HSourceBillNo + "'" +
                 ",'" + oSub.HSourceBillType + "'" +
                 "," + oSub.HRelationQty.ToString() + "" +
                 "," + oSub.HRelationMoney.ToString() +

                     "," + oSub.HICMOInterID.ToString() + "" +
                     "," + oSub.HICMOEntryID.ToString() + "" +
                     ",'" + oSub.HICMOBillNo + "'" +
                     "," + oSub.HProcExchInterID + "" +
                     "," + oSub.HProcExchEntryID + "" +
                     ",'" + oSub.HProcExchBillNo + "'" +
                     ",'" + oSub.HBarCode + "'" +
                 "," + oSub.HMaterID.ToString() + "" +
                 "," + oSub.HUnitID.ToString() + "" +
                 ",'" + oSub.HQty.ToString() +
                 "','" + oSub.HResult + "'" +
                 "," + oSub.HEmpID.ToString() + "" +
                 "," + oSub.HSourceID.ToString() + "" +
                 "," + oSub.HBadReasonID.ToString() + "" +
                 ",'" + oSub.HBadReasonNumber.ToString() + "'" +
                 ",'" + oSub.HGroupID.ToString() + "'" +

                     ",'" + 3 +
                     "','" + oSub.HAddr + "'" +
                     ",'" + msg4 + "'" +
                     ",'" + oSub.HMakeDate.ToShortDateString() + "'" +
                     ") ";
                        oCN.RunProc(subSql);
                    }
                 "," + oSub.HICMOInterID.ToString() + "" +
                 "," + oSub.HICMOEntryID.ToString() + "" +
                 ",'" + oSub.HICMOBillNo + "'" +
                 "," + oSub.HProcExchInterID + "" +
                 "," + oSub.HProcExchEntryID + "" +
                 ",'" + oSub.HProcExchBillNo + "'" +
                 ",'" + oSub.HBadReasonNumber.ToString() + "'" +

                 ",'" + 1 +
                 "','" + oSub.HAddr + "'" +
                 ",'" + msg4 + "'" +
                 ",'" + oSub.HMakeDate.ToShortDateString() + "'" +
                 ") ";
                    oCN.RunProc(subSql);

                }
                objJsonResult.code = "0";
@@ -1818,6 +1825,117 @@
        }
        #endregion

        #region ç‰©æ–™ç”Ÿäº§è‰¯çŽ‡ç»Ÿè®¡(斯莫尔) æŸ¥è¯¢

        [Route("Sc_QualityReportBill/getSc_HMaterYieldStatistics")]
        [HttpGet]
        public object getSc_HMaterYieldStatistics(string sWhere, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //查看权限
                if (!DBUtility.ClsPub.Security_Log("Sc_QualityReportBill_Query", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无查看权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_Sc_HMater_Yield_Statistics_Query order by å•æ®å· desc", "h_v_Sc_HMater_Yield_Statistics_Query");
                }
                else
                {
                    string sql1 = "select * from h_v_Sc_HMater_Yield_Statistics_Query where 1 = 1 ";
                    string sql = sql1 + sWhere + " order by æ—¥æœŸ desc";
                    ds = oCN.RunProcReturn(sql, "h_v_Sc_HMater_Yield_Statistics_Query");
                }

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region ä»»åŠ¡å•é€šè¿‡çŽ‡(斯莫尔) æŸ¥è¯¢

        [Route("Sc_QualityReportBill/getSc_HICMMaterStatistics")]
        [HttpGet]
        public object getSc_HICMMaterStatistics(string sWhere, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //查看权限
                if (!DBUtility.ClsPub.Security_Log("Sc_QualityReportBill_Query", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无查看权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_Sc_HICMMater_Statistics_Query order by å•æ®å· desc", "h_v_Sc_HICMMater_Statistics_Query");
                }
                else
                {
                    string sql1 = "select * from h_v_Sc_HICMMater_Statistics_Query where 1 = 1 ";
                    string sql = sql1 + sWhere + " order by æ—¥æœŸ desc";
                    ds = oCN.RunProcReturn(sql, "h_v_Sc_HICMMater_Statistics_Query");
                }

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

    }
}