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

chenhaozhe

8 天以前 c3c3ba8325acc965729de86b896f4dbeea80b8a2

 WebAPI/Controllers/Éú²ú¹ÜÀí/ÖÊÁ¿»ã±¨µ¥/Sc_QualityReportBillController.cs

@@ -247,8 +247,9 @@
                BillNew.HMaker = mainList[0].HMaker;
                BillNew.HMakeDate = mainList[0].HMakeDate;
                BillNew.HReportType = mainList[0].HReportType;
                BillNew.HSourceBillNo = mainList[0].HICMOBillNo;
                BillNew.HSourceInterID = mainList[0].HICMOInterID;
                BillNew.HSourceBillNo = mainList[0].HSourceBillNo;
                BillNew.HSourceInterID = mainList[0].HSourceInterID;
                BillNew.HSourceEntryID = mainList[0].HSourceEntryID;
                BillNew.HSourceBillType = mainList[0].HSourceBillType;
                BillNew.HBadReasonHQty = mainList[0].HBadReasonHQty;
                BillNew.HQty = DBUtility.ClsPub.isLong(mainList[0].HQty);
@@ -265,7 +266,7 @@
                ",'" + BillNew.HProcExchBillNo + "'," + BillNew.HProcExchInterID + "," + BillNew.HProcExchEntryID + "," + BillNew.HProcID + "," + BillNew.HMaterID +
                "," + BillNew.HSourceID + "," + BillNew.HGroupID + "," + BillNew.HDeptID + "," + BillNew.HCheckManID + "," + BillNew.HBadReasonID + ",'" + BillNew.HBarCode + "'" +
                ",'" + BillNew.HMaker + "','" + BillNew.HMakeDate + "','" + BillNew.HBillType + "','" + +BillNew.HReportType + "','" +BillNew.HSourceBillNo + "'" +
                "," + BillNew.HSourceInterID + ",'" + BillNew.HSourceBillType + "'," + BillNew.HICMOEntryID + "," + BillNew.HICMOEntryID + "," + BillNew.HBadReasonHQty + "," + BillNew.HQty +
                "," + BillNew.HSourceInterID + ",'" + BillNew.HSourceBillType + "'," + BillNew.HICMOEntryID + "," + BillNew.HSourceEntryID + "," + BillNew.HBadReasonHQty + "," + BillNew.HQty +
                ") ");
                sReturn = "扫码成功！";
                oCN.Commit();
@@ -531,7 +532,7 @@
            {
                ds = oCN.RunProcReturn(
                    "Select a.HItemID,a.HInterID,b.HNumber HBadReasonNumber,b.HName HBadReasonHName" +
                    ",c.HName HCheckMan,d.HName HGroupName,e.HName HSourceName " +
                    ",c.HName HCheckMan,d.HName HGroupName,e.HName HSourceName,a.HBadReasonID,a.HBadReasonHQty,a.HQty " +
                    " from Sc_ICMOBillQualityStatus_Tmp a " +
                    " left join Gy_BadReason b on a.HBadReasonID = b.HItemID " +
                    " left join Gy_Employee c on a.HCheckManID = c.HItemID " +
@@ -697,6 +698,7 @@

                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    oCN.RollBack();
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "保存后判断失败！";
@@ -705,6 +707,7 @@
                }
                if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
                {
                    oCN.RollBack();
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "保存失败！" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);