YL
2022-01-22 3b34823a434ecfd972f9e53351ab2645e982e193
WebAPI/DLL/ClsSc_MESReturnStepWorkBill.cs
@@ -91,19 +91,19 @@
            try
            {
                //获取当前工序工序号以及判断是否末道工序
                string sql = string.Format(@"select max(b.HProcNo) HProcNo  from Sc_ProcessPlanMain a
                               inner join   Sc_ProcessPlanSub  b on a.HInterID=b.HInterID
                               where b.HSourceBillNo='" + omodel.HSourceBillNo+"' and b.HSourceInterID='"+omodel.HSourceInterID+"'  and b.HSourceEntryID='"+omodel.HSourceEntryID+"'");
                DataSet ds= oCn.RunProcReturn(sql, "Sc_ProcessPlanMain");
                //string sql = string.Format(@"select max(b.HProcNo) HProcNo  from Sc_ProcessPlanMain a
                //               inner join   Sc_ProcessPlanSub  b on a.HInterID=b.HInterID
                //               where b.HSourceBillNo='" + omodel.HSourceBillNo+"' and b.HSourceInterID='"+omodel.HSourceInterID+"'  and b.HSourceEntryID='"+omodel.HSourceEntryID+"'");
                //DataSet ds= oCn.RunProcReturn(sql, "Sc_ProcessPlanMain");
                //查询最大工序及判断当前工序是否小于最大工序
                if (ds.Tables[0].Rows.Count > 0 && int.Parse(ds.Tables[0].Rows[0]["HProcNo"].ToString()) > omodel.HProcID)
                {
                    omodel.HProcNo = omodel.HProcNo + 5;
                }
                else
                {
                    omodel.HProcNo = omodel.HProcNo + 5; //末道工序序号加5
                }
                //if (ds.Tables[0].Rows.Count > 0 && int.Parse(ds.Tables[0].Rows[0]["HProcNo"].ToString()) > omodel.HProcID)
                //{
                //    omodel.HProcNo = omodel.HProcNo + 5;
                //}
                //else
                //{
                //    omodel.HProcNo = omodel.HProcNo + 5; //末道工序序号加5
                //}
                //得到mainid
                omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
@@ -156,5 +156,47 @@
                throw (e);
            }
        }
        //审核
        public bool CheckBill(Int64 lngBillKey, ref string sReturn)
        {
            try
            {
                string HChecker = DBUtility.ClsPub.CurUserName;
                string HCheckDate = DBUtility.ClsPub.GetServerDate(-1);
                //更新工序计划单审核人、审核时间
                oCn.RunProc(" Update " + MvarItemKey + " set HChecker='" + HChecker + "',HCheckDate='" + HCheckDate + "' Where HInterID=" + lngBillKey.ToString());
                //更新(工序汇报单、生产状态临时表)不良数量=不良数量-返工数量
                sReturn = "";
                return true;
            }
            catch (Exception e)
            {
                sReturn = e.Message;
                throw (e);
            }
        }
        //反审核
        public bool AbandonCheck(Int64 lngBillKey, ref string sReturn)
        {
            if (isUse(lngBillKey, ref sReturn))
            {
                return false;
            }
            try
            {
                oCn.RunProc(" Update " + MvarItemKey + " set HChecker='',HCheckDate=null Where HInterID=" + lngBillKey.ToString());
                //更新(工序汇报单、生产状态临时表)不良数量=不良数量-返工数量
                sReturn = "";
                return true;
            }
            catch (Exception e)
            {
                sReturn = e.Message;
                throw (e);
            }
        }
    }
}