From 98569840bbf45288d64ef5fd377cf79b7458d0a3 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期一, 21 三月 2022 00:24:25 +0800
Subject: [PATCH] 修改了条码打印 条码列表显示方法
---
WarM/条码打印/Sc_ICMOToBarCode.cs | 124 +++++++-
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 176 ++++++------
WarM/条码打印/Sc_ICMOToBarCode.designer.cs | 284 +++++++++------------
WarM/条码打印/Sc_ICMOToBarCode.resx | 8
WebAPI/Controllers/MoveStockBillController.cs | 2
WebAPI/WebServer.cs | 22 +
WebAPI/Controllers/WebAPIController.cs | 153 +++++++++++
7 files changed, 490 insertions(+), 279 deletions(-)
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.cs"
index 5f5cfa8..0129631 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.cs"
@@ -111,8 +111,21 @@
MessageBox.Show("娌℃湁杩斿洖浠讳綍缁撴灉,璇峰湪杩囨护妗嗕腑鐐瑰嚮銆愭仮澶嶃�戞寜閽�,灏濊瘯鍐嶆鏌ヨ锛�" + DBUtility.ClsPub.sExeReturnInfo);
return;
}
+ else
+ {
+ grdMain.DataSource = DSet.Tables[0].DefaultView;
+ //鎶婂綋鍓嶅崟鎹甀D 瀛樺埌涓�涓寜閽噷闈� 鍒锋柊鏃舵瘡娆″瓨涓�閬�
+ if (DSet.Tables[0].Rows.Count > 0)
+ {
+ txtHMaterID.Tag = DBUtility.ClsPub.isInt(grdMain.Rows[0].Cells["HInterID"].Value);
+ }
+ else
+ {
+
+ }
+ }
//
- grdMain.DataSource = DSet.Tables[0].DefaultView;
+
//鏍囧噯瑁呯
//for (int i = 0; i < grdMain.SelectedRows.Count; i++)
@@ -482,13 +495,13 @@
private void Sub_SetReport(string sOpenTmp)
{
//鍒ゆ柇琛屾暟
- for (int i = 0; i < grdMain.Rows.Count; i++)
+ for (int i = 0; i < grdList.Rows.Count; i++)
{
- grdMain.Rows[i].Cells[0].Value = "";
+ grdList.Rows[i].Cells[0].Value = "";
}
- for (int i = 0; i < grdMain.SelectedRows.Count; i++)
+ for (int i = 0; i < grdList.SelectedRows.Count; i++)
{
- grdMain.Rows[grdMain.SelectedRows[i].Index].Cells[0].Value = "*";
+ grdList.Rows[grdMain.SelectedRows[i].Index].Cells[0].Value = "*";
}
//
Report = new GridppReport();
@@ -529,7 +542,7 @@
try
{
DataTable ds = new DataTable();
- BLL.Utility.FillRecordToReport_Sel(Report, grdMain, ds, Fun_GetCol("閫夋嫨"));
+ BLL.Utility.FillRecordToReport_Sel(Report, grdList, ds, Fun_GetCol("閫夋嫨"));
}
catch (Exception e)
{
@@ -818,13 +831,24 @@
//鐢熸垚涓�涓绠辩爜
string sPackStr = "ZXM" + HYear + HPeriod + HDay; //澶栫鐮� 鍓嶇紑
DataSet DsTM = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sPackStr + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿 //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
- Int64 TTM_LSH = ClsPub.isLong(DsTM.Tables[0].Rows[0][0]) + 1;
- string sPackBarCode = sPackStr + LSH.ToString();
+ Int64 TTM_LSH = ClsPub.isInt(DsTM.Tables[0].Rows[0][0]) + 1;
+ string sPackBarCode = sPackStr + TTM_LSH.ToString();
oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sPackStr + "'");
-
+
+
+ //MessageBox.Show("11");
+ oCn.RunProc("insert into Sc_PackUnionBillMain (HYear,HPeriod,HBillType,HInterID,HDate" +
+ ",HBillNo,HBillStatus,HICMOBillNo,HBarCode_Pack,HMaterID,HUnitID,HWeight" +
+ ",HPWeight,HProdOrgID,HDeptID,HEmpID,HSNum,HPackNum,HBarCode_Cus,HBatchNo " +
+ ") values ("
+ + HYear + "," + HPeriod + ",'3783'," + HInterID_TTM + ",'" + HDate + "'"
+ + ", '" + sPackBarCode.ToString() + "',1,'','" + sPackBarCode.ToString() + "',0,0,0"
+ + ",0,1,0,0,0,0,'','')");
+ //MessageBox.Show("12");
+
//1.寰幆缃戞牸锛屾牴鎹� 鏈鏁伴噺 鍒� 鐢熸垚 鍞竴鐮�
-
- for (int j = 0; j < grdMain.Rows.Count; j++)
+
+ for (int j = 0; j < grdMain.Rows.Count; j++)
{
if (DBUtility.ClsPub.isDoule(grdMain.Rows[j].Cells[Fun_GetCol("鏈鏁伴噺")].Value) > 0)
{
@@ -836,7 +860,7 @@
//HBQty = HBQty + ClsPub.isInt(txtHBQty.Text);
HZXQty = DBUtility.ClsPub.isDoule(grdMain.Rows[j].Cells[Fun_GetCol("鏈鏁伴噺")].Value);
- HDDQty = DBUtility.ClsPub.isDoule(grdMain.Rows[j].Cells[Fun_GetCol("璁㈠崟鏁伴噺")].Value);
+ HDDQty = DBUtility.ClsPub.isDoule(grdMain.Rows[j].Cells[Fun_GetCol("鐢熶骇璁㈠崟鏁伴噺")].Value);
HICMOBillNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[Fun_GetCol("鐢熶骇璁㈠崟鍙�")].Value);
HTMNumber = HOrgNumber + HMaterNumber + HYear + HPeriod + HDay;
@@ -932,6 +956,7 @@
+ ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "','" + HInnerBillNo + "')");
oCn.RunProc("exec h_p_WMS_SetMaxNo '" + HTMNumber + "'");
+ DisplayTM();
}
}
//2.寰幆缁撴潫鍚庯紝鏍规嵁 鏈鐢熸垚鐨� 涓诲唴鐮侊紝浠庡悗鍙版暟鎹簱鑾峰彇 鏉＄爜鍒楄〃锛岀敓鎴� 缁勬墭鍗� 鍜� 鎵樻潯鐮侊紝 鐩存帴璋冪敤瀛樺偍杩囩▼
@@ -942,9 +967,22 @@
-
-
+ sPackBarCode = "";
+ DataSet DSet = oCn.RunProcReturn("select * from h_v_IF_BarCodeBillList Where HinterID=" + HInterID.ToString() + " and 鏉＄爜绫诲瀷 = '鎵樼洏鏉＄爜' order by HItemID", "h_v_IF_BarCodeBillList", ref DBUtility.ClsPub.sExeReturnInfo);
+ //鐢熸垚棣栬鏍囬
+ if (DSet == null)
+ {
+ MessageBox.Show("娌℃湁杩斿洖浠讳綍缁撴灉,鏉＄爜涓嶅瓨鍦紒" + DBUtility.ClsPub.sExeReturnInfo);
+ return;
+ }
+ //
+ grdList.DataSource = DSet.Tables[0].DefaultView;
+ //鍐荤粨
+ int FrCol = 0;
+ string s = "鏄�";
+ DBUtility.Xt_BaseBillFun.DisplayGrid(grdList, this.Name + "grdList", s, FrCol);
oCn.Commit();
+ //DisplayTM();
MessageBox.Show("鏉＄爜鐢熸垚瀹屾瘯锛�");
@@ -958,9 +996,10 @@
//
Display();
+
}
- catch(Exception e )
+ catch (Exception e )
{
//鍥炴粴浜嬪姟
@@ -971,6 +1010,7 @@
private void button4_Click(object sender, EventArgs e)
{
+
//鏍规嵁鏈鏁伴噺 鏉� 鍒嗛厤鍒� 姣忎釜鐢熶骇璁㈠崟涓婏紙鍒嗛厤鏃� 瑕佽�冭檻 璁㈠崟鍓╀綑鏁伴噺宸茬粡鏄� 璐熸暟鐨勬儏鍐碉級
//1.鍒ゆ柇鏈鏁伴噺 蹇呴』澶т簬0
double HZXQty = 0;//鏁寸鏁伴噺
@@ -1461,10 +1501,21 @@
+ ",'3710'," + HMaterID1.ToString() + "," + HUnitID.ToString() + "," + HQty2.ToString() + ",0,0,0"
+ ", 0,getdate(),'" + HBarCode + "','" + TTM + "',0,0)");
+ DataSet DSet = oCn.RunProcReturn("select * from h_v_IF_BarCodeBillList Where HInterID=" + HInterID.ToString() + " and HBarCode like '%ZXM&' order by HItemID", "h_v_IF_BarCodeBillList", ref DBUtility.ClsPub.sExeReturnInfo);
+ //鐢熸垚棣栬鏍囬
+ if (DSet == null)
+ {
+ MessageBox.Show("娌℃湁杩斿洖浠讳綍缁撴灉,鏉＄爜涓嶅瓨鍦紒" + DBUtility.ClsPub.sExeReturnInfo);
+ return;
+ }
+ //
+ grdList.DataSource = DSet.Tables[0].DefaultView;
+
oCn.Commit();
MessageBox.Show("鏉＄爜鐢熸垚瀹屾瘯锛�");
//grdSub.RowCount = 0;
- DisplayTM();
+ //DisplayTM();
+
}
catch (Exception e1)
{
@@ -1478,7 +1529,8 @@
private void DisplayTM()
{
- DataSet DSet = oCn.RunProcReturn("select * from h_v_IF_BarCodeBillList Where HinterID=" + HInterID.ToString() + " order by HItemID", "h_v_IF_BarCodeBillList", ref DBUtility.ClsPub.sExeReturnInfo);
+ //HInterID = DBUtility.ClsPub.isInt(txtHMaterID.Tag);
+ DataSet DSet = oCn.RunProcReturn("select * from h_v_IF_BarCodeBillList Where HinterID=" + HInterID.ToString() + " and 鏉＄爜绫诲瀷 = '鎵樼洏鏉＄爜' order by HItemID", "h_v_IF_BarCodeBillList", ref DBUtility.ClsPub.sExeReturnInfo);
//鐢熸垚棣栬鏍囬
if (DSet == null)
{
@@ -1649,19 +1701,32 @@
private void cmdHSourceID_Click(object sender, EventArgs e)
{
- DAL.ClsGy_WorkCenter_View oWork = new DAL.ClsGy_WorkCenter_View();
- if (oWork.RefreshView())
+ DAL.ClsGy_Source_View oSource = new DAL.ClsGy_Source_View();
+ if (oSource.RefreshView())
{
- this.txtHSourceID.Text = oWork.oModel.HName;
- this.txtHSourceID.Tag = oWork.oModel.HItemID.ToString();
+ this.txtHSourceID.Text = oSource.oModel.HName;
+ this.txtHSourceID.Tag = oSource.oModel.HItemID.ToString();
//
Display();
- //
}
else
{
this.txtHSourceID.Text = "";
}
+
+ //DAL.ClsGy_WorkCenter_View oWork = new DAL.ClsGy_WorkCenter_View();
+ //if (oWork.RefreshView())
+ //{
+ // this.txtHSourceID.Text = oWork.oModel.HName;
+ // this.txtHSourceID.Tag = oWork.oModel.HItemID.ToString();
+ // //
+ // Display();
+ // //
+ //}
+ //else
+ //{
+ // this.txtHSourceID.Text = "";
+ //}
}
private void cmdHEmpID_Click(object sender, EventArgs e)
@@ -1838,20 +1903,31 @@
{
//鑾峰彇缃戞牸绗竴琛孒InterID鐨勫��
Int64 HInterID = 0;
- HInterID = DBUtility.ClsPub.isInt(grdMain.Rows[0].Cells[Fun_GetCol("HInterID")].Value);
+ HInterID = DBUtility.ClsPub.isInt(txtHMaterID.Tag);
DataSet DSBefore;
DSBefore = SubCn.RunProcReturn("exec h_p_PreviousMater "+ HInterID, "h_p_PreviousMater", ref DBUtility.ClsPub.sExeReturnInfo);
grdMain.DataSource = DSBefore.Tables[0].DefaultView;
+ if (DSBefore.Tables[0].Rows.Count > 0)
+ {
+ txtHMaterID.Tag = DBUtility.ClsPub.isInt(grdMain.Rows[0].Cells["HInterID"].Value);
+ }
+ else
+ {
+
+ }
}
private void button3_Click(object sender, EventArgs e)
{
//鏍规嵁
Int64 HInterID = 0;
- HInterID = DBUtility.ClsPub.isInt(grdMain.Rows[0].Cells[Fun_GetCol("HInterID")].Value);
+ //HInterID = DBUtility.ClsPub.isInt(grdMain.Rows[0].Cells[Fun_GetCol("HInterID")].Value);
+ HInterID = DBUtility.ClsPub.isInt(txtHMaterID.Tag);
DataSet DSBefore;
DSBefore = SubCn.RunProcReturn("exec h_p_NextMater " + HInterID, "h_p_NextMater", ref DBUtility.ClsPub.sExeReturnInfo);
grdMain.DataSource = DSBefore.Tables[0].DefaultView;
+ txtHMaterID.Tag = DBUtility.ClsPub.isInt(grdMain.Rows[0].Cells["HInterID"].Value);
+ txtHMaterID.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells["HInterID"].Value);
}
//瓒呴鎵撳嵃
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.designer.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.designer.cs"
index 51aa034..dca0cd7 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.designer.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.designer.cs"
@@ -119,7 +119,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(1563, 62);
+ this.Tool.Size = new System.Drawing.Size(1172, 50);
this.Tool.Stretch = true;
this.Tool.TabIndex = 16;
this.Tool.Text = "toolStrip1";
@@ -141,13 +141,13 @@
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
- this.toolStripSeparator3.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator3.Size = new System.Drawing.Size(6, 50);
//
// toolStripSeparator9
//
this.toolStripSeparator9.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator9.Name = "toolStripSeparator9";
- this.toolStripSeparator9.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator9.Size = new System.Drawing.Size(6, 50);
//
// mrlk
//
@@ -157,7 +157,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(73, 59);
+ this.mrlk.Size = new System.Drawing.Size(60, 47);
this.mrlk.Text = "榛樿鍒楀";
this.mrlk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.mrlk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -167,7 +167,7 @@
//
this.toolStripSeparator7.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator7.Name = "toolStripSeparator7";
- this.toolStripSeparator7.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator7.Size = new System.Drawing.Size(6, 50);
//
// bclk
//
@@ -177,7 +177,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(73, 59);
+ this.bclk.Size = new System.Drawing.Size(60, 47);
this.bclk.Text = "淇濆瓨鍒楀";
this.bclk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.bclk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -187,7 +187,7 @@
//
this.toolStripSeparator8.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator8.Name = "toolStripSeparator8";
- this.toolStripSeparator8.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator8.Size = new System.Drawing.Size(6, 50);
//
// cz
//
@@ -218,13 +218,13 @@
this.grdMain.AllowUserToDeleteRows = false;
this.grdMain.BackgroundColor = System.Drawing.SystemColors.ControlLightLight;
this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- this.grdMain.Location = new System.Drawing.Point(5, 8);
+ this.grdMain.Location = new System.Drawing.Point(4, 6);
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(1155, 329);
+ this.grdMain.Size = new System.Drawing.Size(866, 263);
this.grdMain.TabIndex = 19;
this.grdMain.Paint += new System.Windows.Forms.PaintEventHandler(this.grdMain_Paint);
this.grdMain.DoubleClick += new System.EventHandler(this.grdMain_DblClick);
@@ -234,10 +234,9 @@
this.label1.AutoSize = true;
this.label1.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.ForeColor = System.Drawing.Color.Black;
- this.label1.Location = new System.Drawing.Point(25, 44);
- this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label1.Location = new System.Drawing.Point(19, 35);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(109, 20);
+ this.label1.Size = new System.Drawing.Size(88, 16);
this.label1.TabIndex = 46;
this.label1.Text = "鐢熶骇璁㈠崟鍙�";
//
@@ -245,11 +244,10 @@
//
this.txtHICMOBillNo.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHICMOBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHICMOBillNo.Location = new System.Drawing.Point(149, 36);
- this.txtHICMOBillNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHICMOBillNo.Location = new System.Drawing.Point(112, 29);
this.txtHICMOBillNo.Name = "txtHICMOBillNo";
this.txtHICMOBillNo.ReadOnly = true;
- this.txtHICMOBillNo.Size = new System.Drawing.Size(220, 36);
+ this.txtHICMOBillNo.Size = new System.Drawing.Size(166, 30);
this.txtHICMOBillNo.TabIndex = 47;
//
// label2
@@ -257,10 +255,9 @@
this.label2.AutoSize = true;
this.label2.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label2.ForeColor = System.Drawing.Color.Black;
- this.label2.Location = new System.Drawing.Point(416, 42);
- this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label2.Location = new System.Drawing.Point(312, 34);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(49, 20);
+ this.label2.Size = new System.Drawing.Size(40, 16);
this.label2.TabIndex = 49;
this.label2.Text = "鏈哄彴";
//
@@ -268,20 +265,18 @@
//
this.txtHSourceID.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHSourceID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHSourceID.Location = new System.Drawing.Point(485, 35);
- this.txtHSourceID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHSourceID.Location = new System.Drawing.Point(364, 28);
this.txtHSourceID.Name = "txtHSourceID";
this.txtHSourceID.ReadOnly = true;
- this.txtHSourceID.Size = new System.Drawing.Size(220, 36);
+ this.txtHSourceID.Size = new System.Drawing.Size(166, 30);
this.txtHSourceID.TabIndex = 50;
//
// cmdHSourceID
//
this.cmdHSourceID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHSourceID.Image")));
- this.cmdHSourceID.Location = new System.Drawing.Point(703, 34);
- this.cmdHSourceID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.cmdHSourceID.Location = new System.Drawing.Point(527, 27);
this.cmdHSourceID.Name = "cmdHSourceID";
- this.cmdHSourceID.Size = new System.Drawing.Size(43, 40);
+ this.cmdHSourceID.Size = new System.Drawing.Size(32, 32);
this.cmdHSourceID.TabIndex = 51;
this.cmdHSourceID.UseVisualStyleBackColor = true;
this.cmdHSourceID.Click += new System.EventHandler(this.cmdHSourceID_Click);
@@ -291,10 +286,9 @@
this.label3.AutoSize = true;
this.label3.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label3.ForeColor = System.Drawing.Color.Black;
- this.label3.Location = new System.Drawing.Point(799, 42);
- this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label3.Location = new System.Drawing.Point(599, 34);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(49, 20);
+ this.label3.Size = new System.Drawing.Size(40, 16);
this.label3.TabIndex = 52;
this.label3.Text = "鑱屽憳";
//
@@ -302,20 +296,18 @@
//
this.txtHEmpID.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHEmpID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHEmpID.Location = new System.Drawing.Point(868, 35);
- this.txtHEmpID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHEmpID.Location = new System.Drawing.Point(651, 28);
this.txtHEmpID.Name = "txtHEmpID";
this.txtHEmpID.ReadOnly = true;
- this.txtHEmpID.Size = new System.Drawing.Size(220, 36);
+ this.txtHEmpID.Size = new System.Drawing.Size(166, 30);
this.txtHEmpID.TabIndex = 53;
//
// cmdHEmpID
//
this.cmdHEmpID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHEmpID.Image")));
- this.cmdHEmpID.Location = new System.Drawing.Point(1089, 34);
- this.cmdHEmpID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.cmdHEmpID.Location = new System.Drawing.Point(817, 27);
this.cmdHEmpID.Name = "cmdHEmpID";
- this.cmdHEmpID.Size = new System.Drawing.Size(43, 40);
+ this.cmdHEmpID.Size = new System.Drawing.Size(32, 32);
this.cmdHEmpID.TabIndex = 54;
this.cmdHEmpID.UseVisualStyleBackColor = true;
this.cmdHEmpID.Click += new System.EventHandler(this.cmdHEmpID_Click);
@@ -325,10 +317,9 @@
this.label4.AutoSize = true;
this.label4.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label4.ForeColor = System.Drawing.Color.Black;
- this.label4.Location = new System.Drawing.Point(1167, 42);
- this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label4.Location = new System.Drawing.Point(875, 34);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(49, 20);
+ this.label4.Size = new System.Drawing.Size(40, 16);
this.label4.TabIndex = 55;
this.label4.Text = "鐗╂枡";
this.label4.Visible = false;
@@ -337,21 +328,18 @@
//
this.txtHMaterID.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHMaterID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHMaterID.Location = new System.Drawing.Point(1236, 35);
- this.txtHMaterID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHMaterID.Location = new System.Drawing.Point(927, 28);
this.txtHMaterID.Name = "txtHMaterID";
this.txtHMaterID.ReadOnly = true;
- this.txtHMaterID.Size = new System.Drawing.Size(220, 36);
+ this.txtHMaterID.Size = new System.Drawing.Size(166, 30);
this.txtHMaterID.TabIndex = 56;
- this.txtHMaterID.Visible = false;
//
// cmdHMaterID
//
this.cmdHMaterID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHMaterID.Image")));
- this.cmdHMaterID.Location = new System.Drawing.Point(1453, 34);
- this.cmdHMaterID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.cmdHMaterID.Location = new System.Drawing.Point(1090, 27);
this.cmdHMaterID.Name = "cmdHMaterID";
- this.cmdHMaterID.Size = new System.Drawing.Size(43, 40);
+ this.cmdHMaterID.Size = new System.Drawing.Size(32, 32);
this.cmdHMaterID.TabIndex = 57;
this.cmdHMaterID.UseVisualStyleBackColor = true;
this.cmdHMaterID.Visible = false;
@@ -378,11 +366,9 @@
this.gbUp.Controls.Add(this.txtHEmpID);
this.gbUp.Controls.Add(this.label2);
this.gbUp.Controls.Add(this.cmdHEmpID);
- this.gbUp.Location = new System.Drawing.Point(15, 69);
- this.gbUp.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.gbUp.Location = new System.Drawing.Point(11, 55);
this.gbUp.Name = "gbUp";
- this.gbUp.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.gbUp.Size = new System.Drawing.Size(1532, 158);
+ this.gbUp.Size = new System.Drawing.Size(1149, 126);
this.gbUp.TabIndex = 58;
this.gbUp.TabStop = false;
//
@@ -390,11 +376,10 @@
//
this.txtHSeOrderBillNo.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHSeOrderBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHSeOrderBillNo.Location = new System.Drawing.Point(149, 99);
- this.txtHSeOrderBillNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHSeOrderBillNo.Location = new System.Drawing.Point(112, 79);
this.txtHSeOrderBillNo.Name = "txtHSeOrderBillNo";
this.txtHSeOrderBillNo.ReadOnly = true;
- this.txtHSeOrderBillNo.Size = new System.Drawing.Size(163, 36);
+ this.txtHSeOrderBillNo.Size = new System.Drawing.Size(123, 30);
this.txtHSeOrderBillNo.TabIndex = 141;
//
// label9
@@ -402,10 +387,9 @@
this.label9.AutoSize = true;
this.label9.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label9.ForeColor = System.Drawing.Color.Black;
- this.label9.Location = new System.Drawing.Point(25, 106);
- this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label9.Location = new System.Drawing.Point(19, 85);
this.label9.Name = "label9";
- this.label9.Size = new System.Drawing.Size(109, 20);
+ this.label9.Size = new System.Drawing.Size(88, 16);
this.label9.TabIndex = 140;
this.label9.Text = "閿�鍞鍗曞彿";
//
@@ -415,10 +399,10 @@
this.cmbHBarCodeType.FormattingEnabled = true;
this.cmbHBarCodeType.Items.AddRange(new object[] {
"鍞竴鏉＄爜"});
- this.cmbHBarCodeType.Location = new System.Drawing.Point(856, 99);
- this.cmbHBarCodeType.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.cmbHBarCodeType.Location = new System.Drawing.Point(642, 79);
+ this.cmbHBarCodeType.Margin = new System.Windows.Forms.Padding(2);
this.cmbHBarCodeType.Name = "cmbHBarCodeType";
- this.cmbHBarCodeType.Size = new System.Drawing.Size(185, 33);
+ this.cmbHBarCodeType.Size = new System.Drawing.Size(140, 28);
this.cmbHBarCodeType.TabIndex = 139;
//
// label8
@@ -426,10 +410,9 @@
this.label8.AutoSize = true;
this.label8.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label8.ForeColor = System.Drawing.Color.Black;
- this.label8.Location = new System.Drawing.Point(743, 108);
- this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label8.Location = new System.Drawing.Point(557, 86);
this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(89, 20);
+ this.label8.Size = new System.Drawing.Size(72, 16);
this.label8.TabIndex = 138;
this.label8.Text = "鏉＄爜绫诲瀷";
//
@@ -437,10 +420,10 @@
//
this.cmdHSaveBill.BackColor = System.Drawing.Color.White;
this.cmdHSaveBill.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.cmdHSaveBill.Location = new System.Drawing.Point(1149, 85);
- this.cmdHSaveBill.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.cmdHSaveBill.Location = new System.Drawing.Point(862, 68);
+ this.cmdHSaveBill.Margin = new System.Windows.Forms.Padding(2);
this.cmdHSaveBill.Name = "cmdHSaveBill";
- this.cmdHSaveBill.Size = new System.Drawing.Size(149, 62);
+ this.cmdHSaveBill.Size = new System.Drawing.Size(112, 50);
this.cmdHSaveBill.TabIndex = 137;
this.cmdHSaveBill.Text = "鏌ヨ";
this.cmdHSaveBill.UseVisualStyleBackColor = false;
@@ -450,10 +433,10 @@
//
this.dtpHBeginDate.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.dtpHBeginDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
- this.dtpHBeginDate.Location = new System.Drawing.Point(448, 96);
- this.dtpHBeginDate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.dtpHBeginDate.Location = new System.Drawing.Point(336, 77);
+ this.dtpHBeginDate.Margin = new System.Windows.Forms.Padding(2);
this.dtpHBeginDate.Name = "dtpHBeginDate";
- this.dtpHBeginDate.Size = new System.Drawing.Size(204, 36);
+ this.dtpHBeginDate.Size = new System.Drawing.Size(154, 30);
this.dtpHBeginDate.TabIndex = 100;
//
// label6
@@ -461,10 +444,9 @@
this.label6.AutoSize = true;
this.label6.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label6.ForeColor = System.Drawing.Color.Black;
- this.label6.Location = new System.Drawing.Point(343, 106);
- this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label6.Location = new System.Drawing.Point(257, 85);
this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(89, 20);
+ this.label6.Size = new System.Drawing.Size(72, 16);
this.label6.TabIndex = 99;
this.label6.Text = "鏃� 鏈�";
//
@@ -472,10 +454,10 @@
//
this.button4.BackColor = System.Drawing.Color.White;
this.button4.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.button4.Location = new System.Drawing.Point(1381, 236);
- this.button4.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.button4.Location = new System.Drawing.Point(1036, 189);
+ this.button4.Margin = new System.Windows.Forms.Padding(2);
this.button4.Name = "button4";
- this.button4.Size = new System.Drawing.Size(149, 62);
+ this.button4.Size = new System.Drawing.Size(112, 50);
this.button4.TabIndex = 138;
this.button4.Text = "鐢熸垚鏉＄爜";
this.button4.UseVisualStyleBackColor = false;
@@ -485,38 +467,35 @@
//
this.button5.BackColor = System.Drawing.Color.White;
this.button5.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.button5.Location = new System.Drawing.Point(1381, 309);
- this.button5.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.button5.Location = new System.Drawing.Point(1036, 247);
+ this.button5.Margin = new System.Windows.Forms.Padding(2);
this.button5.Name = "button5";
- this.button5.Size = new System.Drawing.Size(149, 52);
+ this.button5.Size = new System.Drawing.Size(112, 42);
this.button5.TabIndex = 139;
this.button5.Text = "棰勮";
this.button5.UseVisualStyleBackColor = false;
- this.button5.Visible = false;
this.button5.Click += new System.EventHandler(this.button5_Click);
//
// button6
//
this.button6.BackColor = System.Drawing.Color.White;
this.button6.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.button6.Location = new System.Drawing.Point(1381, 370);
- this.button6.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.button6.Location = new System.Drawing.Point(1036, 296);
+ this.button6.Margin = new System.Windows.Forms.Padding(2);
this.button6.Name = "button6";
- this.button6.Size = new System.Drawing.Size(149, 55);
+ this.button6.Size = new System.Drawing.Size(112, 44);
this.button6.TabIndex = 140;
this.button6.Text = "鎵撳嵃";
this.button6.UseVisualStyleBackColor = false;
- this.button6.Visible = false;
this.button6.Click += new System.EventHandler(this.button6_Click);
//
// txtHMiniQty
//
- this.txtHMiniQty.Location = new System.Drawing.Point(1197, 370);
- this.txtHMiniQty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHMiniQty.Location = new System.Drawing.Point(898, 296);
this.txtHMiniQty.Multiline = true;
this.txtHMiniQty.Name = "txtHMiniQty";
this.txtHMiniQty.ReadOnly = true;
- this.txtHMiniQty.Size = new System.Drawing.Size(148, 52);
+ this.txtHMiniQty.Size = new System.Drawing.Size(112, 42);
this.txtHMiniQty.TabIndex = 141;
this.txtHMiniQty.TextChanged += new System.EventHandler(this.txtHMiniQty_TextChanged);
//
@@ -524,10 +503,9 @@
//
this.鏍囧噯瑁呯.AutoSize = true;
this.鏍囧噯瑁呯.Font = new System.Drawing.Font("瀹嬩綋", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.鏍囧噯瑁呯.Location = new System.Drawing.Point(1192, 331);
- this.鏍囧噯瑁呯.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.鏍囧噯瑁呯.Location = new System.Drawing.Point(894, 265);
this.鏍囧噯瑁呯.Name = "鏍囧噯瑁呯";
- this.鏍囧噯瑁呯.Size = new System.Drawing.Size(151, 34);
+ this.鏍囧噯瑁呯.Size = new System.Drawing.Size(120, 27);
this.鏍囧噯瑁呯.TabIndex = 142;
this.鏍囧噯瑁呯.Text = "鏍囧噯瑁呯";
//
@@ -535,21 +513,19 @@
//
this.label7.AutoSize = true;
this.label7.Font = new System.Drawing.Font("瀹嬩綋", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label7.Location = new System.Drawing.Point(1177, 436);
- this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label7.Location = new System.Drawing.Point(883, 349);
this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(219, 34);
+ this.label7.Size = new System.Drawing.Size(174, 27);
this.label7.TabIndex = 144;
this.label7.Text = "鏈鐢熸垚鏁伴噺";
this.label7.Visible = false;
//
// txtHBQty
//
- this.txtHBQty.Location = new System.Drawing.Point(1201, 475);
- this.txtHBQty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHBQty.Location = new System.Drawing.Point(901, 380);
this.txtHBQty.Multiline = true;
this.txtHBQty.Name = "txtHBQty";
- this.txtHBQty.Size = new System.Drawing.Size(148, 52);
+ this.txtHBQty.Size = new System.Drawing.Size(112, 42);
this.txtHBQty.TabIndex = 143;
this.txtHBQty.Visible = false;
this.txtHBQty.TextChanged += new System.EventHandler(this.txtHBQty_TextChanged);
@@ -567,11 +543,9 @@
this.groupBox1.Controls.Add(this.txtHMaterID1);
this.groupBox1.Controls.Add(this.label13);
this.groupBox1.Controls.Add(this.cmdHMaterID1);
- this.groupBox1.Location = new System.Drawing.Point(13, 606);
- this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.groupBox1.Location = new System.Drawing.Point(10, 485);
this.groupBox1.Name = "groupBox1";
- this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.groupBox1.Size = new System.Drawing.Size(1531, 158);
+ this.groupBox1.Size = new System.Drawing.Size(1148, 126);
this.groupBox1.TabIndex = 140;
this.groupBox1.TabStop = false;
//
@@ -579,10 +553,10 @@
//
this.cmdHSaveBill1.BackColor = System.Drawing.Color.White;
this.cmdHSaveBill1.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.cmdHSaveBill1.Location = new System.Drawing.Point(1028, 44);
- this.cmdHSaveBill1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.cmdHSaveBill1.Location = new System.Drawing.Point(771, 35);
+ this.cmdHSaveBill1.Margin = new System.Windows.Forms.Padding(2);
this.cmdHSaveBill1.Name = "cmdHSaveBill1";
- this.cmdHSaveBill1.Size = new System.Drawing.Size(149, 62);
+ this.cmdHSaveBill1.Size = new System.Drawing.Size(112, 50);
this.cmdHSaveBill1.TabIndex = 137;
this.cmdHSaveBill1.Text = "鏌ヨ";
this.cmdHSaveBill1.UseVisualStyleBackColor = false;
@@ -592,10 +566,10 @@
//
this.dtpHEndDate1.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.dtpHEndDate1.Format = System.Windows.Forms.DateTimePickerFormat.Short;
- this.dtpHEndDate1.Location = new System.Drawing.Point(637, 94);
- this.dtpHEndDate1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.dtpHEndDate1.Location = new System.Drawing.Point(478, 75);
+ this.dtpHEndDate1.Margin = new System.Windows.Forms.Padding(2);
this.dtpHEndDate1.Name = "dtpHEndDate1";
- this.dtpHEndDate1.Size = new System.Drawing.Size(283, 36);
+ this.dtpHEndDate1.Size = new System.Drawing.Size(213, 30);
this.dtpHEndDate1.TabIndex = 102;
//
// label10
@@ -603,10 +577,9 @@
this.label10.AutoSize = true;
this.label10.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label10.ForeColor = System.Drawing.Color.Black;
- this.label10.Location = new System.Drawing.Point(532, 104);
- this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label10.Location = new System.Drawing.Point(399, 83);
this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(89, 20);
+ this.label10.Size = new System.Drawing.Size(72, 16);
this.label10.TabIndex = 101;
this.label10.Text = "缁撴潫鏃ユ湡";
//
@@ -614,10 +587,10 @@
//
this.dtpHBeginDate1.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.dtpHBeginDate1.Format = System.Windows.Forms.DateTimePickerFormat.Short;
- this.dtpHBeginDate1.Location = new System.Drawing.Point(149, 96);
- this.dtpHBeginDate1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.dtpHBeginDate1.Location = new System.Drawing.Point(112, 77);
+ this.dtpHBeginDate1.Margin = new System.Windows.Forms.Padding(2);
this.dtpHBeginDate1.Name = "dtpHBeginDate1";
- this.dtpHBeginDate1.Size = new System.Drawing.Size(283, 36);
+ this.dtpHBeginDate1.Size = new System.Drawing.Size(213, 30);
this.dtpHBeginDate1.TabIndex = 100;
//
// label11
@@ -625,10 +598,9 @@
this.label11.AutoSize = true;
this.label11.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label11.ForeColor = System.Drawing.Color.Black;
- this.label11.Location = new System.Drawing.Point(44, 106);
- this.label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label11.Location = new System.Drawing.Point(33, 85);
this.label11.Name = "label11";
- this.label11.Size = new System.Drawing.Size(89, 20);
+ this.label11.Size = new System.Drawing.Size(72, 16);
this.label11.TabIndex = 99;
this.label11.Text = "寮�濮嬫棩鏈�";
//
@@ -637,10 +609,9 @@
this.label12.AutoSize = true;
this.label12.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label12.ForeColor = System.Drawing.Color.Black;
- this.label12.Location = new System.Drawing.Point(569, 44);
- this.label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label12.Location = new System.Drawing.Point(427, 35);
this.label12.Name = "label12";
- this.label12.Size = new System.Drawing.Size(49, 20);
+ this.label12.Size = new System.Drawing.Size(40, 16);
this.label12.TabIndex = 55;
this.label12.Text = "鐗╂枡";
//
@@ -648,22 +619,20 @@
//
this.txtHICMOBillNo1.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHICMOBillNo1.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHICMOBillNo1.Location = new System.Drawing.Point(149, 36);
- this.txtHICMOBillNo1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHICMOBillNo1.Location = new System.Drawing.Point(112, 29);
this.txtHICMOBillNo1.Name = "txtHICMOBillNo1";
this.txtHICMOBillNo1.ReadOnly = true;
- this.txtHICMOBillNo1.Size = new System.Drawing.Size(284, 36);
+ this.txtHICMOBillNo1.Size = new System.Drawing.Size(214, 30);
this.txtHICMOBillNo1.TabIndex = 47;
//
// txtHMaterID1
//
this.txtHMaterID1.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHMaterID1.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHMaterID1.Location = new System.Drawing.Point(636, 36);
- this.txtHMaterID1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHMaterID1.Location = new System.Drawing.Point(477, 29);
this.txtHMaterID1.Name = "txtHMaterID1";
this.txtHMaterID1.ReadOnly = true;
- this.txtHMaterID1.Size = new System.Drawing.Size(244, 36);
+ this.txtHMaterID1.Size = new System.Drawing.Size(184, 30);
this.txtHMaterID1.TabIndex = 56;
//
// label13
@@ -671,20 +640,18 @@
this.label13.AutoSize = true;
this.label13.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label13.ForeColor = System.Drawing.Color.Black;
- this.label13.Location = new System.Drawing.Point(25, 44);
- this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label13.Location = new System.Drawing.Point(19, 35);
this.label13.Name = "label13";
- this.label13.Size = new System.Drawing.Size(109, 20);
+ this.label13.Size = new System.Drawing.Size(88, 16);
this.label13.TabIndex = 46;
this.label13.Text = "鐢熶骇璁㈠崟鍙�";
//
// cmdHMaterID1
//
this.cmdHMaterID1.Image = ((System.Drawing.Image)(resources.GetObject("cmdHMaterID1.Image")));
- this.cmdHMaterID1.Location = new System.Drawing.Point(880, 34);
- this.cmdHMaterID1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.cmdHMaterID1.Location = new System.Drawing.Point(660, 27);
this.cmdHMaterID1.Name = "cmdHMaterID1";
- this.cmdHMaterID1.Size = new System.Drawing.Size(43, 40);
+ this.cmdHMaterID1.Size = new System.Drawing.Size(32, 32);
this.cmdHMaterID1.TabIndex = 57;
this.cmdHMaterID1.UseVisualStyleBackColor = true;
this.cmdHMaterID1.Click += new System.EventHandler(this.cmdHMaterID1_Click);
@@ -695,23 +662,22 @@
this.grdSub.AllowUserToDeleteRows = false;
this.grdSub.BackgroundColor = System.Drawing.SystemColors.ControlLightLight;
this.grdSub.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- this.grdSub.Location = new System.Drawing.Point(12, 772);
- this.grdSub.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.grdSub.Location = new System.Drawing.Point(9, 618);
this.grdSub.Name = "grdSub";
this.grdSub.ReadOnly = true;
this.grdSub.RowHeadersWidth = 51;
this.grdSub.RowTemplate.Height = 23;
- this.grdSub.Size = new System.Drawing.Size(1155, 285);
+ this.grdSub.Size = new System.Drawing.Size(866, 228);
this.grdSub.TabIndex = 145;
//
// button1
//
this.button1.BackColor = System.Drawing.Color.White;
this.button1.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.button1.Location = new System.Drawing.Point(1200, 782);
- this.button1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.button1.Location = new System.Drawing.Point(900, 626);
+ this.button1.Margin = new System.Windows.Forms.Padding(2);
this.button1.Name = "button1";
- this.button1.Size = new System.Drawing.Size(149, 62);
+ this.button1.Size = new System.Drawing.Size(112, 50);
this.button1.TabIndex = 146;
this.button1.Text = "琛ユ墦鏉＄爜";
this.button1.UseVisualStyleBackColor = false;
@@ -721,41 +687,37 @@
//
this.鏁寸鏁伴噺.AutoSize = true;
this.鏁寸鏁伴噺.Font = new System.Drawing.Font("瀹嬩綋", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.鏁寸鏁伴噺.Location = new System.Drawing.Point(1200, 238);
- this.鏁寸鏁伴噺.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.鏁寸鏁伴噺.Location = new System.Drawing.Point(900, 190);
this.鏁寸鏁伴噺.Name = "鏁寸鏁伴噺";
- this.鏁寸鏁伴噺.Size = new System.Drawing.Size(151, 34);
+ this.鏁寸鏁伴噺.Size = new System.Drawing.Size(120, 27);
this.鏁寸鏁伴噺.TabIndex = 148;
this.鏁寸鏁伴噺.Text = "鏈鏁伴噺";
//
// txtHZXQty
//
- this.txtHZXQty.Location = new System.Drawing.Point(1200, 276);
- this.txtHZXQty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHZXQty.Location = new System.Drawing.Point(900, 221);
this.txtHZXQty.Multiline = true;
this.txtHZXQty.Name = "txtHZXQty";
- this.txtHZXQty.Size = new System.Drawing.Size(148, 52);
+ this.txtHZXQty.Size = new System.Drawing.Size(112, 42);
this.txtHZXQty.TabIndex = 147;
//
// tabControl1
//
this.tabControl1.Controls.Add(this.tabPage1);
this.tabControl1.Controls.Add(this.tabPage2);
- this.tabControl1.Location = new System.Drawing.Point(12, 226);
- this.tabControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.tabControl1.Location = new System.Drawing.Point(9, 181);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
- this.tabControl1.Size = new System.Drawing.Size(1172, 372);
+ this.tabControl1.Size = new System.Drawing.Size(879, 298);
this.tabControl1.TabIndex = 149;
//
// tabPage1
//
this.tabPage1.Controls.Add(this.grdMain);
- this.tabPage1.Location = new System.Drawing.Point(4, 25);
- this.tabPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.tabPage1.Location = new System.Drawing.Point(4, 22);
this.tabPage1.Name = "tabPage1";
- this.tabPage1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.tabPage1.Size = new System.Drawing.Size(1164, 343);
+ this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
+ this.tabPage1.Size = new System.Drawing.Size(871, 272);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "鐗╂枡淇℃伅";
this.tabPage1.UseVisualStyleBackColor = true;
@@ -763,11 +725,10 @@
// tabPage2
//
this.tabPage2.Controls.Add(this.grdList);
- this.tabPage2.Location = new System.Drawing.Point(4, 25);
- this.tabPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.tabPage2.Location = new System.Drawing.Point(4, 22);
this.tabPage2.Name = "tabPage2";
- this.tabPage2.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.tabPage2.Size = new System.Drawing.Size(1164, 343);
+ this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
+ this.tabPage2.Size = new System.Drawing.Size(871, 272);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "鏉＄爜淇℃伅";
this.tabPage2.UseVisualStyleBackColor = true;
@@ -778,23 +739,23 @@
this.grdList.AllowUserToDeleteRows = false;
this.grdList.BackgroundColor = System.Drawing.SystemColors.ControlLightLight;
this.grdList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- this.grdList.Location = new System.Drawing.Point(4, 4);
+ this.grdList.Location = new System.Drawing.Point(3, 3);
this.grdList.Margin = new System.Windows.Forms.Padding(0);
this.grdList.Name = "grdList";
this.grdList.ReadOnly = true;
this.grdList.RowHeadersWidth = 51;
this.grdList.RowTemplate.Height = 23;
- this.grdList.Size = new System.Drawing.Size(1155, 336);
+ this.grdList.Size = new System.Drawing.Size(866, 269);
this.grdList.TabIndex = 20;
//
// button2
//
this.button2.BackColor = System.Drawing.Color.White;
this.button2.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.button2.Location = new System.Drawing.Point(1200, 545);
- this.button2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.button2.Location = new System.Drawing.Point(900, 436);
+ this.button2.Margin = new System.Windows.Forms.Padding(2);
this.button2.Name = "button2";
- this.button2.Size = new System.Drawing.Size(149, 55);
+ this.button2.Size = new System.Drawing.Size(112, 44);
this.button2.TabIndex = 150;
this.button2.Text = "涓婁竴涓墿鏂�";
this.button2.UseVisualStyleBackColor = false;
@@ -804,10 +765,10 @@
//
this.button3.BackColor = System.Drawing.Color.White;
this.button3.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.button3.Location = new System.Drawing.Point(1381, 472);
- this.button3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.button3.Location = new System.Drawing.Point(1036, 378);
+ this.button3.Margin = new System.Windows.Forms.Padding(2);
this.button3.Name = "button3";
- this.button3.Size = new System.Drawing.Size(149, 55);
+ this.button3.Size = new System.Drawing.Size(112, 44);
this.button3.TabIndex = 151;
this.button3.Text = "涓嬩竴涓墿鏂�";
this.button3.UseVisualStyleBackColor = false;
@@ -817,10 +778,10 @@
//
this.button7.BackColor = System.Drawing.Color.White;
this.button7.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.button7.Location = new System.Drawing.Point(1381, 545);
- this.button7.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.button7.Location = new System.Drawing.Point(1036, 436);
+ this.button7.Margin = new System.Windows.Forms.Padding(2);
this.button7.Name = "button7";
- this.button7.Size = new System.Drawing.Size(149, 55);
+ this.button7.Size = new System.Drawing.Size(112, 44);
this.button7.TabIndex = 152;
this.button7.Text = "瓒呴鐢熶骇";
this.button7.UseVisualStyleBackColor = false;
@@ -828,10 +789,10 @@
//
// Sc_ICMOToBarCode
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.SystemColors.ActiveCaption;
- this.ClientSize = new System.Drawing.Size(1563, 1055);
+ this.ClientSize = new System.Drawing.Size(1172, 844);
this.Controls.Add(this.button7);
this.Controls.Add(this.button3);
this.Controls.Add(this.button2);
@@ -850,7 +811,6 @@
this.Controls.Add(this.button4);
this.Controls.Add(this.gbUp);
this.Controls.Add(this.Tool);
- this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "Sc_ICMOToBarCode";
this.Text = "蹇�熺敓鎴愭潯鐮�";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.resx" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.resx"
index 646138a..19878a1 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.resx"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.resx"
@@ -360,7 +360,7 @@
<data name="tc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
bXeWrGBMYkoHh+gk8xl/XEneP7jXqXIWJkIgHscnT/PEy2vhz7ZhMQ/Dm5l3ObRcB1ACzAKQ6FTcV69G
rgWTbUl3QFQtFgGpfAAoAVDOi2ZbrwW5hwY4N+P6FmDlkrsBq6zOy3AXIEkhGHMbIMaorgGgI8Cu7CsY
wOZbAEgDBch/gOveRzgJAKLwH0CGJsDmxU1dAMiSu3R5iZr+oJuic1+SJ5jRbOqnmgAAAABJRU5ErkJg
@@ -370,7 +370,7 @@
<data name="mrlk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
oBFDY9BF05XMMAoLL3bhxGB4zjzoVCKim4iCgkCMSam1cqP9aO4YJlpIDmqh00IRv73Pe87OWuV54Mt7
znm/n895z0aF8Stj6FdGoARDUAf/H97jTp96FyZmjC8QwuRUBB0zACkiwT0i9rxvgBcvX4MZEye65Vex
vp6HJ7yJ+1nYpmNyE3nRZcbEiW74AljL5UB3gOk84J8HnFPA0UfirZqIaoZPMQDZZcbEibp6+vE9mwUF
@@ -385,7 +385,7 @@
<data name="bclk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
/QN+phG4CQXTNrPLbzFrpZAuBIfEqChctFRndHI0YzKnxkHFYQgH50NH5+o8Pm/HwQ/s4oGHc++5z/O7
77nnvSKPPZDyKYSfA8tN55N6NfMvK1XT+LIBxAH8PqfUqxnNitR+g1x/yQuRlJWCZVm2Uo965RozmpXq
aRR/Io1jYgJwTdlLPeqt92QqqHLj7phZTCST2Nqxl3rUWzrOTKX7JGBykm9x2Us96r3p1ApOAf5G49iI
@@ -400,7 +400,7 @@
<data name="cz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAACfSURBVDhPYyAGsGWf/Q9lkglSz/xnSANiskHCqf9///8n
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACfSURBVDhPYyAGsGWf/Q9lkglSz/xnSANiskHCqf9///8n
wxCQBhAOPfp/ytn/JBgCUpQIsRWGQQYQZwhQ8ilQEQj3XwAqnokFG8/EbwDMNrhiUCCSohluM0wxzAC8
mkEAagBYMbI/QQYQ1AwCuAwgSjMI4DKAaIBkwD2C0YULAJ2LYQgMEwWgBiAbAsMkGQLGoLBAxyR5C2YQ
OoYDBgYA9kn+I3B8Li4AAAAASUVORK5CYII=
diff --git a/WebAPI/Controllers/MoveStockBillController.cs b/WebAPI/Controllers/MoveStockBillController.cs
index 23ad48e..18ae3e9 100644
--- a/WebAPI/Controllers/MoveStockBillController.cs
+++ b/WebAPI/Controllers/MoveStockBillController.cs
@@ -368,7 +368,7 @@
}
//if (webserver.set_SavePonderationBillMain_Temp_Qty(model, sQty, ref DBUtility.ClsPub.sErrInfo))
- bool flag = oWebs1.Get_CheckQtyByBarCode_GetWhAndSP(model.HInterID, model.HBillType, model.HBarCode, ref SCWhID, ref SCSPID, sRelQty, ref sRelQty);
+ bool flag = oWebs1.Get_CheckQtyByBarCode_GetWhAndSP(model.HInterID, model.HBillType, oView.HBarCode, ref SCWhID, ref SCSPID, sRelQty, ref sRelQty);
if (flag)
{
//sQty = sRelQty;
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index 54b55ab..95a5aeb 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -345,6 +345,159 @@
}
+
+ //鏍规嵁鎷栨潯鐮佽繑鍥炴潯鐮佹。妗堣〃鍞竴鐮佷俊鎭�
+ [Route("GroupOrder/GetBillEntry_TmpListGroupOrder")]
+ [HttpGet]
+ public object GetBillEntry_TmpListGroupOrder(string HBarCode)
+ {
+ try
+ {
+ ds = webserver.GetBarCode(HBarCode);
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ //DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning);
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ 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;
+ }
+ }
+
+
+
+ //鏍规嵁缃戞牸閫変腑璁板綍鍘讳慨鏀规潯鐮佹。妗堛�佺粍鎵樺崟瀛愯〃璁板綍骞堕噸鏂扮敓鎴愮粍鎵樺崟sum琛�
+ [Route("GroupOrderBill/Edit")]
+ [HttpGet]
+ public object Edit(string HBarCode1, Int64 HQty)
+ {
+
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ try
+ {
+ oCN.RunProc("update Gy_BarCodeBill set HQty = " + HQty.ToString() + " where HBarCode = '" + HBarCode1 + "'");
+ oCN.RunProc("update Sc_PackUnionBillSub set HQty = " + HQty.ToString() + " where HBarCode = '" + HBarCode1 + "'");
+ DataSet ds = oCN.RunProcReturn("exec h_p_DisPlayBarCode '" + HBarCode1 + "'", "h_p_DisPlayBarCode");
+
+ long HInterIDTTM = 0;
+ long HInterID = 0;
+ string HBarCode_Pack = "";
+ string HBarCode = "";
+ string HUser = "";
+ HInterIDTTM = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HInterID_TTM"]);
+ HBarCode_Pack = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBarCode_Pack"]);
+ HUser = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HMaker"]);
+ HInterID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HInterID"]);
+ oCN.RunProc("exec h_p_WMS_PackUnionBill_SumSubBill " + HInterIDTTM.ToString() + ",'" + HBarCode_Pack + "','3783','" + HUser + "'," + HInterID.ToString()); //鏍规嵁绠辨潯鐮侊紝鍐欏叆 SUM琛紝SUM鏉＄爜妗ｆ
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇敼鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //DataSet DS1 = webserver.GetBarCode(HBarCode); //HSPID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HSPID"]);
+
+ //ds = webserver.GetUnitList(sWhere, ref DBUtility.ClsPub.sErrInfo);
+
+
+ //if (DS1 == null || DS1.Tables[0].Rows.Count <= 0)
+ // {
+ // objjson.code = "0";
+ // objjson.count = 0;
+ // objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+ // objjson.data = null;
+ // return objjson;
+ // }
+ // else
+ // {
+ // objjson.code = "0";
+ // objjson.count = 1;
+ // objjson.Message = "鑾峰彇鎴愬姛!";
+ // objjson.data = DS1.Tables[0];
+ // return objjson;
+ // }
+ //}
+ catch (Exception ex)
+ {
+
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+ objjson.data = null;
+ return objjson;
+ }
+ }
+
+ //鏍规嵁缃戞牸閫変腑璁板綍鐨勫敮涓�鐮� 鍘诲垹闄ゆ潯鐮佹。妗� 缁勬墭鍗曞瓙琛� 缁勬墭鍗晄um琛ㄧ殑鍞竴鐮佹暟鎹�
+ [Route("GroupOrderBill/Delete")]
+ [HttpGet]
+ public object Delete(string HBarCode1)
+ {
+
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ try
+ {
+ oCN.RunProc("delete from Gy_BarCodeBill where HBarCode = '" + HBarCode1 + "'");
+ oCN.RunProc("delete from Sc_PackUnionBillSub where HBarCode = '" + HBarCode1 + "'");
+ oCN.RunProc("delete from Sc_PackUnionBillSub_Sum where HBarCode = '" + HBarCode1 + "'"); //HSPID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HSPID"]);
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //ds = webserver.GetUnitList(sWhere, ref DBUtility.ClsPub.sErrInfo);
+
+
+ //if (DS1 == null || DS1.Tables[0].Rows.Count <= 0)
+ // {
+ // objjson.code = "0";
+ // objjson.count = 0;
+ // objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+ // objjson.data = null;
+ // return objjson;
+ // }
+ // else
+ // {
+ // objjson.code = "0";
+ // objjson.count = 1;
+ // objjson.Message = "鑾峰彇鎴愬姛!";
+ // objjson.data = DS1.Tables[0];
+ // return objjson;
+ // }
+ //}
+ catch (Exception ex)
+ {
+
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鍒犻櫎澶辫触" + ex.ToString();
+ objjson.data = null;
+ return objjson;
+ }
+ }
+
+
//鏍规嵁榛戠偣/鐧界偣杩斿洖涓嶈壇浠ｇ爜銆佷笉鑹唴鐮�
[Route("Web/GetHWBDot")]
[HttpGet]
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index 7d5d6a1..5987105 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -9,7 +9,7 @@
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
- <publishTime>01/16/2022 20:46:29</publishTime>
+ <publishTime>12/23/2021 16:19:08</publishTime>
</File>
<File Include="bin/Antlr3.Runtime.dll">
<publishTime>02/22/2013 08:43:40</publishTime>
@@ -18,40 +18,40 @@
<publishTime>02/22/2013 08:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>03/10/2022 18:59:16</publishTime>
+ <publishTime>03/19/2022 21:35:57</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>03/10/2022 18:59:16</publishTime>
+ <publishTime>03/19/2022 21:35:57</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
- <publishTime>12/18/2020 05:32:28</publishTime>
+ <publishTime>12/17/2020 21:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>03/10/2022 18:59:15</publishTime>
+ <publishTime>03/19/2022 21:35:56</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>03/10/2022 18:59:15</publishTime>
+ <publishTime>03/19/2022 21:35:56</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 14:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>03/10/2022 18:59:13</publishTime>
+ <publishTime>03/19/2022 21:35:54</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>03/10/2022 18:59:13</publishTime>
+ <publishTime>03/19/2022 21:35:54</publishTime>
</File>
<File Include="bin/ICSharpCode.SharpZipLib.dll">
- <publishTime>05/09/2021 01:08:30</publishTime>
+ <publishTime>05/08/2021 17:08:30</publishTime>
</File>
<File Include="bin/ICSharpCode.SharpZipLib.pdb">
- <publishTime>05/09/2021 01:08:30</publishTime>
+ <publishTime>05/08/2021 17:08:30</publishTime>
</File>
<File Include="bin/Interop.gregn6Lib.dll">
<publishTime>08/25/2021 10:28:25</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>01/16/2022 20:46:27</publishTime>
+ <publishTime>12/23/2021 16:19:02</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.FormService.dll">
<publishTime>09/20/2018 19:23:20</publishTime>
@@ -69,58 +69,58 @@
<publishTime>07/25/2012 11:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>03/10/2022 18:59:13</publishTime>
+ <publishTime>03/19/2022 21:35:54</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>03/10/2022 18:59:13</publishTime>
+ <publishTime>03/19/2022 21:35:54</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
- <publishTime>01/16/2022 20:46:29</publishTime>
+ <publishTime>12/23/2021 16:19:07</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
<publishTime>08/03/2014 20:33:56</publishTime>
</File>
<File Include="bin/NPOI.dll">
- <publishTime>10/23/2021 09:07:54</publishTime>
+ <publishTime>10/23/2021 01:07:54</publishTime>
</File>
<File Include="bin/NPOI.OOXML.dll">
- <publishTime>10/23/2021 09:07:56</publishTime>
+ <publishTime>10/23/2021 01:07:56</publishTime>
</File>
<File Include="bin/NPOI.OOXML.pdb">
- <publishTime>10/23/2021 17:07:56</publishTime>
+ <publishTime>10/23/2021 09:07:56</publishTime>
</File>
<File Include="bin/NPOI.OpenXml4Net.dll">
- <publishTime>10/23/2021 09:07:54</publishTime>
+ <publishTime>10/23/2021 01:07:54</publishTime>
</File>
<File Include="bin/NPOI.OpenXml4Net.pdb">
- <publishTime>10/23/2021 17:07:54</publishTime>
- </File>
- <File Include="bin/NPOI.OpenXmlFormats.dll">
<publishTime>10/23/2021 09:07:54</publishTime>
</File>
+ <File Include="bin/NPOI.OpenXmlFormats.dll">
+ <publishTime>10/23/2021 01:07:54</publishTime>
+ </File>
<File Include="bin/NPOI.OpenXmlFormats.pdb">
- <publishTime>10/23/2021 17:07:54</publishTime>
+ <publishTime>10/23/2021 09:07:54</publishTime>
</File>
<File Include="bin/NPOI.pdb">
- <publishTime>10/23/2021 17:07:54</publishTime>
+ <publishTime>10/23/2021 09:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>03/10/2022 18:59:12</publishTime>
+ <publishTime>03/19/2022 21:35:53</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>03/10/2022 18:59:12</publishTime>
+ <publishTime>03/19/2022 21:35:53</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>03/10/2022 18:59:13</publishTime>
+ <publishTime>03/19/2022 21:35:53</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>03/10/2022 18:59:13</publishTime>
+ <publishTime>03/19/2022 21:35:53</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>03/10/2022 18:59:13</publishTime>
+ <publishTime>03/19/2022 21:35:53</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>03/10/2022 18:59:13</publishTime>
+ <publishTime>03/19/2022 21:35:53</publishTime>
</File>
<File Include="bin/stdole.dll">
<publishTime>05/09/2021 13:35:37</publishTime>
@@ -189,7 +189,7 @@
<publishTime>11/28/2018 13:01:00</publishTime>
</File>
<File Include="bin/System.Web.Http.WebHost.dll">
- <publishTime>01/16/2022 20:46:29</publishTime>
+ <publishTime>12/23/2021 16:19:07</publishTime>
</File>
<File Include="bin/System.Web.Mvc.dll">
<publishTime>01/28/2015 04:02:18</publishTime>
@@ -222,181 +222,181 @@
<publishTime>11/24/2014 11:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>03/10/2022 18:59:18</publishTime>
+ <publishTime>03/19/2022 21:36:01</publishTime>
</File>
<File Include="bin/WebAPI.dll.config">
<publishTime>12/15/2021 17:59:43</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>03/10/2022 18:59:18</publishTime>
+ <publishTime>03/19/2022 21:36:01</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/17/2013 17:03:52</publishTime>
</File>
<File Include="bin/zh-Hans/System.Net.Http.Formatting.resources.dll">
- <publishTime>11/29/2018 21:26:02</publishTime>
+ <publishTime>11/29/2018 13:26:02</publishTime>
</File>
<File Include="bin/zh-Hans/System.Web.Http.resources.dll">
- <publishTime>11/29/2018 21:26:30</publishTime>
+ <publishTime>11/29/2018 13:26:30</publishTime>
</File>
<File Include="Content/bootstrap.css">
- <publishTime>01/16/2022 20:46:29</publishTime>
+ <publishTime>12/23/2021 16:19:04</publishTime>
</File>
<File Include="Content/bootstrap.min.css">
- <publishTime>01/16/2022 20:46:29</publishTime>
+ <publishTime>12/23/2021 16:19:04</publishTime>
</File>
<File Include="Content/Site.css">
- <publishTime>01/16/2022 20:46:29</publishTime>
+ <publishTime>12/23/2021 16:19:04</publishTime>
</File>
<File Include="DLL/BLL.dll">
- <publishTime>01/16/2022 20:46:29</publishTime>
+ <publishTime>12/23/2021 16:19:07</publishTime>
</File>
<File Include="DLL/DAL.dll">
- <publishTime>01/16/2022 20:46:29</publishTime>
+ <publishTime>12/23/2021 16:19:07</publishTime>
</File>
<File Include="DLL/DBUtility.dll">
- <publishTime>01/16/2022 20:46:29</publishTime>
+ <publishTime>12/23/2021 16:19:07</publishTime>
</File>
<File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>01/16/2022 20:46:29</publishTime>
+ <publishTime>12/23/2021 16:19:07</publishTime>
</File>
<File Include="DLL/Model.dll">
- <publishTime>01/16/2022 20:46:29</publishTime>
+ <publishTime>12/23/2021 16:19:07</publishTime>
</File>
<File Include="DLL/Newtonsoft.Json.Net35.dll">
- <publishTime>01/16/2022 20:46:29</publishTime>
+ <publishTime>12/23/2021 16:19:07</publishTime>
</File>
<File Include="DLL/Pub_Class.dll">
- <publishTime>01/16/2022 20:46:29</publishTime>
+ <publishTime>12/23/2021 16:19:07</publishTime>
</File>
<File Include="DLL/Pub_Control.dll">
- <publishTime>01/16/2022 20:46:29</publishTime>
+ <publishTime>12/23/2021 16:19:07</publishTime>
</File>
<File Include="DLL/SQLHelper.dll">
- <publishTime>01/16/2022 20:46:29</publishTime>
+ <publishTime>12/23/2021 16:19:07</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.eot">
- <publishTime>01/16/2022 20:46:29</publishTime>
+ <publishTime>12/23/2021 16:19:08</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.svg">
- <publishTime>01/16/2022 20:46:29</publishTime>
+ <publishTime>12/23/2021 16:19:08</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.ttf">
- <publishTime>01/16/2022 20:46:29</publishTime>
+ <publishTime>12/23/2021 16:19:08</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.woff">
- <publishTime>01/16/2022 20:46:29</publishTime>
+ <publishTime>12/23/2021 16:19:08</publishTime>
</File>
<File Include="Global.asax">
- <publishTime>01/16/2022 20:46:29</publishTime>
+ <publishTime>12/23/2021 16:19:07</publishTime>
</File>
<File Include="Index.html">
- <publishTime>01/16/2022 20:46:29</publishTime>
+ <publishTime>12/23/2021 16:19:07</publishTime>
</File>
<File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
- <publishTime>01/16/2022 20:46:29</publishTime>
+ <publishTime>12/23/2021 16:19:07</publishTime>
</File>
<File Include="packages.config">
- <publishTime>01/16/2022 20:46:29</publishTime>
+ <publishTime>01/14/2022 09:12:59</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.js">
- <publishTime>01/16/2022 20:46:29</publishTime>
+ <publishTime>12/23/2021 16:19:07</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.min.js">
- <publishTime>01/16/2022 20:46:29</publishTime>
+ <publishTime>12/23/2021 16:19:07</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.js">
- <publishTime>01/16/2022 20:46:29</publishTime>
+ <publishTime>12/23/2021 16:19:07</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.js">
- <publishTime>01/16/2022 20:46:29</publishTime>
+ <publishTime>12/23/2021 16:19:07</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.map">
- <publishTime>01/16/2022 20:46:29</publishTime>
+ <publishTime>12/23/2021 16:19:07</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.js">
- <publishTime>01/16/2022 20:46:29</publishTime>
+ <publishTime>12/23/2021 16:19:07</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.min.js">
- <publishTime>01/16/2022 20:46:29</publishTime>
+ <publishTime>12/23/2021 16:19:07</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.js">
- <publishTime>01/16/2022 20:46:29</publishTime>
+ <publishTime>12/23/2021 16:19:07</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
- <publishTime>01/16/2022 20:46:29</publishTime>
+ <publishTime>12/23/2021 16:19:07</publishTime>
</File>
<File Include="Views/Scripts/modernizr-2.6.2.js">
- <publishTime>01/16/2022 20:46:29</publishTime>
+ <publishTime>12/23/2021 16:19:07</publishTime>
</File>
<File Include="Views/Shared/Error.cshtml">
- <publishTime>01/16/2022 20:46:29</publishTime>
+ <publishTime>12/23/2021 16:19:07</publishTime>
</File>
<File Include="Views/Shared/_Layout.cshtml">
- <publishTime>01/16/2022 20:46:29</publishTime>
+ <publishTime>12/23/2021 16:19:07</publishTime>
</File>
<File Include="Views/web.config">
- <publishTime>01/16/2022 20:46:29</publishTime>
+ <publishTime>12/23/2021 16:19:07</publishTime>
</File>
<File Include="Views/_ViewStart.cshtml">
- <publishTime>01/16/2022 20:46:29</publishTime>
+ <publishTime>12/23/2021 16:19:07</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
- <publishTime>03/10/2022 16:13:35</publishTime>
+ <publishTime>03/11/2022 10:06:33</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
- <publishTime>03/10/2022 16:13:35</publishTime>
+ <publishTime>03/11/2022 10:06:33</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
- <publishTime>03/10/2022 16:13:35</publishTime>
+ <publishTime>03/11/2022 10:06:33</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
- <publishTime>03/10/2022 16:13:35</publishTime>
+ <publishTime>03/11/2022 10:06:33</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
- <publishTime>03/10/2022 16:13:35</publishTime>
+ <publishTime>03/11/2022 10:06:33</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
- <publishTime>03/10/2022 16:13:35</publishTime>
+ <publishTime>03/11/2022 10:06:33</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
- <publishTime>03/10/2022 16:13:35</publishTime>
+ <publishTime>03/11/2022 10:06:33</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
- <publishTime>03/10/2022 16:13:35</publishTime>
+ <publishTime>03/11/2022 10:06:33</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
- <publishTime>03/10/2022 16:13:35</publishTime>
+ <publishTime>03/11/2022 10:06:33</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Department_Model.datasource">
- <publishTime>03/10/2022 16:13:35</publishTime>
+ <publishTime>03/11/2022 10:06:33</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
- <publishTime>03/10/2022 16:13:35</publishTime>
+ <publishTime>03/11/2022 10:06:33</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Group_Model.datasource">
- <publishTime>03/10/2022 16:13:35</publishTime>
+ <publishTime>03/11/2022 10:06:33</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
- <publishTime>03/10/2022 16:13:35</publishTime>
+ <publishTime>03/11/2022 10:06:33</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Source_Model.datasource">
- <publishTime>03/10/2022 16:13:35</publishTime>
+ <publishTime>03/11/2022 10:06:33</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
- <publishTime>03/10/2022 16:13:35</publishTime>
+ <publishTime>03/11/2022 10:06:33</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
- <publishTime>03/10/2022 16:13:35</publishTime>
+ <publishTime>03/11/2022 10:06:33</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
- <publishTime>03/10/2022 16:13:35</publishTime>
+ <publishTime>03/11/2022 10:06:33</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">
- <publishTime>03/10/2022 16:13:35</publishTime>
+ <publishTime>03/11/2022 10:06:33</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
- <publishTime>03/10/2022 16:13:35</publishTime>
+ <publishTime>03/11/2022 10:06:33</publishTime>
</File>
<File Include="Web References/WebS/Reference.cs">
<publishTime>12/20/2021 13:19:56</publishTime>
@@ -411,7 +411,7 @@
<publishTime>12/20/2021 13:19:56</publishTime>
</File>
<File Include="Web.config">
- <publishTime>03/10/2022 18:59:23</publishTime>
+ <publishTime>03/19/2022 21:36:07</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/WebServer.cs b/WebAPI/WebServer.cs
index 897c588..042e936 100644
--- a/WebAPI/WebServer.cs
+++ b/WebAPI/WebServer.cs
@@ -3841,6 +3841,28 @@
}
}
+ //鏍规嵁鎵樻潯鐮� 鑾峰彇鏉＄爜妗ｆ鍒楄〃鍞竴鐮佷俊鎭�
+ public DataSet GetBarCode(string HBarCode)
+ {
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ //
+ try
+ {
+ DataSet DS = oCn.RunProcReturn("select HBarCode,HQty from Sc_PackUnionBillSub where HBarCode_Pack ='" + HBarCode.ToString() + "'", "Sc_PackUnionBillSub", ref DBUtility.ClsPub.sExeReturnInfo);
+ //DataSet DS = oCn.RunProcReturn("Select * from h_v_Sc_AssemblyBill Where HInterID=" + HInterID.ToString() + " and HBillType='" + sBillType + "' " + sWhere, "h_v_Sc_AssemblyBill", ref DBUtility.ClsPub.sExeReturnInfo);
+ if (DS.Tables[0].Rows.Count == 0)
+ return null;
+ else
+ {
+ return DS;
+ }
+ }
+ catch (Exception e)
+ {
+ throw (e);
+ }
+ }
+
public DataSet GetHBW(long HBadType)
{
SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
--
Gitblit v1.9.1