1

zrg

1 天以前 639ea7256f10697d19c19cc878e999bcb7b1e6a1

 WebAPI/Controllers/QC_ManagementController.cs

@@ -297,13 +297,13 @@
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (sqlWhere == null || sqlWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select top 500 * from h_v_QC_PatrolProcCheckBillList where  关闭人='' order by hmainid desc ", "h_v_QC_PatrolProcCheckBillList");
                    ds = oCN.RunProcReturn("select top 500 * from h_v_QC_PatrolProcCheckBillMainList where  关闭人='' order by hmainid desc ", "h_v_QC_PatrolProcCheckBillMainList");
                }
                else
                {
                    string sql1 = "select * from h_v_QC_PatrolProcCheckBillList where 关闭人='' ";
                    string sql1 = "select * from h_v_QC_PatrolProcCheckBillMainList where 关闭人='' ";
                    string sql = sql1 + sqlWhere+ " order by 制单日期 desc ";
                    ds = oCN.RunProcReturn(sql, "h_v_QC_PatrolProcCheckBillList");
                    ds = oCN.RunProcReturn(sql, "h_v_QC_PatrolProcCheckBillMainList");
                }
            }
            catch (Exception e)
@@ -1083,6 +1083,7 @@
                msg2 = msg2.Replace("\\", "");
                msg2 = msg2.Replace("\n", "");  //\n
                lsmain = oListModels.getObjectByJson_Gy_QCCheckProjectMain(msg2);
                string ts;
                foreach (Model.ClsGy_QCCheckProjectMain oItem in lsmain)
                {
                    //oItem.HMaker = "";
@@ -1107,6 +1108,7 @@
                        return objJsonResult;
                    }
                    oBill.omodel = oItem;
                    ts = oItem.HCheckBillType;
                }
                //表体数据
                //按 },{来拆分数组 //去掉【和】
@@ -1248,7 +1250,7 @@
                }

                //删除前控制=========================================      
                string sql1 = "exec h_p_Gy_QCCheckProject_BeforeDelCtrl  " + BillOld.omodel.HInterID + ",'" + BillOld.omodel.HBillNo + "','" + UserName + "'";
                string sql1 = "exec h_p_Gy_QCCheckProject_BeforeDelCtrl  " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + UserName + "'";
                ds = oCN.RunProcReturn(sql1, "h_p_Gy_QCCheckProject_BeforeDelCtrl");
                if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
                {
@@ -1270,7 +1272,7 @@
                //==================================================================================  

                //删除单据（包含删除后控制、写入日志）
                if (!oBill.DeleteBill(BillOld.omodel.HInterID, BillOld.omodel.HBillNo, "h_p_Gy_QCCheckProject_AfterDelCtrl", UserName, ref ClsPub.sExeReturnInfo))
                if (!oBill.DeleteBill(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Gy_QCCheckProject_AfterDelCtrl", UserName, ref ClsPub.sExeReturnInfo))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -1351,8 +1353,21 @@
                {
                    //判断单据是否已经审核
                    DataSet ds;
                    string sql = "select * from  Gy_QCCheckProjectMain  where HInterID = " + HInterID;
                    string sql;
                    if(HInterID=="0")
                    {
                        sql = "select top 1 * from  Gy_QCCheckProjectMain  order by HInterID desc";
                        
                    }
                    else
                     sql = "select * from  Gy_QCCheckProjectMain  where HInterID = " + HInterID;
                    ds = oCN.RunProcReturn(sql, oBill.MvarItemKey);
                    if(ds!=null)
                    {
                        oBill.omodel.HInterID = Convert.ToInt64(ds.Tables[0].Rows[0]["HInterID"]);
                        HInterID = Convert.ToInt64(ds.Tables[0].Rows[0]["HInterID"]).ToString();
                    }
                    
                    if (ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
                    {
                        objJsonResult.code = "0";
@@ -1749,7 +1764,7 @@
                    oItemSub.HRelationMoney = 0;
                    oItemSub.HCloseMan = "";
                    oItemSub.HRemark = "";
                    oItemSub.HProcCheckEmp = oBill.omodel.HFirstCheckEmp;//检测员
                    // oItemSub.HProcCheckEmp = oBill.omodel.HFirstCheckEmp;//检测员
                    oBill.DetailColl.Add(oItemSub);

                }
@@ -2117,7 +2132,7 @@
                    UserName = oItem.HMaker;
                    oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
                    oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
                    oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
                    oItem.HDate=oItem.HDate.ToString()==""? DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd")) : oItem.HDate;
                    oItem.HBillType = "7506";
                    oItem.HBillSubType = "7506";
                    oItem.HBillStatus = 0;