From adf47a08672d4dfb60529967f4924a207f1ecb71 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 20 十一月 2023 11:59:47 +0800
Subject: [PATCH] 1
---
WarM/仓库管理/Kf_SellOutBill_BarCodeNote.cs | 39 ++
WebAPI/Controllers/CJGL/Cj_SingleStationController.cs | 588 +++++++++++++++++++++++++++++++++++------
WebAPI/Controllers/条码管理/WEBSController.cs | 52 +++
WebAPI/Web.config | 4
WarM/仓库管理/Kf_SellOutBill_BarCodeNote.designer.cs | 121 +++++---
WarM/仓库管理/Kf_SellOutBill_BarCodeNote.resx | 13
Model/生产管理/ClsSc_QualityReportBillMain.cs | 7
7 files changed, 682 insertions(+), 142 deletions(-)
diff --git "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_QualityReportBillMain.cs" "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_QualityReportBillMain.cs"
index f4e0e90..02d4608 100644
--- "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_QualityReportBillMain.cs"
+++ "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_QualityReportBillMain.cs"
@@ -12,6 +12,13 @@
public Int64 HICMOInterID;
public Int64 HICMOEntryID;
public string HICMOBillNo;
+ public Int64 HProcExchEntryID;
+ public Int64 HProcExchInterID;
+ public Int64 HMaterID;
+ public Int64 HProdOrgID;
+ public Int64 HProcID;
+ public string HProcExchBillNo;
+ public string HBarCode;
}
}
diff --git "a/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_SellOutBill_BarCodeNote.cs" "b/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_SellOutBill_BarCodeNote.cs"
index 37c58d0..d203224 100644
--- "a/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_SellOutBill_BarCodeNote.cs"
+++ "b/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_SellOutBill_BarCodeNote.cs"
@@ -29,6 +29,7 @@
public Int64 HStockOrgID = DBUtility.ClsPub.HOrgID;
public DateTime HDate = DateTime.Today;
public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+ public DAL.ClsKf_SellOutBill BillOld = new DAL.ClsKf_SellOutBill(); //瀵瑰簲鍗曟嵁绫�
SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
#region //鍥哄畾浠ｇ爜
@@ -338,28 +339,31 @@
//鐢荤嚎
GraphLine();
- //鏈鏍�
if (cmbHBillStatus.Text == "宸插鏍�")
{
sh.Enabled = false;
+ fsh.Enabled = true;
pic1.Visible = true;
pic1.Image = System.Drawing.Image.FromFile(DBUtility.ClsPub.AppPath + @"/Pic/Checked.jpg");
}
else if (cmbHBillStatus.Text == "宸插叧闂�")
{
sh.Enabled = false;
+ fsh.Enabled = false;
pic1.Visible = true;
pic1.Image = System.Drawing.Image.FromFile(DBUtility.ClsPub.AppPath + @"/Pic/Closed.jpg");
}
else if (cmbHBillStatus.Text == "宸蹭綔搴�")
{
sh.Enabled = false;
+ fsh.Enabled = false;
pic1.Visible = true;
pic1.Image = System.Drawing.Image.FromFile(DBUtility.ClsPub.AppPath + @"/Pic/Deleted.jpg");
}
else
{
sh.Enabled = true;
+ fsh.Enabled = false;
pic1.Visible = false;
pic1.Image = null;
}
@@ -398,9 +402,32 @@
{
cmbHBillStatus.Text="宸插鏍�";
sh.Enabled = false;
+ fsh.Enabled = true;
pic1.Visible = true;
pic1.Image = System.Drawing.Image.FromFile(DBUtility.ClsPub.AppPath + @"/Pic/Checked.jpg");
MessageBox.Show("瀹℃牳鎴愬姛锛�", "鎻愮ず");
+ return;
+ }
+ }
+
+ #endregion
+
+ #region //鍙嶅鏍搁攢鍞嚭搴撳崟
+ private void fsh_Click(object sender, EventArgs e)
+ {
+ if (BillOld.AbandonCheck(HInterID, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ {
+ cmbHBillStatus.Text = "鍒涘缓";
+ sh.Enabled = true;
+ fsh.Enabled = false;
+ pic1.Visible = false;
+ pic1.Image = null;
+ MessageBox.Show("鍙嶅鏍告垚鍔燂紒", "鎻愮ず");
+ return;
+ }
+ else
+ {
+ MessageBox.Show("鍙嶅鏍稿け璐�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo, "鎻愮ず");
return;
}
}
@@ -505,11 +532,11 @@
private void BarCodedy_Click(object sender, EventArgs e)
{
- if (cmbHBillStatus.Text != "宸插鏍�")
- {
- MessageBox.Show("鎵�閫夊崟鎹搴斿崟鎹姸鎬佷笉涓衡�樺凡瀹℃牳鈥欑姸鎬侊紝涓嶅厑璁告墦鍗帮紒", "鎻愮ず");
- return;
- }
+ //if (cmbHBillStatus.Text != "宸插鏍�")
+ //{
+ // MessageBox.Show("鎵�閫夊崟鎹搴斿崟鎹姸鎬佷笉涓衡�樺凡瀹℃牳鈥欑姸鎬侊紝涓嶅厑璁告墦鍗帮紒", "鎻愮ず");
+ // return;
+ //}
//閫夋嫨鎵撳嵃妯℃澘
BLL.Gy_OpenTmp oFrm = new BLL.Gy_OpenTmp();
oFrm.sBillName = ModName;
diff --git "a/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_SellOutBill_BarCodeNote.designer.cs" "b/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_SellOutBill_BarCodeNote.designer.cs"
index 57a6d6e..77a4f80 100644
--- "a/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_SellOutBill_BarCodeNote.designer.cs"
+++ "b/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_SellOutBill_BarCodeNote.designer.cs"
@@ -30,8 +30,8 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Kf_SellOutBill_BarCodeNote));
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
this.Tool = new System.Windows.Forms.ToolStrip();
this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
this.mrlk = new System.Windows.Forms.ToolStripButton();
@@ -101,6 +101,8 @@
this.tabPage1 = new System.Windows.Forms.TabPage();
this.tabPage2 = new System.Windows.Forms.TabPage();
this.grdBarCode = new System.Windows.Forms.DataGridView();
+ this.tabPage3 = new System.Windows.Forms.TabPage();
+ this.grdTM = new System.Windows.Forms.DataGridView();
this.panel1 = new System.Windows.Forms.Panel();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.label1 = new System.Windows.Forms.Label();
@@ -111,8 +113,8 @@
this.涓棿 = new System.Windows.Forms.Panel();
this.搴曢儴 = new System.Windows.Forms.Panel();
this.鍙充晶 = new System.Windows.Forms.Panel();
- this.tabPage3 = new System.Windows.Forms.TabPage();
- this.grdTM = new System.Windows.Forms.DataGridView();
+ this.fsh = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
this.Tool.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();
this.gbUp.SuspendLayout();
@@ -122,11 +124,11 @@
this.tabPage1.SuspendLayout();
this.tabPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.grdBarCode)).BeginInit();
+ this.tabPage3.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.grdTM)).BeginInit();
this.panel1.SuspendLayout();
this.groupBox1.SuspendLayout();
this.panel2.SuspendLayout();
- this.tabPage3.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.grdTM)).BeginInit();
this.SuspendLayout();
//
// Tool
@@ -144,6 +146,8 @@
this.tp,
this.toolStripSeparator1,
this.sh,
+ this.toolStripSeparator6,
+ this.fsh,
this.toolStripSeparator2,
this.Billdy,
this.toolStripSeparator5,
@@ -313,14 +317,14 @@
this.grdMain.AllowUserToDeleteRows = false;
this.grdMain.BackgroundColor = System.Drawing.SystemColors.ControlLightLight;
this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window;
- dataGridViewCellStyle3.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText;
- dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
- this.grdMain.DefaultCellStyle = dataGridViewCellStyle3;
+ dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window;
+ dataGridViewCellStyle1.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText;
+ dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+ this.grdMain.DefaultCellStyle = dataGridViewCellStyle1;
this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;
this.grdMain.Location = new System.Drawing.Point(3, 3);
this.grdMain.Margin = new System.Windows.Forms.Padding(0);
@@ -870,14 +874,14 @@
this.grdSub.AllowUserToDeleteRows = false;
this.grdSub.BackgroundColor = System.Drawing.SystemColors.ControlLightLight;
this.grdSub.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window;
- dataGridViewCellStyle4.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText;
- dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
- this.grdSub.DefaultCellStyle = dataGridViewCellStyle4;
+ dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window;
+ dataGridViewCellStyle2.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText;
+ dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+ this.grdSub.DefaultCellStyle = dataGridViewCellStyle2;
this.grdSub.Dock = System.Windows.Forms.DockStyle.Fill;
this.grdSub.Location = new System.Drawing.Point(0, 73);
this.grdSub.Margin = new System.Windows.Forms.Padding(0);
@@ -940,6 +944,34 @@
this.grdBarCode.Size = new System.Drawing.Size(1091, 377);
this.grdBarCode.TabIndex = 46;
this.grdBarCode.Paint += new System.Windows.Forms.PaintEventHandler(this.grdBarCode_Paint);
+ //
+ // tabPage3
+ //
+ this.tabPage3.Controls.Add(this.grdTM);
+ this.tabPage3.Location = new System.Drawing.Point(4, 22);
+ this.tabPage3.Name = "tabPage3";
+ this.tabPage3.Padding = new System.Windows.Forms.Padding(3);
+ this.tabPage3.Size = new System.Drawing.Size(1097, 383);
+ this.tabPage3.TabIndex = 2;
+ this.tabPage3.Text = "鏉＄爜鏄庣粏";
+ this.tabPage3.UseVisualStyleBackColor = true;
+ //
+ // grdTM
+ //
+ this.grdTM.AllowUserToAddRows = false;
+ this.grdTM.AllowUserToDeleteRows = false;
+ this.grdTM.BackgroundColor = System.Drawing.SystemColors.ControlLightLight;
+ this.grdTM.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.grdTM.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.grdTM.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.grdTM.Location = new System.Drawing.Point(3, 3);
+ this.grdTM.Name = "grdTM";
+ this.grdTM.ReadOnly = true;
+ this.grdTM.RowHeadersWidth = 30;
+ this.grdTM.RowTemplate.Height = 23;
+ this.grdTM.Size = new System.Drawing.Size(1091, 377);
+ this.grdTM.TabIndex = 47;
+ this.grdTM.Paint += new System.Windows.Forms.PaintEventHandler(this.grdTM_Paint);
//
// panel1
//
@@ -1040,33 +1072,24 @@
this.鍙充晶.Size = new System.Drawing.Size(12, 627);
this.鍙充晶.TabIndex = 64;
//
- // tabPage3
+ // fsh
//
- this.tabPage3.Controls.Add(this.grdTM);
- this.tabPage3.Location = new System.Drawing.Point(4, 22);
- this.tabPage3.Name = "tabPage3";
- this.tabPage3.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage3.Size = new System.Drawing.Size(1097, 383);
- this.tabPage3.TabIndex = 2;
- this.tabPage3.Text = "鏉＄爜鏄庣粏";
- this.tabPage3.UseVisualStyleBackColor = true;
+ this.fsh.AutoSize = false;
+ this.fsh.Image = ((System.Drawing.Image)(resources.GetObject("fsh.Image")));
+ this.fsh.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.fsh.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.fsh.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.fsh.Name = "fsh";
+ this.fsh.Size = new System.Drawing.Size(70, 47);
+ this.fsh.Text = "鍙嶅鏍稿崟鎹�";
+ this.fsh.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.fsh.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.fsh.Click += new System.EventHandler(this.fsh_Click);
//
- // grdTM
+ // toolStripSeparator6
//
- this.grdTM.AllowUserToAddRows = false;
- this.grdTM.AllowUserToDeleteRows = false;
- this.grdTM.BackgroundColor = System.Drawing.SystemColors.ControlLightLight;
- this.grdTM.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- this.grdTM.Dock = System.Windows.Forms.DockStyle.Fill;
- this.grdTM.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.grdTM.Location = new System.Drawing.Point(3, 3);
- this.grdTM.Name = "grdTM";
- this.grdTM.ReadOnly = true;
- this.grdTM.RowHeadersWidth = 30;
- this.grdTM.RowTemplate.Height = 23;
- this.grdTM.Size = new System.Drawing.Size(1091, 377);
- this.grdTM.TabIndex = 47;
- this.grdTM.Paint += new System.Windows.Forms.PaintEventHandler(this.grdTM_Paint);
+ this.toolStripSeparator6.Name = "toolStripSeparator6";
+ this.toolStripSeparator6.Size = new System.Drawing.Size(6, 50);
//
// Kf_SellOutBill_BarCodeNote
//
@@ -1097,12 +1120,12 @@
this.tabPage1.ResumeLayout(false);
this.tabPage2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.grdBarCode)).EndInit();
+ this.tabPage3.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.grdTM)).EndInit();
this.panel1.ResumeLayout(false);
this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout();
this.panel2.ResumeLayout(false);
- this.tabPage3.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.grdTM)).EndInit();
this.ResumeLayout(false);
}
@@ -1189,5 +1212,7 @@
private System.Windows.Forms.PictureBox pic1;
private System.Windows.Forms.TabPage tabPage3;
private System.Windows.Forms.DataGridView grdTM;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator6;
+ private System.Windows.Forms.ToolStripButton fsh;
}
}
\ No newline at end of file
diff --git "a/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_SellOutBill_BarCodeNote.resx" "b/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_SellOutBill_BarCodeNote.resx"
index 7a5bbe9..b0ac140 100644
--- "a/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_SellOutBill_BarCodeNote.resx"
+++ "b/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_SellOutBill_BarCodeNote.resx"
@@ -410,6 +410,19 @@
8iQ1XvVn58xU1WnxG1zAJmn61pmIPgBiIY95z/CSIgAAAABJRU5ErkJggg==
</value>
</data>
+ <data name="fsh.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGgSURBVDhPlZPPK8NhHMc/5T7tRM0cOCAHJXGbxQ7c/AEc
+ d1EcjEwytSiH4SZcRHLQ7FemtlJDOPiZml8XSzMWMz9mK7Xevs/z7DvDzLzr9X2253k+r8+nvn0pM10t
+ hGykjnMndRE1ZWJlVKvF+qdErytIF/1G6k72sMPTBULIRcCF4H2bcOMknC8SNsb/IXheJ8R8hAfPPwUH
+ M4Qz6fKVlXBtJwRWxP99aX/NnKfgcJZwMkfwS9OwdW86TwFLc6MGmxPE2Zok+CwCzwjB5XDkLpbDJHYj
+ cax9ArbHDzukt5HJ9wxbpuGe7+fvvL1esLU6BTmsSHpyfggGRiaxe3yJaJzfhbI/wGHJ7MqKS1ZKv+xx
+ gWFoDDtH57h7jCGeSGDQHoTJGUwL5M6MSrsKFd5y/jst6DaapQkuEI6+4eU1hoZRP4dFFhTMK6FYUKB4
+ SQHVciGKbMpPQafBxAWhiDRBPA7S73O4gH0HWtGtza9BrVslCnUSrSmBPAET3Eee0GO9Ra8tjGQyySUs
+ 8iQ1XvVn58xU1WnxG1zAJmn61pmIPgBiIY95z/CSIgAAAABJRU5ErkJggg==
+</value>
+ </data>
<data name="Billdy.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
diff --git a/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs b/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs
index 0038234..178aa71 100644
--- a/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs
@@ -60,6 +60,16 @@
{
try
{
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡璇㈡潈闄�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
ds = oCN.RunProcReturn("select * from gy_czygl where czymc='" + user + "'", "gy_czygl");
string HProcID = ds.Tables[0].Rows[0]["HProcID"].ToString();
@@ -74,7 +84,15 @@
return objJsonResult;
}
- if (ds.Tables[0].Rows[0]["HProcID"].ToString() != HProcID)
+ int num = 0;
+ for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
+ {
+ if (ds.Tables[0].Rows[i]["HProcID"].ToString() == HProcID)
+ {
+ num = 1;
+ }
+ }
+ if (num == 0)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -124,6 +142,16 @@
string user = sArray[2].ToString();
string linterid = sArray[3].ToString();
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Sc_QualityReportBill_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犵紪杈戞潈闄�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
try
{
var msg3 = msg2.ToString();
@@ -168,6 +196,40 @@
//淇濆瓨瀛愯〃
objJsonResult = AddBillSub_NoTable(msg3, HInterID, HResult, linterid);
+
+ //澧炲姞浜х嚎缁勮杩芥函鍗�
+
+ Int64 HInterID1 = DBUtility.ClsPub.CreateBillID("3727", ref DBUtility.ClsPub.sExeReturnInfo);
+ string HBillNo1 = DBUtility.ClsPub.CreateBillCode("3727", ref DBUtility.ClsPub.sExeReturnInfo, true);
+
+ ds = oCN.RunProcReturn("exec h_p_Gy_BarCodeBillBomList '" + mainList[0].HProcExchBillNo + "'," + mainList[0].HProcID, "h_p_Gy_BarCodeBillBomList");
+
+ string jsonstr = JsonConvert.SerializeObject(ds.Tables[0]);
+
+ //淇濆瓨鐢熶骇缁勮鍗曚富琛�
+ string sql = $@"Insert Into Sc_AssemblyBillMain(HYear,HPeriod,HBillType,HBillSubType,HInterID,HDate
+,HBillNo,HBillStatus,HMaker,HMakeDate,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo
+,HICMOInterID,HICMOBillNo,HBarCode_P,HMaterID,HUnitID,HAssemblyStatus,HProdOrgID)
+values('{DateTime.Now.Year}','{DateTime.Now.Month}','3727','3727',{HInterID1},getdate()
+,'{HBillNo1}','1','{user}',getdate(),{mainList[0].HProcExchInterID.ToString()},{mainList[0].HProcExchEntryID.ToString()},'{mainList[0].HProcExchBillNo.ToString()}'
+,{mainList[0].HICMOInterID.ToString()},'{mainList[0].HICMOBillNo.ToString()}','{mainList[0].HBarCode.ToString()}',{mainList[0].HMaterID},0,'姹囨姤',{mainList[0].HProdOrgID})";
+ oCN.RunProc(sql);
+
+ List<Model.ClsSc_AssemblyBillSub> sub = new List<Model.ClsSc_AssemblyBillSub>();
+ sub = JsonConvert.DeserializeObject<List<Model.ClsSc_AssemblyBillSub>>(jsonstr);
+
+ for (int i = 0; i < sub.Count; i++)
+ {
+ //瀛愯〃瀛樺偍
+ string sq2 = $@"Insert Into Sc_AssemblyBillSub(HInterID,HBillNo_bak,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo
+ ,HSourceBillType,HMaterID,HSourceID,HEquipID,HUnitID,HQty
+ ,HGroupID,HWorkerID,HScanDate,HBarCode,HBarCode_P,HSNNumber)
+ values({HInterID1},'{HBillNo1}',{(i + 1)},0,0,''
+ ,'',{sub[i].HMaterID},0,0,0,{sub[i].HQty}
+ ,0,0,getdate(),'{sub[i].HBarCode}','{mainList[0].HBarCode}','') ";
+ oCN.RunProc(sq2);
+ }
+
if (objJsonResult.code == "0")
{
@@ -247,6 +309,16 @@
{
try
{
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡璇㈡潈闄�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
ds = oCN.RunProcReturn("select * from gy_czygl where czymc='" + user + "'", "gy_czygl");
ds = oCN.RunProcReturn(@"exec h_p_Gy_BarCodeBillBomList '" + HBarCode + "'," + ds.Tables[0].Rows[0]["HProcID"].ToString(), "h_p_Gy_BarCodeBillBomList");
@@ -297,6 +369,16 @@
string HBillType = sArray[4].ToString();
string HOrgID = sArray[5].ToString();
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
oCN.BeginTran();
List<Model.Sc_AssemblyBill_BindSourceTemp> tempList = new List<Model.Sc_AssemblyBill_BindSourceTemp>();
@@ -345,49 +427,6 @@
}
#endregion
- #region 宸ュ簭鍗曞搧杩囩珯 鍒犻櫎鍏抽敭浠舵竻鍗�
- [Route("Cj_SingleStation/DelBomTempList")]
- [HttpGet]
- public object DelBomTempList(int HInterID, int HEntryID, string user)
- {
- try
- {
- ds = oCN.RunProcReturn("select * from Sc_AssemblyBill_BindSourceTemp where HInterID = " + HInterID, "Sc_AssemblyBill_BindSourceTemp");
-
- if (ds.Tables[0].Rows.Count == 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏌ユ棤鏁版嵁锛�";
- objJsonResult.data = null;
- }
-
- oCN.BeginTran();
-
- string sql = "delete from Sc_AssemblyBill_BindSourceTemp where HInterID = " + HInterID + " and HEntryID=" + HEntryID;
- oCN.RunProc(sql);
-
- oCN.Commit();
-
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = null;
- return objJsonResult;
-
- }
- catch (Exception e)
- {
- oCN.RollBack();
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
- objJsonResult.data = null;
- return objJsonResult;
- }
- }
- #endregion
-
#region 宸ュ簭鍗曞搧杩囩珯 鎵玈N鐮佷繚瀛樺埌缁勮杩芥函鍗�
[Route("Cj_SingleStation/AddAssemblyBillList")]
[HttpPost]
@@ -401,6 +440,16 @@
string sMainStr = sArray[0].ToString();
string sSubStr = sArray[1].ToString();
string user = sArray[2].ToString();
+
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
oCN.BeginTran();
@@ -572,6 +621,180 @@
}
#endregion
+ #region 宸ュ簭鍗曞搧杩囩珯 SN鐮佹煡璇� 鏉＄爜瑙ｆ瀽
+ [Route("Cj_SingleStation/SNHBardCodeList")]
+ [HttpGet]
+ public object SNHBardCodeList(string HBarCode, string HProcExchBillNo, string user, int HOrgID)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn(@"select * from h_v_Gy_BarCodeBill where HBarCode='" + HBarCode + "'", "h_v_Gy_BarCodeBill");
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ if (HBarCode.Length == 29)
+ {
+ string str1 = HBarCode.Substring(23, 3);
+
+ DataSet dataSet = oCN.RunProcReturn(@"select m.HNumber 鐗╂枡浠ｇ爜,o.HNumber 缁勭粐浠ｇ爜 from Sc_ProcessExchangeBillMain a
+left join Gy_Material m on a.HMaterID=m.HItemID
+left join Xt_ORGANIZATIONS o on a.HPRDORGID=o.HItemID
+where HBillNo='" + HProcExchBillNo + "' and HProjectNum like'" + str1 + "%' and HPRDORGID="+ HOrgID, "Sc_ProcessExchangeBillMain");
+
+ if (dataSet.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏉＄爜涓庢祦杞崱涓嶅瓨鍦ㄥ搴斿叧绯�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else {
+ ClsPub.CurUserName = user;
+ //鏉＄爜鐢熸垚
+ return get_HBardBillSave(HProcExchBillNo, HBarCode);
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏉＄爜鏍煎紡涓嶆纭�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else {
+ if (ds.Tables[0].Rows[0]["HStatus"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "褰撳墠鏉＄爜鐨勭姸鎬佷负:" + ds.Tables[0].Rows[0]["HStatus"].ToString() + "锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ public object get_HBardBillSave(string HProcExchBillNo,string HBarCode) {
+ try
+ {
+ //鏌ヨ娴佽浆鍗℃暟鎹�
+ DataSet dataSet = oCN.RunProcReturn(@"select a.HPRDORGID, m.HModel 鐗╂枡瑙勬牸,m.HName 鍚嶇墿鏂欑О,a.HBillNo,a.HInterID,a.HMaterID,m.HNumber 鐗╂枡浠ｇ爜,o.HNumber 缁勭粐浠ｇ爜,a.HUnitID,u.HNumber 鍗曚綅浠ｇ爜 from Sc_ProcessExchangeBillMain a
+left join Gy_Material m on a.HMaterID=m.HItemID
+left join Xt_ORGANIZATIONS o on a.HPRDORGID=o.HItemID
+left join Gy_Unit u on a.HUnitID=u.HItemID
+where HBillNo='" + HProcExchBillNo + "'", "Sc_ProcessExchangeBillMain");
+
+ string HMaterNumber = dataSet.Tables[0].Rows[0]["鐗╂枡浠ｇ爜"].ToString();
+ string HOrgNumber = dataSet.Tables[0].Rows[0]["缁勭粐浠ｇ爜"].ToString();
+
+ if (HBarCode.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏉″舰鐮佷笉鑳戒负绌猴紝涓嶈兘鐢熸垚鏉＄爜锛�";
+ return objJsonResult;
+ }
+
+ oCN.BeginTran();
+ //鏃ユ湡鑾峰彇鏂瑰紡
+ string sDate = DateTime.Now.ToString();
+ string HWei = "0"; //灏炬暟
+ string HBarCodeType = "鍞竴鏉＄爜";
+ Int64 HMaterID =int.Parse(dataSet.Tables[0].Rows[0]["HMaterID"].ToString());
+ Int64 HAuxPropID = 0;
+ Int64 HUnitID = int.Parse(dataSet.Tables[0].Rows[0]["HUnitID"].ToString());
+ double HQty2 = 1;
+ string HBatchNo2 = "";
+ Int64 HSupID = 0;
+ Int64 HGroupID = 0;
+ int HPrintQty = 0;
+ Int64 HSourceInterID = int.Parse(dataSet.Tables[0].Rows[0]["HInterID"].ToString());
+ Int64 HSourceEntryID = 1;
+ string HSourceBillNo = dataSet.Tables[0].Rows[0]["HBillNo"].ToString();
+ string HSourceBillType = "3772";
+ Int64 HBarcodeNo = 0; //鎵樺彿
+ Int64 HBarcodeQtys = 0; //鎬绘墭鏁�
+ Int64 HDeptID = 0;
+ Int64 HWhID = 0;
+ Int64 HSPID = 0;
+ string HRemark = "";
+ string HMaterName = dataSet.Tables[0].Rows[0]["鍚嶇墿鏂欑О"].ToString();
+ string HMaterModel = dataSet.Tables[0].Rows[0]["鐗╂枡瑙勬牸"].ToString();
+ string HPinfan = "";
+ string HMTONo = "";
+ Int64 HCusID = 0;
+ string HCusType = "";
+ DateTime HEndDate=DateTime.Now;
+ string HWorkLineName = "";
+ string HSeOrderBillNo = "";
+ string HInnerBillNo = "";
+ bool HGiveAwayFlag = false;
+ Int64 HEntryID = 1;
+ Int64 HInterID = DBUtility.ClsPub.CreateBillID_Prod("85", ref DBUtility.ClsPub.sExeReturnInfo);
+ int HOrgID= int.Parse(dataSet.Tables[0].Rows[0]["HPRDORGID"].ToString());
+ string HCoilNO2 = "";
+ string HFurnaceNO2 = "";
+ string HFactory2 = "";
+ decimal HAuxQty2 = 0;
+ string HheatNO2 = "";
+
+
+ oCN.RunProc("insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HMaterID,HUnitID,HQty" +
+ ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty " +
+ ",HBarcodeQtys,HBarcodeNo,HDeptID,HWhID,HSPID,HRemark " +
+ ",HCusID,HCusType,HEndDate,HWorkLineName,HBarCodeDate " +
+ ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HEntryID " +
+ ",HGiveAwayFlag " +
+ ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo" +
+ ",HProduceDate,HExpiryDate " +
+ ") values ("
+ + "'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HQty2.ToString()
+ + ",'" + HBatchNo2 + "'," + HSupID.ToString() + "," + HGroupID.ToString() + ",'" + ClsPub.CurUserName + "',getdate()," + HPrintQty.ToString() + "," + HQty2.ToString()
+ + ", " + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo + "','" + HSourceBillType + "','" + HWei + "'"
+ + ", " + HBarcodeQtys.ToString() + "," + HBarcodeNo.ToString() + "," + HDeptID.ToString() + "," + HWhID.ToString() + "," + HSPID.ToString() + ",'" + HRemark + "'"
+ + ", " + HCusID.ToString() + ",'" + HCusType + "','" + HEndDate.ToShortDateString() + "','" + HWorkLineName + "','" + sDate + "'"
+ + ", " + HOrgID.ToString() + "," + HOrgID.ToString() + ",'" + HSeOrderBillNo + "'," + HInterID.ToString() + "," + HEntryID.ToString() + ""
+ + ", " + DBUtility.ClsPub.BoolToString(HGiveAwayFlag)
+ + ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "','" + HInnerBillNo + "','','')");
+
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#region 宸ュ簭鍗曞搧杩囩珯 閰嶄欢鐮佹煡璇�
[Route("Cj_SingleStation/HBardCodeAccessoryList")]
[HttpGet]
@@ -579,6 +802,15 @@
{
try
{
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡璇㈡潈闄�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
ds = oCN.RunProcReturn(@"select * from h_v_Gy_BarCodeBill where HBarCode='" + HBarCode + "'", "h_v_Gy_BarCodeBill");
if (ds.Tables[0].Rows.Count == 0)
@@ -624,6 +856,15 @@
{
try
{
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡璇㈡潈闄�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
ds = oCN.RunProcReturn("select * from gy_czygl where czymc='" + user + "'", "gy_czygl");
string HProcID = ds.Tables[0].Rows[0]["HProcID"].ToString();
@@ -638,8 +879,15 @@
objJsonResult.data = null;
return objJsonResult;
}
-
- if (ds.Tables[0].Rows[0]["HProcID"].ToString() != HProcID)
+ int num = 0;
+ for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
+ {
+ if (ds.Tables[0].Rows[i]["HProcID"].ToString() == HProcID)
+ {
+ num = 1;
+ }
+ }
+ if (num == 0)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -681,6 +929,15 @@
{
try
{
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡璇㈡潈闄�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
ds = oCN.RunProcReturn(@"select * from h_v_Gy_BadRecordsList where HProcExchBillNo='" + HBarCode + "'", "h_v_Gy_BadRecordsList");
@@ -709,6 +966,15 @@
{
try
{
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡璇㈡潈闄�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
ds = oCN.RunProcReturn(@"select * from h_v_Gy_QualifiedRecordsList where 1=1"+ sWhere, "h_v_Gy_QualifiedRecordsList");
@@ -737,6 +1003,16 @@
{
try
{
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Drop", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
ds = oCN.RunProcReturn("select * from h_v_Gy_BadRecordsList where HInterID = " + HInterID, "h_v_Gy_BadRecordsList");
if (ds.Tables[0].Rows.Count == 0)
@@ -746,6 +1022,10 @@
objJsonResult.Message = "鏌ユ棤鏁版嵁锛�";
objJsonResult.data = null;
}
+ string HProcExchInterID = ds.Tables[0].Rows[0]["HProcExchInterID"].ToString();
+ string HProcExchEntryID = ds.Tables[0].Rows[0]["HProcExchEntryID"].ToString();
+ string HBarCode = ds.Tables[0].Rows[0]["HBarCode"].ToString();
+
oCN.BeginTran();
@@ -754,8 +1034,12 @@
oCN.RunProc(sql);
sql = "delete from Sc_QualityReportBillSub where HInterID = " + HInterID + " and HEntryID = " + HEntryID;
oCN.RunProc(sql);
- string HProcExchInterID = ds.Tables[0].Rows[0]["HProcExchInterID"].ToString();
- string HProcExchEntryID = ds.Tables[0].Rows[0]["HProcExchEntryID"].ToString();
+ //鍒犻櫎缁勮杩芥函鍗�
+ sql = "delete from Sc_AssemblyBillSub where HInterID in(select HInterID from Sc_AssemblyBillMain where HMainSourceInterID=" + HProcExchInterID + " and HMainSourceEntryID=" + HProcExchEntryID + " and HBarCode_P='" + HBarCode + "' )";
+ oCN.RunProc(sql);
+ sql = "delete from Sc_AssemblyBillMain where HMainSourceInterID=" + HProcExchInterID + " and HMainSourceEntryID=" + HProcExchEntryID + " and HBarCode_P='" + HBarCode + "' ";
+ oCN.RunProc(sql);
+
//鍙嶅啓宸ュ簭鍑虹珯鍗曠殑涓嶈壇鏁伴噺
oCN.RunProc("update Sc_StationOutBillMain set HBadCount-=1 where HProcExchInterID='" + HProcExchInterID + "' and HProcExchEntryID=" + HProcExchEntryID);
@@ -787,6 +1071,16 @@
{
try
{
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Drop", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
ds = oCN.RunProcReturn("select * from h_v_Gy_QualifiedRecordsList where hmainid = " + HInterID, "h_v_Gy_QualifiedRecordsList");
string HProcExchInterID = ds.Tables[0].Rows[0]["HProcExchInterID"].ToString();
@@ -847,6 +1141,16 @@
{
try
{
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Sc_SourceLineRepairBill_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡璇㈡潈闄�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
ds = oCN.RunProcReturn("select * from gy_czygl where czymc='" + user + "'", "gy_czygl");
string HProcID = ds.Tables[0].Rows[0]["HProcID"].ToString();
@@ -898,6 +1202,54 @@
}
#endregion
+ #region 宸ュ簭鍗曞搧杩斾慨鍙� 鏌ヨ鍏抽敭浠舵竻鍗�
+ [Route("Cj_SingleStation/AssemHBardCodeBomList")]
+ [HttpGet]
+ public object AssemHBardCodeBomList(int HProcExchInterID, int HProcExchEntryID, string HMaterSN, string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Sc_SourceLineRepairBill_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡璇㈡潈闄�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ds = oCN.RunProcReturn(@"exec h_p_Gy_AssemCodeBillBomList " + HProcExchInterID + "," + HProcExchEntryID + ",'" + HMaterSN + "'", "h_p_Gy_AssemCodeBillBomList");
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "閰嶄欢娓呭崟鏌ユ棤鏁版嵁锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "";
+ objJsonResult.data = ds.Tables[0];
+ }
+
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#region 宸ュ簭鍗曞搧杩斾慨鍙� 鑾峰彇琛ㄦ牸鏁版嵁
[Route("Cj_SingleStation/ProcessItemRepair")]
[HttpGet]
@@ -905,6 +1257,16 @@
{
try
{
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Sc_SourceLineRepairBill_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡璇㈡潈闄�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
List<object> columnNameList = new List<object>();
string sql = @"select * from h_v_Cj_BarCodeProcessItemRepair where 1=1 " + sWhere + " order by 鏃ユ湡 desc, HInterID desc, HEntryID desc";
@@ -948,9 +1310,18 @@
string[] sArray = msg.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string sMainStr = sArray[0].ToString();
string sSubStr = sArray[1].ToString();
- string sSubStr2 = sArray[2].ToString();
- string user = sArray[3].ToString();
- string HResult = sArray[4].ToString();
+ string user = sArray[2].ToString();
+ string HResult = sArray[3].ToString();
+
+ //鍒ゆ柇鏄惁鏈夋潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Sc_SourceLineRepairBill_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
oCN.BeginTran();
if (HResult == "閰嶄欢")
@@ -972,37 +1343,8 @@
ds = oCN.RunProcReturn("select * from Sc_SourceLineRepairBillSub where HInterID=" + model.HInterID, "Sc_SourceLineRepairBillSub");
+
if (ds.Tables[0].Rows[0]["HRepairResult"].ToString() == "OK") {
- //鐢熸垚 浜х嚎缁勮杩芥函鍗�
-
- Int64 HInterID1 = DBUtility.ClsPub.CreateBillID("3727", ref DBUtility.ClsPub.sExeReturnInfo);
- string HBillNo1 = DBUtility.ClsPub.CreateBillCode("3727", ref DBUtility.ClsPub.sExeReturnInfo, true);
-
- ds = oCN.RunProcReturn("select * from Sc_SourceLineRepairBillMain where HInterID=" + model.HInterID, "Sc_SourceLineRepairBillMain");
- string HMaterID = ds.Tables[0].Rows[0]["HMaterID"].ToString();
- //淇濆瓨鐢熶骇缁勮鍗曚富琛�
- string sql = $@"Insert Into Sc_AssemblyBillMain(HYear,HPeriod,HBillType,HBillSubType,HInterID,HDate
-,HBillNo,HBillStatus,HMaker,HMakeDate,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo
-,HICMOInterID,HICMOBillNo,HBarCode_P,HMaterID,HUnitID,HAssemblyStatus,HProdOrgID)
-values('{DateTime.Now.Year}','{DateTime.Now.Month}','3727','3727',{HInterID1},getdate()
-,'{HBillNo1}','1','{user}',getdate(),{temp.HProcExchInterID.ToString()},{temp.HProcExchEntryID.ToString()},'{temp.HProcExchBillNo.ToString()}'
-,{model.HICMOInterID.ToString()},'{model.HICMOBillNo.ToString()}','{model.HBarCode.ToString()}',{HMaterID},0,'姹囨姤',{model.HProdOrgID})";
- oCN.RunProc(sql);
-
- List<Model.Sc_AssemblyBill_BindSourceTemp> sub = new List<Model.Sc_AssemblyBill_BindSourceTemp>();
- sub = JsonConvert.DeserializeObject<List<Model.Sc_AssemblyBill_BindSourceTemp>>(sSubStr2);
-
- for (int i = 0; i < sub.Count; i++)
- {
- //瀛愯〃瀛樺偍
- string sq2 = $@"Insert Into Sc_AssemblyBillSub(HInterID,HBillNo_bak,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo
-,HSourceBillType,HMaterID,HSourceID,HEquipID,HUnitID,HQty
-,HGroupID,HWorkerID,HScanDate,HBarCode,HBarCode_P,HSNNumber)
-values({HInterID1},'{HBillNo1}',{(i + 1)},0,0,''
-,'',{sub[i].HMaterID},0,0,0,{sub[i].HQty}
-,0,0,getdate(),'{sub[i].HBarCode}','{model.HBarCode}','') ";
- oCN.RunProc(sq2);
- }
//鐢熶骇宸ュ簭鍑虹珯SN鏁版嵁
ds = oCN.RunProcReturn("select top 1 HInterID,HBillNo from Sc_StationOutBillMain where HProcExchInterID=" + temp.HProcExchInterID + " and HProcExchEntryID=" + temp.HProcExchEntryID + " and HBadCount<>0 order by HInterID desc", "Sc_StationOutBillMain");
@@ -1016,9 +1358,10 @@
values({HInterIDSN}, '{HBillNoSN}', {ds.Tables[0].Rows.Count + 1}, '{model.HBarCode}', 1, GETDATE(), '', "+ temp.HProcExchInterID + ","+ temp.HProcExchEntryID+ ", '"+ temp.HProcExchBillNo+ "', '', 0, 0)");
//鍙嶅啓宸ュ簭鍑虹珯鍗� 涓昏〃 涓嶈壇鏁伴噺 鍜� 鍚堟牸鏁伴噺
oCN.RunProc("update Sc_StationOutBillMain set HQty+=1,HBadCount-=1 where HInterID='" + HInterIDSN + "'");
-
}
- //淇敼閰嶄欢缁戝畾娓呭崟缁戝畾鐨勬潯鐮佹壒鍙�
+
+ //淇敼浜х嚎杩芥函鍗曠粦瀹氱殑鏉＄爜鎵瑰彿
+ oCN.RunProc("update Sc_AssemblyBillSub set HBarCode='" + temp.HBarCode + "' where HInterID=" + temp.HInterID + " and HEntryID=" + temp.HEntryID);
//oCN.RunProc("exec h_p_AssemblyBill_Temp '" + temp.HProcExchBillNo + "'," + model.HProcess + "," + temp.HMaterID + ",'" + temp.HBatchNo + "'");
}
else if (HResult == "NG"|| HResult == "OK") {
@@ -1048,9 +1391,9 @@
}
}
else {
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触,鏃犵粨鏋滐紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -1083,6 +1426,16 @@
{
try
{
+ //鍒ゆ柇鏄惁鏈夋潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Sc_SourceLineRepairBill_Drop", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
ds = oCN.RunProcReturn("select * from Sc_SourceLineRepairBillMain where HInterID = " + HInterID, "Sc_SourceLineRepairBillMain");
if (ds.Tables[0].Rows.Count == 0) {
@@ -1134,6 +1487,59 @@
}
#endregion
+ #region 宸ュ簭鍗曞搧杩斾慨鍙� 鍒犻櫎鍏抽敭浠舵竻鍗�
+ [Route("Cj_SingleStation/DelBomTempList")]
+ [HttpGet]
+ public object DelBomTempList(int HInterID, int HEntryID, string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夋潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Sc_SourceLineRepairBill_Drop", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ds = oCN.RunProcReturn("select * from Sc_AssemblyBillSub where HInterID = " + HInterID, "Sc_AssemblyBillMain");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ユ棤鏁版嵁锛�";
+ objJsonResult.data = null;
+ }
+
+ oCN.BeginTran();
+
+ string sql = "delete from Sc_AssemblyBillSub where HInterID = " + HInterID + " and HEntryID=" + HEntryID;
+ oCN.RunProc(sql);
+
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#region 宸ュ簭鍗曞搧杩斾慨鍙�--閰嶄欢鏇存崲 鏌ヨ鏇存崲璁板綍
[Route("Cj_SingleStation/Sc_SourceLineRepairBillSub_MaterList")]
[HttpGet]
@@ -1141,6 +1547,16 @@
{
try
{
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Sc_SourceLineRepairBill_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡璇㈡潈闄�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
string sql = @"select * from h_v_Sc_SourceLineRepairBillList where 1=1 " + sWhere + " order by HInterID desc";
ds = oCN.RunProcReturn(sql, "h_v_Sc_SourceLineRepairBillList");
diff --git "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs" "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
index 4a61c07..4e08991 100644
--- "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
+++ "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
@@ -780,6 +780,58 @@
#region 缂撳瓨鍒楄〃妯″潡璋冪敤
+ #region 缂撳瓨鍒楄〃鐣岄潰锛岃繑鍥炵紦瀛樺垪琛ㄤ俊鎭�
+
+ /// <summary>
+ /// 缂撳瓨鍒楄〃鐣岄潰锛岃繑鍥炵紦瀛樺垪琛ㄤ俊鎭�
+ /// </summary>
+ /// <returns></returns>
+ [Route("WEBSController/GetKf_PonderationBillMain_TempList_New_Json")]
+ [HttpGet]
+ public object GetKf_PonderationBillMain_TempList_New_Json(string HBillType, string HMaker, Int64 HStockOrgID)
+ {
+ try
+ {
+ ds = oWebs.GetKf_PonderationBillMain_TempList_New(HBillType, HMaker, HStockOrgID);
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ List<object> columnNameList = new List<object>();
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString)); //鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇鍗曟嵁缂撳瓨鍒楄〃淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鑾峰彇鍗曟嵁缂撳瓨鍒楄〃淇℃伅澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
+
#region 缂撳瓨鍒楄〃 缂栬緫鍔熻兘璋冪敤
/// <summary>
diff --git a/WebAPI/Web.config b/WebAPI/Web.config
index 1a5fed7..92d9332 100644
--- a/WebAPI/Web.config
+++ b/WebAPI/Web.config
@@ -22,7 +22,7 @@
<!--<add key="FileIP" value="http://localhost:8082/LuBaoAPI"/>-->
<!--<add key="FileIP" value="http://localhost:8080/" />-->
<!--<add key="sUrl" value="http://183.129.128.86:9090/WEBS-WMSTest/WebService1.asmx"/> -->
- <!--<add key="sUrl" value="http://192.168.63.20/WEBS-WMS/WebService1.asmx"/>--><!--棰滃彴寮忔満-->
+ <add key="sUrl" value="http://192.168.63.20/WEBS-WMS/WebService1.asmx"/><!--棰滃彴寮忔満-->
<!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> 澶忓疂-->
<!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> -->
<!--<add key="sUrl" value="http://10.10.130.181/WEBS-WMS/WebService1.asmx"/> 鍗氭棩绉戞妧-->
@@ -34,7 +34,7 @@
<!--<add key="sUrl" value="http://192.168.80.90:9090/WEBS-WMS/WebService1.asmx"/> 瀹夌憺鏈嶅姟鍣�-->
<!--<add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx"/> --> <!--娴嬭瘯鏈嶅姟鍣�-->
<!--<add key="sUrl" value="http://localhost:8082/WEBS/WebService1.asmx"/> 鏈湴-->
- <add key="sUrl" value="http://192.168.56.1:81/web/WebService1.asmx"/> <!--闄堥洴闈欐湰鍦伴厤缃�-->
+ <!--<add key="sUrl" value="http://192.168.56.1:81/web/WebService1.asmx"/>--> <!--闄堥洴闈欐湰鍦伴厤缃�-->
<add key="webpages:Version" value="3.0.0.0" />
<add key="webpages:Enabled" value="false" />
<add key="ClientValidationEnabled" value="true" />
--
Gitblit v1.9.1