1

zrg

2024-10-24 20879fb51927c6a192fe50b6fe5ab19600d83641

 WebAPI/Controllers/品质管理/工序检验单/QC_ProcessCheckBillController.cs

@@ -85,7 +85,7 @@
                List<object> columnNameList = new List<object>();

                string sql1 = "select * from h_v_QC_ProcessCheckBill where 1 = 1  ";
                string sql = sql1 + sWhere + " order by hmainid desc";
                string sql = sql1 + sWhere + " order by 鍒跺崟鏃ユ湡 desc";
                ds = oCN.RunProcReturn(sql, "h_v_QC_ProcessCheckBill");

                //娣诲姞鍒楀悕
@@ -135,8 +135,18 @@
            {
                List<object> columnNameList = new List<object>();

                //鍒ゆ柇鏉冮檺
                if (!DBUtility.ClsPub.Security_Log("QC_ProcessCheckBill_Query", 3, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡鏉冮檺,璇蜂笌绠＄悊鍛樿仈绯伙紒";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                string sql1 = "select * from h_v_QC_ProcessCheckBillMainList where 1 = 1  ";
                string sql = sql1 + sWhere + " order by hmainid desc";
                string sql = sql1 + sWhere + " order by 鍒跺崟鏃ユ湡 desc";
                ds = oCN.RunProcReturn(sql, "h_v_QC_ProcessCheckBillMainList");

                //娣诲姞鍒楀悕
@@ -831,6 +841,8 @@
                BillNew.omodel.HShiftsID = ClsPub.isLong(mainList[0].HShiftsID);
                BillNew.omodel.HErrTreatment = ClsPub.isStrNull(mainList[0].HErrTreatment);
                BillNew.omodel.HBatchNo = ClsPub.isStrNull(mainList[0].HBatchNo);
                BillNew.omodel.HTakeSampleCheckBillID = ClsPub.isLong(mainList[0].HTakeSampleCheckBillID);
                BillNew.omodel.HTakeSampleCheckBillNo = ClsPub.isStrNull(mainList[0].HTakeSampleCheckBillNo);
                List<Model.ClsQC_ProcessCheckBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_ProcessCheckBillSub>>(msg3);
                BillNew.DetailColl = new List<Model.ClsQC_ProcessCheckBillSub>();
                for (int i = 0; i < subList.ToArray().Length; i++)
@@ -868,6 +880,7 @@
                        oSub.HTargetVal = DBUtility.ClsPub.isStrNull(subList[i].HTargetVal);
                        oSub.HUpLimit = DBUtility.ClsPub.isStrNull(subList[i].HUpLimit);
                        oSub.HDownLimit = DBUtility.ClsPub.isStrNull(subList[i].HDownLimit);
                        oSub.HQCNote = DBUtility.ClsPub.isStrNull(subList[i].HQCNote);
                        oSub.HUpOffSet = DBUtility.ClsPub.isStrNull(subList[i].HUpOffSet);
                        oSub.HDownOffSet = DBUtility.ClsPub.isStrNull(subList[i].HDownOffSet);
                        oSub.HAnalysisMethod = DBUtility.ClsPub.isStrNull(subList[i].HAnalysisMethod);