From 5a01014dc116813fd4ea05b61e1eb6eec669f95d Mon Sep 17 00:00:00 2001
From: wangbin <lan@DESKTOP-MG88OFJ>
Date: 星期一, 08 七月 2024 09:25:48 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/仓存管理/验收入库/Kf_EntrustOutBackBillController.cs | 10
WebAPI/Controllers/QC_ManagementController.cs | 10
WebAPI/Controllers/CGGL/Kf_POStockInBackBillController.cs | 12
WebAPI/WebAPI.csproj.user | 2
WebAPI/Controllers/SCGL/日计划管理/JIT_Cg_PODemandPlanBillController.cs | 9
WebAPI/Controllers/仓存管理/领料发货/Kf_StepFoldOutBillController.cs | 12
WarM/条码打印/Kf_WeighToBarCode.cs | 340 +++++++++++
WebAPI/Controllers/QC_POStockInCheckBillController.cs | 14
WebAPI/Controllers/CGGL/WW_EntrustOrderBillController.cs | 12
WarM/条码打印/Kf_WeighToBarCode.resx | 18
WebAPI/Controllers/SCGL/Sc_ICMOReportBillController.cs | 9
WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs | 12
WebAPI/Controllers/Kf_ICStockBillMainController.cs | 12
WebAPI/Controllers/XSGL/Xs_SeOutStockBackBillController.cs | 10
WebAPI/Controllers/仓存管理/条码生成/Gy_BarCodeBill_OutController.cs | 9
WebAPI/Controllers/仓存管理/领料发货/Kf_MateOutBackBillController.cs | 9
WebAPI/Controllers/生产管理/报工台工序/Sc_MESEndStepWorkBillController.cs | 12
WebAPI/Controllers/Sc_MouldRepairInBillListController.cs | 50 +
WebAPI/Controllers/仓存管理/验收入库/Kf_ProductInBillController.cs | 3
WebAPI/Controllers/生产管理/报工台工序/Sc_MESBeginStepWorkBillController.cs | 9
WebAPI/Controllers/SCGL/Sc_PPBomBillController.cs | 8
WebAPI/Controllers/仓存管理/调拨盘点/Kf_MoveStockRequestBillController.cs | 9
WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs | 9
WebAPI/Controllers/仓存管理/领料发货/Kf_StockOutRequestBillController.cs | 12
WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs | 9
WarM/条码打印/Kf_WeighToBarCode.designer.cs | 556 +++++++++++++-----
WebAPI/Controllers/BaseSet/Gy_ModelTypeController.cs | 10
WebAPI/Controllers/SCGL/日计划管理/Sc_WorkDemandPlanBillController.cs | 10
WebAPI/Controllers/仓存管理/领料发货/Kf_MateOutRequestBillController.cs | 11
WebAPI/Controllers/生产管理/报工台工序/Sc_MESReturnStepWorkBillController.cs | 10
WebAPI/Controllers/CGGL/Cg_PORequestBillController.cs | 2
WebAPI/Controllers/LMESController.cs | 50 +
WebAPI/Controllers/生产管理/报工台工序/Sc_MESStopStepWorkBillController.cs | 12
WebAPI/Controllers/仓存管理/条码生成/KF_BarCodeStatusChangeBillController.cs | 10
WebAPI/Controllers/生产管理/报工台工序/Sc_QualityReportStepBillController.cs | 12
WebAPI/Controllers/SCGL/Sc_ProductionReturnBillController.cs | 9
WebAPI/Controllers/CGGL/Kf_POStockInBillController.cs | 11
WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs | 11
WebAPI/Controllers/SCGL/QC_OutCompCheckBillController.cs | 11
WebAPI/Properties/PublishProfiles/FolderProfile9.pubxml | 2
WebAPI/Controllers/仓存管理/委外用料/WW_PPBomBillController.cs | 24
WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs | 4
WebAPI/Properties/PublishProfiles/FolderProfile9.pubxml.user | 160 ++--
WebAPI/Controllers/仓存管理/验收入库/Kf_StepFoldinBillController.cs | 18
WebAPI/Controllers/生产管理/报工台工序/Sc_MESProductReportStepBillController.cs | 11
WebAPI/Controllers/SCGL/日计划管理/Sc_JIT_ComplementGoodBillController.cs | 20
WebAPI/Controllers/SCGL/日计划管理/Sc_WorkBillSortBillController.cs | 17
WebAPI/Controllers/CGGL/Cg_POInStockBackBillController.cs | 16
WebAPI/Controllers/仓存管理/领料发货/Kf_MateOutBillController.cs | 12
WebAPI/Controllers/Sc_ProcessMangementController.cs | 11
WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs | 47 +
51 files changed, 1,369 insertions(+), 319 deletions(-)
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Kf_WeighToBarCode.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Kf_WeighToBarCode.cs"
index 42fd702..6f1e97c 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Kf_WeighToBarCode.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Kf_WeighToBarCode.cs"
@@ -12,6 +12,9 @@
using System.IO;
using Pub_Class;
+using System.IO.Ports;
+using System.Linq;
+
namespace WarM
{
public partial class Kf_WeighToBarCode : Form
@@ -49,6 +52,13 @@
public DAL.ClsGy_BarCodeBill_Ctl oBar = new DAL.ClsGy_BarCodeBill_Ctl();
public DBUtility.ClsPub.Enum_BillStatus BillStatus;
SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+
+
+ private static string repeatData = string.Empty;
+ private SerialPort ComDevice = null;
+ private int HGetWeight = 0;
+ private string Message = "";
+ private int timeIndex = 0;
#region //鍥哄畾浠ｇ爜
@@ -176,6 +186,228 @@
DBUtility.Xt_BaseBillFun.DefaultGridView(grdMain, this.Name);
DBUtility.Xt_BaseBillFun.DefaultGridView(grdSub, this.Name + "grdSub");
}
+
+
+ //鎵撳紑涓插彛
+ private void button3_Click(object sender, EventArgs e)
+ {
+ OpenCom();
+ }
+ public void OpenCom()
+ {
+ //鍒濆鍖栦覆鍙�
+ ComDevice = new SerialPort();
+ ComDevice.DataReceived += new SerialDataReceivedEventHandler(Com_DataReceived);//缁戝畾浜嬩欢
+ string[] PortNames = SerialPort.GetPortNames();
+
+
+ if (!ComDevice.IsOpen)
+ {
+
+ try
+ {
+ ComDevice.PortName = txtPortName.Text;
+ ComDevice.BaudRate = int.Parse(txtBaudRate.Text);
+ switch (cmbParity.SelectedItem.ToString())
+ {
+ case "0":
+ ComDevice.Parity = Parity.None;
+ break;
+ case "1":
+ ComDevice.Parity = Parity.Odd;
+ break;
+ case "2":
+ ComDevice.Parity = Parity.Even;
+ break;
+ case "3":
+ ComDevice.Parity = Parity.Mark;
+ break;
+ case "4":
+ ComDevice.Parity = Parity.Space;
+ break;
+ default:
+ break;
+ }
+
+ ComDevice.DataBits = int.Parse(txtDataBits.Text);
+ switch (cmbStopBits.SelectedItem.ToString())
+ {
+ case "0":
+ ComDevice.StopBits = StopBits.None;
+ break;
+ case "1":
+ ComDevice.StopBits = StopBits.One;
+ break;
+ case "2":
+ ComDevice.StopBits = StopBits.Two;
+ break;
+ case "1.5":
+ ComDevice.StopBits = StopBits.OnePointFive;
+ break;
+ default:
+ break;
+ }
+
+ ComDevice.Open();
+
+ //lblComStatus.Text = "涓插彛鐘舵�侊細寮�鍚�";
+ timer3.Enabled = true;
+ }
+ catch (Exception ex)
+ {
+ MessageBox.Show("鎵撳紑涓插彛澶辫触锛�" + ex.Message, "閿欒", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ return;
+ }
+ }
+ else
+ {
+
+ }
+ }
+
+ //鍏抽棴涓插彛
+ private void button2_Click(object sender, EventArgs e)
+ {
+ CloseCom();
+ }
+ public void CloseCom()
+ {
+ if (!ComDevice.IsOpen)
+ {
+
+ }
+ else
+ {
+ try
+ {
+ timer3.Enabled = false;
+ Thread.Sleep(100);
+ ComDevice.Close();
+ // valueCounts = new Dictionary<string, int>();
+ // lblComStatus.Text = "涓插彛鐘舵�侊細鍏抽棴";
+
+ }
+ catch (Exception ex)
+ {
+ MessageBox.Show(ex.Message, "閿欒", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ return;
+ }
+ }
+ }
+
+ //鍙戦�佹暟鎹�
+ public bool SendData(byte[] data)
+ {
+ if (ComDevice.IsOpen)
+ {
+ try
+ {
+ ComDevice.Write(data, 0, data.Length);//鍙戦�佹暟鎹�
+ return true;
+ }
+ catch (Exception ex)
+ {
+ MessageBox.Show(ex.Message, "閿欒", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ }
+ finally
+ {
+
+ }
+ }
+ else
+ {
+ MessageBox.Show("涓插彛鏈墦寮�", "閿欒", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ }
+ return false;
+ }
+
+ //鎺ユ敹鏁版嵁
+ private void Com_DataReceived(object sender, SerialDataReceivedEventArgs e)
+ {
+ //if (!ComDevice.IsOpen)
+ // {
+ // return;
+ // }
+ // Thread.Sleep(100);
+ if (HGetWeight == 1)
+ {
+ byte[] ReDatas = new byte[ComDevice.BytesToRead];
+ ComDevice.Read(ReDatas, 0, ReDatas.Length);//璇诲彇鏁版嵁
+ this.AddData(ReDatas);//杈撳嚭鏁版嵁
+ }
+ }
+
+ //澶勭悊鎺ユ敹鍒扮殑鏁版嵁
+ public void AddData(byte[] data)
+ {
+ //Thread.Sleep(100);
+ StringBuilder sb = new StringBuilder();
+ sb.Append(Encoding.ASCII.GetString(data));
+
+ var str = sb.ToString();
+ str = str.Replace("w", "").Replace("n", "").Replace("kg\r\n", ";");
+
+
+ if (str != repeatData)
+ {
+ repeatData = str;
+ string[] strArray = str.Split(';');
+
+ for (int i = 0; i < strArray.Length; i++)
+ {
+ if (double.TryParse(strArray[i], out double ret))//鍒ゆ柇鏄惁鏄暟瀛�
+ {
+
+ Message += double.Parse(strArray[i]) + ";";
+
+ //UpdateLabel(ret.ToString());
+ }
+ }
+ }
+ }
+
+ //鑾峰彇鏁扮粍涓嚭鐜伴鐜囨渶楂樼殑鏁版嵁
+ private string getMostStr(string message)
+ {
+ string[] strArray = message.Split(';');
+ // 浣跨敤LINQ鏌ヨ鍑虹幇娆℃暟鏈�澶氱殑鍏冪礌
+ var maxElement = strArray.GroupBy(x => x)
+ .OrderByDescending(g => g.Count())
+ .First()
+ .Key;
+
+
+ return maxElement;
+ }
+
+ //渚濇嵁绾跨▼锛屽皢鏁版嵁鍐欏叆鐣岄潰缁勪欢
+ private void UpdateLabel(string text)
+ {
+ if (txtHWeightQyt.InvokeRequired)
+ {
+ // 鍦║I绾跨▼涓婅皟鐢� UpdateLabel
+ txtHWeightQyt.Invoke(new Action<string>(UpdateLabel), text);
+ }
+ else
+ {
+ // 鐩存帴鏇存柊 txtHWeightQyt.Text
+ txtHWeightQyt.Text = text;
+ }
+ }
+
+ //鑾峰彇鏁版嵁鎸夐挳锛屽惎鍔ㄨ鏃跺櫒
+ private void button4_Click(object sender, EventArgs e)
+ {
+ HGetWeight = 1;
+ timer2.Enabled = true;
+ }
+
+ //璁℃椂鍣ㄤ簨浠�
+ private void timer2_Tick(object sender, EventArgs e)
+ {
+
+ }
+
#endregion
@@ -1030,13 +1262,117 @@
}
}
+
+
+
+
+
+
#endregion
+ private void txtHWeightQyt_TextChanged(object sender, EventArgs e)
+ {
+
+ }
+
+ private void label24_Click(object sender, EventArgs e)
+ {
+
+ }
+
+ #region 鏃犵敤浠ｇ爜
+ private void label30_Click(object sender, EventArgs e)
+ {
+
+ }
+
+ private void Form1_Load(object sender, EventArgs e)
+ {
+
+ }
+
+
+ private void txtBaudRate_TextChanged(object sender, EventArgs e)
+ {
+
+ }
+
+ private void lblHBWeight_Click(object sender, EventArgs e)
+ {
+
+ }
+
+ private void cmbStopBits_SelectedIndexChanged(object sender, EventArgs e)
+ {
+
+ }
+
+ private void txtDataBits_TextChanged(object sender, EventArgs e)
+ {
+
+ }
+
+ private void txtPortName_TextChanged(object sender, EventArgs e)
+ {
+
+ }
+
+ private void cmbParity_SelectedIndexChanged(object sender, EventArgs e)
+ {
+
+ }
+
+ private void txtHSend0_TextChanged(object sender, EventArgs e)
+ {
+
+ }
+
+ private void txtHSend_TextChanged(object sender, EventArgs e)
+ {
+
+ }
+
+ private void label26_Click(object sender, EventArgs e)
+ {
+
+ }
+
+ private void label20_Click(object sender, EventArgs e)
+ {
+
+ }
+
+ private void label23_Click(object sender, EventArgs e)
+ {
+
+ }
+
+ private void label25_Click(object sender, EventArgs e)
+ {
+
+ }
+
+ private void cmdHSaveInfo_Click(object sender, EventArgs e)
+ {
+ //ClsIni.WriteIni("COMINFO", "txtPortName", DBUtility.ClsPub.isStrNull(txtPortName.Text), DBUtility.ClsPub.AppPath + @"/HXERP.ini");
+ //ClsIni.WriteIni("COMINFO", "txtBaudRate", DBUtility.ClsPub.isStrNull(txtBaudRate.Text), DBUtility.ClsPub.AppPath + @"/HXERP.ini");
+ //ClsIni.WriteIni("COMINFO", "cmbParity", DBUtility.ClsPub.isStrNull(cmbParity.Text), DBUtility.ClsPub.AppPath + @"/HXERP.ini");
+ //ClsIni.WriteIni("COMINFO", "txtDataBits", DBUtility.ClsPub.isStrNull(txtDataBits.Text), DBUtility.ClsPub.AppPath + @"/HXERP.ini");
+ //ClsIni.WriteIni("COMINFO", "cmbStopBits", DBUtility.ClsPub.isStrNull(cmbStopBits.Text), DBUtility.ClsPub.AppPath + @"/HXERP.ini");
+ //ClsIni.WriteIni("COMINFO", "txtHSend0", DBUtility.ClsPub.isStrNull(txtHSend0.Text), DBUtility.ClsPub.AppPath + @"/HXERP.ini");
+ //ClsIni.WriteIni("COMINFO", "txtHSend", DBUtility.ClsPub.isStrNull(txtHSend.Text), DBUtility.ClsPub.AppPath + @"/HXERP.ini");
+ }
+
+ private void richTextBox1_TextChanged(object sender, EventArgs e)
+ {
+ }
+ #endregion
+ private void button4_Click_1(object sender, EventArgs e)
+ {
-
-
+ }
}
}
\ No newline at end of file
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Kf_WeighToBarCode.designer.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Kf_WeighToBarCode.designer.cs"
index 8a4dd02..bc1c5cf 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Kf_WeighToBarCode.designer.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Kf_WeighToBarCode.designer.cs"
@@ -30,8 +30,8 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Kf_WeighToBarCode));
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = 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();
@@ -55,6 +55,8 @@
this.label4 = new System.Windows.Forms.Label();
this.txtHMaterNumber = new System.Windows.Forms.TextBox();
this.gbUp = new System.Windows.Forms.GroupBox();
+ this.label17 = new System.Windows.Forms.Label();
+ this.txtHOrderPickRemark = new System.Windows.Forms.TextBox();
this.label15 = new System.Windows.Forms.Label();
this.txtHCusModel = new System.Windows.Forms.TextBox();
this.label16 = new System.Windows.Forms.Label();
@@ -98,8 +100,20 @@
this.涓棿 = new System.Windows.Forms.Panel();
this.搴曢儴 = new System.Windows.Forms.Panel();
this.鍙充晶 = new System.Windows.Forms.Panel();
- this.label17 = new System.Windows.Forms.Label();
- this.txtHOrderPickRemark = new System.Windows.Forms.TextBox();
+ this.button4 = new System.Windows.Forms.Button();
+ this.Button3 = new System.Windows.Forms.Button();
+ this.label21 = new System.Windows.Forms.Label();
+ this.txtPortName = new System.Windows.Forms.TextBox();
+ this.label22 = new System.Windows.Forms.Label();
+ this.txtBaudRate = new System.Windows.Forms.TextBox();
+ this.label25 = new System.Windows.Forms.Label();
+ this.cmbStopBits = new System.Windows.Forms.ComboBox();
+ this.cmbParity = new System.Windows.Forms.ComboBox();
+ this.label23 = new System.Windows.Forms.Label();
+ this.label24 = new System.Windows.Forms.Label();
+ this.txtDataBits = new System.Windows.Forms.TextBox();
+ this.timer3 = new System.Windows.Forms.Timer(this.components);
+ this.timer2 = new System.Windows.Forms.Timer(this.components);
this.Tool.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();
this.gbUp.SuspendLayout();
@@ -134,7 +148,7 @@
this.Tool.Location = new System.Drawing.Point(0, 0);
this.Tool.Name = "Tool";
this.Tool.Padding = new System.Windows.Forms.Padding(0);
- this.Tool.Size = new System.Drawing.Size(1396, 50);
+ this.Tool.Size = new System.Drawing.Size(1861, 62);
this.Tool.Stretch = true;
this.Tool.TabIndex = 16;
this.Tool.Text = "toolStrip1";
@@ -143,7 +157,7 @@
//
this.toolStripSeparator9.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator9.Name = "toolStripSeparator9";
- this.toolStripSeparator9.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator9.Size = new System.Drawing.Size(6, 62);
//
// mrlk
//
@@ -153,7 +167,7 @@
this.mrlk.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.mrlk.ImageTransparentColor = System.Drawing.Color.White;
this.mrlk.Name = "mrlk";
- this.mrlk.Size = new System.Drawing.Size(60, 47);
+ this.mrlk.Size = new System.Drawing.Size(73, 59);
this.mrlk.Text = "榛樿鍒楀";
this.mrlk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.mrlk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -163,7 +177,7 @@
//
this.toolStripSeparator7.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator7.Name = "toolStripSeparator7";
- this.toolStripSeparator7.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator7.Size = new System.Drawing.Size(6, 62);
//
// bclk
//
@@ -173,7 +187,7 @@
this.bclk.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.bclk.ImageTransparentColor = System.Drawing.Color.White;
this.bclk.Name = "bclk";
- this.bclk.Size = new System.Drawing.Size(60, 47);
+ this.bclk.Size = new System.Drawing.Size(73, 59);
this.bclk.Text = "淇濆瓨鍒楀";
this.bclk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.bclk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -183,7 +197,7 @@
//
this.toolStripSeparator8.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator8.Name = "toolStripSeparator8";
- this.toolStripSeparator8.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator8.Size = new System.Drawing.Size(6, 62);
//
// sx
//
@@ -202,7 +216,7 @@
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
- this.toolStripSeparator1.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator1.Size = new System.Drawing.Size(6, 62);
//
// dy
//
@@ -221,7 +235,7 @@
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
- this.toolStripSeparator2.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator2.Size = new System.Drawing.Size(6, 62);
//
// hb
//
@@ -240,7 +254,7 @@
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
- this.toolStripSeparator3.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator3.Size = new System.Drawing.Size(6, 62);
//
// tc
//
@@ -259,7 +273,7 @@
// toolStripSeparator4
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
- this.toolStripSeparator4.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator4.Size = new System.Drawing.Size(6, 62);
//
// timer1
//
@@ -272,22 +286,22 @@
this.grdMain.AllowUserToDeleteRows = false;
this.grdMain.BackgroundColor = System.Drawing.SystemColors.ControlLightLight;
this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window;
- dataGridViewCellStyle5.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText;
- dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
- this.grdMain.DefaultCellStyle = dataGridViewCellStyle5;
+ dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Window;
+ dataGridViewCellStyle15.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ dataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.ControlText;
+ dataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+ this.grdMain.DefaultCellStyle = dataGridViewCellStyle15;
this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;
- this.grdMain.Location = new System.Drawing.Point(3, 3);
+ this.grdMain.Location = new System.Drawing.Point(4, 4);
this.grdMain.Margin = new System.Windows.Forms.Padding(0);
this.grdMain.Name = "grdMain";
this.grdMain.ReadOnly = true;
this.grdMain.RowHeadersWidth = 51;
this.grdMain.RowTemplate.Height = 23;
- this.grdMain.Size = new System.Drawing.Size(1091, 334);
+ this.grdMain.Size = new System.Drawing.Size(1456, 422);
this.grdMain.TabIndex = 19;
this.grdMain.Paint += new System.Windows.Forms.PaintEventHandler(this.grdMain_Paint);
//
@@ -296,9 +310,10 @@
this.label2.AutoSize = true;
this.label2.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label2.ForeColor = System.Drawing.Color.Black;
- this.label2.Location = new System.Drawing.Point(442, 60);
+ this.label2.Location = new System.Drawing.Point(589, 75);
+ this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(53, 12);
+ this.label2.Size = new System.Drawing.Size(67, 15);
this.label2.TabIndex = 49;
this.label2.Text = "瑙勬牸鍨嬪彿";
//
@@ -306,10 +321,11 @@
//
this.txtHMaterModel.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHMaterModel.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHMaterModel.Location = new System.Drawing.Point(498, 56);
+ this.txtHMaterModel.Location = new System.Drawing.Point(664, 70);
+ this.txtHMaterModel.Margin = new System.Windows.Forms.Padding(4);
this.txtHMaterModel.Name = "txtHMaterModel";
this.txtHMaterModel.ReadOnly = true;
- this.txtHMaterModel.Size = new System.Drawing.Size(128, 21);
+ this.txtHMaterModel.Size = new System.Drawing.Size(169, 25);
this.txtHMaterModel.TabIndex = 50;
//
// label3
@@ -317,9 +333,10 @@
this.label3.AutoSize = true;
this.label3.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label3.ForeColor = System.Drawing.Color.Black;
- this.label3.Location = new System.Drawing.Point(63, 148);
+ this.label3.Location = new System.Drawing.Point(84, 185);
+ this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(29, 12);
+ this.label3.Size = new System.Drawing.Size(37, 15);
this.label3.TabIndex = 52;
this.label3.Text = "澶囨敞";
//
@@ -327,9 +344,10 @@
//
this.txtHRemark.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHRemark.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHRemark.Location = new System.Drawing.Point(95, 144);
+ this.txtHRemark.Location = new System.Drawing.Point(127, 180);
+ this.txtHRemark.Margin = new System.Windows.Forms.Padding(4);
this.txtHRemark.Name = "txtHRemark";
- this.txtHRemark.Size = new System.Drawing.Size(705, 21);
+ this.txtHRemark.Size = new System.Drawing.Size(939, 25);
this.txtHRemark.TabIndex = 53;
//
// label4
@@ -337,9 +355,10 @@
this.label4.AutoSize = true;
this.label4.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label4.ForeColor = System.Drawing.Color.Black;
- this.label4.Location = new System.Drawing.Point(39, 60);
+ this.label4.Location = new System.Drawing.Point(52, 75);
+ this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(53, 12);
+ this.label4.Size = new System.Drawing.Size(67, 15);
this.label4.TabIndex = 55;
this.label4.Text = "鐗╂枡浠ｇ爜";
//
@@ -347,15 +366,28 @@
//
this.txtHMaterNumber.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHMaterNumber.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHMaterNumber.Location = new System.Drawing.Point(95, 56);
+ this.txtHMaterNumber.Location = new System.Drawing.Point(127, 70);
+ this.txtHMaterNumber.Margin = new System.Windows.Forms.Padding(4);
this.txtHMaterNumber.Name = "txtHMaterNumber";
this.txtHMaterNumber.ReadOnly = true;
- this.txtHMaterNumber.Size = new System.Drawing.Size(128, 21);
+ this.txtHMaterNumber.Size = new System.Drawing.Size(169, 25);
this.txtHMaterNumber.TabIndex = 56;
//
// gbUp
//
this.gbUp.BackColor = System.Drawing.Color.Transparent;
+ this.gbUp.Controls.Add(this.txtDataBits);
+ this.gbUp.Controls.Add(this.label24);
+ this.gbUp.Controls.Add(this.label23);
+ this.gbUp.Controls.Add(this.cmbParity);
+ this.gbUp.Controls.Add(this.cmbStopBits);
+ this.gbUp.Controls.Add(this.label25);
+ this.gbUp.Controls.Add(this.txtBaudRate);
+ this.gbUp.Controls.Add(this.label22);
+ this.gbUp.Controls.Add(this.txtPortName);
+ this.gbUp.Controls.Add(this.label21);
+ this.gbUp.Controls.Add(this.Button3);
+ this.gbUp.Controls.Add(this.button4);
this.gbUp.Controls.Add(this.label17);
this.gbUp.Controls.Add(this.txtHOrderPickRemark);
this.gbUp.Controls.Add(this.label15);
@@ -396,19 +428,49 @@
this.gbUp.Controls.Add(this.label2);
this.gbUp.Dock = System.Windows.Forms.DockStyle.Top;
this.gbUp.Location = new System.Drawing.Point(0, 0);
+ this.gbUp.Margin = new System.Windows.Forms.Padding(4);
this.gbUp.Name = "gbUp";
- this.gbUp.Size = new System.Drawing.Size(1105, 261);
+ this.gbUp.Padding = new System.Windows.Forms.Padding(4);
+ this.gbUp.Size = new System.Drawing.Size(1472, 326);
this.gbUp.TabIndex = 58;
this.gbUp.TabStop = false;
+ //
+ // label17
+ //
+ this.label17.AutoSize = true;
+ this.label17.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label17.ForeColor = System.Drawing.Color.Black;
+ this.label17.Location = new System.Drawing.Point(20, 221);
+ this.label17.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label17.Name = "label17";
+ this.label17.Size = new System.Drawing.Size(97, 15);
+ this.label17.TabIndex = 324;
+ this.label17.Text = "璁㈠崟鍖呰澶囨敞";
+ //
+ // txtHOrderPickRemark
+ //
+ this.txtHOrderPickRemark.BackColor = System.Drawing.SystemColors.Window;
+ this.txtHOrderPickRemark.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHOrderPickRemark.ForeColor = System.Drawing.Color.Red;
+ this.txtHOrderPickRemark.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHOrderPickRemark.Location = new System.Drawing.Point(127, 216);
+ this.txtHOrderPickRemark.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHOrderPickRemark.Multiline = true;
+ this.txtHOrderPickRemark.Name = "txtHOrderPickRemark";
+ this.txtHOrderPickRemark.ReadOnly = true;
+ this.txtHOrderPickRemark.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
+ this.txtHOrderPickRemark.Size = new System.Drawing.Size(967, 54);
+ this.txtHOrderPickRemark.TabIndex = 325;
//
// label15
//
this.label15.AutoSize = true;
this.label15.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label15.ForeColor = System.Drawing.Color.Black;
- this.label15.Location = new System.Drawing.Point(224, 116);
+ this.label15.Location = new System.Drawing.Point(299, 145);
+ this.label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label15.Name = "label15";
- this.label15.Size = new System.Drawing.Size(77, 12);
+ this.label15.Size = new System.Drawing.Size(97, 15);
this.label15.TabIndex = 322;
this.label15.Text = "瀹㈡埛瑙勬牸鍨嬪彿";
//
@@ -416,10 +478,11 @@
//
this.txtHCusModel.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHCusModel.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHCusModel.Location = new System.Drawing.Point(303, 112);
+ this.txtHCusModel.Location = new System.Drawing.Point(404, 140);
+ this.txtHCusModel.Margin = new System.Windows.Forms.Padding(4);
this.txtHCusModel.Name = "txtHCusModel";
this.txtHCusModel.ReadOnly = true;
- this.txtHCusModel.Size = new System.Drawing.Size(128, 21);
+ this.txtHCusModel.Size = new System.Drawing.Size(169, 25);
this.txtHCusModel.TabIndex = 323;
//
// label16
@@ -427,9 +490,10 @@
this.label16.AutoSize = true;
this.label16.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label16.ForeColor = System.Drawing.Color.Black;
- this.label16.Location = new System.Drawing.Point(15, 116);
+ this.label16.Location = new System.Drawing.Point(20, 145);
+ this.label16.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label16.Name = "label16";
- this.label16.Size = new System.Drawing.Size(77, 12);
+ this.label16.Size = new System.Drawing.Size(97, 15);
this.label16.TabIndex = 320;
this.label16.Text = "瀹㈡埛鐗╂枡鍚嶇О";
//
@@ -437,10 +501,11 @@
//
this.txtHCusMaterName.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHCusMaterName.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHCusMaterName.Location = new System.Drawing.Point(95, 112);
+ this.txtHCusMaterName.Location = new System.Drawing.Point(127, 140);
+ this.txtHCusMaterName.Margin = new System.Windows.Forms.Padding(4);
this.txtHCusMaterName.Name = "txtHCusMaterName";
this.txtHCusMaterName.ReadOnly = true;
- this.txtHCusMaterName.Size = new System.Drawing.Size(128, 21);
+ this.txtHCusMaterName.Size = new System.Drawing.Size(169, 25);
this.txtHCusMaterName.TabIndex = 321;
//
// label13
@@ -448,9 +513,10 @@
this.label13.AutoSize = true;
this.label13.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label13.ForeColor = System.Drawing.Color.Black;
- this.label13.Location = new System.Drawing.Point(662, 88);
+ this.label13.Location = new System.Drawing.Point(883, 110);
+ this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label13.Name = "label13";
- this.label13.Size = new System.Drawing.Size(29, 12);
+ this.label13.Size = new System.Drawing.Size(37, 15);
this.label13.TabIndex = 318;
this.label13.Text = "鍖呭彿";
//
@@ -458,9 +524,10 @@
//
this.txtHBarcodeNo.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHBarcodeNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHBarcodeNo.Location = new System.Drawing.Point(693, 84);
+ this.txtHBarcodeNo.Location = new System.Drawing.Point(924, 105);
+ this.txtHBarcodeNo.Margin = new System.Windows.Forms.Padding(4);
this.txtHBarcodeNo.Name = "txtHBarcodeNo";
- this.txtHBarcodeNo.Size = new System.Drawing.Size(128, 21);
+ this.txtHBarcodeNo.Size = new System.Drawing.Size(169, 25);
this.txtHBarcodeNo.TabIndex = 319;
//
// cmdHBadReasonID
@@ -468,9 +535,10 @@
this.cmdHBadReasonID.BackColor = System.Drawing.Color.Transparent;
this.cmdHBadReasonID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHBadReasonID.Image")));
this.cmdHBadReasonID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdHBadReasonID.Location = new System.Drawing.Point(799, 143);
+ this.cmdHBadReasonID.Location = new System.Drawing.Point(1065, 179);
+ this.cmdHBadReasonID.Margin = new System.Windows.Forms.Padding(4);
this.cmdHBadReasonID.Name = "cmdHBadReasonID";
- this.cmdHBadReasonID.Size = new System.Drawing.Size(22, 22);
+ this.cmdHBadReasonID.Size = new System.Drawing.Size(29, 28);
this.cmdHBadReasonID.TabIndex = 317;
this.cmdHBadReasonID.UseVisualStyleBackColor = false;
this.cmdHBadReasonID.Click += new System.EventHandler(this.cmdHBadReasonID_Click);
@@ -478,10 +546,10 @@
// chkHDYFlag
//
this.chkHDYFlag.AutoSize = true;
- this.chkHDYFlag.Location = new System.Drawing.Point(558, 236);
- this.chkHDYFlag.Margin = new System.Windows.Forms.Padding(2);
+ this.chkHDYFlag.Location = new System.Drawing.Point(744, 295);
+ this.chkHDYFlag.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.chkHDYFlag.Name = "chkHDYFlag";
- this.chkHDYFlag.Size = new System.Drawing.Size(72, 16);
+ this.chkHDYFlag.Size = new System.Drawing.Size(89, 19);
this.chkHDYFlag.TabIndex = 316;
this.chkHDYFlag.Text = "鑷姩鎵撳嵃";
this.chkHDYFlag.UseVisualStyleBackColor = true;
@@ -490,10 +558,10 @@
//
this.cmdFZF.BackColor = System.Drawing.Color.White;
this.cmdFZF.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.cmdFZF.Location = new System.Drawing.Point(729, 222);
- this.cmdFZF.Margin = new System.Windows.Forms.Padding(2);
+ this.cmdFZF.Location = new System.Drawing.Point(972, 278);
+ this.cmdFZF.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.cmdFZF.Name = "cmdFZF";
- this.cmdFZF.Size = new System.Drawing.Size(86, 32);
+ this.cmdFZF.Size = new System.Drawing.Size(115, 40);
this.cmdFZF.TabIndex = 157;
this.cmdFZF.Text = "鍙嶄綔搴�";
this.cmdFZF.UseVisualStyleBackColor = false;
@@ -503,10 +571,10 @@
//
this.cmdZF.BackColor = System.Drawing.Color.White;
this.cmdZF.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.cmdZF.Location = new System.Drawing.Point(635, 222);
- this.cmdZF.Margin = new System.Windows.Forms.Padding(2);
+ this.cmdZF.Location = new System.Drawing.Point(847, 278);
+ this.cmdZF.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.cmdZF.Name = "cmdZF";
- this.cmdZF.Size = new System.Drawing.Size(86, 32);
+ this.cmdZF.Size = new System.Drawing.Size(115, 40);
this.cmdZF.TabIndex = 156;
this.cmdZF.Text = "浣滃簾";
this.cmdZF.UseVisualStyleBackColor = false;
@@ -516,10 +584,11 @@
//
this.txtHDeptName.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHDeptName.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHDeptName.Location = new System.Drawing.Point(498, 28);
+ this.txtHDeptName.Location = new System.Drawing.Point(664, 35);
+ this.txtHDeptName.Margin = new System.Windows.Forms.Padding(4);
this.txtHDeptName.Name = "txtHDeptName";
this.txtHDeptName.ReadOnly = true;
- this.txtHDeptName.Size = new System.Drawing.Size(128, 21);
+ this.txtHDeptName.Size = new System.Drawing.Size(169, 25);
this.txtHDeptName.TabIndex = 155;
//
// label12
@@ -527,9 +596,10 @@
this.label12.AutoSize = true;
this.label12.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label12.ForeColor = System.Drawing.Color.Black;
- this.label12.Location = new System.Drawing.Point(466, 32);
+ this.label12.Location = new System.Drawing.Point(621, 40);
+ this.label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label12.Name = "label12";
- this.label12.Size = new System.Drawing.Size(29, 12);
+ this.label12.Size = new System.Drawing.Size(37, 15);
this.label12.TabIndex = 154;
this.label12.Text = "杞﹂棿";
//
@@ -537,10 +607,11 @@
//
this.txtHBatchNo.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHBatchNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHBatchNo.Location = new System.Drawing.Point(693, 56);
+ this.txtHBatchNo.Location = new System.Drawing.Point(924, 70);
+ this.txtHBatchNo.Margin = new System.Windows.Forms.Padding(4);
this.txtHBatchNo.Name = "txtHBatchNo";
this.txtHBatchNo.ReadOnly = true;
- this.txtHBatchNo.Size = new System.Drawing.Size(128, 21);
+ this.txtHBatchNo.Size = new System.Drawing.Size(169, 25);
this.txtHBatchNo.TabIndex = 153;
//
// label11
@@ -548,9 +619,10 @@
this.label11.AutoSize = true;
this.label11.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label11.ForeColor = System.Drawing.Color.Black;
- this.label11.Location = new System.Drawing.Point(662, 60);
+ this.label11.Location = new System.Drawing.Point(883, 75);
+ this.label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label11.Name = "label11";
- this.label11.Size = new System.Drawing.Size(29, 12);
+ this.label11.Size = new System.Drawing.Size(37, 15);
this.label11.TabIndex = 152;
this.label11.Text = "鎵瑰彿";
//
@@ -559,9 +631,10 @@
this.label10.AutoSize = true;
this.label10.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label10.ForeColor = System.Drawing.Color.Black;
- this.label10.Location = new System.Drawing.Point(454, 88);
+ this.label10.Location = new System.Drawing.Point(605, 110);
+ this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(41, 12);
+ this.label10.Size = new System.Drawing.Size(52, 15);
this.label10.TabIndex = 150;
this.label10.Text = "鎵ｇ偣鏁�";
//
@@ -569,9 +642,10 @@
//
this.txtHKDQty.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHKDQty.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHKDQty.Location = new System.Drawing.Point(498, 84);
+ this.txtHKDQty.Location = new System.Drawing.Point(664, 105);
+ this.txtHKDQty.Margin = new System.Windows.Forms.Padding(4);
this.txtHKDQty.Name = "txtHKDQty";
- this.txtHKDQty.Size = new System.Drawing.Size(128, 21);
+ this.txtHKDQty.Size = new System.Drawing.Size(169, 25);
this.txtHKDQty.TabIndex = 151;
//
// label9
@@ -579,9 +653,10 @@
this.label9.AutoSize = true;
this.label9.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label9.ForeColor = System.Drawing.Color.Black;
- this.label9.Location = new System.Drawing.Point(272, 88);
+ this.label9.Location = new System.Drawing.Point(363, 110);
+ this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label9.Name = "label9";
- this.label9.Size = new System.Drawing.Size(29, 12);
+ this.label9.Size = new System.Drawing.Size(37, 15);
this.label9.TabIndex = 148;
this.label9.Text = "閲嶉噺";
//
@@ -589,19 +664,22 @@
//
this.txtHWeightQyt.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHWeightQyt.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHWeightQyt.Location = new System.Drawing.Point(303, 84);
+ this.txtHWeightQyt.Location = new System.Drawing.Point(404, 105);
+ this.txtHWeightQyt.Margin = new System.Windows.Forms.Padding(4);
this.txtHWeightQyt.Name = "txtHWeightQyt";
- this.txtHWeightQyt.Size = new System.Drawing.Size(128, 21);
+ this.txtHWeightQyt.Size = new System.Drawing.Size(169, 25);
this.txtHWeightQyt.TabIndex = 149;
+ this.txtHWeightQyt.TextChanged += new System.EventHandler(this.txtHWeightQyt_TextChanged);
//
// label7
//
this.label7.AutoSize = true;
this.label7.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label7.ForeColor = System.Drawing.Color.Black;
- this.label7.Location = new System.Drawing.Point(63, 88);
+ this.label7.Location = new System.Drawing.Point(84, 110);
+ this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(29, 12);
+ this.label7.Size = new System.Drawing.Size(37, 15);
this.label7.TabIndex = 146;
this.label7.Text = "绫虫暟";
//
@@ -609,9 +687,10 @@
//
this.txtHQty.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHQty.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHQty.Location = new System.Drawing.Point(95, 84);
+ this.txtHQty.Location = new System.Drawing.Point(127, 105);
+ this.txtHQty.Margin = new System.Windows.Forms.Padding(4);
this.txtHQty.Name = "txtHQty";
- this.txtHQty.Size = new System.Drawing.Size(128, 21);
+ this.txtHQty.Size = new System.Drawing.Size(169, 25);
this.txtHQty.TabIndex = 147;
//
// label14
@@ -619,9 +698,10 @@
this.label14.AutoSize = true;
this.label14.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label14.ForeColor = System.Drawing.Color.Black;
- this.label14.Location = new System.Drawing.Point(248, 60);
+ this.label14.Location = new System.Drawing.Point(331, 75);
+ this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label14.Name = "label14";
- this.label14.Size = new System.Drawing.Size(53, 12);
+ this.label14.Size = new System.Drawing.Size(67, 15);
this.label14.TabIndex = 144;
this.label14.Text = "鐗╂枡鍚嶇О";
//
@@ -629,20 +709,21 @@
//
this.txtHMaterName.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHMaterName.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHMaterName.Location = new System.Drawing.Point(303, 56);
+ this.txtHMaterName.Location = new System.Drawing.Point(404, 70);
+ this.txtHMaterName.Margin = new System.Windows.Forms.Padding(4);
this.txtHMaterName.Name = "txtHMaterName";
this.txtHMaterName.ReadOnly = true;
- this.txtHMaterName.Size = new System.Drawing.Size(128, 21);
+ this.txtHMaterName.Size = new System.Drawing.Size(169, 25);
this.txtHMaterName.TabIndex = 145;
//
// cmdSave
//
this.cmdSave.BackColor = System.Drawing.Color.White;
this.cmdSave.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.cmdSave.Location = new System.Drawing.Point(209, 222);
- this.cmdSave.Margin = new System.Windows.Forms.Padding(2);
+ this.cmdSave.Location = new System.Drawing.Point(279, 278);
+ this.cmdSave.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.cmdSave.Name = "cmdSave";
- this.cmdSave.Size = new System.Drawing.Size(86, 32);
+ this.cmdSave.Size = new System.Drawing.Size(115, 40);
this.cmdSave.TabIndex = 139;
this.cmdSave.Text = "淇濆瓨";
this.cmdSave.UseVisualStyleBackColor = false;
@@ -653,9 +734,10 @@
this.label5.AutoSize = true;
this.label5.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label5.ForeColor = System.Drawing.Color.Black;
- this.label5.Location = new System.Drawing.Point(51, 32);
+ this.label5.Location = new System.Drawing.Point(68, 40);
+ this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(41, 12);
+ this.label5.Size = new System.Drawing.Size(52, 15);
this.label5.TabIndex = 142;
this.label5.Text = "鍗曟嵁鍙�";
//
@@ -663,10 +745,10 @@
//
this.cmdSourceBillNo.BackColor = System.Drawing.Color.White;
this.cmdSourceBillNo.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.cmdSourceBillNo.Location = new System.Drawing.Point(102, 222);
- this.cmdSourceBillNo.Margin = new System.Windows.Forms.Padding(2);
+ this.cmdSourceBillNo.Location = new System.Drawing.Point(136, 278);
+ this.cmdSourceBillNo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.cmdSourceBillNo.Name = "cmdSourceBillNo";
- this.cmdSourceBillNo.Size = new System.Drawing.Size(86, 32);
+ this.cmdSourceBillNo.Size = new System.Drawing.Size(115, 40);
this.cmdSourceBillNo.TabIndex = 138;
this.cmdSourceBillNo.Text = "閫夊崟";
this.cmdSourceBillNo.UseVisualStyleBackColor = false;
@@ -676,10 +758,11 @@
//
this.txtHBillNo.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHBillNo.Location = new System.Drawing.Point(95, 28);
+ this.txtHBillNo.Location = new System.Drawing.Point(127, 35);
+ this.txtHBillNo.Margin = new System.Windows.Forms.Padding(4);
this.txtHBillNo.Name = "txtHBillNo";
this.txtHBillNo.ReadOnly = true;
- this.txtHBillNo.Size = new System.Drawing.Size(128, 21);
+ this.txtHBillNo.Size = new System.Drawing.Size(169, 25);
this.txtHBillNo.TabIndex = 143;
//
// cmbHBarCodeType
@@ -688,10 +771,10 @@
this.cmbHBarCodeType.FormattingEnabled = true;
this.cmbHBarCodeType.Items.AddRange(new object[] {
"鍞竴鏉＄爜"});
- this.cmbHBarCodeType.Location = new System.Drawing.Point(693, 28);
- this.cmbHBarCodeType.Margin = new System.Windows.Forms.Padding(2);
+ this.cmbHBarCodeType.Location = new System.Drawing.Point(924, 35);
+ this.cmbHBarCodeType.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.cmbHBarCodeType.Name = "cmbHBarCodeType";
- this.cmbHBarCodeType.Size = new System.Drawing.Size(128, 20);
+ this.cmbHBarCodeType.Size = new System.Drawing.Size(169, 23);
this.cmbHBarCodeType.TabIndex = 139;
//
// label8
@@ -699,9 +782,10 @@
this.label8.AutoSize = true;
this.label8.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label8.ForeColor = System.Drawing.Color.Black;
- this.label8.Location = new System.Drawing.Point(638, 32);
+ this.label8.Location = new System.Drawing.Point(851, 40);
+ this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(53, 12);
+ this.label8.Size = new System.Drawing.Size(67, 15);
this.label8.TabIndex = 138;
this.label8.Text = "鏉＄爜绫诲瀷";
//
@@ -709,10 +793,10 @@
//
this.dtpHDate.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.dtpHDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
- this.dtpHDate.Location = new System.Drawing.Point(303, 28);
- this.dtpHDate.Margin = new System.Windows.Forms.Padding(2);
+ this.dtpHDate.Location = new System.Drawing.Point(404, 35);
+ this.dtpHDate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.dtpHDate.Name = "dtpHDate";
- this.dtpHDate.Size = new System.Drawing.Size(128, 21);
+ this.dtpHDate.Size = new System.Drawing.Size(169, 25);
this.dtpHDate.TabIndex = 100;
//
// label6
@@ -720,9 +804,10 @@
this.label6.AutoSize = true;
this.label6.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label6.ForeColor = System.Drawing.Color.Black;
- this.label6.Location = new System.Drawing.Point(272, 32);
+ this.label6.Location = new System.Drawing.Point(363, 40);
+ this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(29, 12);
+ this.label6.Size = new System.Drawing.Size(37, 15);
this.label6.TabIndex = 99;
this.label6.Text = "鏃ユ湡";
//
@@ -732,22 +817,22 @@
this.grdSub.AllowUserToDeleteRows = false;
this.grdSub.BackgroundColor = System.Drawing.SystemColors.ControlLightLight;
this.grdSub.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Window;
- dataGridViewCellStyle6.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.ControlText;
- dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
- this.grdSub.DefaultCellStyle = dataGridViewCellStyle6;
+ dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Window;
+ dataGridViewCellStyle16.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ dataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.ControlText;
+ dataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+ this.grdSub.DefaultCellStyle = dataGridViewCellStyle16;
this.grdSub.Dock = System.Windows.Forms.DockStyle.Fill;
- this.grdSub.Location = new System.Drawing.Point(0, 73);
+ this.grdSub.Location = new System.Drawing.Point(0, 91);
this.grdSub.Margin = new System.Windows.Forms.Padding(0);
this.grdSub.Name = "grdSub";
this.grdSub.ReadOnly = true;
this.grdSub.RowHeadersWidth = 51;
this.grdSub.RowTemplate.Height = 23;
- this.grdSub.Size = new System.Drawing.Size(257, 554);
+ this.grdSub.Size = new System.Drawing.Size(343, 694);
this.grdSub.TabIndex = 18;
this.grdSub.Paint += new System.Windows.Forms.PaintEventHandler(this.grdSub_Paint);
//
@@ -755,19 +840,21 @@
//
this.tabControl1.Controls.Add(this.tabPage1);
this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tabControl1.Location = new System.Drawing.Point(0, 261);
+ this.tabControl1.Location = new System.Drawing.Point(0, 326);
+ this.tabControl1.Margin = new System.Windows.Forms.Padding(4);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
- this.tabControl1.Size = new System.Drawing.Size(1105, 366);
+ this.tabControl1.Size = new System.Drawing.Size(1472, 459);
this.tabControl1.TabIndex = 149;
//
// tabPage1
//
this.tabPage1.Controls.Add(this.grdMain);
- this.tabPage1.Location = new System.Drawing.Point(4, 22);
+ this.tabPage1.Location = new System.Drawing.Point(4, 25);
+ this.tabPage1.Margin = new System.Windows.Forms.Padding(4);
this.tabPage1.Name = "tabPage1";
- this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage1.Size = new System.Drawing.Size(1097, 340);
+ this.tabPage1.Padding = new System.Windows.Forms.Padding(4);
+ this.tabPage1.Size = new System.Drawing.Size(1464, 430);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "绉伴噸璁板綍";
this.tabPage1.UseVisualStyleBackColor = true;
@@ -777,9 +864,10 @@
this.panel1.Controls.Add(this.grdSub);
this.panel1.Controls.Add(this.groupBox1);
this.panel1.Dock = System.Windows.Forms.DockStyle.Left;
- this.panel1.Location = new System.Drawing.Point(11, 50);
+ this.panel1.Location = new System.Drawing.Point(15, 62);
+ this.panel1.Margin = new System.Windows.Forms.Padding(4);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(257, 627);
+ this.panel1.Size = new System.Drawing.Size(343, 785);
this.panel1.TabIndex = 59;
//
// groupBox1
@@ -789,8 +877,10 @@
this.groupBox1.Controls.Add(this.cmdOK);
this.groupBox1.Dock = System.Windows.Forms.DockStyle.Top;
this.groupBox1.Location = new System.Drawing.Point(0, 0);
+ this.groupBox1.Margin = new System.Windows.Forms.Padding(4);
this.groupBox1.Name = "groupBox1";
- this.groupBox1.Size = new System.Drawing.Size(257, 73);
+ this.groupBox1.Padding = new System.Windows.Forms.Padding(4);
+ this.groupBox1.Size = new System.Drawing.Size(343, 91);
this.groupBox1.TabIndex = 146;
this.groupBox1.TabStop = false;
//
@@ -799,9 +889,10 @@
this.label1.AutoSize = true;
this.label1.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.ForeColor = System.Drawing.Color.Black;
- this.label1.Location = new System.Drawing.Point(11, 40);
+ this.label1.Location = new System.Drawing.Point(15, 50);
+ this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(41, 12);
+ this.label1.Size = new System.Drawing.Size(52, 15);
this.label1.TabIndex = 151;
this.label1.Text = "鏉″舰鐮�";
//
@@ -809,9 +900,10 @@
//
this.txtHBarCode.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHBarCode.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHBarCode.Location = new System.Drawing.Point(57, 36);
+ this.txtHBarCode.Location = new System.Drawing.Point(76, 45);
+ this.txtHBarCode.Margin = new System.Windows.Forms.Padding(4);
this.txtHBarCode.Name = "txtHBarCode";
- this.txtHBarCode.Size = new System.Drawing.Size(127, 21);
+ this.txtHBarCode.Size = new System.Drawing.Size(168, 25);
this.txtHBarCode.TabIndex = 152;
this.txtHBarCode.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtHBarCode_KeyPress);
//
@@ -820,10 +912,10 @@
this.cmdOK.BackColor = System.Drawing.Color.White;
this.cmdOK.Cursor = System.Windows.Forms.Cursors.Default;
this.cmdOK.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.cmdOK.Location = new System.Drawing.Point(189, 33);
- this.cmdOK.Margin = new System.Windows.Forms.Padding(2);
+ this.cmdOK.Location = new System.Drawing.Point(252, 41);
+ this.cmdOK.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.cmdOK.Name = "cmdOK";
- this.cmdOK.Size = new System.Drawing.Size(55, 27);
+ this.cmdOK.Size = new System.Drawing.Size(73, 34);
this.cmdOK.TabIndex = 150;
this.cmdOK.Text = "纭";
this.cmdOK.UseVisualStyleBackColor = false;
@@ -834,75 +926,200 @@
this.panel2.Controls.Add(this.tabControl1);
this.panel2.Controls.Add(this.gbUp);
this.panel2.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel2.Location = new System.Drawing.Point(279, 50);
+ this.panel2.Location = new System.Drawing.Point(373, 62);
+ this.panel2.Margin = new System.Windows.Forms.Padding(4);
this.panel2.Name = "panel2";
- this.panel2.Size = new System.Drawing.Size(1105, 627);
+ this.panel2.Size = new System.Drawing.Size(1472, 785);
this.panel2.TabIndex = 60;
//
// 宸︿晶
//
this.宸︿晶.Dock = System.Windows.Forms.DockStyle.Left;
- this.宸︿晶.Location = new System.Drawing.Point(0, 50);
+ this.宸︿晶.Location = new System.Drawing.Point(0, 62);
+ this.宸︿晶.Margin = new System.Windows.Forms.Padding(4);
this.宸︿晶.Name = "宸︿晶";
- this.宸︿晶.Size = new System.Drawing.Size(11, 627);
+ this.宸︿晶.Size = new System.Drawing.Size(15, 785);
this.宸︿晶.TabIndex = 61;
//
// 涓棿
//
this.涓棿.Dock = System.Windows.Forms.DockStyle.Left;
- this.涓棿.Location = new System.Drawing.Point(268, 50);
+ this.涓棿.Location = new System.Drawing.Point(358, 62);
+ this.涓棿.Margin = new System.Windows.Forms.Padding(4);
this.涓棿.Name = "涓棿";
- this.涓棿.Size = new System.Drawing.Size(11, 627);
+ this.涓棿.Size = new System.Drawing.Size(15, 785);
this.涓棿.TabIndex = 62;
//
// 搴曢儴
//
this.搴曢儴.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.搴曢儴.Location = new System.Drawing.Point(0, 677);
+ this.搴曢儴.Location = new System.Drawing.Point(0, 847);
+ this.搴曢儴.Margin = new System.Windows.Forms.Padding(4);
this.搴曢儴.Name = "搴曢儴";
- this.搴曢儴.Size = new System.Drawing.Size(1396, 10);
+ this.搴曢儴.Size = new System.Drawing.Size(1861, 12);
this.搴曢儴.TabIndex = 63;
//
// 鍙充晶
//
this.鍙充晶.Dock = System.Windows.Forms.DockStyle.Right;
- this.鍙充晶.Location = new System.Drawing.Point(1384, 50);
+ this.鍙充晶.Location = new System.Drawing.Point(1845, 62);
+ this.鍙充晶.Margin = new System.Windows.Forms.Padding(4);
this.鍙充晶.Name = "鍙充晶";
- this.鍙充晶.Size = new System.Drawing.Size(12, 627);
+ this.鍙充晶.Size = new System.Drawing.Size(16, 785);
this.鍙充晶.TabIndex = 64;
//
- // label17
+ // button4
//
- this.label17.AutoSize = true;
- this.label17.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label17.ForeColor = System.Drawing.Color.Black;
- this.label17.Location = new System.Drawing.Point(15, 177);
- this.label17.Name = "label17";
- this.label17.Size = new System.Drawing.Size(77, 12);
- this.label17.TabIndex = 324;
- this.label17.Text = "璁㈠崟鍖呰澶囨敞";
+ this.button4.BackColor = System.Drawing.Color.Snow;
+ this.button4.Location = new System.Drawing.Point(404, 278);
+ this.button4.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.button4.Name = "button4";
+ this.button4.Size = new System.Drawing.Size(100, 40);
+ this.button4.TabIndex = 326;
+ this.button4.Text = "鐐瑰嚮鑾峰彇纾呴噸";
+ this.button4.UseVisualStyleBackColor = false;
+ this.button4.Click += new System.EventHandler(this.button4_Click_1);
//
- // txtHOrderPickRemark
+ // Button3
//
- this.txtHOrderPickRemark.BackColor = System.Drawing.SystemColors.Window;
- this.txtHOrderPickRemark.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.txtHOrderPickRemark.ForeColor = System.Drawing.Color.Red;
- this.txtHOrderPickRemark.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHOrderPickRemark.Location = new System.Drawing.Point(95, 173);
- this.txtHOrderPickRemark.Multiline = true;
- this.txtHOrderPickRemark.Name = "txtHOrderPickRemark";
- this.txtHOrderPickRemark.ReadOnly = true;
- this.txtHOrderPickRemark.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
- this.txtHOrderPickRemark.Size = new System.Drawing.Size(726, 44);
- this.txtHOrderPickRemark.TabIndex = 325;
+ this.Button3.Location = new System.Drawing.Point(551, 276);
+ this.Button3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.Button3.Name = "Button3";
+ this.Button3.Size = new System.Drawing.Size(105, 42);
+ this.Button3.TabIndex = 327;
+ this.Button3.Text = "鎵撳紑涓插彛";
+ this.Button3.UseVisualStyleBackColor = true;
+ //
+ // label21
+ //
+ this.label21.AutoSize = true;
+ this.label21.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label21.ForeColor = System.Drawing.Color.Black;
+ this.label21.Location = new System.Drawing.Point(1142, 34);
+ this.label21.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label21.Name = "label21";
+ this.label21.Size = new System.Drawing.Size(39, 20);
+ this.label21.TabIndex = 145;
+ this.label21.Text = "COM";
+ //
+ // txtPortName
+ //
+ this.txtPortName.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtPortName.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtPortName.Location = new System.Drawing.Point(1189, 24);
+ this.txtPortName.Margin = new System.Windows.Forms.Padding(4);
+ this.txtPortName.Name = "txtPortName";
+ this.txtPortName.Size = new System.Drawing.Size(71, 36);
+ this.txtPortName.TabIndex = 329;
+ this.txtPortName.Text = "COM5";
+ //
+ // label22
+ //
+ this.label22.AutoSize = true;
+ this.label22.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label22.ForeColor = System.Drawing.Color.Black;
+ this.label22.Location = new System.Drawing.Point(1112, 75);
+ this.label22.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label22.Name = "label22";
+ this.label22.Size = new System.Drawing.Size(69, 20);
+ this.label22.TabIndex = 330;
+ this.label22.Text = "娉㈢壒鐜�";
+ //
+ // txtBaudRate
+ //
+ this.txtBaudRate.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtBaudRate.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtBaudRate.Location = new System.Drawing.Point(1189, 70);
+ this.txtBaudRate.Margin = new System.Windows.Forms.Padding(4);
+ this.txtBaudRate.Name = "txtBaudRate";
+ this.txtBaudRate.Size = new System.Drawing.Size(71, 36);
+ this.txtBaudRate.TabIndex = 331;
+ this.txtBaudRate.Text = "9600";
+ //
+ // label25
+ //
+ this.label25.AutoSize = true;
+ this.label25.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label25.Location = new System.Drawing.Point(1112, 110);
+ this.label25.Name = "label25";
+ this.label25.Size = new System.Drawing.Size(69, 20);
+ this.label25.TabIndex = 332;
+ this.label25.Text = "鍋滄浣�";
+ //
+ // cmbStopBits
+ //
+ this.cmbStopBits.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.cmbStopBits.FormattingEnabled = true;
+ this.cmbStopBits.Items.AddRange(new object[] {
+ "0",
+ "1",
+ "1.5",
+ "2"});
+ this.cmbStopBits.Location = new System.Drawing.Point(1187, 112);
+ this.cmbStopBits.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.cmbStopBits.Name = "cmbStopBits";
+ this.cmbStopBits.Size = new System.Drawing.Size(73, 33);
+ this.cmbStopBits.TabIndex = 333;
+ this.cmbStopBits.Text = "1";
+ //
+ // cmbParity
+ //
+ this.cmbParity.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.cmbParity.FormattingEnabled = true;
+ this.cmbParity.Items.AddRange(new object[] {
+ "0",
+ "1",
+ "2",
+ "3",
+ "4"});
+ this.cmbParity.Location = new System.Drawing.Point(1344, 25);
+ this.cmbParity.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.cmbParity.Name = "cmbParity";
+ this.cmbParity.Size = new System.Drawing.Size(72, 33);
+ this.cmbParity.TabIndex = 334;
+ this.cmbParity.Text = "0";
+ //
+ // label23
+ //
+ this.label23.AutoSize = true;
+ this.label23.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label23.ForeColor = System.Drawing.Color.Black;
+ this.label23.Location = new System.Drawing.Point(1268, 31);
+ this.label23.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label23.Name = "label23";
+ this.label23.Size = new System.Drawing.Size(69, 20);
+ this.label23.TabIndex = 335;
+ this.label23.Text = "鏍￠獙浣�";
+ //
+ // label24
+ //
+ this.label24.AutoSize = true;
+ this.label24.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label24.Location = new System.Drawing.Point(1277, 77);
+ this.label24.Name = "label24";
+ this.label24.Size = new System.Drawing.Size(69, 20);
+ this.label24.TabIndex = 336;
+ this.label24.Text = "鏁版嵁浣�";
+ this.label24.Click += new System.EventHandler(this.label24_Click);
+ //
+ // txtDataBits
+ //
+ this.txtDataBits.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtDataBits.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtDataBits.Location = new System.Drawing.Point(1344, 68);
+ this.txtDataBits.Margin = new System.Windows.Forms.Padding(4);
+ this.txtDataBits.Name = "txtDataBits";
+ this.txtDataBits.Size = new System.Drawing.Size(72, 36);
+ this.txtDataBits.TabIndex = 337;
+ this.txtDataBits.Text = "8";
//
// Kf_WeighToBarCode
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.AutoSize = true;
this.BackColor = System.Drawing.SystemColors.ActiveCaption;
- this.ClientSize = new System.Drawing.Size(1396, 687);
+ this.ClientSize = new System.Drawing.Size(1861, 859);
this.Controls.Add(this.panel2);
this.Controls.Add(this.涓棿);
this.Controls.Add(this.panel1);
@@ -910,6 +1127,7 @@
this.Controls.Add(this.鍙充晶);
this.Controls.Add(this.搴曢儴);
this.Controls.Add(this.Tool);
+ this.Margin = new System.Windows.Forms.Padding(4);
this.Name = "Kf_WeighToBarCode";
this.Text = "绉伴噸鍏ュ簱";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
@@ -999,5 +1217,19 @@
private System.Windows.Forms.TextBox txtHCusMaterName;
private System.Windows.Forms.Label label17;
private System.Windows.Forms.TextBox txtHOrderPickRemark;
+ private System.Windows.Forms.TextBox txtDataBits;
+ private System.Windows.Forms.Label label24;
+ private System.Windows.Forms.Label label23;
+ private System.Windows.Forms.ComboBox cmbParity;
+ private System.Windows.Forms.ComboBox cmbStopBits;
+ private System.Windows.Forms.Label label25;
+ private System.Windows.Forms.TextBox txtBaudRate;
+ private System.Windows.Forms.Label label22;
+ private System.Windows.Forms.TextBox txtPortName;
+ private System.Windows.Forms.Label label21;
+ private System.Windows.Forms.Button Button3;
+ private System.Windows.Forms.Button button4;
+ private System.Windows.Forms.Timer timer3;
+ private System.Windows.Forms.Timer timer2;
}
}
\ No newline at end of file
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Kf_WeighToBarCode.resx" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Kf_WeighToBarCode.resx"
index f9ea286..497e3f7 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Kf_WeighToBarCode.resx"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Kf_WeighToBarCode.resx"
@@ -360,7 +360,7 @@
<data name="mrlk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
oBFDY9BF05XMMAoLL3bhxGB4zjzoVCKim4iCgkCMSam1cqP9aO4YJlpIDmqh00IRv73Pe87OWuV54Mt7
znm/n895z0aF8Stj6FdGoARDUAf/H97jTp96FyZmjC8QwuRUBB0zACkiwT0i9rxvgBcvX4MZEye65Vex
vp6HJ7yJ+1nYpmNyE3nRZcbEiW74AljL5UB3gOk84J8HnFPA0UfirZqIaoZPMQDZZcbEibp6+vE9mwUF
@@ -375,7 +375,7 @@
<data name="bclk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
/QN+phG4CQXTNrPLbzFrpZAuBIfEqChctFRndHI0YzKnxkHFYQgH50NH5+o8Pm/HwQ/s4oGHc++5z/O7
77nnvSKPPZDyKYSfA8tN55N6NfMvK1XT+LIBxAH8PqfUqxnNitR+g1x/yQuRlJWCZVm2Uo965RozmpXq
aRR/Io1jYgJwTdlLPeqt92QqqHLj7phZTCST2Nqxl3rUWzrOTKX7JGBykm9x2Us96r3p1ApOAf5G49iI
@@ -390,7 +390,7 @@
<data name="sx.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFtSURBVDhPtVPLTsJAFOUj+kV+gWv9CaAWBApoITzER6UJ
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAFtSURBVDhPtVPLTsJAFOUj+kV+gWv9CaAWBApoITzER6UJ
EYMuNLIiigkaCKAGEhWN78ToQqMLTTS60I3GzXHu2CpxCsGFJ5l0eu8959y50zr+DcrYAPoH+4RFcbOk
M6jQaIXReDFQf9JRuptA4SqJhfMYAqUhSJLUWYTIe28ZHHzM8GeTiVQedRRvUli6iCN3rCHNxG1FqD1y
JvIZZvmeCq1F7nMnER6nvXAccm+8Gmi9Z77JZorDEknvhhDfCohdkED9eZqfXUiaoBp9O4jYhs9eoHQ/
@@ -402,7 +402,7 @@
<data name="dy.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADmSURBVDhPlY6xDYMwFES9U3bKCmzACEh0FJmACRiAnoqK
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADmSURBVDhPlY6xDYMwFES9U3bKCmzACEh0FJmACRiAnoqK
jo6OzvH7yVk/OFHg0MnC/vfuhzOq6zrK76vzIrRtm3nf92sgBpdlieu6ZgCe5xmAXEot0zTZMABBXLiU
grRUVRWHYTATYpOfYR9kiGbMnQelUTu5wzmsoDWk796GOI6jGRDDzH0BxAyQ1Z5e4xhuGUSQWbkAaE2B
FMRN05h9uAD4JoHato1d9yjCOjOAH9Y+QggDOW5gwZdfEgR7iAf4YG53yq0eBADzjlWk/+QP2WXf9xmk
@@ -412,7 +412,7 @@
<data name="hb.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGgSURBVDhPlZPPK8NhHMc/5T7tRM0cOCAHJXGbxQ7c/AEc
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAGgSURBVDhPlZPPK8NhHMc/5T7tRM0cOCAHJXGbxQ7c/AEc
d1EcjEwytSiH4SZcRHLQ7FemtlJDOPiZml8XSzMWMz9mK7Xevs/z7DvDzLzr9X2253k+r8+nvn0pM10t
hGykjnMndRE1ZWJlVKvF+qdErytIF/1G6k72sMPTBULIRcCF4H2bcOMknC8SNsb/IXheJ8R8hAfPPwUH
M4Qz6fKVlXBtJwRWxP99aX/NnKfgcJZwMkfwS9OwdW86TwFLc6MGmxPE2Zok+CwCzwjB5XDkLpbDJHYj
@@ -425,7 +425,7 @@
<data name="tc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
bXeWrGBMYkoHh+gk8xl/XEneP7jXqXIWJkIgHscnT/PEy2vhz7ZhMQ/Dm5l3ObRcB1ACzAKQ6FTcV69G
rgWTbUl3QFQtFgGpfAAoAVDOi2ZbrwW5hwY4N+P6FmDlkrsBq6zOy3AXIEkhGHMbIMaorgGgI8Cu7CsY
wOZbAEgDBch/gOveRzgJAKLwH0CGJsDmxU1dAMiSu3R5iZr+oJuic1+SJ5jRbOqnmgAAAABJRU5ErkJg
@@ -450,6 +450,12 @@
FIYcEAA7
</value>
</data>
+ <metadata name="timer3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>241, 17</value>
+ </metadata>
+ <metadata name="timer2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>357, 14</value>
+ </metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>37</value>
</metadata>
diff --git a/WebAPI/Controllers/BaseSet/Gy_ModelTypeController.cs b/WebAPI/Controllers/BaseSet/Gy_ModelTypeController.cs
index 600e113..43cab7d 100644
--- a/WebAPI/Controllers/BaseSet/Gy_ModelTypeController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_ModelTypeController.cs
@@ -1,4 +1,5 @@
锘縰sing DBUtility;
+using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
@@ -34,8 +35,10 @@
{
try
{
+ List<object> a = new List<object>();
if (!DBUtility.ClsPub.Security_Log(ModRightNameSelect, 1, false, user))
{
+
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "娌℃湁鏌ョ湅鏉冮檺";
@@ -43,6 +46,12 @@
return objJsonResult;
}
ds = oCN.RunProcReturn("select HItemID,HParentID,HNumber,HName,HLevel, case when HEndFlag<>0 then 'Y'else ' 'end HEndFlag,case when HStopFlag <> 0 then 'Y'else ' 'end HStopFlag, HRemark, HUseFlag from Gy_MouldType where 1=1 " + sWhere+ " order by HNumber", "Gy_MouldType");
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ a.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
//if (ds.Tables[0].Rows.Count != 0 || ds != null)
//{
@@ -50,6 +59,7 @@
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = a;
return objJsonResult;
//}
//else
diff --git a/WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs b/WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs
index 69c2f00..71e5b47 100644
--- a/WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs
+++ b/WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs
@@ -28,7 +28,7 @@
{
try
{
-
+ List<object> columnNameList = new List<object>(); //瀹氫箟澹版槑鍙橀噺 锛屾妸閫氳繃 new List<object>()鍒涘缓鐨� 瀹炰緥锛岃祴鍊肩粰鍙橀噺
ds = oCN.RunProcReturn("select * from Xt_grdAlignment_WMES where HModName='" + HModName + "' and HUserName='" + user + "'", "Xt_grdAlignment_WMES");
if (ds.Tables[0].Rows.Count == 0)
@@ -43,11 +43,18 @@
return objJsonResult;
}
}
+ foreach (DataColumn col in ds.Tables[0].Columns)//閬嶅巻ds涓涓�涓〃锛圱ables[0]锛夌殑鎵�鏈夊垪锛圕olumns锛夋瘡娆″惊鐜腑锛宑ol鍙橀噺浼氭寔鏈夊綋鍓嶅垪鐨勫紩鐢�
+ {
+ Type dataType = col.DataType; //鑾峰彇褰撳墠鏁版嵁绫诲瀷浼犲叆 鑷畾涔夊彉閲廳atadataType
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; //瀛楃涓叉嫾鎺� // 灏嗗垪鍚嶅拰鏁版嵁绫诲瀷淇℃伅鎷兼帴鎴愪竴涓狫SON鏍煎紡鐨勫瓧绗︿覆
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = ds.Tables[0];
+ objJsonResult.data = ds.Tables[0];//浠ｇ爜灏嗙涓�涓狣ataTable锛堢储寮曚负0锛夎祴鍊肩粰objJsonResult鐨刣ata灞炴��
+ objJsonResult.list = columnNameList;//灏哻olumnNameList璧嬪�肩粰objJsonResult鐨刲ist灞炴��
return objJsonResult;
}
catch (Exception e)
diff --git a/WebAPI/Controllers/CGGL/Cg_POInStockBackBillController.cs b/WebAPI/Controllers/CGGL/Cg_POInStockBackBillController.cs
index cb4573a..df78c81 100644
--- a/WebAPI/Controllers/CGGL/Cg_POInStockBackBillController.cs
+++ b/WebAPI/Controllers/CGGL/Cg_POInStockBackBillController.cs
@@ -40,7 +40,7 @@
{
try
{
-
+ List<object> columnNameList = new List<object>(); //瀹氫箟澹版槑鍙橀噺 锛屾妸閫氳繃 new List<object>()鍒涘缓鐨� 瀹炰緥锛岃祴鍊肩粰鍙橀噺
//鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
if (!DBUtility.ClsPub.Security_Log("Cg_POInStockBackBillQuery", 1, false, user))
{
@@ -61,16 +61,20 @@
string sql = sql1 + sWhere+ " order by hmainid desc";
ds = oCN.RunProcReturn(sql, "h_v_IF_POInStockBackBillList");
}
-
-
-
-
+ foreach (DataColumn col in ds.Tables[0].Columns)//閬嶅巻ds涓涓�涓〃锛圱ables[0]锛夌殑鎵�鏈夊垪锛圕olumns锛夋瘡娆″惊鐜腑锛宑ol鍙橀噺浼氭寔鏈夊綋鍓嶅垪鐨勫紩鐢�
+ {
+ Type dataType = col.DataType; //鑾峰彇褰撳墠鏁版嵁绫诲瀷浼犲叆 鑷畾涔夊彉閲廳atadataType
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
//if (ds.Tables[0].Rows.Count != 0 || ds != null)
//{
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = ds.Tables[0];
+ //objJsonResult.data = ds.Tables[0];
+ objJsonResult.data = ds.Tables[0];//浠ｇ爜灏嗙涓�涓狣ataTable锛堢储寮曚负0锛夎祴鍊肩粰objJsonResult鐨刣ata灞炴��
+ objJsonResult.list = columnNameList;//灏哻olumnNameList璧嬪�肩粰objJsonResult鐨刲ist灞炴��
return objJsonResult;
//}
//else
diff --git a/WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs b/WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs
index 7b74011..bfeb542 100644
--- a/WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs
+++ b/WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs
@@ -76,6 +76,7 @@
{
try
{
+ List<object> columnNameList = new List<object>(); //瀹氫箟澹版槑鍙橀噺 锛屾妸閫氳繃 new List<object>()鍒涘缓鐨� 瀹炰緥锛岃祴鍊肩粰鍙橀噺
//鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
if (!DBUtility.ClsPub.Security_Log("Cg_POInStockBillQuery", 1, false, user))
{
@@ -86,6 +87,7 @@
return objJsonResult;
}
+ //if(sWhere=="" || sWhere==null)
if (sWhere == null || sWhere.Equals(""))
{
ds = oCN.RunProcReturn("select * from h_v_IF_POInStockBillList order by hmainid desc", "h_v_IF_POInStockBillList");
@@ -96,13 +98,19 @@
string sql = sql1 + sWhere + " order by 鏃ユ湡 desc,hmainid desc";
ds = oCN.RunProcReturn(sql, "h_v_IF_POInStockBillList");
}
-
+ foreach (DataColumn col in ds.Tables[0].Columns)//閬嶅巻ds涓涓�涓〃锛圱ables[0]锛夌殑鎵�鏈夊垪锛圕olumns锛夋瘡娆″惊鐜腑锛宑ol鍙橀噺浼氭寔鏈夊綋鍓嶅垪鐨勫紩鐢�
+ {
+ Type dataType = col.DataType; //鑾峰彇褰撳墠鏁版嵁绫诲瀷浼犲叆 鑷畾涔夊彉閲廳atadataType
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; //瀛楃涓叉嫾鎺� // 灏嗗垪鍚嶅拰鏁版嵁绫诲瀷淇℃伅鎷兼帴鎴愪竴涓狫SON鏍煎紡鐨勫瓧绗︿覆
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
//if (ds.Tables[0].Rows.Count != 0 || ds != null)
//{
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = ds.Tables[0];
+ objJsonResult.data = ds.Tables[0];//浠ｇ爜灏嗙涓�涓狣ataTable锛堢储寮曚负0锛夎祴鍊肩粰objJsonResult鐨刣ata灞炴��
+ objJsonResult.list = columnNameList;//灏哻olumnNameList璧嬪�肩粰objJsonResult鐨刲ist灞炴��
return objJsonResult;
//}
//else
diff --git a/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs b/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
index 8ffe2c1..fb3adf2 100644
--- a/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
+++ b/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
@@ -50,9 +50,9 @@
//}
//string sql = "select * from h_v_IF_POOrderBillList where 1 = 1 ";
- //if (sWhere=="" || sWhere == null)
+ //if (sWhere == "" || sWhere == null)
//{
- // ds = oCN.RunProcReturn(sql+ " order by hmainid desc", "h_v_IF_POOrderBillList");
+ // ds = oCN.RunProcReturn("select * from h_v_IF_POOrderBillList order by hmainid desc", "h_v_IF_POOrderBillList");
//}
//else
//{
diff --git a/WebAPI/Controllers/CGGL/Cg_PORequestBillController.cs b/WebAPI/Controllers/CGGL/Cg_PORequestBillController.cs
index 186e0df..08033d0 100644
--- a/WebAPI/Controllers/CGGL/Cg_PORequestBillController.cs
+++ b/WebAPI/Controllers/CGGL/Cg_PORequestBillController.cs
@@ -63,7 +63,7 @@
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
- objJsonResult.list = columnNameList;
+ objJsonResult.list = columnNameList;//灏哻olumnNameList璧嬪�肩粰objJsonResult鐨刲ist灞炴��
return objJsonResult;
}
catch (Exception e)
diff --git a/WebAPI/Controllers/CGGL/Kf_POStockInBackBillController.cs b/WebAPI/Controllers/CGGL/Kf_POStockInBackBillController.cs
index 8ff54d5..5a5df2f 100644
--- a/WebAPI/Controllers/CGGL/Kf_POStockInBackBillController.cs
+++ b/WebAPI/Controllers/CGGL/Kf_POStockInBackBillController.cs
@@ -1,4 +1,5 @@
-锘縰sing Newtonsoft.Json.Linq;
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
using NPOI.SS.Formula.Functions;
using Pub_Class;
using System;
@@ -44,6 +45,7 @@
{
try
{
+ List<object> columnNameList = new List<object>();//瀹氫箟澹版槑鍙橀噺 锛屾妸閫氳繃 new List<object>()鍒涘缓鐨� 瀹炰緥锛岃祴鍊肩粰鍙橀噺
if (sWhere == null || sWhere.Equals(""))
{
ds = oCN.RunProcReturn("select * from h_v_Kf_POStockInBackBillList order by hmainid desc", "h_v_Kf_POStockInBackBillList");
@@ -54,13 +56,19 @@
string sql = sql1 + sWhere + " order by hmainid desc";
ds = oCN.RunProcReturn(sql, "h_v_Kf_POStockInBackBillList");
}
-
+ foreach (DataColumn col in ds.Tables[0].Columns)//閬嶅巻ds涓涓�涓〃锛圱ables[0]锛夌殑鎵�鏈夊垪锛圕olumns锛夋瘡娆″惊鐜腑锛宑ol鍙橀噺浼氭寔鏈夊綋鍓嶅垪鐨勫紩鐢�
+ {
+ Type dataType = col.DataType; //鑾峰彇褰撳墠鏁版嵁绫诲瀷浼犲叆 鑷畾涔夊彉閲廳atadataType
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; //瀛楃涓叉嫾鎺� // 灏嗗垪鍚嶅拰鏁版嵁绫诲瀷淇℃伅鎷兼帴鎴愪竴涓狫SON鏍煎紡鐨勫瓧绗︿覆
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
//if (ds.Tables[0].Rows.Count != 0 || ds != null)
//{
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;//灏哻olumnNameList璧嬪�肩粰objJsonResult鐨刲ist灞炴��
return objJsonResult;
//}
//else
diff --git a/WebAPI/Controllers/CGGL/Kf_POStockInBillController.cs b/WebAPI/Controllers/CGGL/Kf_POStockInBillController.cs
index 37a3419..e249519 100644
--- a/WebAPI/Controllers/CGGL/Kf_POStockInBillController.cs
+++ b/WebAPI/Controllers/CGGL/Kf_POStockInBillController.cs
@@ -1,4 +1,5 @@
-锘縰sing Newtonsoft.Json.Linq;
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
using NPOI.SS.Formula.Functions;
using Pub_Class;
using System;
@@ -39,6 +40,7 @@
{
try
{
+ List<object> columnNameList = new List<object>();//瀹氫箟澹版槑鍙橀噺 锛屾妸閫氳繃 new List<object>()鍒涘缓鐨� 瀹炰緥锛岃祴鍊肩粰鍙橀噺
if (sWhere == null || sWhere.Equals(""))
{
string sql = "select * from h_v_Kf_POStockInBillList order by hmainid desc";
@@ -50,6 +52,12 @@
string sql = sql1 + sWhere+ " order by hmainid desc";
ds = oCN.RunProcReturn(sql, "h_v_Kf_POStockInBillList");
}
+ foreach (DataColumn col in ds.Tables[0].Columns)//閬嶅巻ds涓涓�涓〃锛圱ables[0]锛夌殑鎵�鏈夊垪锛圕olumns锛夋瘡娆″惊鐜腑锛宑ol鍙橀噺浼氭寔鏈夊綋鍓嶅垪鐨勫紩鐢�
+ {
+ Type dataType = col.DataType; //鑾峰彇褰撳墠鏁版嵁绫诲瀷浼犲叆 鑷畾涔夊彉閲廳atadataType
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; //瀛楃涓叉嫾鎺� // 灏嗗垪鍚嶅拰鏁版嵁绫诲瀷淇℃伅鎷兼帴鎴愪竴涓狫SON鏍煎紡鐨勫瓧绗︿覆
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
//if (ds.Tables[0].Rows.Count != 0 || ds != null)
//{
@@ -57,6 +65,7 @@
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;//灏哻olumnNameList璧嬪�肩粰objJsonResult鐨刲ist灞炴��
return objJsonResult;
//}
//else
diff --git a/WebAPI/Controllers/CGGL/WW_EntrustOrderBillController.cs b/WebAPI/Controllers/CGGL/WW_EntrustOrderBillController.cs
index e168699..a3bb04e 100644
--- a/WebAPI/Controllers/CGGL/WW_EntrustOrderBillController.cs
+++ b/WebAPI/Controllers/CGGL/WW_EntrustOrderBillController.cs
@@ -1,4 +1,5 @@
-锘縰sing Newtonsoft.Json.Linq;
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
using System.Collections;
@@ -31,6 +32,7 @@
{
try
{
+ List<object> columnNameList = new List<object>(); //瀹氫箟澹版槑鍙橀噺 锛屾妸閫氳繃 new List<object>()鍒涘缓鐨� 瀹炰緥锛岃祴鍊肩粰鍙橀噺
//鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
//if (!DBUtility.ClsPub.Security_Log("WW_EntrustOrderBillQuery", 1, false, user))
//{
@@ -59,13 +61,19 @@
}
string sql = "select * from h_v_IF_EntrustOrderBillList where 1 = 1 " + sWhere;
ds = oCN.RunProcReturn(sql, "h_v_IF_EntrustOrderBillList");
-
+ foreach (DataColumn col in ds.Tables[0].Columns)//閬嶅巻ds涓涓�涓〃锛圱ables[0]锛夌殑鎵�鏈夊垪锛圕olumns锛夋瘡娆″惊鐜腑锛宑ol鍙橀噺浼氭寔鏈夊綋鍓嶅垪鐨勫紩鐢�
+ {
+ Type dataType = col.DataType; //鑾峰彇褰撳墠鏁版嵁绫诲瀷浼犲叆 鑷畾涔夊彉閲廳atadataType
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; //瀛楃涓叉嫾鎺� // 灏嗗垪鍚嶅拰鏁版嵁绫诲瀷淇℃伅鎷兼帴鎴愪竴涓狫SON鏍煎紡鐨勫瓧绗︿覆
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
//if (ds.Tables[0].Rows.Count != 0 || ds != null)
//{
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
return objJsonResult;
//}
//else
diff --git a/WebAPI/Controllers/Kf_ICStockBillMainController.cs b/WebAPI/Controllers/Kf_ICStockBillMainController.cs
index 5efd68d..6d2e33c 100644
--- a/WebAPI/Controllers/Kf_ICStockBillMainController.cs
+++ b/WebAPI/Controllers/Kf_ICStockBillMainController.cs
@@ -1,4 +1,5 @@
-锘縰sing Newtonsoft.Json.Linq;
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
@@ -24,6 +25,7 @@
{
try
{
+ List<object> columnNameList = new List<object>(); //瀹氫箟澹版槑鍙橀噺 锛屾妸閫氳繃 new List<object>()鍒涘缓鐨� 瀹炰緥锛岃祴鍊肩粰鍙橀噺
//鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
if (!DBUtility.ClsPub.Security_Log("Kf_ICStockBill_Query", 1, false, user))
{
@@ -43,13 +45,19 @@
string sql = "select * from h_v_IF_Kf_ICStockBillMain where 1 = 1 " + sWhere + " order by hmainid desc";
ds = oCN.RunProcReturn(sql, "h_v_IF_Kf_ICStockBillMain");
}
-
+ foreach (DataColumn col in ds.Tables[0].Columns)//閬嶅巻ds涓涓�涓〃锛圱ables[0]锛夌殑鎵�鏈夊垪锛圕olumns锛夋瘡娆″惊鐜腑锛宑ol鍙橀噺浼氭寔鏈夊綋鍓嶅垪鐨勫紩鐢�
+ {
+ Type dataType = col.DataType; //鑾峰彇褰撳墠鏁版嵁绫诲瀷浼犲叆 鑷畾涔夊彉閲廳atadataType
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; //瀛楃涓叉嫾鎺� // 灏嗗垪鍚嶅拰鏁版嵁绫诲瀷淇℃伅鎷兼帴鎴愪竴涓狫SON鏍煎紡鐨勫瓧绗︿覆
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
//if (ds.Tables[0].Rows.Count != 0 || ds != null)
//{
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
return objJsonResult;
//}
//else
diff --git a/WebAPI/Controllers/LMESController.cs b/WebAPI/Controllers/LMESController.cs
index 2177b34..70d922e 100644
--- a/WebAPI/Controllers/LMESController.cs
+++ b/WebAPI/Controllers/LMESController.cs
@@ -1118,6 +1118,7 @@
DataSet ds;
try
{
+ List<object> columnNameList = new List<object>();
if (HBillSubType == "SUB")
{
//鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
@@ -1175,7 +1176,19 @@
}
string sql = sql1 + sWhere + " order by hmainid desc,cast(宸ュ簭鍙� as int)";
ds = oCN.RunProcReturn(sql, "h_v_Gy_RoutingBillList");
+ } //娣诲姞鍒楀悕
+ 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 = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+
}
catch (Exception e)
{
@@ -1203,6 +1216,7 @@
DataSet ds;
try
{
+ //List<object> columnNameList = new List<object>(); //瀹氫箟澹版槑鍙橀噺 锛屾妸閫氳繃 new List<object>()鍒涘缓鐨� 瀹炰緥锛岃祴鍊肩粰鍙橀噺
//鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
if (!DBUtility.ClsPub.Security_Log("Gy_RoutingBill_Query", 1, false, user))
{
@@ -1243,6 +1257,18 @@
string sql = sql1 + sWhere + " order by hmainid desc,cast(宸ュ簭鍙� as int)";
ds = oCN.RunProcReturn(sql, "h_v_Gy_RoutingBillList_His");
}
+ //foreach (DataColumn col in ds.Tables[0].Columns)//閬嶅巻ds涓涓�涓〃锛圱ables[0]锛夌殑鎵�鏈夊垪锛圕olumns锛夋瘡娆″惊鐜腑锛宑ol鍙橀噺浼氭寔鏈夊綋鍓嶅垪鐨勫紩鐢�
+ //{
+ // Type dataType = col.DataType; //鑾峰彇褰撳墠鏁版嵁绫诲瀷浼犲叆 鑷畾涔夊彉閲廳atadataType
+ // string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; //瀛楃涓叉嫾鎺� // 灏嗗垪鍚嶅拰鏁版嵁绫诲瀷淇℃伅鎷兼帴鎴愪竴涓狫SON鏍煎紡鐨勫瓧绗︿覆
+ // columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ //}
+ //objJsonResult.code = "1";
+ //objJsonResult.count = 1;
+ //objJsonResult.Message = "Sucess锛�";
+ //objJsonResult.data = ds.Tables[0];//浠ｇ爜灏嗙涓�涓狣ataTable锛堢储寮曚负0锛夎祴鍊肩粰objJsonResult鐨刣ata灞炴��
+ //objJsonResult.list = columnNameList;//灏哻olumnNameList璧嬪�肩粰objJsonResult鐨刲ist灞炴��
+
}
catch (Exception e)
{
@@ -1587,7 +1613,8 @@
DataSet ds;
try
{
- //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ List<object> columnNameList = new List<object>()
+; //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
if (!DBUtility.ClsPub.Security_Log("Sc_ICMOBillQuery", 1, false, user))
{
objJsonResult.code = "0";
@@ -1612,6 +1639,22 @@
}
ds = oCN.RunProcReturn("select * from h_v_IF_ICMOBillList where 1 = 1 " + sWhere + " order by 鍒跺崟鏃ユ湡 desc,鍗曟嵁鍙� desc", "h_v_IF_ICMOBillList");
+ //娣诲姞鍒楀悕
+ 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鍒楀璞＄殑鍒楀悕
+ }
+
+ //if (ds.Tables[0].Rows.Count != 0 || ds != null)
+ //{
+ //objJsonResult.code = "1";
+ //objJsonResult.count = 1;
+ //objJsonResult.Message = "Sucess锛�";
+ //objJsonResult.data = ds.Tables[0];
+ //objJsonResult.list = a;
+ //return objJsonResult;
}
catch (Exception e)
{
@@ -2109,7 +2152,7 @@
{
List<object> columnNameList = new List<object>();
- //娣诲姞鍒楀悕
+ //娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
{
Type dataType = col.DataType;
@@ -2120,8 +2163,9 @@
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
- objJsonResult.list = columnNameList;
+
objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
return objJsonResult;
}
catch (Exception e)
diff --git a/WebAPI/Controllers/QC_ManagementController.cs b/WebAPI/Controllers/QC_ManagementController.cs
index ab87089..05e988d 100644
--- a/WebAPI/Controllers/QC_ManagementController.cs
+++ b/WebAPI/Controllers/QC_ManagementController.cs
@@ -9,6 +9,7 @@
using System.Data;
using Newtonsoft.Json.Linq;
using Pub_Class;
+using Newtonsoft.Json;
namespace WebAPI.Controllers
{
@@ -33,12 +34,21 @@
{
try
{
+ List<object> a = new List<object>();
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ a.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
//if (ds.Tables[0].Rows.Count != 0 || ds != null)
//{
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = a;
return objJsonResult;
//}
//else
diff --git a/WebAPI/Controllers/QC_POStockInCheckBillController.cs b/WebAPI/Controllers/QC_POStockInCheckBillController.cs
index edae5dd..4932707 100644
--- a/WebAPI/Controllers/QC_POStockInCheckBillController.cs
+++ b/WebAPI/Controllers/QC_POStockInCheckBillController.cs
@@ -1,4 +1,5 @@
-锘縰sing Newtonsoft.Json.Linq;
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
using System.Collections;
@@ -33,7 +34,8 @@
public object GetPOStockInCheckBill(string sWhere,string user)
{
try
- {
+ {
+ List<object> a = new List<object>();
//鏌ョ湅鏉冮檺
if (!DBUtility.ClsPub.Security_Log("QC_POStockInCheckBill_Query", 1, false, user))
{
@@ -45,11 +47,17 @@
}
ds = QC_POStockInCheckBill(sWhere);
-
+ foreach (DataColumn col in ds.Tables[0].Columns)//閬嶅巻ds涓涓�涓〃锛圱ables[0]锛夌殑鎵�鏈夊垪锛圕olumns锛夋瘡娆″惊鐜腑锛宑ol鍙橀噺浼氭寔鏈夊綋鍓嶅垪鐨勫紩鐢�
+ {
+ Type dataType = col.DataType; //鑾峰彇褰撳墠鏁版嵁绫诲瀷浼犲叆 鑷畾涔夊彉閲廳atadataType
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; //瀛楃涓叉嫾鎺� // 灏嗗垪鍚嶅拰鏁版嵁绫诲瀷淇℃伅鎷兼帴鎴愪竴涓狫SON鏍煎紡鐨勫瓧绗︿覆
+ a.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
objJsonResult.data = ds.Tables[0];
+ objJsonResult.list=a;
return objJsonResult;
}
catch (Exception ex)
diff --git a/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs b/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs
index fafe1d8..2b3d114 100644
--- a/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs
+++ b/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs
@@ -82,7 +82,7 @@
return objJsonResult;
}
- string s = "";
+ //string s = "";
Int64 lngBillKey = 0;
lngBillKey = DBUtility.ClsPub.isLong(HItemID);
if (lngBillKey == 0)
@@ -151,6 +151,51 @@
}
#endregion
+ # region 璁惧淇濆吇瑙勭▼缂栬緫鏃惰幏鍙栬〃浣撴暟鎹柊(淇濆吇瑙勭▼鍒楄〃銆佺偣妫�瑙勭▼鍒楄〃)
+ [Route("Gy_EquipFileMain/Gy_EquipFileMainSubAndSubItem")]
+ [HttpGet]
+ public object Gy_EquipFileMainSubAndSubItem(string HInterID)
+ {
+
+ DataSet ds, ds1;
+ List<object> list = new List<object>();
+ string Swhere = "";
+ try
+ {
+ if (HInterID != "" || HInterID != null)
+ {
+ Swhere = " and hmainid='" + HInterID + "'";
+ }
+ else
+ {
+ Swhere = HInterID;
+ }
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ //鑾峰彇淇濆吇椤圭洰缂栬緫鏁版嵁
+ string sql = "select 淇濆吇椤圭洰ID HMaintainItemID,淇濆吇椤圭洰浠ｇ爜 HMaintainItemNumber,淇濆吇椤圭洰 HMaintainItem,淇濆吇閮ㄤ綅 HMaintainPart,鍏蜂綋瑕佹眰 HClaim,璐熻矗浜篒D HManagerID,璐熻矗浜轰唬鐮� HManagerNumber,璐熻矗浜哄悕绉� HManagerName,瀛愬娉�2 HRemark from h_v_Sb_EquipMaintainRuleSub_Item where 1 = 1 " + Swhere + "";
+ ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipMaintainRuleSub_Item");
+ //鑾峰彇閰嶄欢椤圭洰缂栬緫鏁版嵁
+ string sql1 = "select 閰嶄欢ID HMaterID,閰嶄欢浠ｇ爜 HMaterNumber,閰嶄欢鍚嶇О HMaterName,鍗曚綅ID HUnitID,璁￠噺鍗曚綅浠ｇ爜 HUnitNumber,璁￠噺鍗曚綅鍚嶇О HUnitName,鐢ㄩ噺 HQty,瀛愬娉�1 HRemark from h_v_Sb_EquipMaintainRuleSub where 1 = 1 " + Swhere + "";
+ ds1 = oCN.RunProcReturn(sql1, "h_v_Sb_EquipMaintainRuleSub");
+
+ list.Add(ds.Tables[0]);
+ list.Add(ds1.Tables[0]);
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.list = list;
+ }
+ 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/Controllers/SCGL/QC_OutCompCheckBillController.cs b/WebAPI/Controllers/SCGL/QC_OutCompCheckBillController.cs
index 7d36d09..baed541 100644
--- a/WebAPI/Controllers/SCGL/QC_OutCompCheckBillController.cs
+++ b/WebAPI/Controllers/SCGL/QC_OutCompCheckBillController.cs
@@ -1,4 +1,5 @@
-锘縰sing Newtonsoft.Json.Linq;
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
using System.Collections;
@@ -33,6 +34,7 @@
{
try
{
+ List<object> a = new List<object>();
//鏌ョ湅鏉冮檺
if (!DBUtility.ClsPub.Security_Log("QC_OutCompCheckBill_Query", 1, false, user))
{
@@ -53,6 +55,12 @@
string sql = sql1 + sWhere+ " order by hmainid desc ";
ds = oCN.RunProcReturn(sql, "h_v_QC_OutCompCheckBillList");
}
+ foreach (DataColumn col in ds.Tables[0].Columns)//閬嶅巻ds涓涓�涓〃锛圱ables[0]锛夌殑鎵�鏈夊垪锛圕olumns锛夋瘡娆″惊鐜腑锛宑ol鍙橀噺浼氭寔鏈夊綋鍓嶅垪鐨勫紩鐢�
+ {
+ Type dataType = col.DataType; //鑾峰彇褰撳墠鏁版嵁绫诲瀷浼犲叆 鑷畾涔夊彉閲廳atadataType
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; //瀛楃涓叉嫾鎺� // 灏嗗垪鍚嶅拰鏁版嵁绫诲瀷淇℃伅鎷兼帴鎴愪竴涓狫SON鏍煎紡鐨勫瓧绗︿覆
+ a.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
//if (ds.Tables[0].Rows.Count != 0 || ds != null)
//{
@@ -60,6 +68,7 @@
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = a;
return objJsonResult;
//}
//else
diff --git a/WebAPI/Controllers/SCGL/Sc_ICMOReportBillController.cs b/WebAPI/Controllers/SCGL/Sc_ICMOReportBillController.cs
index 398d627..9ec52fb 100644
--- a/WebAPI/Controllers/SCGL/Sc_ICMOReportBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_ICMOReportBillController.cs
@@ -38,6 +38,7 @@
{
try
{
+ List<object> a = new List<object>();
//鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
if (!DBUtility.ClsPub.Security_Log("Sc_ICMOReportBillQuery", 1, false, user))
{
@@ -58,13 +59,19 @@
string sql = sql1 + sWhere + " order by hmainid desc ";
ds = oCN.RunProcReturn(sql, "h_v_IF_ICMOReportBillList_Edit");
}
-
+ foreach (DataColumn col in ds.Tables[0].Columns)//閬嶅巻ds涓涓�涓〃锛圱ables[0]锛夌殑鎵�鏈夊垪锛圕olumns锛夋瘡娆″惊鐜腑锛宑ol鍙橀噺浼氭寔鏈夊綋鍓嶅垪鐨勫紩鐢�
+ {
+ Type dataType = col.DataType; //鑾峰彇褰撳墠鏁版嵁绫诲瀷浼犲叆 鑷畾涔夊彉閲廳atadataType
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; //瀛楃涓叉嫾鎺� // 灏嗗垪鍚嶅拰鏁版嵁绫诲瀷淇℃伅鎷兼帴鎴愪竴涓狫SON鏍煎紡鐨勫瓧绗︿覆
+ a.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
//if (ds.Tables[0].Rows.Count != 0 || ds != null)
//{
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = a;
return objJsonResult;
//}
//else
diff --git a/WebAPI/Controllers/SCGL/Sc_PPBomBillController.cs b/WebAPI/Controllers/SCGL/Sc_PPBomBillController.cs
index 49d90d3..dde2295 100644
--- a/WebAPI/Controllers/SCGL/Sc_PPBomBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_PPBomBillController.cs
@@ -35,6 +35,7 @@
{
try
{
+ List<object> a = new List<object>();
//鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
if (!DBUtility.ClsPub.Security_Log("Sc_PPBomBillList_Query", 1, false, user))
{
@@ -55,6 +56,12 @@
string sql = sql1 + sWhere + " order by hmainid desc ";
ds = oCN.RunProcReturn(sql, "h_v_IF_PPBomBillList");
}
+ foreach (DataColumn col in ds.Tables[0].Columns)//閬嶅巻ds涓涓�涓〃锛圱ables[0]锛夌殑鎵�鏈夊垪锛圕olumns锛夋瘡娆″惊鐜腑锛宑ol鍙橀噺浼氭寔鏈夊綋鍓嶅垪鐨勫紩鐢�
+ {
+ Type dataType = col.DataType; //鑾峰彇褰撳墠鏁版嵁绫诲瀷浼犲叆 鑷畾涔夊彉閲廳atadataType
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; //瀛楃涓叉嫾鎺� // 灏嗗垪鍚嶅拰鏁版嵁绫诲瀷淇℃伅鎷兼帴鎴愪竴涓狫SON鏍煎紡鐨勫瓧绗︿覆
+ a.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
//if (ds.Tables[0].Rows.Count != 0 || ds != null)
//{
@@ -62,6 +69,7 @@
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = a;
return objJsonResult;
//}
//else
diff --git a/WebAPI/Controllers/SCGL/Sc_ProductionReturnBillController.cs b/WebAPI/Controllers/SCGL/Sc_ProductionReturnBillController.cs
index 1922813..ae1c5fc 100644
--- a/WebAPI/Controllers/SCGL/Sc_ProductionReturnBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_ProductionReturnBillController.cs
@@ -8,6 +8,7 @@
using WebAPI.Models;
using Model;
using Newtonsoft.Json.Linq;
+using Newtonsoft.Json;
namespace WebAPI.Controllers.SCGL
{
@@ -75,6 +76,7 @@
{
try
{
+ List<object> columnNameList = new List<object>(); //瀹氫箟澹版槑鍙橀噺 锛屾妸閫氳繃 new List<object>()鍒涘缓鐨� 瀹炰緥锛岃祴鍊肩粰鍙橀噺
//鍒ゆ柇鏄惁鏈夋煡璇㈢殑鏉冮檺
if (!DBUtility.ClsPub.Security_Log("Kf_ProductionReturnBill_Query", 1, false, user))
{
@@ -94,6 +96,12 @@
string sql = "select * from h_v_IF_ProductionReturnList where 1 = 1 " + sWhere + " order by hmainid desc";
ds = oCN.RunProcReturn(sql, "h_v_IF_ProductionReturnList");
}
+ foreach (DataColumn col in ds.Tables[0].Columns)//閬嶅巻ds涓涓�涓〃锛圱ables[0]锛夌殑鎵�鏈夊垪锛圕olumns锛夋瘡娆″惊鐜腑锛宑ol鍙橀噺浼氭寔鏈夊綋鍓嶅垪鐨勫紩鐢�
+ {
+ Type dataType = col.DataType; //鑾峰彇褰撳墠鏁版嵁绫诲瀷浼犲叆 鑷畾涔夊彉閲廳atadataType
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; //瀛楃涓叉嫾鎺� // 灏嗗垪鍚嶅拰鏁版嵁绫诲瀷淇℃伅鎷兼帴鎴愪竴涓狫SON鏍煎紡鐨勫瓧绗︿覆
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
//if (ds.Tables[0].Rows.Count != 0 || ds != null)
//{
@@ -101,6 +109,7 @@
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
return objJsonResult;
//}
//else
diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_Cg_PODemandPlanBillController.cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_Cg_PODemandPlanBillController.cs"
index 49ee536..e722d4e 100644
--- "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_Cg_PODemandPlanBillController.cs"
+++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_Cg_PODemandPlanBillController.cs"
@@ -28,6 +28,7 @@
{
try
{
+ List<object> a = new List<object>();
//鏌ョ湅鏉冮檺
if (!DBUtility.ClsPub.Security_Log("JIT_Cg_PODemandPlanBill_Query", 1, false, user))
{
@@ -39,11 +40,17 @@
}
ds = oCN.RunProcReturn("select * from h_v_JIT_Cg_PODemandPlanBillList where 1=1" + sWhere + "order by hmainid desc ", "h_v_JIT_Cg_PODemandPlanBillList");
-
+ foreach (DataColumn col in ds.Tables[0].Columns)//閬嶅巻ds涓涓�涓〃锛圱ables[0]锛夌殑鎵�鏈夊垪锛圕olumns锛夋瘡娆″惊鐜腑锛宑ol鍙橀噺浼氭寔鏈夊綋鍓嶅垪鐨勫紩鐢�
+ {
+ Type dataType = col.DataType; //鑾峰彇褰撳墠鏁版嵁绫诲瀷浼犲叆 鑷畾涔夊彉閲廳atadataType
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; //瀛楃涓叉嫾鎺� // 灏嗗垪鍚嶅拰鏁版嵁绫诲瀷淇℃伅鎷兼帴鎴愪竴涓狫SON鏍煎紡鐨勫瓧绗︿覆
+ a.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = a;
return objJsonResult;
}
catch (Exception e)
diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/Sc_JIT_ComplementGoodBillController.cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/Sc_JIT_ComplementGoodBillController.cs"
index b2321bb..142d610 100644
--- "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/Sc_JIT_ComplementGoodBillController.cs"
+++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/Sc_JIT_ComplementGoodBillController.cs"
@@ -1,4 +1,5 @@
锘縰sing DBUtility;
+using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
@@ -32,6 +33,7 @@
{
try
{
+ List<object> a = new List<object>();
//鏌ヨ鏉冮檺
if (!DBUtility.ClsPub.Security_Log_second("JIT_ComplementGoodBill_Query", 1, false, user))
{
@@ -43,11 +45,17 @@
}
ds = oCN.RunProcReturn("select * from h_v_JIT_Gy_WorkWarehouseBillList where 1=1 " + sWhere + " order by hmainid desc ", "h_v_JIT_Gy_WorkWarehouseBillList");
-
+ foreach (DataColumn col in ds.Tables[0].Columns)//閬嶅巻ds涓涓�涓〃锛圱ables[0]锛夌殑鎵�鏈夊垪锛圕olumns锛夋瘡娆″惊鐜腑锛宑ol鍙橀噺浼氭寔鏈夊綋鍓嶅垪鐨勫紩鐢�
+ {
+ Type dataType = col.DataType; //鑾峰彇褰撳墠鏁版嵁绫诲瀷浼犲叆 鑷畾涔夊彉閲廳atadataType
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; //瀛楃涓叉嫾鎺� // 灏嗗垪鍚嶅拰鏁版嵁绫诲瀷淇℃伅鎷兼帴鎴愪竴涓狫SON鏍煎紡鐨勫瓧绗︿覆
+ a.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = a;
return objJsonResult;
}
catch (Exception e)
@@ -292,6 +300,7 @@
{
try
{
+ List<object> A = new List<object>();
//鏌ヨ鏉冮檺
if (!DBUtility.ClsPub.Security_Log_second("Cg_PODemandPlanConfigBill_Query", 1, false, user))
{
@@ -303,11 +312,18 @@
}
ds = oCN.RunProcReturn("select * from h_v_JIT_Cg_PODemandPlanConfigBillList where 1=1 " + sWhere + " order by hmainid desc ", "h_v_JIT_Cg_PODemandPlanConfigBillList");
-
+ foreach (DataColumn col in ds.Tables[0].Columns)//閬嶅巻ds涓涓�涓〃锛圱ables[0]锛夌殑鎵�鏈夊垪锛圕olumns锛夋瘡娆″惊鐜腑锛宑ol鍙橀噺浼氭寔鏈夊綋鍓嶅垪鐨勫紩鐢�
+ {
+ Type dataType = col.DataType; //鑾峰彇褰撳墠鏁版嵁绫诲瀷浼犲叆 鑷畾涔夊彉閲廳atadataType
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; //瀛楃涓叉嫾鎺� // 灏嗗垪鍚嶅拰鏁版嵁绫诲瀷淇℃伅鎷兼帴鎴愪竴涓狫SON鏍煎紡鐨勫瓧绗︿覆
+ A.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = A;
+
return objJsonResult;
}
catch (Exception e)
diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/Sc_WorkBillSortBillController.cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/Sc_WorkBillSortBillController.cs"
index e8fd889..fb4aa7a 100644
--- "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/Sc_WorkBillSortBillController.cs"
+++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/Sc_WorkBillSortBillController.cs"
@@ -1,4 +1,5 @@
-锘縰sing Newtonsoft.Json.Linq;
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
@@ -25,6 +26,7 @@
{
try
{
+ List<object> columnNameList = new List<object>();
//鏌ョ湅鏉冮檺
if (!DBUtility.ClsPub.Security_Log("Sc_WorkBillSortBill_Query", 1, false, user))
{
@@ -36,11 +38,20 @@
}
ds = oCN.RunProcReturn("select * from h_v_JIT_Sc_WorkBillSortBillList_Left where 1=1" + sWhere + " order by 鍗曟嵁鍙� desc ", "h_v_JIT_Sc_WorkBillSortBillList");
-
+
+ foreach (DataColumn col in ds.Tables[0].Columns)//閬嶅巻ds涓涓�涓〃锛圱ables[0]锛夌殑鎵�鏈夊垪锛圕olumns锛夋瘡娆″惊鐜腑锛宑ol鍙橀噺浼氭寔鏈夊綋鍓嶅垪鐨勫紩鐢�
+ {
+ Type dataType = col.DataType; //鑾峰彇褰撳墠鏁版嵁绫诲瀷浼犲叆 鑷畾涔夊彉閲廳atadataType
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; //瀛楃涓叉嫾鎺� // 灏嗗垪鍚嶅拰鏁版嵁绫诲瀷淇℃伅鎷兼帴鎴愪竴涓狫SON鏍煎紡鐨勫瓧绗︿覆
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+
+ }
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = ds.Tables[0];
+
+ objJsonResult.data = ds.Tables[0];//浠ｇ爜灏嗙涓�涓狣ataTable锛堢储寮曚负0锛夎祴鍊肩粰objJsonResult鐨刣ata灞炴��
+ objJsonResult.list = columnNameList;//灏哻olumnNameList璧嬪�肩粰objJsonResult鐨刲ist灞炴��
return objJsonResult;
}
catch (Exception e)
diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/Sc_WorkDemandPlanBillController.cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/Sc_WorkDemandPlanBillController.cs"
index 9aec3f1..13ee963 100644
--- "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/Sc_WorkDemandPlanBillController.cs"
+++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/Sc_WorkDemandPlanBillController.cs"
@@ -27,6 +27,7 @@
{
try
{
+ List<object> A = new List<object>();
//鏌ョ湅鏉冮檺
if (!DBUtility.ClsPub.Security_Log("Sc_WorkDemandPlanBill_Query", 1, false, user))
{
@@ -38,11 +39,18 @@
}
ds = oCN.RunProcReturn("select * from h_v_JIT_Sc_WorkDemandPlanBillList where 1=1" + sWhere + "order by hmainid desc ", "h_v_JIT_Sc_WorkDemandPlanBillList");
-
+ foreach (DataColumn col in ds.Tables[0].Columns)//閬嶅巻ds涓涓�涓〃锛圱ables[0]锛夌殑鎵�鏈夊垪锛圕olumns锛夋瘡娆″惊鐜腑锛宑ol鍙橀噺浼氭寔鏈夊綋鍓嶅垪鐨勫紩鐢�
+ {
+ Type dataType = col.DataType; //鑾峰彇褰撳墠鏁版嵁绫诲瀷浼犲叆 鑷畾涔夊彉閲廳atadataType
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; //瀛楃涓叉嫾鎺� // 灏嗗垪鍚嶅拰鏁版嵁绫诲瀷淇℃伅鎷兼帴鎴愪竴涓狫SON鏍煎紡鐨勫瓧绗︿覆
+ A.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = A;
return objJsonResult;
}
catch (Exception e)
diff --git a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
index 69522d9..434777a 100644
--- a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
+++ b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
@@ -1583,6 +1583,7 @@
{
try
{
+ List<object> columnNameList = new List<object>(); //瀹氫箟澹版槑鍙橀噺 锛屾妸閫氳繃 new List<object>()鍒涘缓鐨� 瀹炰緥锛岃祴鍊肩粰鍙橀噺
//鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
if (!DBUtility.ClsPub.Security_Log("Kf_MoveStockBillQuery", 1, false, user))
{
@@ -1602,11 +1603,18 @@
string sql = "select * from h_v_IF_MoveStockBillList where 1=1 " + sWhere+ "order by hmainid desc";
ds = oCN.RunProcReturn(sql, "h_v_IF_MoveStockBillList");
}
+ foreach (DataColumn col in ds.Tables[0].Columns)//閬嶅巻ds涓涓�涓〃锛圱ables[0]锛夌殑鎵�鏈夊垪锛圕olumns锛夋瘡娆″惊鐜腑锛宑ol鍙橀噺浼氭寔鏈夊綋鍓嶅垪鐨勫紩鐢�
+ {
+ Type dataType = col.DataType; //鑾峰彇褰撳墠鏁版嵁绫诲瀷浼犲叆 鑷畾涔夊彉閲廳atadataType
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; //瀛楃涓叉嫾鎺� // 灏嗗垪鍚嶅拰鏁版嵁绫诲瀷淇℃伅鎷兼帴鎴愪竴涓狫SON鏍煎紡鐨勫瓧绗︿覆
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
return objJsonResult;
}
@@ -1775,6 +1783,7 @@
{
try
{
+ List<object> columnNameList = new List<object>(); //瀹氫箟澹版槑鍙橀噺 锛屾妸閫氳繃 new List<object>()鍒涘缓鐨� 瀹炰緥锛岃祴鍊肩粰鍙橀噺
//鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
if (!DBUtility.ClsPub.Security_Log("Kf_SellOutBillQuery", 1, false, user))
{
@@ -1786,6 +1795,12 @@
}
ds = Sc_GetSellOutBillList(sWhere);
+ foreach (DataColumn col in ds.Tables[0].Columns)//閬嶅巻ds涓涓�涓〃锛圱ables[0]锛夌殑鎵�鏈夊垪锛圕olumns锛夋瘡娆″惊鐜腑锛宑ol鍙橀噺浼氭寔鏈夊綋鍓嶅垪鐨勫紩鐢�
+ {
+ Type dataType = col.DataType; //鑾峰彇褰撳墠鏁版嵁绫诲瀷浼犲叆 鑷畾涔夊彉閲廳atadataType
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; //瀛楃涓叉嫾鎺� // 灏嗗垪鍚嶅拰鏁版嵁绫诲瀷淇℃伅鎷兼帴鎴愪竴涓狫SON鏍煎紡鐨勫瓧绗︿覆
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
//if (ds.Tables[0].Rows.Count != 0 || ds != null)
//{
@@ -1793,6 +1808,7 @@
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
return objJsonResult;
//}
//else
@@ -2200,6 +2216,7 @@
{
try
{
+ List<object> columnNameList = new List<object>(); //瀹氫箟澹版槑鍙橀噺 锛屾妸閫氳繃 new List<object>()鍒涘缓鐨� 瀹炰緥锛岃祴鍊肩粰鍙橀噺
//鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
if (!DBUtility.ClsPub.Security_Log("Kf_OtherOutBillQuery", 1, false, user))
{
@@ -2219,13 +2236,21 @@
string sql = "select * from h_v_Kf_OtherOutBillList where 1 = 1 " + sWhere+ " order by hmainid desc";
ds = oCN.RunProcReturn(sql, "h_v_Kf_OtherOutBillList");
}
-
+ foreach (DataColumn col in ds.Tables[0].Columns)//閬嶅巻ds涓涓�涓〃锛圱ables[0]锛夌殑鎵�鏈夊垪锛圕olumns锛夋瘡娆″惊鐜腑锛宑ol鍙橀噺浼氭寔鏈夊綋鍓嶅垪鐨勫紩鐢�
+ {
+ Type dataType = col.DataType; //鑾峰彇褰撳墠鏁版嵁绫诲瀷浼犲叆 鑷畾涔夊彉閲廳atadataType
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; //瀛楃涓叉嫾鎺� // 灏嗗垪鍚嶅拰鏁版嵁绫诲瀷淇℃伅鎷兼帴鎴愪竴涓狫SON鏍煎紡鐨勫瓧绗︿覆
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
//if (ds.Tables[0].Rows.Count != 0 || ds != null)
+
+
//{
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = ds.Tables[0];
+ objJsonResult.data = ds.Tables[0];//浠ｇ爜灏嗙涓�涓狣ataTable锛堢储寮曚负0锛夎祴鍊肩粰objJsonResult鐨刣ata灞炴��
+ objJsonResult.list = columnNameList;//灏哻olumnNameList璧嬪�肩粰objJsonResult鐨刲ist灞炴��
return objJsonResult;
//}
//else
@@ -3644,6 +3669,7 @@
{
try
{
+ List<object> columnNameList = new List<object>(); //瀹氫箟澹版槑鍙橀噺 锛屾妸閫氳繃 new List<object>()鍒涘缓鐨� 瀹炰緥锛岃祴鍊肩粰鍙橀噺
//鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
if (!DBUtility.ClsPub.Security_Log("Kf_OtherInBillQuery", 1, false, user))
{
@@ -3663,13 +3689,19 @@
string sql = "select * from h_v_Kf_OtherInBillList where 1 = 1 " + sWhere+ " order by hmainid desc";
ds = oCN.RunProcReturn(sql, "h_v_Kf_OtherInBillList");
}
-
+ foreach (DataColumn col in ds.Tables[0].Columns)//閬嶅巻ds涓涓�涓〃锛圱ables[0]锛夌殑鎵�鏈夊垪锛圕olumns锛夋瘡娆″惊鐜腑锛宑ol鍙橀噺浼氭寔鏈夊綋鍓嶅垪鐨勫紩鐢�
+ {
+ Type dataType = col.DataType; //鑾峰彇褰撳墠鏁版嵁绫诲瀷浼犲叆 鑷畾涔夊彉閲廳atadataType
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; //瀛楃涓叉嫾鎺� // 灏嗗垪鍚嶅拰鏁版嵁绫诲瀷淇℃伅鎷兼帴鎴愪竴涓狫SON鏍煎紡鐨勫瓧绗︿覆
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
//if (ds.Tables[0].Rows.Count != 0 || ds != null)
//{
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = ds.Tables[0];
+ objJsonResult.data = ds.Tables[0];//浠ｇ爜灏嗙涓�涓狣ataTable锛堢储寮曚负0锛夎祴鍊肩粰objJsonResult鐨刣ata灞炴��
+ objJsonResult.list = columnNameList;//灏哻olumnNameList璧嬪�肩粰objJsonResult鐨刲ist灞炴��
return objJsonResult;
//}
//else
@@ -3836,6 +3868,7 @@
{
try
{
+ List<object> columnNameList = new List<object>(); //瀹氫箟澹版槑鍙橀噺 锛屾妸閫氳繃 new List<object>()鍒涘缓鐨� 瀹炰緥锛岃祴鍊肩粰鍙橀噺
//鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
if (!DBUtility.ClsPub.Security_Log("Kf_EntrustInBillQuery", 1, false, user))
{
@@ -3854,13 +3887,20 @@
string sql = "select * from h_v_Kf_EntrustInBillList where 1 = 1 " + sWhere+ " order by hmainid desc";
ds = oCN.RunProcReturn(sql, "h_v_Kf_EntrustInBillList");
}
+ foreach (DataColumn col in ds.Tables[0].Columns)//閬嶅巻ds涓涓�涓〃锛圱ables[0]锛夌殑鎵�鏈夊垪锛圕olumns锛夋瘡娆″惊鐜腑锛宑ol鍙橀噺浼氭寔鏈夊綋鍓嶅垪鐨勫紩鐢�
+ {
+ Type dataType = col.DataType; //鑾峰彇褰撳墠鏁版嵁绫诲瀷浼犲叆 鑷畾涔夊彉閲廳atadataType
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; //瀛楃涓叉嫾鎺� // 灏嗗垪鍚嶅拰鏁版嵁绫诲瀷淇℃伅鎷兼帴鎴愪竴涓狫SON鏍煎紡鐨勫瓧绗︿覆
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
//if (ds.Tables[0].Rows.Count != 0 || ds != null)
//{
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = ds.Tables[0];
+ objJsonResult.data = ds.Tables[0];//浠ｇ爜灏嗙涓�涓狣ataTable锛堢储寮曚负0锛夎祴鍊肩粰objJsonResult鐨刣ata灞炴��
+ objJsonResult.list = columnNameList;//灏哻olumnNameList璧嬪�肩粰objJsonResult鐨刲ist灞炴��
return objJsonResult;
//}
//else
diff --git a/WebAPI/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs
index 8efb342..647c045 100644
--- a/WebAPI/Controllers/Sc_ProcessMangementController.cs
+++ b/WebAPI/Controllers/Sc_ProcessMangementController.cs
@@ -34,12 +34,21 @@
{
try
{
+ List<object> a = new List<object>();
+ foreach (DataColumn col in ds.Tables[0].Columns)//閬嶅巻ds涓涓�涓〃锛圱ables[0]锛夌殑鎵�鏈夊垪锛圕olumns锛夋瘡娆″惊鐜腑锛宑ol鍙橀噺浼氭寔鏈夊綋鍓嶅垪鐨勫紩鐢�
+ {
+ Type dataType = col.DataType; //鑾峰彇褰撳墠鏁版嵁绫诲瀷浼犲叆 鑷畾涔夊彉閲廳atadataType
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; //瀛楃涓叉嫾鎺� // 灏嗗垪鍚嶅拰鏁版嵁绫诲瀷淇℃伅鎷兼帴鎴愪竴涓狫SON鏍煎紡鐨勫瓧绗︿覆
+ a.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
//if (ds.Tables[0].Rows.Count != 0 || ds != null)
//{
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = a;
+
return objJsonResult;
//}
//else
@@ -2075,6 +2084,7 @@
DataSet ds;
try
{
+
if (!DBUtility.ClsPub.Security_Log("Sc_ProcessPlan_Query", 1, false, user))
{
objJsonResult.code = "0";
@@ -2095,6 +2105,7 @@
string sql = sql1 + sWhere + " order by hmainid desc ";
ds = oCN.RunProcReturn(sql, "h_v_Sc_ProcessPlanList");
}
+
}
catch (Exception e)
{
diff --git a/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs b/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs
index 4c3302f..f811653 100644
--- a/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs
+++ b/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs
@@ -75,6 +75,7 @@
{
try
{
+ List<object> columnNameList = new List<object>(); //瀹氫箟澹版槑鍙橀噺 锛屾妸閫氳繃 new List<object>()鍒涘缓鐨� 瀹炰緥锛岃祴鍊肩粰鍙橀噺
//鍒ゆ柇鏌ヨ鏉冮檺
if (!DBUtility.ClsPub.Security_Log("Xs_SeOrderBillQuery", 1, false, user))
{
@@ -95,11 +96,19 @@
string sql = sql1 + sWhere+ " order by hmainid desc,hsubid asc";
ds = oCN.RunProcReturn(sql, "h_v_IF_SeOrderBillList");
}
+ foreach (DataColumn col in ds.Tables[0].Columns)//閬嶅巻ds涓涓�涓〃锛圱ables[0]锛夌殑鎵�鏈夊垪锛圕olumns锛夋瘡娆″惊鐜腑锛宑ol鍙橀噺浼氭寔鏈夊綋鍓嶅垪鐨勫紩鐢�
+ {
+ Type dataType = col.DataType; //鑾峰彇褰撳墠鏁版嵁绫诲瀷浼犲叆 鑷畾涔夊彉閲廳atadataType
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; //瀛楃涓叉嫾鎺� // 灏嗗垪鍚嶅拰鏁版嵁绫诲瀷淇℃伅鎷兼帴鎴愪竴涓狫SON鏍煎紡鐨勫瓧绗︿覆
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;//灏哻olumnNameList璧嬪�肩粰objJsonResult鐨刲ist灞炴��
return objJsonResult;
}
catch (Exception e)
diff --git a/WebAPI/Controllers/XSGL/Xs_SeOutStockBackBillController.cs b/WebAPI/Controllers/XSGL/Xs_SeOutStockBackBillController.cs
index f6eac2f..513009d 100644
--- a/WebAPI/Controllers/XSGL/Xs_SeOutStockBackBillController.cs
+++ b/WebAPI/Controllers/XSGL/Xs_SeOutStockBackBillController.cs
@@ -35,7 +35,8 @@
{
try
{
- //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ List < object > columnNameList = new List<object>()
+; //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
if (!DBUtility.ClsPub.Security_Log("Xs_SeOutStockBackBillQuery", 1, false, user))
{
objJsonResult.code = "0";
@@ -55,6 +56,12 @@
string sql = sql1 + sWhere+ " order by hmainid desc";
ds = oCN.RunProcReturn(sql, "h_v_IF_SeOutStockBackBillList");
}
+ foreach (DataColumn col in ds.Tables[0].Columns)//閬嶅巻ds涓涓�涓〃锛圱ables[0]锛夌殑鎵�鏈夊垪锛圕olumns锛夋瘡娆″惊鐜腑锛宑ol鍙橀噺浼氭寔鏈夊綋鍓嶅垪鐨勫紩鐢�
+ {
+ Type dataType = col.DataType; //鑾峰彇褰撳墠鏁版嵁绫诲瀷浼犲叆 鑷畾涔夊彉閲廳atadataType
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; //瀛楃涓叉嫾鎺� // 灏嗗垪鍚嶅拰鏁版嵁绫诲瀷淇℃伅鎷兼帴鎴愪竴涓狫SON鏍煎紡鐨勫瓧绗︿覆
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
//if (ds.Tables[0].Rows.Count != 0 || ds != null)
//{
@@ -62,6 +69,7 @@
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;//灏哻olumnNameList璧嬪�肩粰objJsonResult鐨刲ist灞炴��
return objJsonResult;
//}
//else
diff --git a/WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs b/WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs
index 90f045d..2891ac6 100644
--- a/WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs
+++ b/WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs
@@ -75,6 +75,7 @@
{
try
{
+ List<object> columnNameList = new List<object>(); //瀹氫箟澹版槑鍙橀噺 锛屾妸閫氳繃 new List<object>()鍒涘缓鐨� 瀹炰緥锛岃祴鍊肩粰鍙橀噺
//鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
if (!DBUtility.ClsPub.Security_Log("Xs_SeOutStockBillQuery", 1, false, user))
{
@@ -95,6 +96,12 @@
string sql = sql1 + sWhere+ " order by hmainid desc";
ds = oCN.RunProcReturn(sql, "h_v_IF_SeOutStockBillList");
}
+ foreach (DataColumn col in ds.Tables[0].Columns)//閬嶅巻ds涓涓�涓〃锛圱ables[0]锛夌殑鎵�鏈夊垪锛圕olumns锛夋瘡娆″惊鐜腑锛宑ol鍙橀噺浼氭寔鏈夊綋鍓嶅垪鐨勫紩鐢�
+ {
+ Type dataType = col.DataType; //鑾峰彇褰撳墠鏁版嵁绫诲瀷浼犲叆 鑷畾涔夊彉閲廳atadataType
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; //瀛楃涓叉嫾鎺� // 灏嗗垪鍚嶅拰鏁版嵁绫诲瀷淇℃伅鎷兼帴鎴愪竴涓狫SON鏍煎紡鐨勫瓧绗︿覆
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
//if (ds.Tables[0].Rows.Count != 0 || ds != null)
//{
@@ -102,6 +109,8 @@
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;// 灏哻olumnNameList璧嬪�肩粰objJsonResult鐨刲ist灞炴��
+
return objJsonResult;
//}
//else
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\345\247\224\345\244\226\347\224\250\346\226\231/WW_PPBomBillController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\345\247\224\345\244\226\347\224\250\346\226\231/WW_PPBomBillController.cs"
index adeee61..55e3782 100644
--- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\345\247\224\345\244\226\347\224\250\346\226\231/WW_PPBomBillController.cs"
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\345\247\224\345\244\226\347\224\250\346\226\231/WW_PPBomBillController.cs"
@@ -1,4 +1,6 @@
-锘縰sing System;
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
@@ -26,6 +28,7 @@
{
try
{
+ List<object> columnNameList = new List<object>(); //瀹氫箟澹版槑鍙橀噺 锛屾妸閫氳繃 new List<object>()鍒涘缓鐨� 瀹炰緥锛岃祴鍊肩粰鍙橀噺
//鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
if (!DBUtility.ClsPub.Security_Log("WW_PPBomBill_Query", 1, false, user))
{
@@ -38,12 +41,20 @@
ds = WW_PPBomBillList(sWhere);
+
if (ds.Tables[0].Rows.Count != 0 || ds != null)
{
+ foreach (DataColumn col in ds.Tables[0].Columns)//閬嶅巻ds涓涓�涓〃锛圱ables[0]锛夌殑鎵�鏈夊垪锛圕olumns锛夋瘡娆″惊鐜腑锛宑ol鍙橀噺浼氭寔鏈夊綋鍓嶅垪鐨勫紩鐢�
+ {
+ Type dataType = col.DataType; //鑾峰彇褰撳墠鏁版嵁绫诲瀷浼犲叆 鑷畾涔夊彉閲廳atadataType
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; //瀛楃涓叉嫾鎺� // 灏嗗垪鍚嶅拰鏁版嵁绫诲瀷淇℃伅鎷兼帴鎴愪竴涓狫SON鏍煎紡鐨勫瓧绗︿覆
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = ds.Tables[0];
+ objJsonResult.data = ds.Tables[0];//浠ｇ爜灏嗙涓�涓狣ataTable锛堢储寮曚负0锛夎祴鍊肩粰objJsonResult鐨刣ata灞炴��
+ objJsonResult.list = columnNameList;//灏哻olumnNameList璧嬪�肩粰objJsonResult鐨刲ist灞炴��
return objJsonResult;
}
else
@@ -77,8 +88,11 @@
string sql = sql1 + sWhere + " order by hmainid desc";
return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_WW_PPBomBillList");
}
- }
- #endregion
- }
+ }
+
+ }
+
+ #endregion
}
+
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill_OutController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill_OutController.cs"
index b2fe0bd..e854f7c 100644
--- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill_OutController.cs"
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill_OutController.cs"
@@ -27,6 +27,7 @@
{
try
{
+ List<object> columnNameList = new List<object>();
if (sWhere == null || sWhere.Equals(""))
{
ds = oCN.RunProcReturn("select * from h_v_Gy_BarCodeBill_OutList order by HMainID asc", "h_v_Gy_BarCodeBill_OutList");
@@ -37,11 +38,17 @@
string sql = sql1 + sWhere + " order by HMainID asc";
ds = oCN.RunProcReturn(sql, "h_v_Gy_BarCodeBill_OutList");
}
-
+ foreach (DataColumn col in ds.Tables[0].Columns)//閬嶅巻ds涓涓�涓〃锛圱ables[0]锛夌殑鎵�鏈夊垪锛圕olumns锛夋瘡娆″惊鐜腑锛宑ol鍙橀噺浼氭寔鏈夊綋鍓嶅垪鐨勫紩鐢�
+ {
+ Type dataType = col.DataType; //鑾峰彇褰撳墠鏁版嵁绫诲瀷浼犲叆 鑷畾涔夊彉閲廳atadataType
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; //瀛楃涓叉嫾鎺� // 灏嗗垪鍚嶅拰鏁版嵁绫诲瀷淇℃伅鎷兼帴鎴愪竴涓狫SON鏍煎紡鐨勫瓧绗︿覆
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
return objJsonResult;
}
catch (Exception e)
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/KF_BarCodeStatusChangeBillController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/KF_BarCodeStatusChangeBillController.cs"
index 6d5ab07..cb02911 100644
--- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/KF_BarCodeStatusChangeBillController.cs"
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/KF_BarCodeStatusChangeBillController.cs"
@@ -27,6 +27,7 @@
{
try
{
+ List<object> columnNameList = new List<object>(); //瀹氫箟澹版槑鍙橀噺 锛屾妸閫氳繃 new List<object>()鍒涘缓鐨� 瀹炰緥锛岃祴鍊肩粰鍙橀噺
if (sWhere == null || sWhere.Equals(""))
{
ds = oCN.RunProcReturn("select * from h_v_KF_BarCodeStatusChangeBillList order by HMainID asc", "h_v_KF_BarCodeStatusChangeBillList");
@@ -37,11 +38,18 @@
string sql = sql1 + sWhere + " order by HMainID asc";
ds = oCN.RunProcReturn(sql, "h_v_KF_BarCodeStatusChangeBillList");
}
+ foreach (DataColumn col in ds.Tables[0].Columns)//閬嶅巻ds涓涓�涓〃锛圱ables[0]锛夌殑鎵�鏈夊垪锛圕olumns锛夋瘡娆″惊鐜腑锛宑ol鍙橀噺浼氭寔鏈夊綋鍓嶅垪鐨勫紩鐢�
+ {
+ Type dataType = col.DataType; //鑾峰彇褰撳墠鏁版嵁绫诲瀷浼犲叆 鑷畾涔夊彉閲廳atadataType
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; //瀛楃涓叉嫾鎺� // 灏嗗垪鍚嶅拰鏁版嵁绫诲瀷淇℃伅鎷兼帴鎴愪竴涓狫SON鏍煎紡鐨勫瓧绗︿覆
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = ds.Tables[0];
+ objJsonResult.data = ds.Tables[0];//浠ｇ爜灏嗙涓�涓狣ataTable锛堢储寮曚负0锛夎祴鍊肩粰objJsonResult鐨刣ata灞炴��
+ objJsonResult.list = columnNameList;//灏哻olumnNameList璧嬪�肩粰objJsonResult鐨刲ist灞炴��
return objJsonResult;
}
catch (Exception e)
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\350\260\203\346\213\250\347\233\230\347\202\271/Kf_MoveStockRequestBillController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\350\260\203\346\213\250\347\233\230\347\202\271/Kf_MoveStockRequestBillController.cs"
index f1797c9..7b3048d 100644
--- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\350\260\203\346\213\250\347\233\230\347\202\271/Kf_MoveStockRequestBillController.cs"
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\350\260\203\346\213\250\347\233\230\347\202\271/Kf_MoveStockRequestBillController.cs"
@@ -1,5 +1,6 @@
锘縰sing DBUtility;
using Model;
+using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
@@ -26,6 +27,7 @@
{
try
{
+ List<object> columnNameList = new List<object>(); //瀹氫箟澹版槑鍙橀噺 锛屾妸閫氳繃 new List<object>()鍒涘缓鐨� 瀹炰緥锛岃祴鍊肩粰鍙橀噺
//鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
if (!DBUtility.ClsPub.Security_Log("Kf_MoveStockRequestBill_Query", 1, false, user))
{
@@ -46,11 +48,18 @@
string sql = sql1 + sWhere + " order by hmainid desc";
ds = oCn.RunProcReturn(sql, "h_v_IF_MoveStockRequestBillList_Litee");
}
+ foreach (DataColumn col in ds.Tables[0].Columns)//閬嶅巻ds涓涓�涓〃锛圱ables[0]锛夌殑鎵�鏈夊垪锛圕olumns锛夋瘡娆″惊鐜腑锛宑ol鍙橀噺浼氭寔鏈夊綋鍓嶅垪鐨勫紩鐢�
+ {
+ Type dataType = col.DataType; //鑾峰彇褰撳墠鏁版嵁绫诲瀷浼犲叆 鑷畾涔夊彉閲廳atadataType
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; //瀛楃涓叉嫾鎺� // 灏嗗垪鍚嶅拰鏁版嵁绫诲瀷淇℃伅鎷兼帴鎴愪竴涓狫SON鏍煎紡鐨勫瓧绗︿覆
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
return objJsonResult;
}
catch (Exception ex)
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_MateOutBackBillController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_MateOutBackBillController.cs"
index 7cb661c..3a8b76f 100644
--- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_MateOutBackBillController.cs"
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_MateOutBackBillController.cs"
@@ -1,4 +1,5 @@
锘縰sing DBUtility;
+using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
@@ -28,6 +29,7 @@
{
try
{
+ List<object> columnNameList = new List<object>(); //瀹氫箟澹版槑鍙橀噺 锛屾妸閫氳繃 new List<object>()鍒涘缓鐨� 瀹炰緥锛岃祴鍊肩粰鍙橀噺
//鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
if (!DBUtility.ClsPub.Security_Log("Kf_MateOutBackBill_Query", 1, false, user))
{
@@ -47,6 +49,12 @@
string sql = "select * from h_v_IF_MateOutBackBillList " + sWhere+ " order by hmainid desc";
ds = oCn.RunProcReturn(sql, "h_v_IF_MateOutBackBillList");
}
+ foreach (DataColumn col in ds.Tables[0].Columns)//閬嶅巻ds涓涓�涓〃锛圱ables[0]锛夌殑鎵�鏈夊垪锛圕olumns锛夋瘡娆″惊鐜腑锛宑ol鍙橀噺浼氭寔鏈夊綋鍓嶅垪鐨勫紩鐢�
+ {
+ Type dataType = col.DataType; //鑾峰彇褰撳墠鏁版嵁绫诲瀷浼犲叆 鑷畾涔夊彉閲廳atadataType
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; //瀛楃涓叉嫾鎺� // 灏嗗垪鍚嶅拰鏁版嵁绫诲瀷淇℃伅鎷兼帴鎴愪竴涓狫SON鏍煎紡鐨勫瓧绗︿覆
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
//if (ds.Tables[0].Rows.Count != 0 || ds != null)
//{
@@ -54,6 +62,7 @@
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
return objJsonResult;
//}
//else
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_MateOutBillController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_MateOutBillController.cs"
index 0726ab2..0604318 100644
--- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_MateOutBillController.cs"
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_MateOutBillController.cs"
@@ -1,4 +1,5 @@
锘縰sing DBUtility;
+using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
@@ -21,13 +22,14 @@
public DLL.ClsKf_MateOutBill BillOld0 = new DLL.ClsKf_MateOutBill(); //妯″叿鎶ュ簾鍏ュ簱瀵瑰簲鍗曟嵁绫�
#region 鐢熶骇棰嗘枡鍗曞垪琛�
-
+
[Route("Kf_MateOutBill/GetMateOutBillList")]
[HttpGet]
public object GetMateOutBillList(string sWhere,string user)
{
try
{
+ List<object> columnNameList = new List<object>(); //瀹氫箟澹版槑鍙橀噺 锛屾妸閫氳繃 new List<object>()鍒涘缓鐨� 瀹炰緥锛岃祴鍊肩粰鍙橀噺
//鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
if (!DBUtility.ClsPub.Security_Log("Kf_MateOutBillQuery", 1, false, user))
{
@@ -39,13 +41,19 @@
}
ds = oCn.RunProcReturn("select * from h_v_IF_MateOutBillList_Search " + sWhere + " order by 鏃ユ湡 desc, hmainid desc", "h_v_IF_MateOutBillList_Search");
-
+ foreach (DataColumn col in ds.Tables[0].Columns)//閬嶅巻ds涓涓�涓〃锛圱ables[0]锛夌殑鎵�鏈夊垪锛圕olumns锛夋瘡娆″惊鐜腑锛宑ol鍙橀噺浼氭寔鏈夊綋鍓嶅垪鐨勫紩鐢�
+ {
+ Type dataType = col.DataType; //鑾峰彇褰撳墠鏁版嵁绫诲瀷浼犲叆 鑷畾涔夊彉閲廳atadataType
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; //瀛楃涓叉嫾鎺� // 灏嗗垪鍚嶅拰鏁版嵁绫诲瀷淇℃伅鎷兼帴鎴愪竴涓狫SON鏍煎紡鐨勫瓧绗︿覆
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
//if (ds.Tables[0].Rows.Count != 0 || ds != null)
//{
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
return objJsonResult;
//}
//else
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_MateOutRequestBillController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_MateOutRequestBillController.cs"
index 85c936a..80b8606 100644
--- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_MateOutRequestBillController.cs"
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_MateOutRequestBillController.cs"
@@ -1,5 +1,6 @@
锘縰sing DBUtility;
using Model;
+using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
@@ -28,6 +29,7 @@
{
try
{
+ List<object> columnNameList = new List<object>(); //瀹氫箟澹版槑鍙橀噺 锛屾妸閫氳繃 new List<object>()鍒涘缓鐨� 瀹炰緥锛岃祴鍊肩粰鍙橀噺
////鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
//if (!DBUtility.ClsPub.Security_Log("Kf_MoveMateRequestBill_Query", 1, false, user))
//{
@@ -48,11 +50,18 @@
string sql = sql1 + sWhere + " order by hmainid desc";
ds = oCn.RunProcReturn(sql, "h_v_IF_MateOutRequestBillList");
}
+ foreach (DataColumn col in ds.Tables[0].Columns)//閬嶅巻ds涓涓�涓〃锛圱ables[0]锛夌殑鎵�鏈夊垪锛圕olumns锛夋瘡娆″惊鐜腑锛宑ol鍙橀噺浼氭寔鏈夊綋鍓嶅垪鐨勫紩鐢�
+ {
+ Type dataType = col.DataType; //鑾峰彇褰撳墠鏁版嵁绫诲瀷浼犲叆 鑷畾涔夊彉閲廳atadataType
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; //瀛楃涓叉嫾鎺� // 灏嗗垪鍚嶅拰鏁版嵁绫诲瀷淇℃伅鎷兼帴鎴愪竴涓狫SON鏍煎紡鐨勫瓧绗︿覆
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = ds.Tables[0];
+ objJsonResult.data = ds.Tables[0];//浠ｇ爜灏嗙涓�涓狣ataTable锛堢储寮曚负0锛夎祴鍊肩粰objJsonResult鐨刣ata灞炴��
+ objJsonResult.list = columnNameList;//灏哻olumnNameList璧嬪�肩粰objJsonResult鐨刲ist灞炴��
return objJsonResult;
}
catch (Exception ex)
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_StepFoldOutBillController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_StepFoldOutBillController.cs"
index 81b8985..3182a1e 100644
--- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_StepFoldOutBillController.cs"
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_StepFoldOutBillController.cs"
@@ -8,6 +8,7 @@
using Newtonsoft.Json.Linq;
using Model;
using DBUtility;
+using Newtonsoft.Json;
namespace WebAPI.Controllers.浠撳瓨绠＄悊.棰嗘枡鍙戣揣
{
@@ -78,6 +79,7 @@
{
try
{
+ List<object> columnNameList = new List<object>(); //瀹氫箟澹版槑鍙橀噺 锛屾妸閫氳繃 new List<object>()鍒涘缓鐨� 瀹炰緥锛岃祴鍊肩粰鍙橀噺
if (sWhere == null || sWhere.Equals(""))
{
ds = oCn.RunProcReturn("select * from h_v_IF_StepFoldOutBillList order by hmainid desc", "h_v_IF_StepFoldOutBillList");
@@ -88,13 +90,19 @@
string sql = sql1 + sWhere + " order by hmainid desc";
ds = oCn.RunProcReturn(sql, "h_v_IF_StepFoldOutBillList");
}
-
+ foreach (DataColumn col in ds.Tables[0].Columns)//閬嶅巻ds涓涓�涓〃锛圱ables[0]锛夌殑鎵�鏈夊垪锛圕olumns锛夋瘡娆″惊鐜腑锛宑ol鍙橀噺浼氭寔鏈夊綋鍓嶅垪鐨勫紩鐢�
+ {
+ Type dataType = col.DataType; //鑾峰彇褰撳墠鏁版嵁绫诲瀷浼犲叆 鑷畾涔夊彉閲廳atadataType
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; //瀛楃涓叉嫾鎺� // 灏嗗垪鍚嶅拰鏁版嵁绫诲瀷淇℃伅鎷兼帴鎴愪竴涓狫SON鏍煎紡鐨勫瓧绗︿覆
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
//if (ds.Tables[0].Rows.Count != 0 || ds != null)
//{
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = ds.Tables[0];
+ objJsonResult.data = ds.Tables[0];//浠ｇ爜灏嗙涓�涓狣ataTable锛堢储寮曚负0锛夎祴鍊肩粰objJsonResult鐨刣ata灞炴��
+ objJsonResult.list = columnNameList;//灏哻olumnNameList璧嬪�肩粰objJsonResult鐨刲ist灞炴��
return objJsonResult;
//}
//else
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_StockOutRequestBillController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_StockOutRequestBillController.cs"
index 303acbb..736ed46 100644
--- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_StockOutRequestBillController.cs"
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_StockOutRequestBillController.cs"
@@ -1,5 +1,6 @@
锘縰sing DBUtility;
using Model;
+using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
@@ -26,6 +27,7 @@
{
try
{
+ List<object> columnNameList = new List<object>(); //瀹氫箟澹版槑鍙橀噺 锛屾妸閫氳繃 new List<object>()鍒涘缓鐨� 瀹炰緥锛岃祴鍊肩粰鍙橀噺
////鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
//if (!DBUtility.ClsPub.Security_Log("Kf_MoveStockRequestBill_Query", 1, false, user))
//{
@@ -46,11 +48,17 @@
string sql = sql1 + sWhere + " order by hmainid desc";
ds = oCn.RunProcReturn(sql, "h_v_IF_StockOutRequestBillList");
}
-
+ foreach (DataColumn col in ds.Tables[0].Columns)//閬嶅巻ds涓涓�涓〃锛圱ables[0]锛夌殑鎵�鏈夊垪锛圕olumns锛夋瘡娆″惊鐜腑锛宑ol鍙橀噺浼氭寔鏈夊綋鍓嶅垪鐨勫紩鐢�
+ {
+ Type dataType = col.DataType; //鑾峰彇褰撳墠鏁版嵁绫诲瀷浼犲叆 鑷畾涔夊彉閲廳atadataType
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; //瀛楃涓叉嫾鎺� // 灏嗗垪鍚嶅拰鏁版嵁绫诲瀷淇℃伅鎷兼帴鎴愪竴涓狫SON鏍煎紡鐨勫瓧绗︿覆
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = ds.Tables[0];
+ objJsonResult.data = ds.Tables[0];//浠ｇ爜灏嗙涓�涓狣ataTable锛堢储寮曚负0锛夎祴鍊肩粰objJsonResult鐨刣ata灞炴��
+ objJsonResult.list = columnNameList;//灏哻olumnNameList璧嬪�肩粰objJsonResult鐨刲ist灞炴��
return objJsonResult;
}
catch (Exception ex)
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\252\214\346\224\266\345\205\245\345\272\223/Kf_EntrustOutBackBillController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\252\214\346\224\266\345\205\245\345\272\223/Kf_EntrustOutBackBillController.cs"
index ca9a6c1..2705557 100644
--- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\252\214\346\224\266\345\205\245\345\272\223/Kf_EntrustOutBackBillController.cs"
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\252\214\346\224\266\345\205\245\345\272\223/Kf_EntrustOutBackBillController.cs"
@@ -1,4 +1,5 @@
锘縰sing DBUtility;
+using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
@@ -25,6 +26,7 @@
public object GetEntrustOutBackBillList(string sWhere,string user)
{
//鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ List<object> columnNameList = new List<object>(); //瀹氫箟澹版槑鍙橀噺 锛屾妸閫氳繃 new List<object>()鍒涘缓鐨� 瀹炰緥锛岃祴鍊肩粰鍙橀噺
if (!DBUtility.ClsPub.Security_Log("Kf_EntrustOutBillQuery", 1, false, user))
{
objJsonResult.code = "0";
@@ -37,13 +39,19 @@
try
{
ds = oCn.RunProcReturn("select * from h_v_Kf_EntrustOutBillList " + sWhere + " order by hmainid desc", "h_v_Kf_EntrustOutBillList");
-
+ foreach (DataColumn col in ds.Tables[0].Columns)//閬嶅巻ds涓涓�涓〃锛圱ables[0]锛夌殑鎵�鏈夊垪锛圕olumns锛夋瘡娆″惊鐜腑锛宑ol鍙橀噺浼氭寔鏈夊綋鍓嶅垪鐨勫紩鐢�
+ {
+ Type dataType = col.DataType; //鑾峰彇褰撳墠鏁版嵁绫诲瀷浼犲叆 鑷畾涔夊彉閲廳atadataType
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; //瀛楃涓叉嫾鎺� // 灏嗗垪鍚嶅拰鏁版嵁绫诲瀷淇℃伅鎷兼帴鎴愪竴涓狫SON鏍煎紡鐨勫瓧绗︿覆
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
//if (ds.Tables[0].Rows.Count != 0 || ds != null)
//{
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
return objJsonResult;
//}
//else
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\252\214\346\224\266\345\205\245\345\272\223/Kf_ProductInBillController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\252\214\346\224\266\345\205\245\345\272\223/Kf_ProductInBillController.cs"
index 1bbc891..f4e3b9e 100644
--- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\252\214\346\224\266\345\205\245\345\272\223/Kf_ProductInBillController.cs"
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\252\214\346\224\266\345\205\245\345\272\223/Kf_ProductInBillController.cs"
@@ -44,6 +44,7 @@
{
try
{
+ List<object> columnNameList = new List<object>();
//鍒ゆ柇鏉冮檺
if (OperationType == "1")
{
@@ -60,7 +61,7 @@
//杩斿洖鍒楄〃淇℃伅
ds = oCn.RunProcReturn("select * from " + ViewName + " where 1=1 " + sWhere + " order by hmainid desc", ViewName);
- List<object> columnNameList = new List<object>();
+
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
{
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\252\214\346\224\266\345\205\245\345\272\223/Kf_StepFoldinBillController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\252\214\346\224\266\345\205\245\345\272\223/Kf_StepFoldinBillController.cs"
index 04aea87..c30698b 100644
--- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\252\214\346\224\266\345\205\245\345\272\223/Kf_StepFoldinBillController.cs"
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\252\214\346\224\266\345\205\245\345\272\223/Kf_StepFoldinBillController.cs"
@@ -8,6 +8,7 @@
using WebAPI.Models;
using Newtonsoft.Json.Linq;
using Model;
+using Newtonsoft.Json;
namespace WebAPI.Controllers.浠撳瓨绠＄悊.楠屾敹鍏ュ簱
{
@@ -81,6 +82,7 @@
{
try
{
+ List<object> columnNameList = new List<object>(); //瀹氫箟澹版槑鍙橀噺 锛屾妸閫氳繃 new List<object>()鍒涘缓鐨� 瀹炰緥锛岃祴鍊肩粰鍙橀噺
if (sWhere == null || sWhere.Equals(""))
{
ds = oCN.RunProcReturn("select * from h_v_IF_StepFoldInBillList order by hmainid desc", "h_v_IF_StepFoldInBillList");
@@ -91,6 +93,12 @@
string sql = sql1 + sWhere + " order by hmainid desc";
ds = oCN.RunProcReturn(sql, "h_v_IF_StepFoldInBillList");
}
+ foreach (DataColumn col in ds.Tables[0].Columns)//閬嶅巻ds涓涓�涓〃锛圱ables[0]锛夌殑鎵�鏈夊垪锛圕olumns锛夋瘡娆″惊鐜腑锛宑ol鍙橀噺浼氭寔鏈夊綋鍓嶅垪鐨勫紩鐢�
+ {
+ Type dataType = col.DataType; //鑾峰彇褰撳墠鏁版嵁绫诲瀷浼犲叆 鑷畾涔夊彉閲廳atadataType
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; //瀛楃涓叉嫾鎺� // 灏嗗垪鍚嶅拰鏁版嵁绫诲瀷淇℃伅鎷兼帴鎴愪竴涓狫SON鏍煎紡鐨勫瓧绗︿覆
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
//if (ds.Tables[0].Rows.Count != 0 || ds != null)
//{
@@ -98,6 +106,7 @@
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;//灏哻olumnNameList璧嬪�肩粰objJsonResult鐨刲ist灞炴��
return objJsonResult;
//}
//else
@@ -127,7 +136,7 @@
{
try
{
-
+ //List<object> columnNameList = new List<object>(); //瀹氫箟澹版槑鍙橀噺 锛屾妸閫氳繃 new List<object>()鍒涘缓鐨� 瀹炰緥锛岃祴鍊肩粰鍙橀噺
ds = oCN.RunProcReturn("select * from h_v_IF_StepFoldInBillList where hmainid =" + HInterID, "h_v_IF_StepFoldInBillList");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
@@ -139,10 +148,17 @@
}
else
{
+ //foreach (DataColumn col in ds.Tables[0].Columns)//閬嶅巻ds涓涓�涓〃锛圱ables[0]锛夌殑鎵�鏈夊垪锛圕olumns锛夋瘡娆″惊鐜腑锛宑ol鍙橀噺浼氭寔鏈夊綋鍓嶅垪鐨勫紩鐢�
+ //{
+ // Type dataType = col.DataType; //鑾峰彇褰撳墠鏁版嵁绫诲瀷浼犲叆 鑷畾涔夊彉閲廳atadataType
+ // string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; //瀛楃涓叉嫾鎺� // 灏嗗垪鍚嶅拰鏁版嵁绫诲瀷淇℃伅鎷兼帴鎴愪竴涓狫SON鏍煎紡鐨勫瓧绗︿覆
+ // columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ //}
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
+ //objJsonResult.list = columnNameList;
return objJsonResult;
}
}
diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESBeginStepWorkBillController.cs" "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESBeginStepWorkBillController.cs"
index 3c32689..ded9d25 100644
--- "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESBeginStepWorkBillController.cs"
+++ "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESBeginStepWorkBillController.cs"
@@ -45,7 +45,9 @@
{
try
{
+ List<object> a = new List<object>();
LogService.Write("鎵ц浜�0");
+
//鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
if (!DBUtility.ClsPub.Security_Log("MES_MESBeginWorkBill_Query", 1, false, user))
{
@@ -57,11 +59,18 @@
}
LogService.Write("鎵ц浜�");
ds = Sc_GetMESBeginStepWorkBill(sWhere);
+ foreach (DataColumn col in ds.Tables[0].Columns)//閬嶅巻ds涓涓�涓〃锛圱ables[0]锛夌殑鎵�鏈夊垪锛圕olumns锛夋瘡娆″惊鐜腑锛宑ol鍙橀噺浼氭寔鏈夊綋鍓嶅垪鐨勫紩鐢�
+ {
+ Type dataType = col.DataType; //鑾峰彇褰撳墠鏁版嵁绫诲瀷浼犲叆 鑷畾涔夊彉閲廳atadataType
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; //瀛楃涓叉嫾鎺� // 灏嗗垪鍚嶅拰鏁版嵁绫诲瀷淇℃伅鎷兼帴鎴愪竴涓狫SON鏍煎紡鐨勫瓧绗︿覆
+ a.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = a;
return objJsonResult;
}
catch (Exception ex)
diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESEndStepWorkBillController.cs" "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESEndStepWorkBillController.cs"
index a2da61d..4382e02 100644
--- "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESEndStepWorkBillController.cs"
+++ "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESEndStepWorkBillController.cs"
@@ -1,4 +1,5 @@
-锘縰sing Newtonsoft.Json.Linq;
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
using System.Collections.Generic;
@@ -35,6 +36,7 @@
{
try
{
+ List<object> a = new List<object>();
//鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
if (!DBUtility.ClsPub.Security_Log("MES_MESEndWorkBill_Query", 1, false, user))
{
@@ -46,11 +48,17 @@
}
ds = Sc_GetMESEndWorkBill(sWhere);
-
+ foreach (DataColumn col in ds.Tables[0].Columns)//閬嶅巻ds涓涓�涓〃锛圱ables[0]锛夌殑鎵�鏈夊垪锛圕olumns锛夋瘡娆″惊鐜腑锛宑ol鍙橀噺浼氭寔鏈夊綋鍓嶅垪鐨勫紩鐢�
+ {
+ Type dataType = col.DataType; //鑾峰彇褰撳墠鏁版嵁绫诲瀷浼犲叆 鑷畾涔夊彉閲廳atadataType
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; //瀛楃涓叉嫾鎺� // 灏嗗垪鍚嶅拰鏁版嵁绫诲瀷淇℃伅鎷兼帴鎴愪竴涓狫SON鏍煎紡鐨勫瓧绗︿覆
+ a.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = a;
return objJsonResult;
}
catch (Exception ex)
diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESProductReportStepBillController.cs" "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESProductReportStepBillController.cs"
index f40d8c5..36ef350 100644
--- "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESProductReportStepBillController.cs"
+++ "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESProductReportStepBillController.cs"
@@ -1,4 +1,5 @@
-锘縰sing System;
+锘縰sing Newtonsoft.Json;
+using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
@@ -98,6 +99,7 @@
{
try
{
+ List<object> a = new List<object>();
//鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
if (!DBUtility.ClsPub.Security_Log("MES_ProcExchReport_Query", 1, false, user))
{
@@ -117,10 +119,17 @@
string sql = sql1 + sWhere + " order by HInterID desc";
ds = oCN.RunProcReturn(sql, "h_v_IF_ICMOBillWorkQtyStatus_Tmp");
}
+ foreach (DataColumn col in ds.Tables[0].Columns)//閬嶅巻ds涓涓�涓〃锛圱ables[0]锛夌殑鎵�鏈夊垪锛圕olumns锛夋瘡娆″惊鐜腑锛宑ol鍙橀噺浼氭寔鏈夊綋鍓嶅垪鐨勫紩鐢�
+ {
+ Type dataType = col.DataType; //鑾峰彇褰撳墠鏁版嵁绫诲瀷浼犲叆 鑷畾涔夊彉閲廳atadataType
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; //瀛楃涓叉嫾鎺� // 灏嗗垪鍚嶅拰鏁版嵁绫诲瀷淇℃伅鎷兼帴鎴愪竴涓狫SON鏍煎紡鐨勫瓧绗︿覆
+ a.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "鏌ヨ鏁版嵁鎴愬姛锛�";
objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = a;
return objJsonResult;
}
catch (Exception e)
diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESReturnStepWorkBillController.cs" "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESReturnStepWorkBillController.cs"
index 4e7ab44..6818cab 100644
--- "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESReturnStepWorkBillController.cs"
+++ "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESReturnStepWorkBillController.cs"
@@ -1,4 +1,5 @@
锘縰sing DBUtility;
+using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
@@ -38,13 +39,20 @@
{
try
{
+ List<object> a = new List<object>();
ds = Sc_GetMESReturnStepWorkBill(sWhere);
-
+ foreach (DataColumn col in ds.Tables[0].Columns)//閬嶅巻ds涓涓�涓〃锛圱ables[0]锛夌殑鎵�鏈夊垪锛圕olumns锛夋瘡娆″惊鐜腑锛宑ol鍙橀噺浼氭寔鏈夊綋鍓嶅垪鐨勫紩鐢�
+ {
+ Type dataType = col.DataType; //鑾峰彇褰撳墠鏁版嵁绫诲瀷浼犲叆 鑷畾涔夊彉閲廳atadataType
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; //瀛楃涓叉嫾鎺� // 灏嗗垪鍚嶅拰鏁版嵁绫诲瀷淇℃伅鎷兼帴鎴愪竴涓狫SON鏍煎紡鐨勫瓧绗︿覆
+ a.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = a;
return objJsonResult;
}
catch (Exception ex)
diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESStopStepWorkBillController.cs" "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESStopStepWorkBillController.cs"
index ba28356..a68007b 100644
--- "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESStopStepWorkBillController.cs"
+++ "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESStopStepWorkBillController.cs"
@@ -1,4 +1,5 @@
-锘縰sing Newtonsoft.Json.Linq;
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
using System.Collections;
@@ -34,6 +35,7 @@
{
try
{
+ List<object> a = new List<object>();
//鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
if (!DBUtility.ClsPub.Security_Log("MES_MESStopWorkBill_Query", 1, false, user))
{
@@ -54,11 +56,17 @@
string sql = sql1 + sWhere+ " order by hmainid desc ";
ds = oCN.RunProcReturn(sql, "h_v_Sc_MESStopWorkBillList_NEW");
}
-
+ foreach (DataColumn col in ds.Tables[0].Columns)//閬嶅巻ds涓涓�涓〃锛圱ables[0]锛夌殑鎵�鏈夊垪锛圕olumns锛夋瘡娆″惊鐜腑锛宑ol鍙橀噺浼氭寔鏈夊綋鍓嶅垪鐨勫紩鐢�
+ {
+ Type dataType = col.DataType; //鑾峰彇褰撳墠鏁版嵁绫诲瀷浼犲叆 鑷畾涔夊彉閲廳atadataType
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; //瀛楃涓叉嫾鎺� // 灏嗗垪鍚嶅拰鏁版嵁绫诲瀷淇℃伅鎷兼帴鎴愪竴涓狫SON鏍煎紡鐨勫瓧绗︿覆
+ a.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = a;
return objJsonResult;
}
catch (Exception e)
diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_QualityReportStepBillController.cs" "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_QualityReportStepBillController.cs"
index 3534fb7..358b720 100644
--- "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_QualityReportStepBillController.cs"
+++ "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_QualityReportStepBillController.cs"
@@ -1,4 +1,5 @@
-锘縰sing Newtonsoft.Json.Linq;
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
using System.Collections;
@@ -30,6 +31,7 @@
{
try
{
+ List<object> a = new List<object>();
//鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
if (!DBUtility.ClsPub.Security_Log("Sc_QualityReportBill_Query", 1, false, user))
{
@@ -50,13 +52,19 @@
string sql = sql1 + sWhere+ " order by hmainid desc ";
ds = oCN.RunProcReturn(sql, "h_v_Sc_QualityReportBillListDetail");
}
-
+ foreach (DataColumn col in ds.Tables[0].Columns)//閬嶅巻ds涓涓�涓〃锛圱ables[0]锛夌殑鎵�鏈夊垪锛圕olumns锛夋瘡娆″惊鐜腑锛宑ol鍙橀噺浼氭寔鏈夊綋鍓嶅垪鐨勫紩鐢�
+ {
+ Type dataType = col.DataType; //鑾峰彇褰撳墠鏁版嵁绫诲瀷浼犲叆 鑷畾涔夊彉閲廳atadataType
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; //瀛楃涓叉嫾鎺� // 灏嗗垪鍚嶅拰鏁版嵁绫诲瀷淇℃伅鎷兼帴鎴愪竴涓狫SON鏍煎紡鐨勫瓧绗︿覆
+ a.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
//if (ds.Tables[0].Rows.Count != 0 || ds != null)
//{
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = a;
return objJsonResult;
//}
//else
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile9.pubxml b/WebAPI/Properties/PublishProfiles/FolderProfile9.pubxml
index cb89d73..cb25945 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile9.pubxml
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile9.pubxml
@@ -10,7 +10,7 @@
<LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration>
<LastUsedPlatform>Any CPU</LastUsedPlatform>
<PublishProvider>FileSystem</PublishProvider>
- <PublishUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</PublishUrl>
+ <PublishUrl>D:\缂栫爜\鍙戝竷\dpi</PublishUrl>
<WebPublishMethod>FileSystem</WebPublishMethod>
<SiteUrlToLaunchAfterPublish />
</PropertyGroup>
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile9.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile9.pubxml.user
index 643a521..0b218a5 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile9.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile9.pubxml.user
@@ -4,12 +4,12 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <History>True|2024-05-28T07:39:01.7560878Z;False|2024-05-28T15:38:15.0419571+08:00;</History>
- <_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
+ <History>True|2024-07-08T01:25:20.0276919Z;True|2024-06-27T16:54:38.4812649+08:00;True|2024-06-26T10:03:43.4751808+08:00;True|2024-06-26T09:42:20.2204506+08:00;True|2024-06-26T09:28:39.0871463+08:00;True|2024-06-26T09:09:58.6226886+08:00;True|2024-06-26T09:07:49.7704057+08:00;True|2024-06-25T15:07:14.6722201+08:00;True|2024-06-24T16:56:52.4558500+08:00;True|2024-06-24T16:53:23.6378002+08:00;True|2024-06-24T14:59:07.2400452+08:00;True|2024-06-24T14:53:51.5955825+08:00;True|2024-06-24T14:46:48.9089533+08:00;True|2024-06-24T14:43:45.6730695+08:00;True|2024-06-24T13:13:28.6056412+08:00;True|2024-06-12T19:22:53.6646704+08:00;True|2024-05-30T10:55:24.4229171+08:00;True|2024-05-30T10:49:42.0037122+08:00;True|2024-05-28T15:39:01.7560878+08:00;False|2024-05-28T15:38:15.0419571+08:00;</History>
+ <_PublishTargetUrl>D:\缂栫爜\鍙戝竷\dpi</_PublishTargetUrl>
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>05/23/2024 14:14:39</publishTime>
</File>
<File Include="bin/Antlr3.Runtime.dll">
<publishTime>02/22/2013 16:43:40</publishTime>
@@ -18,28 +18,28 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>05/28/2024 15:35:42</publishTime>
+ <publishTime>07/08/2024 09:05:23</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>05/28/2024 15:35:42</publishTime>
+ <publishTime>07/08/2024 09:05:23</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>05/28/2024 15:35:41</publishTime>
+ <publishTime>07/08/2024 09:04:57</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>05/28/2024 15:35:41</publishTime>
+ <publishTime>07/08/2024 09:04:57</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>05/28/2024 15:35:39</publishTime>
+ <publishTime>07/08/2024 09:04:19</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>05/28/2024 15:35:39</publishTime>
+ <publishTime>07/08/2024 09:04:19</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.dll">
<publishTime>03/22/2022 13:17:26</publishTime>
@@ -66,7 +66,7 @@
<publishTime>05/09/2021 01:08:30</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>05/23/2024 14:14:38</publishTime>
</File>
<File Include="bin/libgrpc_csharp_ext.x64.dylib">
<publishTime>03/19/2022 07:38:44</publishTime>
@@ -84,13 +84,13 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>05/28/2024 15:35:39</publishTime>
+ <publishTime>07/08/2024 09:04:27</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>05/28/2024 15:35:39</publishTime>
+ <publishTime>07/08/2024 09:04:27</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>05/23/2024 14:14:38</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
<publishTime>08/04/2014 04:33:56</publishTime>
@@ -120,25 +120,25 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>05/28/2024 15:35:38</publishTime>
+ <publishTime>07/08/2024 09:03:49</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>05/28/2024 15:35:38</publishTime>
+ <publishTime>07/08/2024 09:03:49</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>05/28/2024 15:35:38</publishTime>
+ <publishTime>07/08/2024 09:04:05</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>05/28/2024 15:35:38</publishTime>
+ <publishTime>07/08/2024 09:04:05</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>05/28/2024 15:35:38</publishTime>
+ <publishTime>07/08/2024 09:04:06</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>05/28/2024 15:35:38</publishTime>
+ <publishTime>07/08/2024 09:04:06</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
@@ -213,7 +213,7 @@
<publishTime>11/28/2018 21:01:00</publishTime>
</File>
<File Include="bin/System.Web.Http.WebHost.dll">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>05/23/2024 14:14:38</publishTime>
</File>
<File Include="bin/System.Web.Mvc.dll">
<publishTime>01/28/2015 12:02:18</publishTime>
@@ -246,10 +246,10 @@
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>05/28/2024 15:39:00</publishTime>
+ <publishTime>07/08/2024 09:07:06</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>05/28/2024 15:39:00</publishTime>
+ <publishTime>07/08/2024 09:07:06</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/18/2013 01:03:52</publishTime>
@@ -261,58 +261,58 @@
<publishTime>11/29/2018 21:26:30</publishTime>
</File>
<File Include="Config/kdapi.config">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>05/23/2024 14:14:36</publishTime>
</File>
<File Include="Content/bootstrap.css">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>05/23/2024 14:14:36</publishTime>
</File>
<File Include="Content/bootstrap.min.css">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>05/23/2024 14:14:36</publishTime>
</File>
<File Include="Content/Site.css">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>05/23/2024 14:14:36</publishTime>
</File>
<File Include="DLL/BLL.dll">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>05/23/2024 14:14:37</publishTime>
</File>
<File Include="DLL/DAL.dll">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>05/23/2024 14:14:38</publishTime>
</File>
<File Include="DLL/DBUtility.dll">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>05/23/2024 14:14:38</publishTime>
</File>
<File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>05/23/2024 14:14:38</publishTime>
</File>
<File Include="DLL/Model.dll">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>05/23/2024 14:14:38</publishTime>
</File>
<File Include="DLL/Newtonsoft.Json.Net35.dll">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>05/23/2024 14:14:38</publishTime>
</File>
<File Include="DLL/Pub_Class.dll">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>05/23/2024 14:14:38</publishTime>
</File>
<File Include="DLL/Pub_Control.dll">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>05/23/2024 14:14:38</publishTime>
</File>
<File Include="DLL/SQLHelper.dll">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>05/23/2024 14:14:38</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.eot">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>05/23/2024 14:14:39</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.svg">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>05/23/2024 14:14:39</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.ttf">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>05/23/2024 14:14:39</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.woff">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>05/23/2024 14:14:39</publishTime>
</File>
<File Include="Global.asax">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>05/23/2024 14:14:38</publishTime>
</File>
<File Include="grpc_csharp_ext.x64.dll">
<publishTime>03/22/2022 13:17:22</publishTime>
@@ -321,7 +321,7 @@
<publishTime>03/22/2022 13:17:22</publishTime>
</File>
<File Include="Index.html">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>05/23/2024 14:14:38</publishTime>
</File>
<File Include="libgrpc_csharp_ext.x64.dylib">
<publishTime>03/19/2022 07:38:44</publishTime>
@@ -330,121 +330,121 @@
<publishTime>03/19/2022 07:38:42</publishTime>
</File>
<File Include="libman.json">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>05/23/2024 14:14:39</publishTime>
</File>
<File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>05/23/2024 14:14:38</publishTime>
</File>
<File Include="packages.config">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>05/23/2024 14:14:39</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.js">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>05/23/2024 14:14:39</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.min.js">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>05/23/2024 14:14:39</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.js">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>05/23/2024 14:14:39</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.js">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>05/23/2024 14:14:39</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.map">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>05/23/2024 14:14:39</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.js">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>05/23/2024 14:14:39</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.min.js">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>05/23/2024 14:14:39</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.js">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>05/23/2024 14:14:39</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>05/23/2024 14:14:39</publishTime>
</File>
<File Include="Views/Scripts/modernizr-2.6.2.js">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>05/23/2024 14:14:39</publishTime>
</File>
<File Include="Views/Shared/Error.cshtml">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>05/23/2024 14:14:39</publishTime>
</File>
<File Include="Views/Shared/_Layout.cshtml">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>05/23/2024 14:14:39</publishTime>
</File>
<File Include="Views/web.config">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>05/23/2024 14:14:39</publishTime>
</File>
<File Include="Views/_ViewStart.cshtml">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>05/23/2024 14:14:39</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>05/23/2024 14:14:39</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>05/23/2024 14:14:39</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>05/23/2024 14:14:39</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>05/23/2024 14:14:39</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>05/23/2024 14:14:39</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>05/23/2024 14:14:39</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>05/23/2024 14:14:39</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>05/23/2024 14:14:39</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>05/23/2024 14:14:39</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>05/23/2024 14:14:39</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Department_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>05/23/2024 14:14:39</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>05/23/2024 14:14:39</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Group_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>05/23/2024 14:14:39</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>05/23/2024 14:14:39</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Source_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>05/23/2024 14:14:39</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>05/23/2024 14:14:39</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>05/23/2024 14:14:39</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>05/23/2024 14:14:39</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>05/23/2024 14:14:39</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>05/23/2024 14:14:39</publishTime>
</File>
<File Include="Web References/WebS/Reference.map">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>05/23/2024 14:14:39</publishTime>
</File>
<File Include="Web.config">
- <publishTime>05/28/2024 15:39:00</publishTime>
+ <publishTime>07/08/2024 09:25:12</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index de642fd..ec37317 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -9,7 +9,7 @@
<WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>D:\Git\houduan\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
- <NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile9.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>D:\缂栫爜\1\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile9.pubxml</NameOfLastUsedPublishProfile>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
--
Gitblit v1.9.1