安瑞 增加完成状态

王 垚

2022-04-27 da7a4fff9828c9958945f1aed7218f063b0b2dea

安瑞 增加完成状态

 WebAPI/Controllers/EntrustOrderController.cs

@@ -63,22 +63,12 @@
                Int64 RowTotal = Common.GetRowTotal("H_v_SRM_EntrustOrderBillList", VsWhere, ref DBUtility.ClsPub.sExeReturnInfo);
                //获取返回数据
                ds = oCn.RunProcReturn("exec H_p_SRM_EntrustOrderBillList '" + PcWhere + "'", "H_p_SRM_EntrustOrderBillList");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objjson.code = "0";
                    objjson.count = 0;
                    objjson.Message = "获取失败";
                    objjson.data = null;
                    return objjson;
                }
                else
                {
                    objjson.code = "0";
                    objjson.count = 10000;
                    objjson.Message = "获取成功";
                    objjson.data = ds.Tables[0];
                    return objjson;
                }

                objjson.code = "0";
                objjson.count = 1;
                objjson.Message = "获取成功";
                objjson.data = ds.Tables[0];
                return objjson;
            }
            catch (Exception e)
            {

 WebAPI/Controllers/POInStockController.cs

@@ -156,8 +156,7 @@
                    objjson.data = null;
                    return objjson;
                }
                DAL.ClsCg_POInStockBill oClsCg_POInStockBill = new DAL.ClsCg_POInStockBill();
                ds = oClsCg_POInStockBill.ShowNewBillMainTo(DBUtility.ClsPub.isLong(sMsg), DBUtility.ClsPub.isStrNull(sMsg3), ShowItem, ref DBUtility.ClsPub.sExeReturnInfo);
                ds = ShowNewBillMainTo(DBUtility.ClsPub.isLong(sMsg), DBUtility.ClsPub.isStrNull(sMsg3), ShowItem, ref DBUtility.ClsPub.sExeReturnInfo);
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objjson.code = "0";
@@ -395,10 +394,10 @@
                if (oBill.omodel.HInterID == 0)
                {
                    LogService.Write("保存测试1");
                    LogService.Write("model:"+ oBill.omodel);
                    LogService.Write("model:" + oBill.omodel);
                    // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
                    bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
                    LogService.Write("测试问题"+ DBUtility.ClsPub.sExeReturnInfo);
                    LogService.Write("测试问题" + DBUtility.ClsPub.sExeReturnInfo);
                    LogService.Write("保存测试2");

                }
@@ -1049,5 +1048,29 @@
            }
        }


        //显示单据头
        public DataSet ShowNewBillMainTo(Int64 lngBillKey, string HBillType, string sShowItem, ref string sReturn)
        {
            try
            {
                SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
                //查询主表
                DataSet Ds;
                Ds = oCn.RunProcReturn(" exec h_p_SRM_POInStockBillMain_ForWeb " + lngBillKey.ToString() + ",'" + HBillType + "'", "h_p_SRM_POInStockBillMain_ForWeb");
                if (Ds == null || Ds.Tables[0].Rows.Count == 0)
                {
                    sReturn = "单据头未找到！";
                    return null;
                }
                sReturn = "显示单据头成功！";
                return Ds;
            }
            catch (Exception e)
            {
                sReturn = e.Message;
                return null;
            }
        }
    }
}

 WebAPI/Controllers/POOrderController.cs

@@ -67,22 +67,12 @@
                //LogService.WriteAsync(sql);

                ds = oCn.RunProcReturn("exec H_p_SRM_POOrderBillList '" + PcWhere + "'", "H_p_SRM_POOrderBillList");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objjson.code = "0";
                    objjson.count = 0;
                    objjson.Message = "无数据";
                    objjson.data = null;
                    return objjson;
                }
                else
                {
                    objjson.code = "0";
                    objjson.count = 10000;
                    objjson.Message = "获取成功";
                    objjson.data = ds.Tables[0];
                    return objjson;
                }
                objjson.code = "0";
                objjson.count = 1;
                objjson.Message = "获取成功";
                objjson.data = ds.Tables[0];
                return objjson;

            }
            catch (Exception e)
            {