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

yangle

2022-12-09 526f787a2dfb97f6492912a73376b5a5551a432c

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

@@ -172,19 +172,19 @@
                //根据内码   å›žå¡«å¯¹åº”流转卡 ä¸è‰¯å…³è”数量
                oCn.RunProc("exec h_p_QC_NoPassProdCheckBillToProcExch " + omodel.HInterID.ToString() + ",1");
                //////////////////////////////
                //DataSet Ds;
                //Ds = oCn.RunProcReturn("exec h_p_QC_NoPassProdCheckBillQtyCtrl " + omodel.HInterID.ToString(), "h_p_QC_NoPassProdCheckBillQtyCtrl");
                //if (Ds == null || Ds.Tables[0].Rows.Count == 0)
                //{
                //    oCn.RollBack();
                //    return false;
                //}
                //if (DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBack"]) == "2")
                //{
                //    sReturn = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBackRemark"]);
                //    oCn.RollBack();
                //    return false;
                //}
                DataSet Ds;
                Ds = oCn.RunProcReturn("exec h_p_QC_NoPassProdCheckBill_QtyCtrl " + omodel.HInterID.ToString(), "h_p_QC_NoPassProdCheckBill_QtyCtrl");
                if (Ds == null || Ds.Tables[0].Rows.Count == 0)
                {
                    oCn.RollBack();
                    return false;
                }
                if (DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBack"]) == "2")
                {
                    sReturn = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBackRemark"]);
                    oCn.RollBack();
                    return false;
                }
                ////////////////////////


@@ -219,7 +219,7 @@
                ",HMaterID,HProcID,HMainSourceInterID" +
                ",HProcExchInterID,HProcExchEntryID,HProcExchBillNo,HOrderProcNo,HProcExchQty" +
                ") " +
                " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "'," + omodel.HBillStatus.ToString() + ",'" + omodel.HDate + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
                " values('" + this.BillType + "','" + omodel.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "'," + omodel.HBillStatus.ToString() + ",'" + omodel.HDate + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
                "," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HGroupName.ToString() + "'" +
                "," + omodel.HSourceID.ToString() + "," + omodel.HICMOInterID.ToString() + ",'" + omodel.HICMOBillNo + "'," + omodel.HInStockQty.ToString() + "," + omodel.HCheckQty.ToString() + "," + omodel.HRightQty.ToString() +
                "," + omodel.HBadQty.ToString() + "," + omodel.HPlanQty.ToString() + "," + omodel.HBadPNL.ToString() + "," + omodel.HPlanPNL.ToString() + "," + omodel.HFirstCheckEmp.ToString() +
@@ -275,19 +275,19 @@
                oCn.RunProc("exec h_p_QC_NoPassProdCheckBillToProcExch " + omodel.HInterID.ToString() + ",1");
                //
                //////////////////////////////
                //DataSet Ds;
                //Ds = oCn.RunProcReturn("exec h_p_QC_NoPassProdCheckBillQtyCtrl " + omodel.HInterID.ToString(), "h_p_QC_NoPassProdCheckBillQtyCtrl");
                //if (Ds == null || Ds.Tables[0].Rows.Count == 0)
                //{
                //    oCn.RollBack();
                //    return false;
                //}
                //if (DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBack"]) == "2")
                //{
                //    sReturn = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBackRemark"]);
                //    oCn.RollBack();
                //    return false;
                //}
                DataSet Ds;
                Ds = oCn.RunProcReturn("exec h_p_QC_NoPassProdCheckBill_QtyCtrl " + omodel.HInterID.ToString(), "h_p_QC_NoPassProdCheckBill_QtyCtrl");
                if (Ds == null || Ds.Tables[0].Rows.Count == 0)
                {
                    oCn.RollBack();
                    return false;
                }
                if (DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBack"]) == "2")
                {
                    sReturn = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBackRemark"]);
                    oCn.RollBack();
                    return false;
                }
                ////////////////////////

                //