派生自 MES-WEB-API
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
zzr99
2021-08-30 f84c16d8a3e18bc25189d4feae18362e1aa8a622 
 WebAPI/Controllers/Éú²ú¹ÜÀí/ÖÊÁ¿»ã±¨µ¥/Sc_QualityReportBillController.cs


@@ -29,13 +29,13 @@


            {


                if (sWhere == null || sWhere.Equals(""))


                {


                    ds = oCN.RunProcReturn("select * from h_v_Sc_QualityReportBillList " + sWhere, "h_v_Sc_QualityReportBillList");


                    ds = oCN.RunProcReturn("select * from h_v_Sc_QualityReportBillListDetail " + sWhere, "h_v_Sc_QualityReportBillListDetail");


                }


                else


                {


                    string sql1 = "select * from h_v_Sc_QualityReportBillList where 1 = 1 ";


                    string sql1 = "select * from h_v_Sc_QualityReportBillListDetail where 1 = 1 ";


                    string sql = sql1 + sWhere;


                    ds = oCN.RunProcReturn(sql, "h_v_Sc_QualityReportBillList");


                    ds = oCN.RunProcReturn(sql, "h_v_Sc_QualityReportBillListDetail");


                }


                if (ds == null || ds.Tables[0].Rows.Count == 0)


                {


@@ -136,13 +136,13 @@


            try


            {


                msg = "[" + msg.ToString() + "]";


                List<Model.Sc_ICMOBillQualityStatus_Tmp> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ICMOBillQualityStatus_Tmp>>(msg);


                List<Model.ClsSc_ICMOBillQualityStatus_Tmp> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ICMOBillQualityStatus_Tmp>>(msg);


                DAL.ClsQC_FirstPieceCheckBill BillNew = new DAL.ClsQC_FirstPieceCheckBill();


                //判断会计期是否合理


                string s = "";


                int sYear = 0;


                int sPeriod = 0;


                DateTime HDate = mainList[0].HDate;//日期


                DateTime HDate = mainList[0].HMakeDate;


                if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)


                {


                    objJsonResult.code = "0";


@@ -155,26 +155,26 @@


                BillNew.omodel.HPeriod = sPeriod;


                //固定赋值=================================


                BillNew.omodel.HInterID = mainList[0].HInterID;//递入type得到的单据ID


                BillNew.omodel.HBillNo = mainList[0].HBillNo;//递入type得到的单据号


                BillNew.omodel.HDate = HDate;


                BillNew.omodel.HRemark = mainList[0].HRemark;//备注


                BillNew.omodel.HMaker = mainList[0].HMaker;


                BillNew.omodel.HSourceID = ClsPub.isLong(mainList[0].HSourceID);


                BillNew.omodel.HICMOInterID = ClsPub.isLong(mainList[0].HICMOInterID);


                BillNew.omodel.HICMOBillNo = ClsPub.isStrNull(mainList[0].HICMOBillNo);


                BillNew.omodel.HICMOInterID = ClsPub.isLong(mainList[0].HICMOInterID);


                BillNew.omodel.HICMOQty = ClsPub.isLong(mainList[0].HICMOQty);


                BillNew.omodel.HProcExchInterID = ClsPub.isLong(mainList[0].HProcExchInterID);


                BillNew.omodel.HProcExchEntryID = ClsPub.isLong(mainList[0].HProcExchEntryID);


                BillNew.omodel.HProcExchBillNo = ClsPub.isStrNull(mainList[0].HProcExchBillNo);


                BillNew.omodel.HProcExchQty = ClsPub.isLong(mainList[0].HProcExchQty);


                BillNew.omodel.HMaterID = ClsPub.isLong(mainList[0].HMaterID);


                BillNew.omodel.HFirstCheckEmp = ClsPub.isLong(mainList[0].HFirstCheckEmp);


                BillNew.omodel.HLastResult = ClsPub.isBool(mainList[0].HLastResult);


                BillNew.omodel.HMainSourceInterID = ClsPub.isLong(mainList[0].HMainSourceInterID);


                BillNew.omodel.HMainSourceEntryID = ClsPub.isLong(mainList[0].HMainSourceEntryID);


                BillNew.omodel.HMainSourceBillNo = ClsPub.isStrNull(mainList[0].HMainSourceBillNo);


                BillNew.omodel.HMainSourceBillType = ClsPub.isStrNull(mainList[0].HMainSourceBillType);


                //BillNew.omodel.HBillNo = mainList[0].HBillNo;//递入type得到的单据号


                //BillNew.omodel.HDate = HDate;


                //BillNew.omodel.HRemark = mainList[0].HRemark;//备注


                //BillNew.omodel.HMaker = mainList[0].HMaker;


                //BillNew.omodel.HSourceID = ClsPub.isLong(mainList[0].HSourceID);


                //BillNew.omodel.HICMOInterID = ClsPub.isLong(mainList[0].HICMOInterID);


                //BillNew.omodel.HICMOBillNo = ClsPub.isStrNull(mainList[0].HICMOBillNo);


                //BillNew.omodel.HICMOInterID = ClsPub.isLong(mainList[0].HICMOInterID);


                //BillNew.omodel.HICMOQty = ClsPub.isLong(mainList[0].HICMOQty);


                //BillNew.omodel.HProcExchInterID = ClsPub.isLong(mainList[0].HProcExchInterID);


                //BillNew.omodel.HProcExchEntryID = ClsPub.isLong(mainList[0].HProcExchEntryID);


                //BillNew.omodel.HProcExchBillNo = ClsPub.isStrNull(mainList[0].HProcExchBillNo);


                //BillNew.omodel.HProcExchQty = ClsPub.isLong(mainList[0].HProcExchQty);


                //BillNew.omodel.HMaterID = ClsPub.isLong(mainList[0].HMaterID);


                //BillNew.omodel.HFirstCheckEmp = ClsPub.isLong(mainList[0].HFirstCheckEmp);


                //BillNew.omodel.HLastResult = ClsPub.isBool(mainList[0].HLastResult);


                //BillNew.omodel.HMainSourceInterID = ClsPub.isLong(mainList[0].HMainSourceInterID);


                //BillNew.omodel.HMainSourceEntryID = ClsPub.isLong(mainList[0].HMainSourceEntryID);


                //BillNew.omodel.HMainSourceBillNo = ClsPub.isStrNull(mainList[0].HMainSourceBillNo);


                //BillNew.omodel.HMainSourceBillType = ClsPub.isStrNull(mainList[0].HMainSourceBillType);


                BillNew.omodel.HBillStatus = 1;


                //保存完毕后处理


                if (OperationType.Equals("1") || OperationType.Equals("2"))


@@ -196,7 +196,7 @@


                    objJsonResult.code = "1";


                    objJsonResult.count = 1;


                    //objJsonResult.Message = "单据存盘完毕!单据号:" + mainList[0].HBillNo.Trim();


                    objJsonResult.Message = ClsPub.sExeReturnInfo + "单据号:" + mainList[0].HBillNo.Trim();


                    objJsonResult.Message = ClsPub.sExeReturnInfo + "单据号:" ;


                    objJsonResult.data = null;


                    return objJsonResult;


                }