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

yangle

2022-07-25 061a166a87fd30ae6a4e61785e3c36a1c313f8a6

 WebAPI/DLL/ClsWW_EntrustWorkOrderBill.cs

@@ -190,29 +190,29 @@
                      ") ");
                }

                //根据内码 委外工单表头供应商 回填对应流转卡 供应商，有委外标记才回填..并且回填 关联数量
                oCn.RunProc("exec h_p_WW_EntrustWorkOrderToProcExch " + omodel.HInterID.ToString());
                //
                DataSet Ds;
                Ds = oCn.RunProcReturn("exec h_p_WW_EntrustWorkOrderToProcExch_QtyCtrl " + omodel.HInterID.ToString() + "", "h_p_WW_EntrustWorkOrderToProcExch_QtyCtrl");
                if (Ds == null)
                {
                    sReturn = "判断数量失败！";
                    oCn.RollBack();
                    return false;
                }
                if (Ds.Tables[0].Rows.Count == 0)
                {
                    sReturn = "判断数量失败！";
                    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;
                }
                ////根据内码 委外工单表头供应商 回填对应流转卡 供应商，有委外标记才回填..并且回填 关联数量
                //oCn.RunProc("exec h_p_WW_EntrustWorkOrderToProcExch " + omodel.HInterID.ToString());
                ////
                //DataSet Ds;
                //Ds = oCn.RunProcReturn("exec h_p_WW_EntrustWorkOrderToProcExch_QtyCtrl " + omodel.HInterID.ToString() + "", "h_p_WW_EntrustWorkOrderToProcExch_QtyCtrl");
                //if (Ds == null)
                //{
                //    sReturn = "判断数量失败！";
                //    oCn.RollBack();
                //    return false;
                //}
                //if (Ds.Tables[0].Rows.Count == 0)
                //{
                //    sReturn = "判断数量失败！";
                //    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;
                //}
                //
                sReturn = "新增单据成功！";
                oCn.Commit();