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

llj

2 天以前 a91fdba94705dd25cecccc7a4a5dcc2b3f2c09a6

 DAL/Öʼì¹ÜÀí/ClsQC_OutCompCheckBill.cs

@@ -10,13 +10,14 @@
        public Model.ClsQC_OutCompCheckBillMain omodel = new Model.ClsQC_OutCompCheckBillMain();
        public List<Model.ClsQC_OutCompCheckBillSub> DetailColl = new List<Model.ClsQC_OutCompCheckBillSub>();
        public List<Model.ClsQC_OutCompCheckBillSub_ValueGrid> DetailColl_Value = new List<Model.ClsQC_OutCompCheckBillSub_ValueGrid>();
        public List<Model.ClsQC_OutCompCheckBillSub_BadReason> DetailCol1_BadReason = new List<Model.ClsQC_OutCompCheckBillSub_BadReason>();

        //public List<Model.ClsQC_OutCompCheckBillSub_Item> DetailColl1 = new List<Model.ClsQC_OutCompCheckBillSub_Item>();
        public ClsQC_OutCompCheckBill()
        {
            base.MvarItemKeySub = "QC_OutCompCheckBillSub";
            base.MvarItemKeySub2 = "QC_OutCompCheckBillSub_ValueGrid";
            base.MvarItemKeySub3 = "";
            base.MvarItemKeySub3 = "QC_OutCompCheckBillSub_BadReason";
            base.MvarItemKeySub4 = "";
            base.MvarItemKey="QC_OutCompCheckBillMain";
            base.MvarReportTitle="出库检验单";
@@ -83,6 +84,7 @@
                ",HErrTreatment='" + omodel.HErrTreatment + "'" +
                ",HBatchNo='" + omodel.HBatchNo + "'" +
                ",HRemarkSN='" + omodel.HRemarkSN + "'" +
                ",HCheckQty=" + omodel.HCheckQty +
                " where HInterID=" + lngBillKey.ToString());
                //删除关联
                DeleteRelation(ref sReturn, lngBillKey);
@@ -98,13 +100,13 @@
                      ",HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
                      ",HQCCheckItemID,HQCStd,HUnit,HQCNote,HResult" +
                      ",HMax,HMin,HAvg,HInspectVal,HUpLimit,HDownLimit,HInspectInstruMentID,HQualityStdID,HInspectMethodID,HInspectBasisID,HCompareSymbol" +
                      ") values("
                      ", HInsepctValQ) values("
                      + omodel.HInterID.ToString() + ",'" + oSub.HBillNo_bak + "'," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "'" +
                      ",getdate()," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'," + oSub.HSourceInterID.ToString() +
                      "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
                      "," + oSub.HQCCheckItemID.ToString() + ",'" + oSub.HQCStd + "','" + oSub.HUnit + "','" + oSub.HQCNote + "','" + oSub.HResult + "'" +
                      ",'" + oSub.HMax + "','" + oSub.HMin + "','" + oSub.HAvg + "','" + oSub.HInspectVal + "','" + oSub.HUpLimit + "','" + oSub.HDownLimit + "','" + oSub.HInspectInstruMentID +
                      "','" + oSub.HQualityStdID + "','" + oSub.HInspectMethodID + "'," + oSub.HInspectBasisID + ",'" + oSub.HCompareSymbol + "'" +
                      "','" + oSub.HQualityStdID + "','" + oSub.HInspectMethodID + "'," + oSub.HInspectBasisID + ",'" + oSub.HCompareSymbol + "'" + oSub.HInspectValQ +
                      ") ");
                }
                //foreach (Model.ClsQC_OutCompCheckBillSub_Item oSub2 in DetailColl1)
@@ -134,6 +136,7 @@
                //        return false;
                //    }
                //}
                AddBadReason(ref sReturn);
                sReturn = "修改单据成功！";
                oCn.Commit();
                return true;
@@ -193,14 +196,14 @@
                ",HSourceID,HICMOInterID,HICMOBillNo,HICMOQty,HProcExchInterID,HProcExchEntryID" +
                ",HProcExchBillNo,HProcExchQty,HMaterID,HFirstCheckEmp,HLastResult" +
                ",HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType,HICMOEntryID,HQCSchemeID,HShiftsID,HErrTreatment,HBatchNo" +
                ",HTakeSampleCheckBillID,HTakeSampleCheckBillNo,HProcID,HRemarkSN" +
                ",HTakeSampleCheckBillID,HTakeSampleCheckBillNo,HProcID,HRemarkSN, HCheckQty" +
                ") " +
                " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "'," + omodel.HBillStatus.ToString() + ",'" + omodel.HDate + "','" + omodel.HMaker + "',getdate()" +
                "," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'" +
                "," + omodel.HSourceID.ToString() + "," + omodel.HICMOInterID.ToString() + ",'" + omodel.HICMOBillNo + "'," + omodel.HICMOQty.ToString() + "," + omodel.HProcExchInterID.ToString() + "," + omodel.HProcExchEntryID.ToString() +
                ",'" + omodel.HProcExchBillNo + "'," + omodel.HProcExchQty.ToString() + "," + omodel.HMaterID.ToString() + "," + omodel.HFirstCheckEmp.ToString() + ", " + DBUtility.ClsPub.BoolToString(omodel.HLastResult) +
                "," + omodel.HMainSourceInterID + "," + omodel.HMainSourceEntryID + ",'" + omodel.HMainSourceBillNo + "','" + omodel.HMainSourceBillType + "'," + omodel.HICMOEntryID + "," + omodel.HQCSchemeID + "," + omodel.HShiftsID + ",'" + omodel.HErrTreatment + "','" + omodel.HBatchNo + "'" +
                "," + omodel.HTakeSampleCheckBillID + ",'" + omodel.HTakeSampleCheckBillNo + "','" + omodel.HProcID + "','" + omodel.HRemarkSN + "'" +
                "," + omodel.HTakeSampleCheckBillID + ",'" + omodel.HTakeSampleCheckBillNo + "','" + omodel.HProcID + "','" + omodel.HRemarkSN + "'," + omodel.HCheckQty +
                ") ");
                //插入子表
                foreach (Model.ClsQC_OutCompCheckBillSub oSub in DetailColl)
@@ -213,7 +216,7 @@
                      ",HMax,HMin,HAvg,HSampleSchemeID,HSampleQty,HSampleDamageQty,HAcceptQty" +
                      ",HRejectQty,HSampleUnRightQty,HStatus,HUnitID,HInspectVal,HTargetVal" +
                      ",HUpLimit,HDownLimit,HUpOffSet,HDownOffSet,HKeyInspect,HAnalysisMethod,HInspectInstruMentID,HInspectResult,HQualityStdID,HInspectMethodID,HInspectBasisID,HCompareSymbol" +
                      ") values("
                      ", HInspectValQ) values("
                      + omodel.HInterID.ToString() + ",'" + oSub.HBillNo_bak + "'," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "'" +
                      ",getdate()," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'," + oSub.HSourceInterID.ToString() +
                      "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
@@ -222,7 +225,7 @@
                      "," + oSub.HSampleDamageQty + "," + oSub.HAcceptQty + "," + oSub.HRejectQty + "," + oSub.HSampleUnRightQty + ",'" + oSub.HStatus +
                      "'," + oSub.HUnitID + ",'" + oSub.HInspectVal + "','" + oSub.HTargetVal + "','" + oSub.HUpLimit + "','" + oSub.HDownLimit +
                      "','" + oSub.HUpOffSet + "','" + oSub.HDownOffSet + "'," + oSub.HKeyInspect + ",'" + oSub.HAnalysisMethod + "'," + oSub.HInspectInstruMentID + ",'" + oSub.HInspectResult+
                      "','" + oSub.HQualityStdID + "','" + oSub.HInspectMethodID + "'," + oSub.HInspectBasisID + ",'" + oSub.HCompareSymbol + "'" +
                      "','" + oSub.HQualityStdID + "','" + oSub.HInspectMethodID + "'," + oSub.HInspectBasisID + ",'" + oSub.HCompareSymbol + "'," + oSub.HInspectValQ +
                      ") ");
                }
                //foreach (Model.ClsQC_OutCompCheckBillSub_Item oSub2 in DetailColl1)
@@ -253,6 +256,7 @@
                //    }
                //}
                //
                AddBadReason(ref sReturn);
                sReturn = "新增单据成功！";
                oCn.Commit();
                return true;
@@ -456,6 +460,38 @@
            }
        }

        //新增不良原因
        public virtual bool AddBadReason(ref string sReturn)
        {
            try
            {
                if (DetailCol1_BadReason.Count == 0)
                {
                    return true;
                }
                oCn.RunProc("delete from "+ MvarItemKeySub3 + " where HInterID = " + DetailCol1_BadReason[0].HInterID);

                //插入子表
                foreach (Model.ClsQC_OutCompCheckBillSub_BadReason reason in DetailCol1_BadReason)
                {
                    oCn.RunProc("Insert into " + MvarItemKeySub3 + 
                      " (HInterID,HEntryID,HBillNo_bak,HCloseMan" +
                      ",HRemark,HBadReasonID,HQty,HCheckTime" +
                      ") values("
                      + reason.HInterID + "," + reason.HEntryID + ",'" + reason.HBillNo_bak + "','','" +
                      reason.HRemark + "'," + reason.HBadReasonID + ",'" + reason.HQty + "',getdate()" +
                      ") ");
                }
                sReturn = "新增不良原因成功！";
                return true;
            }
            catch (Exception e)
            {
                sReturn = e.Message;
                throw (e);
            }
        }

        //审核
        public bool CheckBill(Int64 lngBillKey, ref string sReturn)
        {