From b01e1fddc24128e23a5a4528dbf903676f5f7681 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期日, 19 十一月 2023 20:50:53 +0800
Subject: [PATCH] 销售码单打印模块，新增反审核功能，打印码单去除审核判断控制；新增PDA缓存列表调用方法
---
WarM/仓库管理/Kf_SellOutBill_BarCodeNote.cs | 39 ++++++++-
WebAPI/Controllers/条码管理/WEBSController.cs | 52 +++++++++++++
WebAPI/Web.config | 4
WarM/仓库管理/Kf_SellOutBill_BarCodeNote.designer.cs | 121 ++++++++++++++++++------------
WarM/仓库管理/Kf_SellOutBill_BarCodeNote.resx | 13 +++
5 files changed, 173 insertions(+), 56 deletions(-)
diff --git "a/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_SellOutBill_BarCodeNote.cs" "b/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_SellOutBill_BarCodeNote.cs"
index 37c58d0..d203224 100644
--- "a/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_SellOutBill_BarCodeNote.cs"
+++ "b/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_SellOutBill_BarCodeNote.cs"
@@ -29,6 +29,7 @@
public Int64 HStockOrgID = DBUtility.ClsPub.HOrgID;
public DateTime HDate = DateTime.Today;
public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+ public DAL.ClsKf_SellOutBill BillOld = new DAL.ClsKf_SellOutBill(); //瀵瑰簲鍗曟嵁绫�
SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
#region //鍥哄畾浠ｇ爜
@@ -338,28 +339,31 @@
//鐢荤嚎
GraphLine();
- //鏈鏍�
if (cmbHBillStatus.Text == "宸插鏍�")
{
sh.Enabled = false;
+ fsh.Enabled = true;
pic1.Visible = true;
pic1.Image = System.Drawing.Image.FromFile(DBUtility.ClsPub.AppPath + @"/Pic/Checked.jpg");
}
else if (cmbHBillStatus.Text == "宸插叧闂�")
{
sh.Enabled = false;
+ fsh.Enabled = false;
pic1.Visible = true;
pic1.Image = System.Drawing.Image.FromFile(DBUtility.ClsPub.AppPath + @"/Pic/Closed.jpg");
}
else if (cmbHBillStatus.Text == "宸蹭綔搴�")
{
sh.Enabled = false;
+ fsh.Enabled = false;
pic1.Visible = true;
pic1.Image = System.Drawing.Image.FromFile(DBUtility.ClsPub.AppPath + @"/Pic/Deleted.jpg");
}
else
{
sh.Enabled = true;
+ fsh.Enabled = false;
pic1.Visible = false;
pic1.Image = null;
}
@@ -398,9 +402,32 @@
{
cmbHBillStatus.Text="宸插鏍�";
sh.Enabled = false;
+ fsh.Enabled = true;
pic1.Visible = true;
pic1.Image = System.Drawing.Image.FromFile(DBUtility.ClsPub.AppPath + @"/Pic/Checked.jpg");
MessageBox.Show("瀹℃牳鎴愬姛锛�", "鎻愮ず");
+ return;
+ }
+ }
+
+ #endregion
+
+ #region //鍙嶅鏍搁攢鍞嚭搴撳崟
+ private void fsh_Click(object sender, EventArgs e)
+ {
+ if (BillOld.AbandonCheck(HInterID, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ {
+ cmbHBillStatus.Text = "鍒涘缓";
+ sh.Enabled = true;
+ fsh.Enabled = false;
+ pic1.Visible = false;
+ pic1.Image = null;
+ MessageBox.Show("鍙嶅鏍告垚鍔燂紒", "鎻愮ず");
+ return;
+ }
+ else
+ {
+ MessageBox.Show("鍙嶅鏍稿け璐�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo, "鎻愮ず");
return;
}
}
@@ -505,11 +532,11 @@
private void BarCodedy_Click(object sender, EventArgs e)
{
- if (cmbHBillStatus.Text != "宸插鏍�")
- {
- MessageBox.Show("鎵�閫夊崟鎹搴斿崟鎹姸鎬佷笉涓衡�樺凡瀹℃牳鈥欑姸鎬侊紝涓嶅厑璁告墦鍗帮紒", "鎻愮ず");
- return;
- }
+ //if (cmbHBillStatus.Text != "宸插鏍�")
+ //{
+ // MessageBox.Show("鎵�閫夊崟鎹搴斿崟鎹姸鎬佷笉涓衡�樺凡瀹℃牳鈥欑姸鎬侊紝涓嶅厑璁告墦鍗帮紒", "鎻愮ず");
+ // return;
+ //}
//閫夋嫨鎵撳嵃妯℃澘
BLL.Gy_OpenTmp oFrm = new BLL.Gy_OpenTmp();
oFrm.sBillName = ModName;
diff --git "a/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_SellOutBill_BarCodeNote.designer.cs" "b/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_SellOutBill_BarCodeNote.designer.cs"
index 57a6d6e..77a4f80 100644
--- "a/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_SellOutBill_BarCodeNote.designer.cs"
+++ "b/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_SellOutBill_BarCodeNote.designer.cs"
@@ -30,8 +30,8 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Kf_SellOutBill_BarCodeNote));
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
this.Tool = new System.Windows.Forms.ToolStrip();
this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
this.mrlk = new System.Windows.Forms.ToolStripButton();
@@ -101,6 +101,8 @@
this.tabPage1 = new System.Windows.Forms.TabPage();
this.tabPage2 = new System.Windows.Forms.TabPage();
this.grdBarCode = new System.Windows.Forms.DataGridView();
+ this.tabPage3 = new System.Windows.Forms.TabPage();
+ this.grdTM = new System.Windows.Forms.DataGridView();
this.panel1 = new System.Windows.Forms.Panel();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.label1 = new System.Windows.Forms.Label();
@@ -111,8 +113,8 @@
this.涓棿 = new System.Windows.Forms.Panel();
this.搴曢儴 = new System.Windows.Forms.Panel();
this.鍙充晶 = new System.Windows.Forms.Panel();
- this.tabPage3 = new System.Windows.Forms.TabPage();
- this.grdTM = new System.Windows.Forms.DataGridView();
+ this.fsh = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
this.Tool.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();
this.gbUp.SuspendLayout();
@@ -122,11 +124,11 @@
this.tabPage1.SuspendLayout();
this.tabPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.grdBarCode)).BeginInit();
+ this.tabPage3.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.grdTM)).BeginInit();
this.panel1.SuspendLayout();
this.groupBox1.SuspendLayout();
this.panel2.SuspendLayout();
- this.tabPage3.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.grdTM)).BeginInit();
this.SuspendLayout();
//
// Tool
@@ -144,6 +146,8 @@
this.tp,
this.toolStripSeparator1,
this.sh,
+ this.toolStripSeparator6,
+ this.fsh,
this.toolStripSeparator2,
this.Billdy,
this.toolStripSeparator5,
@@ -313,14 +317,14 @@
this.grdMain.AllowUserToDeleteRows = false;
this.grdMain.BackgroundColor = System.Drawing.SystemColors.ControlLightLight;
this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window;
- dataGridViewCellStyle3.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText;
- dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
- this.grdMain.DefaultCellStyle = dataGridViewCellStyle3;
+ dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window;
+ dataGridViewCellStyle1.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText;
+ dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+ this.grdMain.DefaultCellStyle = dataGridViewCellStyle1;
this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;
this.grdMain.Location = new System.Drawing.Point(3, 3);
this.grdMain.Margin = new System.Windows.Forms.Padding(0);
@@ -870,14 +874,14 @@
this.grdSub.AllowUserToDeleteRows = false;
this.grdSub.BackgroundColor = System.Drawing.SystemColors.ControlLightLight;
this.grdSub.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window;
- dataGridViewCellStyle4.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText;
- dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
- this.grdSub.DefaultCellStyle = dataGridViewCellStyle4;
+ dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window;
+ dataGridViewCellStyle2.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText;
+ dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+ this.grdSub.DefaultCellStyle = dataGridViewCellStyle2;
this.grdSub.Dock = System.Windows.Forms.DockStyle.Fill;
this.grdSub.Location = new System.Drawing.Point(0, 73);
this.grdSub.Margin = new System.Windows.Forms.Padding(0);
@@ -940,6 +944,34 @@
this.grdBarCode.Size = new System.Drawing.Size(1091, 377);
this.grdBarCode.TabIndex = 46;
this.grdBarCode.Paint += new System.Windows.Forms.PaintEventHandler(this.grdBarCode_Paint);
+ //
+ // tabPage3
+ //
+ this.tabPage3.Controls.Add(this.grdTM);
+ this.tabPage3.Location = new System.Drawing.Point(4, 22);
+ this.tabPage3.Name = "tabPage3";
+ this.tabPage3.Padding = new System.Windows.Forms.Padding(3);
+ this.tabPage3.Size = new System.Drawing.Size(1097, 383);
+ this.tabPage3.TabIndex = 2;
+ this.tabPage3.Text = "鏉＄爜鏄庣粏";
+ this.tabPage3.UseVisualStyleBackColor = true;
+ //
+ // grdTM
+ //
+ this.grdTM.AllowUserToAddRows = false;
+ this.grdTM.AllowUserToDeleteRows = false;
+ this.grdTM.BackgroundColor = System.Drawing.SystemColors.ControlLightLight;
+ this.grdTM.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.grdTM.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.grdTM.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.grdTM.Location = new System.Drawing.Point(3, 3);
+ this.grdTM.Name = "grdTM";
+ this.grdTM.ReadOnly = true;
+ this.grdTM.RowHeadersWidth = 30;
+ this.grdTM.RowTemplate.Height = 23;
+ this.grdTM.Size = new System.Drawing.Size(1091, 377);
+ this.grdTM.TabIndex = 47;
+ this.grdTM.Paint += new System.Windows.Forms.PaintEventHandler(this.grdTM_Paint);
//
// panel1
//
@@ -1040,33 +1072,24 @@
this.鍙充晶.Size = new System.Drawing.Size(12, 627);
this.鍙充晶.TabIndex = 64;
//
- // tabPage3
+ // fsh
//
- this.tabPage3.Controls.Add(this.grdTM);
- this.tabPage3.Location = new System.Drawing.Point(4, 22);
- this.tabPage3.Name = "tabPage3";
- this.tabPage3.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage3.Size = new System.Drawing.Size(1097, 383);
- this.tabPage3.TabIndex = 2;
- this.tabPage3.Text = "鏉＄爜鏄庣粏";
- this.tabPage3.UseVisualStyleBackColor = true;
+ this.fsh.AutoSize = false;
+ this.fsh.Image = ((System.Drawing.Image)(resources.GetObject("fsh.Image")));
+ this.fsh.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.fsh.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.fsh.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.fsh.Name = "fsh";
+ this.fsh.Size = new System.Drawing.Size(70, 47);
+ this.fsh.Text = "鍙嶅鏍稿崟鎹�";
+ this.fsh.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.fsh.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.fsh.Click += new System.EventHandler(this.fsh_Click);
//
- // grdTM
+ // toolStripSeparator6
//
- this.grdTM.AllowUserToAddRows = false;
- this.grdTM.AllowUserToDeleteRows = false;
- this.grdTM.BackgroundColor = System.Drawing.SystemColors.ControlLightLight;
- this.grdTM.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- this.grdTM.Dock = System.Windows.Forms.DockStyle.Fill;
- this.grdTM.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.grdTM.Location = new System.Drawing.Point(3, 3);
- this.grdTM.Name = "grdTM";
- this.grdTM.ReadOnly = true;
- this.grdTM.RowHeadersWidth = 30;
- this.grdTM.RowTemplate.Height = 23;
- this.grdTM.Size = new System.Drawing.Size(1091, 377);
- this.grdTM.TabIndex = 47;
- this.grdTM.Paint += new System.Windows.Forms.PaintEventHandler(this.grdTM_Paint);
+ this.toolStripSeparator6.Name = "toolStripSeparator6";
+ this.toolStripSeparator6.Size = new System.Drawing.Size(6, 50);
//
// Kf_SellOutBill_BarCodeNote
//
@@ -1097,12 +1120,12 @@
this.tabPage1.ResumeLayout(false);
this.tabPage2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.grdBarCode)).EndInit();
+ this.tabPage3.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.grdTM)).EndInit();
this.panel1.ResumeLayout(false);
this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout();
this.panel2.ResumeLayout(false);
- this.tabPage3.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.grdTM)).EndInit();
this.ResumeLayout(false);
}
@@ -1189,5 +1212,7 @@
private System.Windows.Forms.PictureBox pic1;
private System.Windows.Forms.TabPage tabPage3;
private System.Windows.Forms.DataGridView grdTM;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator6;
+ private System.Windows.Forms.ToolStripButton fsh;
}
}
\ No newline at end of file
diff --git "a/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_SellOutBill_BarCodeNote.resx" "b/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_SellOutBill_BarCodeNote.resx"
index 7a5bbe9..b0ac140 100644
--- "a/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_SellOutBill_BarCodeNote.resx"
+++ "b/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_SellOutBill_BarCodeNote.resx"
@@ -410,6 +410,19 @@
8iQ1XvVn58xU1WnxG1zAJmn61pmIPgBiIY95z/CSIgAAAABJRU5ErkJggg==
</value>
</data>
+ <data name="fsh.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGgSURBVDhPlZPPK8NhHMc/5T7tRM0cOCAHJXGbxQ7c/AEc
+ d1EcjEwytSiH4SZcRHLQ7FemtlJDOPiZml8XSzMWMz9mK7Xevs/z7DvDzLzr9X2253k+r8+nvn0pM10t
+ hGykjnMndRE1ZWJlVKvF+qdErytIF/1G6k72sMPTBULIRcCF4H2bcOMknC8SNsb/IXheJ8R8hAfPPwUH
+ M4Qz6fKVlXBtJwRWxP99aX/NnKfgcJZwMkfwS9OwdW86TwFLc6MGmxPE2Zok+CwCzwjB5XDkLpbDJHYj
+ cax9ArbHDzukt5HJ9wxbpuGe7+fvvL1esLU6BTmsSHpyfggGRiaxe3yJaJzfhbI/wGHJ7MqKS1ZKv+xx
+ gWFoDDtH57h7jCGeSGDQHoTJGUwL5M6MSrsKFd5y/jst6DaapQkuEI6+4eU1hoZRP4dFFhTMK6FYUKB4
+ SQHVciGKbMpPQafBxAWhiDRBPA7S73O4gH0HWtGtza9BrVslCnUSrSmBPAET3Eee0GO9Ra8tjGQyySUs
+ 8iQ1XvVn58xU1WnxG1zAJmn61pmIPgBiIY95z/CSIgAAAABJRU5ErkJggg==
+</value>
+ </data>
<data name="Billdy.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
diff --git "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs" "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
index 4a61c07..4e08991 100644
--- "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
+++ "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
@@ -780,6 +780,58 @@
#region 缂撳瓨鍒楄〃妯″潡璋冪敤
+ #region 缂撳瓨鍒楄〃鐣岄潰锛岃繑鍥炵紦瀛樺垪琛ㄤ俊鎭�
+
+ /// <summary>
+ /// 缂撳瓨鍒楄〃鐣岄潰锛岃繑鍥炵紦瀛樺垪琛ㄤ俊鎭�
+ /// </summary>
+ /// <returns></returns>
+ [Route("WEBSController/GetKf_PonderationBillMain_TempList_New_Json")]
+ [HttpGet]
+ public object GetKf_PonderationBillMain_TempList_New_Json(string HBillType, string HMaker, Int64 HStockOrgID)
+ {
+ try
+ {
+ ds = oWebs.GetKf_PonderationBillMain_TempList_New(HBillType, HMaker, HStockOrgID);
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ List<object> columnNameList = new List<object>();
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString)); //鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇鍗曟嵁缂撳瓨鍒楄〃淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鑾峰彇鍗曟嵁缂撳瓨鍒楄〃淇℃伅澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
+
#region 缂撳瓨鍒楄〃 缂栬緫鍔熻兘璋冪敤
/// <summary>
diff --git a/WebAPI/Web.config b/WebAPI/Web.config
index 1a5fed7..92d9332 100644
--- a/WebAPI/Web.config
+++ b/WebAPI/Web.config
@@ -22,7 +22,7 @@
<!--<add key="FileIP" value="http://localhost:8082/LuBaoAPI"/>-->
<!--<add key="FileIP" value="http://localhost:8080/" />-->
<!--<add key="sUrl" value="http://183.129.128.86:9090/WEBS-WMSTest/WebService1.asmx"/> -->
- <!--<add key="sUrl" value="http://192.168.63.20/WEBS-WMS/WebService1.asmx"/>--><!--棰滃彴寮忔満-->
+ <add key="sUrl" value="http://192.168.63.20/WEBS-WMS/WebService1.asmx"/><!--棰滃彴寮忔満-->
<!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> 澶忓疂-->
<!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> -->
<!--<add key="sUrl" value="http://10.10.130.181/WEBS-WMS/WebService1.asmx"/> 鍗氭棩绉戞妧-->
@@ -34,7 +34,7 @@
<!--<add key="sUrl" value="http://192.168.80.90:9090/WEBS-WMS/WebService1.asmx"/> 瀹夌憺鏈嶅姟鍣�-->
<!--<add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx"/> --> <!--娴嬭瘯鏈嶅姟鍣�-->
<!--<add key="sUrl" value="http://localhost:8082/WEBS/WebService1.asmx"/> 鏈湴-->
- <add key="sUrl" value="http://192.168.56.1:81/web/WebService1.asmx"/> <!--闄堥洴闈欐湰鍦伴厤缃�-->
+ <!--<add key="sUrl" value="http://192.168.56.1:81/web/WebService1.asmx"/>--> <!--闄堥洴闈欐湰鍦伴厤缃�-->
<add key="webpages:Version" value="3.0.0.0" />
<add key="webpages:Enabled" value="false" />
<add key="ClientValidationEnabled" value="true" />
--
Gitblit v1.9.1