WEBS引用更新

yxj

7 天以前 ae36a4639fff74935c27c8e7bb0ce6b39ad039a5

 WebAPI/Controllers/LMESController.cs

@@ -3039,7 +3039,6 @@
                ds = null;
            }
            return CustomCorrect(ds);
            //return ds.Tables[0].Rows;
        }

        //墨西哥白标生成
@@ -3193,7 +3192,6 @@
                ds = null;
            }
            return CustomCorrect(ds);
            //return ds.Tables[0].Rows;
        }

        #endregion
@@ -3252,9 +3250,7 @@
                ds = null;
            }
            return CustomCorrect(ds);
            //return ds.Tables[0].Rows;
        }


        #endregion

@@ -3305,7 +3301,7 @@

        [Route("LEMS/SaveToSc_PackUnionBillMain_MXG")]
        [HttpGet]
        public object SaveToSc_PackUnionBillMain(string HBillNo, string HRemark, string HProjectNum, string zxQty, string BBM, string LDM, string HMaterNumber, string HBarCode_White,string HOrgID,string NBXMH)
        public object SaveToSc_PackUnionBillMain_MXG(string HBillNo, string HRemark, string HProjectNum, string zxQty, string BBM, string LDM, string HMaterNumber, string HBarCode_White,string HOrgID,string NBXMH)
        {
            DataSet ds;
            DataSet dsHSNum;
@@ -3547,7 +3543,6 @@
                ds = null;
            }
            return CustomCorrect(ds);
            //return ds.Tables[0].Rows;
        }

        #endregion
@@ -3952,7 +3947,7 @@
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "[0000-1-051]" + ds.Tables[0].Rows[0]["HBackRemark"].ToString() + "！";
                    objJsonResult.Message = ds.Tables[0].Rows[0]["HBackRemark"].ToString() + "！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
@@ -4411,7 +4406,7 @@
            {
                if (HBillSubType == "SUB")
                {
                    //判断是否有删除权限
                    //判断是否有审核权限
                    if (!DBUtility.ClsPub.Security_Log("Gy_RoutingBill_Sub_Check", 1, false, user))
                    {
                        objJsonResult.code = "0";
@@ -4593,28 +4588,55 @@
                            return objJsonResult;
                        }
                    }
                    //反审核单据
                    if (BillOld.AbandonCheck(Int64.Parse(HInterID), ds.Tables[0].Rows[0]["HBillNo"].ToString(), "h_p_Gy_RoutingBill_AfterUnCheckCtrl", user, ref ClsPub.sExeReturnInfo))
                    {
                        //SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
                        //DataSet DSet = oCn.RunProcReturn("exec h_p_Sc_ICMOBill_AbandonCheckCtrl " + int.Parse(HInterID), "h_p_Sc_ICMOBill_AbandonCheckCtrl");
                        ////if (DBUtility.ClsPub.isInt(DSet.Tables[0].Rows[0]["Hback"]) != 0)
                        ////{
                        ////    objJsonResult.code = "0";
                        ////    objJsonResult.count = 1;
                        ////    objJsonResult.Message = "该任务单已下推流转卡，不允许反审核" + DBUtility.ClsPub.isStrNull(DSet.Tables[0].Rows[0]["HBackRemark"]);
                        ////    objJsonResult.data = null;
                        ////    return objJsonResult;
                        ////}
                    }
                    else

                    string HBillNo = ds.Tables[0].Rows[0]["HBillNo"].ToString();

                    oCN.RunProc(" Update Gy_RoutingBillMain set HChecker='',HCheckDate=null,HBillStatus=1 Where HInterID=" + HInterID.ToString());


                    string sql2 = "exec h_p_Gy_RoutingBill_AfterCheckCtrl " + HInterID + ",'" + HBillNo + "','" + user + "'";
                    ds = oCN.RunProcReturn(sql2, "h_p_Gy_RoutingBill_AfterUnCheckCtrl");
                    if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "审核失败!原因:" + ClsPub.sExeReturnInfo;
                        objJsonResult.Message = "审核失败!原因:审核后判断失败，请与网络管理人员联系";
                        objJsonResult.data = null;
                        oCN.RollBack();
                        return objJsonResult;
                    }

                    if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "审核失败!原因:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
                        objJsonResult.data = null;
                        oCN.RollBack();
                        return objJsonResult;
                    }
                    //反审核单据
                    // if (BillOld.AbandonCheck(HInterID, ds.Tables[0].Rows[0]["HBillNo"].ToString(), "h_p_Gy_RoutingBill_AfterUnCheckCtrl", user, ref ClsPub.sExeReturnInfo))
                    //{
                    //SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
                    //DataSet DSet = oCn.RunProcReturn("exec h_p_Sc_ICMOBill_AbandonCheckCtrl " + int.Parse(HInterID), "h_p_Sc_ICMOBill_AbandonCheckCtrl");
                    ////if (DBUtility.ClsPub.isInt(DSet.Tables[0].Rows[0]["Hback"]) != 0)
                    ////{
                    ////    objJsonResult.code = "0";
                    ////    objJsonResult.count = 1;
                    ////    objJsonResult.Message = "该任务单已下推流转卡，不允许反审核" + DBUtility.ClsPub.isStrNull(DSet.Tables[0].Rows[0]["HBackRemark"]);
                    ////    objJsonResult.data = null;
                    ////    return objJsonResult;
                    ////}
                    //}
                    // else
                    // {
                    //     objJsonResult.code = "0";
                    //     objJsonResult.count = 1;
                    //     objJsonResult.Message = "审核失败!原因:" + ClsPub.sExeReturnInfo;
                    //     objJsonResult.data = null;
                    //     return objJsonResult;
                    // }
                }

                oCN.Commit();//提交事务