From e6ffa9ef6fc1a298121cdf2f09bb4370550f0842 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 21 十月 2022 10:14:38 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
PayM/bin/x86/Debug/SQLHelper.dll | 0
NETERPNoWin/bin/x86/Debug/Pub_Class.pdb | 0
PayM/obj/x86/Debug/PayM.csproj.GenerateResource.cache | 0
WarM/条码打印/Sc_ICMOToBarCode.cs | 94 +++
Kanban/Sc_CJKB.cs | 72 +-
PayM/bin/x86/Debug/Pub_Control.pdb | 0
PayM/obj/x86/Debug/PayM.csproj.CoreCompileInputs.cache | 2
NETERPNoWin/bin/x86/Debug/Pub_Class.dll | 0
NETERPNoWin/obj/x86/Debug/NETERPNoWin.exe | 0
NETERPNoWin/bin/x86/Debug/Pub_Control.dll | 0
WebAPI/Controllers/MateOutController.cs | 38 +
PayM/bin/x86/Debug/Pub_Class.pdb | 0
NETERPNoWin/bin/x86/Debug/SQLHelper.dll | 0
PayM/bin/x86/Debug/Pub_Control.dll | 0
WarM/条码打印/Gy_BarCodeBillList.designer.cs | 92 ++-
PayM/bin/x86/Debug/Pub_Class.dll | 0
PayM/bin/x86/Debug/SQLHelper.pdb | 0
NETERPNoWin/bin/x86/Debug/Model.pdb | 0
PayM/bin/x86/Debug/Model.pdb | 0
PayM/bin/x86/Debug/BLL.dll | 0
WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs | 1
NETERPNoWin/bin/x86/Debug/Pub_Control.pdb | 0
PayM/bin/x86/Debug/BLL.pdb | 0
NETERPNoWin/obj/x86/Debug/NETERPNoWin.pdb | 0
NETERPNoWin/bin/x86/Debug/NETERPNoWin.pdb | 0
NETERPNoWin/bin/x86/Debug/WarM.pdb | 0
NETERPNoWin/bin/x86/Debug/OAM.dll | 0
NETERPNoWin/bin/x86/Debug/WarM.dll | 0
NETERPNoWin/bin/x86/Debug/WorkM.pdb | 0
NETERPNoWin/bin/x86/Debug/Model.dll | 0
PayM/bin/x86/Debug/DBUtility.dll | 0
NETERPNoWin/bin/x86/Debug/grdWidth.wyini | 2
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 198 ++++----
NETERPNoWin/bin/x86/Debug/Kanban.dll | 0
NETERPNoWin/bin/x86/Debug/WorkM.dll | 0
PayM/bin/x86/Debug/DAL.dll | 0
NETERPNoWin/bin/x86/Debug/BaseSet.dll | 0
PayM/bin/x86/Debug/DBUtility.pdb | 0
NETERPNoWin/bin/x86/Debug/OAM.pdb | 0
NETERPNoWin/bin/x86/Debug/BaseSet.pdb | 0
NETERPNoWin/bin/x86/Debug/DBUtility.dll | 0
NETERPNoWin/bin/x86/Debug/Kanban.pdb | 0
PayM/obj/x86/Debug/PayM.csprojAssemblyReference.cache | 0
NETERPNoWin/bin/x86/Debug/BLL.dll | 0
NETERPNoWin/bin/x86/Debug/DBUtility.pdb | 0
PayM/obj/x86/Debug/PayM.pdb | 0
NETERPNoWin/bin/x86/Debug/BLL.pdb | 0
WarM/条码打印/Gy_BarCodeBillList.cs | 127 +++++
Kanban/Sc_QLKB.cs | 54 +-
PayM/obj/x86/Debug/PayM.dll | 0
PayM/bin/x86/Debug/Model.dll | 0
NETERPNoWin/bin/x86/Debug/DAL.pdb | 0
WarM/条码打印/Gy_BarCodeBillList.resx | 24 +
WarM/条码打印/Sc_ICMOToBarCode.designer.cs | 376 ++++++++--------
NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe | 0
NETERPNoWin/bin/x86/Debug/SQLHelper.pdb | 0
NETERPNoWin/obj/x86/Debug/NETERPNoWin.csprojAssemblyReference.cache | 0
NETERPNoWin/bin/x86/Debug/PlanM.dll | 0
PayM/bin/x86/Debug/DAL.pdb | 0
NETERPNoWin/bin/x86/Debug/DAL.dll | 0
WarM/条码打印/Sc_ICMOToBarCode.resx | 23
PayM/bin/x86/Debug/PayM.dll | 0
NETERPNoWin/bin/x86/Debug/HXERP.ini | 31
PayM/bin/x86/Debug/PayM.pdb | 0
WebAPI/Controllers/Sc_ProcessMangementController.cs | 193 ++++++++
NETERPNoWin/bin/x86/Debug/PlanM.pdb | 0
WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs | 32 +
67 files changed, 928 insertions(+), 431 deletions(-)
diff --git a/Kanban/Sc_CJKB.cs b/Kanban/Sc_CJKB.cs
index f05b93a..ecf3747 100644
--- a/Kanban/Sc_CJKB.cs
+++ b/Kanban/Sc_CJKB.cs
@@ -102,15 +102,15 @@
//寮�宸ユ椂闂村皬浜庡綋澶╂椂闂达紝浣嗘槸浠诲姟鍗曠姸鎬佽繕鏄� 寰呯敓浜э紝绯荤粺鑷姩榛勮壊璀︾ず锛�
//瀹屽伐鏃堕棿灏忎簬褰撳ぉ鏃堕棿锛屼絾鏄换鍔″崟杩樻槸寰呯敓浜ф垨鑰呭湪鎵ц鐨勶紝绯荤粺鑷姩绾㈣壊璀︾ず锛�
- int HEDateCol = Fun_GetCol("璁″垝瀹屽伐鏃ユ湡");
- DateTime oNow = DateTime.Today.Date;
- for (int i = 0; i < grdMain.Rows.Count; i++)
- {
- if (DBUtility.ClsPub.isDate(grdMain.Rows[i].Cells[HEDateCol].Value) < oNow)
- {
- grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.Red;
- }
- }
+ //int HEDateCol = Fun_GetCol("璁″垝瀹屽伐鏃ユ湡");
+ //DateTime oNow = DateTime.Today.Date;
+ //for (int i = 0; i < grdMain.Rows.Count; i++)
+ //{
+ // if (DBUtility.ClsPub.isDate(grdMain.Rows[i].Cells[HEDateCol].Value) < oNow)
+ // {
+ // grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.Red;
+ // }
+ //}
//璁剧疆鍚堣鍒�
string sTotalCol = "";
@@ -278,15 +278,15 @@
grdMain.DataSource = null;
grdMain.DataSource = DSet.Tables[0].DefaultView;
- int HEDateCol = Fun_GetCol("璁″垝瀹屽伐鏃ユ湡");
- DateTime oNow = DateTime.Today.Date;
- for (int i = 0; i < grdMain.Rows.Count; i++)
- {
- if (DBUtility.ClsPub.isDate(grdMain.Rows[i].Cells[HEDateCol].Value) < oNow)
- {
- grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.Red;
- }
- }
+ //int HEDateCol = Fun_GetCol("璁″垝瀹屽伐鏃ユ湡");
+ //DateTime oNow = DateTime.Today.Date;
+ //for (int i = 0; i < grdMain.Rows.Count; i++)
+ //{
+ // if (DBUtility.ClsPub.isDate(grdMain.Rows[i].Cells[HEDateCol].Value) < oNow)
+ // {
+ // grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.Red;
+ // }
+ //}
////-----------棰勮鐘舵�� 灏忎簬绛変簬 鏄剧ず 绾㈣壊锛� 灏忎簬7 姗欒壊锛屽皬浜庣瓑浜�14 榛勮壊
//int HYJDateCol = Fun_GetCol("棰勮鐘舵�侊紙澶╋級");
@@ -451,15 +451,15 @@
HQty = 0;
timer1.Enabled = true;
}
- int HEDateCol = Fun_GetCol("璁″垝瀹屽伐鏃ユ湡");
- DateTime oNow = DateTime.Today.Date;
- for (int i = 0; i < grdMain.Rows.Count; i++)
- {
- if (DBUtility.ClsPub.isDate(grdMain.Rows[i].Cells[HEDateCol].Value) < oNow)
- {
- grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.Red;
- }
- }
+ //int HEDateCol = Fun_GetCol("璁″垝瀹屽伐鏃ユ湡");
+ //DateTime oNow = DateTime.Today.Date;
+ //for (int i = 0; i < grdMain.Rows.Count; i++)
+ //{
+ // if (DBUtility.ClsPub.isDate(grdMain.Rows[i].Cells[HEDateCol].Value) < oNow)
+ // {
+ // grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.Red;
+ // }
+ //}
}
private void toolStripButton1_Click(object sender, EventArgs e)
@@ -517,15 +517,15 @@
// grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.Red;
// }
//}
- int HEDateCol = Fun_GetCol("璁″垝瀹屽伐鏃ユ湡");
- DateTime oNow = DateTime.Today.Date;
- for (int i = 0; i < grdMain.Rows.Count; i++)
- {
- if (DBUtility.ClsPub.isDate(grdMain.Rows[i].Cells[HEDateCol].Value) < oNow)
- {
- grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.Red;
- }
- }
+ //int HEDateCol = Fun_GetCol("璁″垝瀹屽伐鏃ユ湡");
+ //DateTime oNow = DateTime.Today.Date;
+ //for (int i = 0; i < grdMain.Rows.Count; i++)
+ //{
+ // if (DBUtility.ClsPub.isDate(grdMain.Rows[i].Cells[HEDateCol].Value) < oNow)
+ // {
+ // grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.Red;
+ // }
+ //}
}
diff --git a/Kanban/Sc_QLKB.cs b/Kanban/Sc_QLKB.cs
index fd3c8ee..64fb0c9 100644
--- a/Kanban/Sc_QLKB.cs
+++ b/Kanban/Sc_QLKB.cs
@@ -173,15 +173,15 @@
s = "鍚�";
Xt_BaseBillFun.DisplayGrid(this.grdMain, base.Name, s, frCol);
}
- int HEDateCol = Fun_GetCol("璁″垝寮�宸ユ棩鏈�");
- DateTime oNow = DateTime.Today.Date;
- for (int i = 0; i < grdMain.Rows.Count; i++)
- {
- if (DBUtility.ClsPub.isDate(grdMain.Rows[i].Cells[HEDateCol].Value) < oNow)
- {
- grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.Red;
- }
- }
+ //int HEDateCol = Fun_GetCol("璁″垝寮�宸ユ棩鏈�");
+ //DateTime oNow = DateTime.Today.Date;
+ //for (int i = 0; i < grdMain.Rows.Count; i++)
+ //{
+ // if (DBUtility.ClsPub.isDate(grdMain.Rows[i].Cells[HEDateCol].Value) < oNow)
+ // {
+ // grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.Red;
+ // }
+ //}
s = "鍚�";
int MainIDCol = Fun_GetCol("hmainid");
int SubIDCol = Fun_GetCol("hsubid");
@@ -324,15 +324,15 @@
grdMain.DataSource = null;
grdMain.DataSource = DSet.Tables[0].DefaultView;
- int HEDateCol = Fun_GetCol("璁″垝寮�宸ユ棩鏈�");
- DateTime oNow = DateTime.Today.Date;
- for (int i = 0; i < grdMain.Rows.Count; i++)
- {
- if (DBUtility.ClsPub.isDate(grdMain.Rows[i].Cells[HEDateCol].Value) < oNow)
- {
- grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.Red;
- }
- }
+ //int HEDateCol = Fun_GetCol("璁″垝寮�宸ユ棩鏈�");
+ //DateTime oNow = DateTime.Today.Date;
+ //for (int i = 0; i < grdMain.Rows.Count; i++)
+ //{
+ // if (DBUtility.ClsPub.isDate(grdMain.Rows[i].Cells[HEDateCol].Value) < oNow)
+ // {
+ // grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.Red;
+ // }
+ //}
int MainIDCol = Fun_GetCol("hmainid");
@@ -507,15 +507,15 @@
HQty = 0;
timer1.Enabled = true;
}
- int HEDateCol = Fun_GetCol("璁″垝寮�宸ユ棩鏈�");
- DateTime oNow = DateTime.Today.Date;
- for (int i = 0; i < grdMain.Rows.Count; i++)
- {
- if (DBUtility.ClsPub.isDate(grdMain.Rows[i].Cells[HEDateCol].Value) < oNow)
- {
- grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.Red;
- }
- }
+ //int HEDateCol = Fun_GetCol("璁″垝寮�宸ユ棩鏈�");
+ //DateTime oNow = DateTime.Today.Date;
+ //for (int i = 0; i < grdMain.Rows.Count; i++)
+ //{
+ // if (DBUtility.ClsPub.isDate(grdMain.Rows[i].Cells[HEDateCol].Value) < oNow)
+ // {
+ // grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.Red;
+ // }
+ //}
}
private void toolStripButton1_Click(object sender, EventArgs e)
diff --git a/NETERPNoWin/bin/x86/Debug/BLL.dll b/NETERPNoWin/bin/x86/Debug/BLL.dll
index 64a76e8..5812eff 100644
--- a/NETERPNoWin/bin/x86/Debug/BLL.dll
+++ b/NETERPNoWin/bin/x86/Debug/BLL.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/BLL.pdb b/NETERPNoWin/bin/x86/Debug/BLL.pdb
index 922db76..b19d90e 100644
--- a/NETERPNoWin/bin/x86/Debug/BLL.pdb
+++ b/NETERPNoWin/bin/x86/Debug/BLL.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/BaseSet.dll b/NETERPNoWin/bin/x86/Debug/BaseSet.dll
index 2ecedb7..96e5699 100644
--- a/NETERPNoWin/bin/x86/Debug/BaseSet.dll
+++ b/NETERPNoWin/bin/x86/Debug/BaseSet.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/BaseSet.pdb b/NETERPNoWin/bin/x86/Debug/BaseSet.pdb
index 1636204..6b81981 100644
--- a/NETERPNoWin/bin/x86/Debug/BaseSet.pdb
+++ b/NETERPNoWin/bin/x86/Debug/BaseSet.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/DAL.dll b/NETERPNoWin/bin/x86/Debug/DAL.dll
index 2d17cd9..eda9841 100644
--- a/NETERPNoWin/bin/x86/Debug/DAL.dll
+++ b/NETERPNoWin/bin/x86/Debug/DAL.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/DAL.pdb b/NETERPNoWin/bin/x86/Debug/DAL.pdb
index b5a7cd8..1f31c41 100644
--- a/NETERPNoWin/bin/x86/Debug/DAL.pdb
+++ b/NETERPNoWin/bin/x86/Debug/DAL.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/DBUtility.dll b/NETERPNoWin/bin/x86/Debug/DBUtility.dll
index ff6de1f..883c6fc 100644
--- a/NETERPNoWin/bin/x86/Debug/DBUtility.dll
+++ b/NETERPNoWin/bin/x86/Debug/DBUtility.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/DBUtility.pdb b/NETERPNoWin/bin/x86/Debug/DBUtility.pdb
index 920bd36..8b35bd2 100644
--- a/NETERPNoWin/bin/x86/Debug/DBUtility.pdb
+++ b/NETERPNoWin/bin/x86/Debug/DBUtility.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/HXERP.ini b/NETERPNoWin/bin/x86/Debug/HXERP.ini
index 97a7676..d84e2a2 100644
--- a/NETERPNoWin/bin/x86/Debug/HXERP.ini
+++ b/NETERPNoWin/bin/x86/Debug/HXERP.ini
@@ -1,39 +1,26 @@
[po]
-Server=47.96.97.237,15127
+Server=.\SQL2014
[Erp]
-Server=47.96.97.237,15127
+Server=192.168.0.88
DataBase=HX_LMESsys
-DataBaseNumber=001-智云LMES管理系统
+DataBaseNumber=001-WMS条码系统
UserName=HX_USER
PassWord=lc@841022
-UserPsd=
-Remember=
-[Srm]
-Server=47.96.97.237,15127
-DataBase=HX_LMESsys
-DataBaseNumber=001-ERP供应商协同平台
-UserName=HX_USER
-PassWord=lc@841022
+HCompName=奥邦
UserPsd=
Remember=
[K3Erp]
-Server=47.96.97.237,15127
-DataBase=
+Server=192.168.0.88
+DataBase=HX_LMESsys
UserName=HX_USER
PassWord=lc@841022
[K32Erp]
-Server=47.96.97.237,15127
+Server=192.168.0.88
DataBase=HX_LMESsys
UserName=HX_USER
PassWord=lc@841022
[UserInfo]
-UserName=admin,33.995,001,宁波海关驻慈溪办事处,景焕章
+UserName=admin,1030,关竹萍,张鸭忠,刘观春,袁正宇,官香明,胥光芬,赵敏,胡从琴
UserPsd=
Remember=1
-HOrgName=手机事业部
-[CLOUDINFO]
-
-sCLOUDUrl=http://47.96.97.237/k3cloud/
-sCLOUDAcc=6204a70eba35fc
-sCLOUDUseName=demo
-sCLOUDPsd=888888
+HOrgName=宁波奥邦喷雾器有限公司
diff --git a/NETERPNoWin/bin/x86/Debug/Kanban.dll b/NETERPNoWin/bin/x86/Debug/Kanban.dll
index 4d392ea..d6b9a03 100644
--- a/NETERPNoWin/bin/x86/Debug/Kanban.dll
+++ b/NETERPNoWin/bin/x86/Debug/Kanban.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Kanban.pdb b/NETERPNoWin/bin/x86/Debug/Kanban.pdb
index e0733b7..175d02f 100644
--- a/NETERPNoWin/bin/x86/Debug/Kanban.pdb
+++ b/NETERPNoWin/bin/x86/Debug/Kanban.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Model.dll b/NETERPNoWin/bin/x86/Debug/Model.dll
index c54333a..8834131 100644
--- a/NETERPNoWin/bin/x86/Debug/Model.dll
+++ b/NETERPNoWin/bin/x86/Debug/Model.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Model.pdb b/NETERPNoWin/bin/x86/Debug/Model.pdb
index 8dd2d26..5acd079 100644
--- a/NETERPNoWin/bin/x86/Debug/Model.pdb
+++ b/NETERPNoWin/bin/x86/Debug/Model.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe b/NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe
index 0784f1a..9e8ade9 100644
--- a/NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe
+++ b/NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/NETERPNoWin.pdb b/NETERPNoWin/bin/x86/Debug/NETERPNoWin.pdb
index 9e6d3e4..790ca38 100644
--- a/NETERPNoWin/bin/x86/Debug/NETERPNoWin.pdb
+++ b/NETERPNoWin/bin/x86/Debug/NETERPNoWin.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/OAM.dll b/NETERPNoWin/bin/x86/Debug/OAM.dll
index 256667c..a2d7d4d 100644
--- a/NETERPNoWin/bin/x86/Debug/OAM.dll
+++ b/NETERPNoWin/bin/x86/Debug/OAM.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/OAM.pdb b/NETERPNoWin/bin/x86/Debug/OAM.pdb
index 596f14a..421f093 100644
--- a/NETERPNoWin/bin/x86/Debug/OAM.pdb
+++ b/NETERPNoWin/bin/x86/Debug/OAM.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/PlanM.dll b/NETERPNoWin/bin/x86/Debug/PlanM.dll
index a31cb4b..42a8f45 100644
--- a/NETERPNoWin/bin/x86/Debug/PlanM.dll
+++ b/NETERPNoWin/bin/x86/Debug/PlanM.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/PlanM.pdb b/NETERPNoWin/bin/x86/Debug/PlanM.pdb
index 44bbd76..e35e57e 100644
--- a/NETERPNoWin/bin/x86/Debug/PlanM.pdb
+++ b/NETERPNoWin/bin/x86/Debug/PlanM.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Pub_Class.dll b/NETERPNoWin/bin/x86/Debug/Pub_Class.dll
index 2507fa0..8e7a086 100644
--- a/NETERPNoWin/bin/x86/Debug/Pub_Class.dll
+++ b/NETERPNoWin/bin/x86/Debug/Pub_Class.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Pub_Class.pdb b/NETERPNoWin/bin/x86/Debug/Pub_Class.pdb
index b6db143..b0850d8 100644
--- a/NETERPNoWin/bin/x86/Debug/Pub_Class.pdb
+++ b/NETERPNoWin/bin/x86/Debug/Pub_Class.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Pub_Control.dll b/NETERPNoWin/bin/x86/Debug/Pub_Control.dll
index 493480c..5c71631 100644
--- a/NETERPNoWin/bin/x86/Debug/Pub_Control.dll
+++ b/NETERPNoWin/bin/x86/Debug/Pub_Control.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Pub_Control.pdb b/NETERPNoWin/bin/x86/Debug/Pub_Control.pdb
index b5df9b1..2f30d47 100644
--- a/NETERPNoWin/bin/x86/Debug/Pub_Control.pdb
+++ b/NETERPNoWin/bin/x86/Debug/Pub_Control.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/SQLHelper.dll b/NETERPNoWin/bin/x86/Debug/SQLHelper.dll
index 67ff7e5..5c4abad 100644
--- a/NETERPNoWin/bin/x86/Debug/SQLHelper.dll
+++ b/NETERPNoWin/bin/x86/Debug/SQLHelper.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/SQLHelper.pdb b/NETERPNoWin/bin/x86/Debug/SQLHelper.pdb
index 5cf7bcc..2209ce4 100644
--- a/NETERPNoWin/bin/x86/Debug/SQLHelper.pdb
+++ b/NETERPNoWin/bin/x86/Debug/SQLHelper.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/WarM.dll b/NETERPNoWin/bin/x86/Debug/WarM.dll
index e906546..3c41ac2 100644
--- a/NETERPNoWin/bin/x86/Debug/WarM.dll
+++ b/NETERPNoWin/bin/x86/Debug/WarM.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/WarM.pdb b/NETERPNoWin/bin/x86/Debug/WarM.pdb
index 93f761c..1134162 100644
--- a/NETERPNoWin/bin/x86/Debug/WarM.pdb
+++ b/NETERPNoWin/bin/x86/Debug/WarM.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/WorkM.dll b/NETERPNoWin/bin/x86/Debug/WorkM.dll
index 640ff99..77d0361 100644
--- a/NETERPNoWin/bin/x86/Debug/WorkM.dll
+++ b/NETERPNoWin/bin/x86/Debug/WorkM.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/WorkM.pdb b/NETERPNoWin/bin/x86/Debug/WorkM.pdb
index 27f0bc6..af62fe8 100644
--- a/NETERPNoWin/bin/x86/Debug/WorkM.pdb
+++ b/NETERPNoWin/bin/x86/Debug/WorkM.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/grdWidth.wyini b/NETERPNoWin/bin/x86/Debug/grdWidth.wyini
index 124a15b..fa84e72 100644
--- a/NETERPNoWin/bin/x86/Debug/grdWidth.wyini
+++ b/NETERPNoWin/bin/x86/Debug/grdWidth.wyini
@@ -54,4 +54,4 @@
Sc_WorkBillProcProdReportKB=193,556,523,112
Sc_HZQLCGKB=11,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100
frmDownMenu任务单设置=100,135,100
-Sc_CJKB=100,428,301,100,273,372
+Sc_CJKB=100,100,100,100,100,100,100,100,100,100
diff --git a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csprojAssemblyReference.cache b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csprojAssemblyReference.cache
index 8b3ea05..6ab04df 100644
--- a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csprojAssemblyReference.cache
+++ b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csprojAssemblyReference.cache
Binary files differ
diff --git a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.exe b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.exe
index 0784f1a..9e8ade9 100644
--- a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.exe
+++ b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.exe
Binary files differ
diff --git a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.pdb b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.pdb
index 9e6d3e4..790ca38 100644
--- a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.pdb
+++ b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/BLL.dll b/PayM/bin/x86/Debug/BLL.dll
index c8902b4..d99f3e7 100644
--- a/PayM/bin/x86/Debug/BLL.dll
+++ b/PayM/bin/x86/Debug/BLL.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/BLL.pdb b/PayM/bin/x86/Debug/BLL.pdb
index 48dba05..9a09bfe 100644
--- a/PayM/bin/x86/Debug/BLL.pdb
+++ b/PayM/bin/x86/Debug/BLL.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/DAL.dll b/PayM/bin/x86/Debug/DAL.dll
index 494c7b7..c228bf3 100644
--- a/PayM/bin/x86/Debug/DAL.dll
+++ b/PayM/bin/x86/Debug/DAL.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/DAL.pdb b/PayM/bin/x86/Debug/DAL.pdb
index e8cc6d5..352677a 100644
--- a/PayM/bin/x86/Debug/DAL.pdb
+++ b/PayM/bin/x86/Debug/DAL.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/DBUtility.dll b/PayM/bin/x86/Debug/DBUtility.dll
index c0b1a2c..c28e62d 100644
--- a/PayM/bin/x86/Debug/DBUtility.dll
+++ b/PayM/bin/x86/Debug/DBUtility.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/DBUtility.pdb b/PayM/bin/x86/Debug/DBUtility.pdb
index 3a7bc65..c31836a 100644
--- a/PayM/bin/x86/Debug/DBUtility.pdb
+++ b/PayM/bin/x86/Debug/DBUtility.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/Model.dll b/PayM/bin/x86/Debug/Model.dll
index d4f2501..6248f13 100644
--- a/PayM/bin/x86/Debug/Model.dll
+++ b/PayM/bin/x86/Debug/Model.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/Model.pdb b/PayM/bin/x86/Debug/Model.pdb
index e36dc83..4605af2 100644
--- a/PayM/bin/x86/Debug/Model.pdb
+++ b/PayM/bin/x86/Debug/Model.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/PayM.dll b/PayM/bin/x86/Debug/PayM.dll
index 22b47a8..a9c8949 100644
--- a/PayM/bin/x86/Debug/PayM.dll
+++ b/PayM/bin/x86/Debug/PayM.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/PayM.pdb b/PayM/bin/x86/Debug/PayM.pdb
index f248a65..e6ac237 100644
--- a/PayM/bin/x86/Debug/PayM.pdb
+++ b/PayM/bin/x86/Debug/PayM.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/Pub_Class.dll b/PayM/bin/x86/Debug/Pub_Class.dll
index 243e991..a866b63 100644
--- a/PayM/bin/x86/Debug/Pub_Class.dll
+++ b/PayM/bin/x86/Debug/Pub_Class.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/Pub_Class.pdb b/PayM/bin/x86/Debug/Pub_Class.pdb
index 8be0fea..db230f9 100644
--- a/PayM/bin/x86/Debug/Pub_Class.pdb
+++ b/PayM/bin/x86/Debug/Pub_Class.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/Pub_Control.dll b/PayM/bin/x86/Debug/Pub_Control.dll
index 4c74cf2..1e0842c 100644
--- a/PayM/bin/x86/Debug/Pub_Control.dll
+++ b/PayM/bin/x86/Debug/Pub_Control.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/Pub_Control.pdb b/PayM/bin/x86/Debug/Pub_Control.pdb
index 89b59d9..9e7be38 100644
--- a/PayM/bin/x86/Debug/Pub_Control.pdb
+++ b/PayM/bin/x86/Debug/Pub_Control.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/SQLHelper.dll b/PayM/bin/x86/Debug/SQLHelper.dll
index d3d3496..f9a3ccf 100644
--- a/PayM/bin/x86/Debug/SQLHelper.dll
+++ b/PayM/bin/x86/Debug/SQLHelper.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/SQLHelper.pdb b/PayM/bin/x86/Debug/SQLHelper.pdb
index 3e2df98..ab989be 100644
--- a/PayM/bin/x86/Debug/SQLHelper.pdb
+++ b/PayM/bin/x86/Debug/SQLHelper.pdb
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.csproj.CoreCompileInputs.cache b/PayM/obj/x86/Debug/PayM.csproj.CoreCompileInputs.cache
index eb2086c..ead15dd 100644
--- a/PayM/obj/x86/Debug/PayM.csproj.CoreCompileInputs.cache
+++ b/PayM/obj/x86/Debug/PayM.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-08bc7f9ad52dac46a486d601aad75ab55bfbf42b
+b14f4fcc24537f5a4b1d1021595a00930f37f5f5
diff --git a/PayM/obj/x86/Debug/PayM.csproj.GenerateResource.cache b/PayM/obj/x86/Debug/PayM.csproj.GenerateResource.cache
index c5d9e08..e0ce1fc 100644
--- a/PayM/obj/x86/Debug/PayM.csproj.GenerateResource.cache
+++ b/PayM/obj/x86/Debug/PayM.csproj.GenerateResource.cache
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.csprojAssemblyReference.cache b/PayM/obj/x86/Debug/PayM.csprojAssemblyReference.cache
index 74f14fb..c353f8d 100644
--- a/PayM/obj/x86/Debug/PayM.csprojAssemblyReference.cache
+++ b/PayM/obj/x86/Debug/PayM.csprojAssemblyReference.cache
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.dll b/PayM/obj/x86/Debug/PayM.dll
index 22b47a8..a9c8949 100644
--- a/PayM/obj/x86/Debug/PayM.dll
+++ b/PayM/obj/x86/Debug/PayM.dll
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.pdb b/PayM/obj/x86/Debug/PayM.pdb
index f248a65..e6ac237 100644
--- a/PayM/obj/x86/Debug/PayM.pdb
+++ b/PayM/obj/x86/Debug/PayM.pdb
Binary files differ
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBillList.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBillList.cs"
index 28c328d..0d742fb 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBillList.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBillList.cs"
@@ -37,6 +37,7 @@
public string PrintQtyCtl = ""; //鏉＄爜鎵撳嵃娆℃暟鎺у埗
public string UpdatePrintQtyCtl = ""; //鏉＄爜鎵撳嵃娆℃暟鏇存柊
public string SourceQtyCtl = ""; //瓒呮簮鍗曟暟閲忔帶鍒�
+ public string CampanyName = ""; //瀹㈡埛瀹氬埗鍖栧悕绉�
#region 鍥哄畾浠ｇ爜
@@ -70,6 +71,7 @@
PrintQtyCtl = oSystemParameter.omodel.BarCode_PrintQtyCtl;
UpdatePrintQtyCtl = oSystemParameter.omodel.BarCode_UpdatePrintQtyCtl;
SourceQtyCtl = oSystemParameter.omodel.BarCode_SourceQtyCtl;
+ CampanyName = oSystemParameter.omodel.WMS_CampanyName;
}
}
@@ -598,9 +600,134 @@
+
+
+
#endregion
+ #region 缁戝畾鎵樻潯鐮�
+ private void bdBarCode_Pack_Click(object sender, EventArgs e)
+ {
+ if (grdMain.CurrentRow == null)
+ {
+ MessageBox.Show("璇峰厛閫夋嫨闇�瑕佺粦瀹氱殑鏉＄爜锛�", "鎻愮ず");
+ return;
+ }
+ else
+ {
+ Int64 hmainid = 0;
+ string HItemID = "";
+ string s = "";
+ string HBarCode_Pack = "";
+ for (int i = 0; i <= grdMain.SelectedRows.Count - 1; i++)
+ {
+ if (s.Length > 4500)
+ {
+ HItemID = HItemID + "#" + DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("hmainid")].Value.ToString());
+ s = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("hmainid")].Value.ToString());
+ }
+ else
+ {
+ HItemID = HItemID + "," + DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("hmainid")].Value.ToString());
+ s = s + "," + DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("hmainid")].Value.ToString());
+ }
+
+ //鑾峰彇鎵樻潯鐮佸彿锛氭墭鏉＄爜=鎵�閫夋潯鐮佷腑娴佹按鍙锋渶澶х殑鏉＄爜+鈥�-1鈥�
+ if (hmainid<DBUtility.ClsPub.isLong(grdMain.SelectedRows[i].Cells[Fun_GetCol("hmainid")].Value.ToString()))
+ {
+ hmainid = DBUtility.ClsPub.isLong(grdMain.SelectedRows[i].Cells[Fun_GetCol("hmainid")].Value.ToString());
+ HBarCode_Pack = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("鏉＄爜缂栧彿")].Value) + "-1";
+ }
+ }
+
+ try
+ {
+ oCn.BeginTran();
+ Int64 HFlag = 0;
+ HItemID = HItemID.Remove(0, 1); //鍘绘帀瀛楃涓茬涓�涓瓧绗�
+ string[] NewHItemID;
+ NewHItemID = HItemID.Split(Convert.ToChar("#"));
+
+ for (int i = 0; i <= NewHItemID.Length - 1; i++)
+ {
+ if(i == NewHItemID.Length - 1)
+ {
+ HFlag = 1;
+ }
+ //鎵樻潯鐮佺粦瀹氬墠鍒ゆ柇锛屽洖濉墭鏉＄爜淇℃伅锛岀敓鎴愭墭鏉＄爜
+ DataSet DS = oCn.RunProcReturn("exec h_p_Gy_BarCodeBill_BindPack '" + NewHItemID[i] + "','" + HBarCode_Pack + "','" + CampanyName + "'," + HFlag + ",'" + DBUtility.ClsPub.CurUserName + "'", "h_p_Gy_BarCodeBill_BindPack");
+ if (DS == null || DS.Tables[0].Rows.Count <= 0)
+ {
+ oCn.CnClose();
+ oCn.CnDispose();
+ MessageBox.Show("缁戝畾骞剁敓鎴愭墭鏉＄爜鍒ゆ柇閿欒锛�");
+ return;
+ }
+ else if (DBUtility.ClsPub.isStrNull(DS.Tables[0].Rows[0][0]) == "1")
+ {
+ oCn.CnClose();
+ oCn.CnDispose();
+ MessageBox.Show(DBUtility.ClsPub.isStrNull(DS.Tables[0].Rows[0]["HRemark"]));
+ return;
+ }
+ }
+
+ MessageBox.Show("缁戝畾骞剁敓鎴愭墭鏉＄爜鎴愬姛锛�", "鎻愮ず");
+ Display();
+ oCn.Commit();
+ }
+ catch (Exception e2)
+ {
+ oCn.RollBack();
+ throw (e2);
+ }
+ }
+ }
+
+ #endregion
+
+
+ #region 瑙ｇ粦鎵樻潯鐮�
+ private void jbBarCode_Pack_Click(object sender, EventArgs e)
+ {
+ if (grdMain.CurrentRow == null)
+ {
+ MessageBox.Show("璇峰厛閫夋嫨闇�瑕佽В缁戠殑鏉＄爜锛�", "鎻愮ず");
+ return;
+ }
+ if (grdMain.SelectedRows.Count != 1)
+ {
+ MessageBox.Show("涓�娆″彧鍏佽閫変腑涓�琛屾潯鐮佽褰曪紝璇烽噸鏂伴�夋嫨闇�瑕佽В缁戠殑鏉＄爜锛�");
+ return;
+ }
+ else
+ {
+ Int64 HItemID = 0;
+ HItemID = DBUtility.ClsPub.isLong(grdMain.SelectedRows[0].Cells[Fun_GetCol("hmainid")].Value);
+
+ //鎵樻潯鐮佽В缁戝墠鍒ゆ柇锛屽洖濉墭鏉＄爜淇℃伅锛屽垹闄ゆ墭鏉＄爜
+ DataSet DS = oCn.RunProcReturn("exec h_p_Gy_BarCodeBill_UnBindPack " + HItemID + ",'" + CampanyName + "'", "h_p_Gy_BarCodeBill_UnBindPack");
+ if (DS == null || DS.Tables[0].Rows.Count <= 0)
+ {
+ MessageBox.Show("瑙ｇ粦骞跺垹闄ゆ墭鏉＄爜鍒ゆ柇閿欒锛�");
+ return;
+ }
+ else if (DBUtility.ClsPub.isStrNull(DS.Tables[0].Rows[0][0]) == "1")
+ {
+ MessageBox.Show(DBUtility.ClsPub.isStrNull(DS.Tables[0].Rows[0]["HRemark"]));
+ return;
+ }
+ else
+ {
+ MessageBox.Show("瑙ｇ粦骞跺垹闄ゆ墭鏉＄爜鎴愬姛锛�", "鎻愮ず");
+ Display();
+ }
+ }
+ }
+
+ #endregion
+
}
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBillList.designer.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBillList.designer.cs"
index 95a0fd1..35a647e 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBillList.designer.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBillList.designer.cs"
@@ -36,6 +36,9 @@
this.lbldj = new System.Windows.Forms.Label();
this.lblCaption = new System.Windows.Forms.Label();
this.Tool = new System.Windows.Forms.ToolStrip();
+ this.toolStripDropDownButton1 = new System.Windows.Forms.ToolStripDropDownButton();
+ this.eXCELToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.cSVToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.dy = new System.Windows.Forms.ToolStripButton();
this.yl = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
@@ -59,9 +62,9 @@
this.timer2 = new System.Windows.Forms.Timer(this.components);
this.grdMain = new System.Windows.Forms.DataGridView();
this.grdPrint = new System.Windows.Forms.DataGridView();
- this.toolStripDropDownButton1 = new System.Windows.Forms.ToolStripDropDownButton();
- this.eXCELToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.cSVToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.bdBarCode_Pack = new System.Windows.Forms.ToolStripButton();
+ this.jbBarCode_Pack = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
this.pPic.SuspendLayout();
this.panel1.SuspendLayout();
this.Tool.SuspendLayout();
@@ -141,6 +144,9 @@
this.toolStripSeparator5,
this.zf,
this.fzf,
+ this.toolStripSeparator4,
+ this.bdBarCode_Pack,
+ this.jbBarCode_Pack,
this.toolStripSeparator6,
this.tc,
this.toolStripSeparator3,
@@ -156,6 +162,34 @@
this.Tool.Stretch = true;
this.Tool.TabIndex = 16;
this.Tool.Text = "toolStrip1";
+ //
+ // toolStripDropDownButton1
+ //
+ this.toolStripDropDownButton1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.eXCELToolStripMenuItem,
+ this.cSVToolStripMenuItem});
+ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image")));
+ this.toolStripDropDownButton1.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.toolStripDropDownButton1.Name = "toolStripDropDownButton1";
+ this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 47);
+ this.toolStripDropDownButton1.Text = "寮曞嚭";
+ this.toolStripDropDownButton1.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.toolStripDropDownButton1.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ //
+ // eXCELToolStripMenuItem
+ //
+ this.eXCELToolStripMenuItem.Name = "eXCELToolStripMenuItem";
+ this.eXCELToolStripMenuItem.Size = new System.Drawing.Size(112, 22);
+ this.eXCELToolStripMenuItem.Text = "EXCEL";
+ this.eXCELToolStripMenuItem.Click += new System.EventHandler(this.eXCELToolStripMenuItem_Click);
+ //
+ // cSVToolStripMenuItem
+ //
+ this.cSVToolStripMenuItem.Name = "cSVToolStripMenuItem";
+ this.cSVToolStripMenuItem.Size = new System.Drawing.Size(112, 22);
+ this.cSVToolStripMenuItem.Text = "CSV";
+ this.cSVToolStripMenuItem.Click += new System.EventHandler(this.cSVToolStripMenuItem_Click);
//
// dy
//
@@ -388,33 +422,38 @@
this.grdPrint.TabIndex = 8;
this.grdPrint.Visible = false;
//
- // toolStripDropDownButton1
+ // bdBarCode_Pack
//
- this.toolStripDropDownButton1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.eXCELToolStripMenuItem,
- this.cSVToolStripMenuItem});
- this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image")));
- this.toolStripDropDownButton1.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.toolStripDropDownButton1.Name = "toolStripDropDownButton1";
- this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 47);
- this.toolStripDropDownButton1.Text = "寮曞嚭";
- this.toolStripDropDownButton1.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.toolStripDropDownButton1.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.bdBarCode_Pack.AutoSize = false;
+ this.bdBarCode_Pack.Image = ((System.Drawing.Image)(resources.GetObject("bdBarCode_Pack.Image")));
+ this.bdBarCode_Pack.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.bdBarCode_Pack.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.bdBarCode_Pack.ImageTransparentColor = System.Drawing.Color.White;
+ this.bdBarCode_Pack.Name = "bdBarCode_Pack";
+ this.bdBarCode_Pack.Size = new System.Drawing.Size(70, 47);
+ this.bdBarCode_Pack.Text = "缁戝畾鎵樻潯鐮�";
+ this.bdBarCode_Pack.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.bdBarCode_Pack.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.bdBarCode_Pack.Click += new System.EventHandler(this.bdBarCode_Pack_Click);
//
- // eXCELToolStripMenuItem
+ // jbBarCode_Pack
//
- this.eXCELToolStripMenuItem.Name = "eXCELToolStripMenuItem";
- this.eXCELToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
- this.eXCELToolStripMenuItem.Text = "EXCEL";
- this.eXCELToolStripMenuItem.Click += new System.EventHandler(this.eXCELToolStripMenuItem_Click);
+ this.jbBarCode_Pack.AutoSize = false;
+ this.jbBarCode_Pack.Image = ((System.Drawing.Image)(resources.GetObject("jbBarCode_Pack.Image")));
+ this.jbBarCode_Pack.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.jbBarCode_Pack.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.jbBarCode_Pack.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.jbBarCode_Pack.Name = "jbBarCode_Pack";
+ this.jbBarCode_Pack.Size = new System.Drawing.Size(70, 47);
+ this.jbBarCode_Pack.Text = "瑙ｇ粦鎵樻潯鐮�";
+ this.jbBarCode_Pack.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.jbBarCode_Pack.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.jbBarCode_Pack.Click += new System.EventHandler(this.jbBarCode_Pack_Click);
//
- // cSVToolStripMenuItem
+ // toolStripSeparator4
//
- this.cSVToolStripMenuItem.Name = "cSVToolStripMenuItem";
- this.cSVToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
- this.cSVToolStripMenuItem.Text = "CSV";
- this.cSVToolStripMenuItem.Click += new System.EventHandler(this.cSVToolStripMenuItem_Click);
+ this.toolStripSeparator4.Name = "toolStripSeparator4";
+ this.toolStripSeparator4.Size = new System.Drawing.Size(6, 50);
//
// Gy_BarCodeBillList
//
@@ -475,5 +514,8 @@
private System.Windows.Forms.ToolStripDropDownButton toolStripDropDownButton1;
private System.Windows.Forms.ToolStripMenuItem eXCELToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem cSVToolStripMenuItem;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;
+ private System.Windows.Forms.ToolStripButton bdBarCode_Pack;
+ private System.Windows.Forms.ToolStripButton jbBarCode_Pack;
}
}
\ No newline at end of file
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBillList.resx" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBillList.resx"
index b4b5f1e..2f86434 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBillList.resx"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBillList.resx"
@@ -4029,6 +4029,30 @@
8iQ1XvVn58xU1WnxG1zAJmn61pmIPgBiIY95z/CSIgAAAABJRU5ErkJggg==
</value>
</data>
+ <data name="bdBarCode_Pack.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAG3SURBVDhPfVLdK0NhHH5LSXGn/QculCsfUbtRLl1JbhQh
+ taxNNPnOolY+yhjjQo12oRQ3bhWiZGULF3Kv5Nucbeacs4/HeX/HnJ289tRT7+/5/Z7nfc+vw+bXgvD4
+ NuFZDojpC2DOvwX/1i6YCDPeDXEjDyu+C5oRhrgX1knMZrMQkfe83vNf45+QydlVEtKZDETkvaWlkMlk
+ Chn3LFOhptIQMQsgsHmElvYetHXYcHB4YgpjIzOLJMhKCiIqagoZLUVKJPEWlWg2UlOKs3KmB7ncC3RI
+ yioKMfc5Zc4IkhUMCAOXVgvY4OQsNeJJBYl/qKYM8/ZtQr9QCwlZtFf0j3lI+PiUIQmoaHvg/RJ7mMzX
+ KlDtv6NXUIBjeJoG3mNfiMbNlFXdXGy/MplZAGB1QeqxPtcUHV4lbUkxg7K2PK4XOW7+N3PYBiaoeI5+
+ 4uXDINdWu1hhM0evc5SEx7c4nt4TRL51rvEAXLT+MR+fGn8m67YPUXH/IuH+NUbkNZnVB0C5opD8m3Me
+ QndfXpGHXECnlRF/ZILJ09zWhaqGJlTVG+R6ZW0jeAgNadjZ29f72iz36Cpj3yFNGCz1c9N0AAAAAElF
+ TkSuQmCC
+</value>
+ </data>
+ <data name="jbBarCode_Pack.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADSSURBVDhPlZPRDYQgEERpxgaswlCGv/ZBSXwbC6AAC7AA
+ G9hj1huCuMS7SUYi8l4IqhvHUf5tHRWc59ntcRy3dgXrusq2baUppUf3fe8L3mD0J0EPZLsCC0Sdcw8B
+ 5hgV4HBaEIt14bIUCYUyTUViCmpYhqFICLM61wq41YcEbeDbDmqwbpEYMKICC0QhRhUwYMQUEGxhS6KC
+ EIJ472We51dYm8+DEr1Cgm8BkhijCeNe575vhZJLk8OdQMCvkhKM+FfwjBIdc4oAgaQtFlpzV0Q+Xg/P
+ E8pc2+4AAAAASUVORK5CYII=
+</value>
+ </data>
<data name="tc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
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 4d74421..587564b 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"
@@ -121,6 +121,9 @@
{
txtHMaterID.Tag = DBUtility.ClsPub.isInt(grdMain.Rows[0].Cells["HInterID"].Value);
txtHMiniQty.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells["鏍囧噯瑁呯"].Value);
+ //txtHMaterID.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells["鐗╂枡缂栫爜"].Value);
+ txtHMaterModel.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells["瑙勬牸鍨嬪彿"].Value);
+ txtHMaterName.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells["鐗╂枡鍚嶇О"].Value);
}
else
{
@@ -1211,19 +1214,70 @@
//Sub_SaveBarCode();
////
+
+
+ //bool flag = this.txtHZXQty.Text.Trim() != "";
+ //double num;
+ //double HICMOQty = 0;
+ //if (flag)
+ //{
+ // num = Pub_Class.ClsPub.isDoule(this.txtHZXQty.Text);
+ //}
+ //else
+ //{
+ // num = Pub_Class.ClsPub.isDoule(this.txtHMiniQty.Text);
+ //}
+ //bool flag2 = num <= 0.0;
+ //if (flag2)
+ //{
+ // MessageBox.Show("璇疯緭鍏ユ暣绠辨暟閲忥紒");
+ //}
+ //else
+ //{
+ // for (int i = 0; i < this.grdMain.Rows.Count; i++)
+ // {
+ // for (int i1 = 0; i1 < this.grdMain.Rows.Count; i1++)
+ // {
+
+ // HICMOQty += Pub_Class.ClsPub.isDoule(this.grdMain.Rows[i1].Cells["鐢熶骇璁㈠崟鏁伴噺"].Value);
+ // }
+ // if (HICMOQty < num)
+ // {
+ // MessageBox.Show("璇风偣鍑昏秴棰濈敓浜ф寜閽敓鎴愭潯鐮侊紒");
+ // break;
+ // }
+
+ // bool flag3 = num > 0.0;
+ // if (!flag3)
+ // {
+ // break;
+ // }
+ // bool flag4 = num > Pub_Class.ClsPub.isDoule(this.grdMain.Rows[i].Cells["鐢熶骇璁㈠崟鏁伴噺"].Value);
+ // if (!flag4)
+ // {
+ // this.grdMain.Rows[i].Cells["鏈鏁伴噺"].Value = num;
+ // break;
+ // }
+ // num -= Pub_Class.ClsPub.isDoule(this.grdMain.Rows[i].Cells["鐢熶骇璁㈠崟鏁伴噺"].Value);
+ // this.grdMain.Rows[i].Cells["鏈鏁伴噺"].Value = Pub_Class.ClsPub.isDoule(this.grdMain.Rows[i].Cells["鐢熶骇璁㈠崟鏁伴噺"].Value);
+ // }
+ // this.Sub_SaveBarCode();
+
bool flag = this.txtHZXQty.Text.Trim() != "";
+ double HICMOQty = 0.0;
+ bool flag5 = flag;
double num;
- double HICMOQty = 0;
- if (flag)
+ if (flag5)
{
- num = Pub_Class.ClsPub.isDoule(this.txtHZXQty.Text);
+ num = ClsPub.isDoule(this.txtHZXQty.Text);
}
else
{
- num = Pub_Class.ClsPub.isDoule(this.txtHMiniQty.Text);
+ num = ClsPub.isDoule(this.txtHMiniQty.Text);
}
bool flag2 = num <= 0.0;
- if (flag2)
+ bool flag6 = flag2;
+ if (flag6)
{
MessageBox.Show("璇疯緭鍏ユ暣绠辨暟閲忥紒");
}
@@ -1231,30 +1285,31 @@
{
for (int i = 0; i < this.grdMain.Rows.Count; i++)
{
- for (int i1 = 0; i1 < this.grdMain.Rows.Count; i1++)
+ for (int i2 = 0; i2 < this.grdMain.Rows.Count; i2++)
{
-
- HICMOQty += Pub_Class.ClsPub.isDoule(this.grdMain.Rows[i1].Cells["鐢熶骇璁㈠崟鏁伴噺"].Value);
+ HICMOQty += ClsPub.isDoule(this.grdMain.Rows[i2].Cells["鐢熶骇璁㈠崟鏁伴噺"].Value);
}
- if (HICMOQty < num)
+ bool flag7 = HICMOQty < num;
+ if (flag7)
{
MessageBox.Show("璇风偣鍑昏秴棰濈敓浜ф寜閽敓鎴愭潯鐮侊紒");
break;
}
-
bool flag3 = num > 0.0;
- if (!flag3)
+ bool flag8 = !flag3;
+ if (flag8)
{
break;
}
- bool flag4 = num > Pub_Class.ClsPub.isDoule(this.grdMain.Rows[i].Cells["鐢熶骇璁㈠崟鏁伴噺"].Value);
- if (!flag4)
+ bool flag4 = num > ClsPub.isDoule(this.grdMain.Rows[i].Cells["鐢熶骇璁㈠崟鏁伴噺"].Value);
+ bool flag9 = !flag4;
+ if (flag9)
{
this.grdMain.Rows[i].Cells["鏈鏁伴噺"].Value = num;
break;
}
- num -= Pub_Class.ClsPub.isDoule(this.grdMain.Rows[i].Cells["鐢熶骇璁㈠崟鏁伴噺"].Value);
- this.grdMain.Rows[i].Cells["鏈鏁伴噺"].Value = Pub_Class.ClsPub.isDoule(this.grdMain.Rows[i].Cells["鐢熶骇璁㈠崟鏁伴噺"].Value);
+ num -= ClsPub.isDoule(this.grdMain.Rows[i].Cells["鐢熶骇璁㈠崟鏁伴噺"].Value);
+ this.grdMain.Rows[i].Cells["鏈鏁伴噺"].Value = ClsPub.isDoule(this.grdMain.Rows[i].Cells["鐢熶骇璁㈠崟鏁伴噺"].Value);
}
this.Sub_SaveBarCode();
}
@@ -2077,6 +2132,8 @@
grdMain.DataSource = DSBefore.Tables[0].DefaultView;
txtHMaterID.Tag = DBUtility.ClsPub.isInt(grdMain.Rows[0].Cells["HInterID"].Value);
txtHMiniQty.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells["鏍囧噯瑁呯"].Value);
+ txtHMaterModel.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells["瑙勬牸鍨嬪彿"].Value);
+ txtHMaterName.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells["鐗╂枡鍚嶇О"].Value);
}
@@ -2102,6 +2159,8 @@
grdMain.DataSource = DSBefore.Tables[0].DefaultView;
txtHMaterID.Tag = DBUtility.ClsPub.isInt(grdMain.Rows[0].Cells["HInterID"].Value);
txtHMiniQty.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells["鏍囧噯瑁呯"].Value);
+ txtHMaterModel.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells["瑙勬牸鍨嬪彿"].Value);
+ txtHMaterName.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells["鐗╂枡鍚嶇О"].Value);
}
//txtHMaterID.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells["HInterID"].Value);
}
@@ -2205,5 +2264,10 @@
Thread.Sleep(1000);
}
}
+
+ private void label14_Click(object sender, EventArgs e)
+ {
+
+ }
}
}
\ No newline at end of file
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.designer.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.designer.cs"
index f65f095..c05eb67 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"
@@ -30,7 +30,7 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Sc_ICMOToBarCode));
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
this.Tool = new System.Windows.Forms.ToolStrip();
this.tc = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
@@ -53,7 +53,6 @@
this.cmdHEmpID = new System.Windows.Forms.Button();
this.label4 = new System.Windows.Forms.Label();
this.txtHMaterID = new System.Windows.Forms.TextBox();
- this.cmdHMaterID = new System.Windows.Forms.Button();
this.gbUp = new System.Windows.Forms.GroupBox();
this.txtHSeOrderBillNo = new System.Windows.Forms.TextBox();
this.label9 = new System.Windows.Forms.Label();
@@ -93,6 +92,10 @@
this.button3 = new System.Windows.Forms.Button();
this.button7 = new System.Windows.Forms.Button();
this.txtHBarCode = new System.Windows.Forms.TextBox();
+ this.label5 = new System.Windows.Forms.Label();
+ this.txtHMaterModel = new System.Windows.Forms.TextBox();
+ this.label14 = new System.Windows.Forms.Label();
+ this.txtHMaterName = new System.Windows.Forms.TextBox();
this.Tool.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();
this.gbUp.SuspendLayout();
@@ -122,7 +125,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";
@@ -144,13 +147,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
//
@@ -160,7 +163,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;
@@ -170,7 +173,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
//
@@ -180,7 +183,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;
@@ -190,7 +193,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
//
@@ -221,21 +224,21 @@
this.grdMain.AllowUserToDeleteRows = false;
this.grdMain.BackgroundColor = System.Drawing.SystemColors.ControlLightLight;
this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window;
- dataGridViewCellStyle2.Font = new System.Drawing.Font("瀹嬩綋", 15F, 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.grdMain.DefaultCellStyle = dataGridViewCellStyle2;
- this.grdMain.Location = new System.Drawing.Point(5, 8);
+ dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window;
+ dataGridViewCellStyle1.Font = new System.Drawing.Font("瀹嬩綋", 15F, 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.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(1156, 329);
+ this.grdMain.Size = new System.Drawing.Size(867, 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);
@@ -245,10 +248,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(783, 34);
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 = "鐢熶骇璁㈠崟鍙�";
//
@@ -256,11 +258,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);
+ this.txtHICMOBillNo.Location = new System.Drawing.Point(877, 26);
this.txtHICMOBillNo.Name = "txtHICMOBillNo";
this.txtHICMOBillNo.ReadOnly = true;
- this.txtHICMOBillNo.Size = new System.Drawing.Size(220, 36);
+ this.txtHICMOBillNo.Size = new System.Drawing.Size(99, 30);
this.txtHICMOBillNo.TabIndex = 47;
//
// label2
@@ -268,10 +269,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 = "鏈哄彴";
//
@@ -279,20 +279,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);
+ 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);
+ 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);
@@ -302,10 +300,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(585, 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 = "鑱屽憳";
//
@@ -313,20 +310,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);
+ this.txtHEmpID.Location = new System.Drawing.Point(631, 29);
this.txtHEmpID.Name = "txtHEmpID";
this.txtHEmpID.ReadOnly = true;
- this.txtHEmpID.Size = new System.Drawing.Size(220, 36);
+ this.txtHEmpID.Size = new System.Drawing.Size(98, 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);
+ this.cmdHEmpID.Location = new System.Drawing.Point(735, 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);
@@ -336,40 +331,29 @@
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(355, 118);
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;
//
// txtHMaterID
//
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);
+ this.txtHMaterID.Location = new System.Drawing.Point(401, 112);
this.txtHMaterID.Name = "txtHMaterID";
this.txtHMaterID.ReadOnly = true;
- this.txtHMaterID.Size = new System.Drawing.Size(220, 36);
+ this.txtHMaterID.Size = new System.Drawing.Size(254, 30);
this.txtHMaterID.TabIndex = 56;
- //
- // 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);
- this.cmdHMaterID.Name = "cmdHMaterID";
- this.cmdHMaterID.Size = new System.Drawing.Size(43, 40);
- this.cmdHMaterID.TabIndex = 57;
- this.cmdHMaterID.UseVisualStyleBackColor = true;
- this.cmdHMaterID.Visible = false;
- this.cmdHMaterID.Click += new System.EventHandler(this.cmdHMaterID_Click);
//
// gbUp
//
this.gbUp.BackColor = System.Drawing.Color.Transparent;
+ this.gbUp.Controls.Add(this.label14);
+ this.gbUp.Controls.Add(this.txtHMaterName);
+ this.gbUp.Controls.Add(this.label5);
+ this.gbUp.Controls.Add(this.txtHMaterModel);
this.gbUp.Controls.Add(this.txtHSeOrderBillNo);
this.gbUp.Controls.Add(this.label9);
this.gbUp.Controls.Add(this.cmbHBarCodeType);
@@ -381,18 +365,15 @@
this.gbUp.Controls.Add(this.txtHICMOBillNo);
this.gbUp.Controls.Add(this.txtHMaterID);
this.gbUp.Controls.Add(this.label1);
- this.gbUp.Controls.Add(this.cmdHMaterID);
this.gbUp.Controls.Add(this.cmdHSourceID);
this.gbUp.Controls.Add(this.label3);
this.gbUp.Controls.Add(this.txtHSourceID);
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);
+ this.gbUp.Location = new System.Drawing.Point(11, 55);
this.gbUp.Name = "gbUp";
- this.gbUp.Padding = new System.Windows.Forms.Padding(4);
- this.gbUp.Size = new System.Drawing.Size(1532, 158);
+ this.gbUp.Size = new System.Drawing.Size(1149, 150);
this.gbUp.TabIndex = 58;
this.gbUp.TabStop = false;
//
@@ -400,11 +381,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);
+ this.txtHSeOrderBillNo.Location = new System.Drawing.Point(967, 72);
this.txtHSeOrderBillNo.Name = "txtHSeOrderBillNo";
this.txtHSeOrderBillNo.ReadOnly = true;
- this.txtHSeOrderBillNo.Size = new System.Drawing.Size(220, 36);
+ this.txtHSeOrderBillNo.Size = new System.Drawing.Size(166, 30);
this.txtHSeOrderBillNo.TabIndex = 141;
//
// label9
@@ -412,10 +392,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(874, 78);
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 = "閿�鍞鍗曞彿";
//
@@ -425,10 +404,10 @@
this.cmbHBarCodeType.FormattingEnabled = true;
this.cmbHBarCodeType.Items.AddRange(new object[] {
"鍞竴鏉＄爜"});
- this.cmbHBarCodeType.Location = new System.Drawing.Point(868, 99);
- this.cmbHBarCodeType.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.cmbHBarCodeType.Location = new System.Drawing.Point(651, 79);
+ this.cmbHBarCodeType.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.cmbHBarCodeType.Name = "cmbHBarCodeType";
- this.cmbHBarCodeType.Size = new System.Drawing.Size(264, 33);
+ this.cmbHBarCodeType.Size = new System.Drawing.Size(199, 28);
this.cmbHBarCodeType.TabIndex = 139;
//
// label8
@@ -436,10 +415,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(759, 106);
- this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label8.Location = new System.Drawing.Point(569, 85);
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 = "鏉＄爜绫诲瀷";
//
@@ -447,10 +425,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(1228, 85);
- this.cmdHSaveBill.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.cmdHSaveBill.Location = new System.Drawing.Point(1009, 15);
+ this.cmdHSaveBill.Margin = new System.Windows.Forms.Padding(2, 2, 2, 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;
@@ -460,10 +438,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(485, 94);
- this.dtpHBeginDate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.dtpHBeginDate.Location = new System.Drawing.Point(364, 75);
+ this.dtpHBeginDate.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.dtpHBeginDate.Name = "dtpHBeginDate";
- this.dtpHBeginDate.Size = new System.Drawing.Size(261, 36);
+ this.dtpHBeginDate.Size = new System.Drawing.Size(197, 30);
this.dtpHBeginDate.TabIndex = 100;
//
// label6
@@ -471,10 +449,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(416, 106);
- this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label6.Location = new System.Drawing.Point(312, 85);
this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(49, 20);
+ this.label6.Size = new System.Drawing.Size(40, 16);
this.label6.TabIndex = 99;
this.label6.Text = "鏃ユ湡";
//
@@ -482,10 +459,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(1244, 242);
- this.button4.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.button4.Location = new System.Drawing.Point(933, 211);
+ this.button4.Margin = new System.Windows.Forms.Padding(2, 2, 2, 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;
@@ -495,10 +472,10 @@
//
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(1244, 315);
- this.button5.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.button5.Location = new System.Drawing.Point(933, 270);
+ this.button5.Margin = new System.Windows.Forms.Padding(2, 2, 2, 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;
@@ -508,10 +485,10 @@
//
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(1244, 376);
- this.button6.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.button6.Location = new System.Drawing.Point(933, 316);
+ this.button6.Margin = new System.Windows.Forms.Padding(2, 2, 2, 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;
@@ -519,12 +496,11 @@
//
// txtHMiniQty
//
- this.txtHMiniQty.Location = new System.Drawing.Point(1059, 370);
- this.txtHMiniQty.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHMiniQty.Location = new System.Drawing.Point(794, 316);
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);
//
@@ -532,10 +508,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(1053, 331);
- this.鏍囧噯瑁呯.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.鏍囧噯瑁呯.Location = new System.Drawing.Point(791, 277);
this.鏍囧噯瑁呯.Name = "鏍囧噯瑁呯";
- this.鏍囧噯瑁呯.Size = new System.Drawing.Size(151, 34);
+ this.鏍囧噯瑁呯.Size = new System.Drawing.Size(120, 27);
this.鏍囧噯瑁呯.TabIndex = 142;
this.鏍囧噯瑁呯.Text = "鏍囧噯瑁呯";
//
@@ -543,21 +518,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(1039, 436);
- this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label7.Location = new System.Drawing.Point(774, 362);
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(1063, 475);
- this.txtHBQty.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHBQty.Location = new System.Drawing.Point(798, 393);
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);
@@ -576,11 +549,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);
+ this.groupBox1.Location = new System.Drawing.Point(10, 485);
this.groupBox1.Name = "groupBox1";
- this.groupBox1.Padding = new System.Windows.Forms.Padding(4);
- this.groupBox1.Size = new System.Drawing.Size(1406, 158);
+ this.groupBox1.Size = new System.Drawing.Size(1054, 126);
this.groupBox1.TabIndex = 140;
this.groupBox1.TabStop = false;
//
@@ -588,10 +559,10 @@
//
this.cmdESOP.BackColor = System.Drawing.Color.White;
this.cmdESOP.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.cmdESOP.Location = new System.Drawing.Point(1230, 44);
- this.cmdESOP.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.cmdESOP.Location = new System.Drawing.Point(922, 35);
+ this.cmdESOP.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.cmdESOP.Name = "cmdESOP";
- this.cmdESOP.Size = new System.Drawing.Size(149, 62);
+ this.cmdESOP.Size = new System.Drawing.Size(112, 50);
this.cmdESOP.TabIndex = 138;
this.cmdESOP.Text = "E-SOP";
this.cmdESOP.UseVisualStyleBackColor = false;
@@ -601,10 +572,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(1045, 44);
- this.cmdHSaveBill1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.cmdHSaveBill1.Location = new System.Drawing.Point(784, 35);
+ this.cmdHSaveBill1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 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;
@@ -614,10 +585,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, 2, 2, 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
@@ -625,10 +596,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 = "缁撴潫鏃ユ湡";
//
@@ -636,10 +606,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, 2, 2, 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
@@ -647,10 +617,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 = "寮�濮嬫棩鏈�";
//
@@ -659,10 +628,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 = "鐗╂枡";
//
@@ -670,22 +638,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);
+ 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);
+ 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
@@ -693,20 +659,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);
+ 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);
@@ -717,23 +681,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);
+ 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(1244, 772);
- this.button1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.button1.Location = new System.Drawing.Point(933, 618);
+ this.button1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 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;
@@ -743,41 +706,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(1061, 238);
- this.鏁寸鏁伴噺.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.鏁寸鏁伴噺.Location = new System.Drawing.Point(793, 194);
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(1061, 276);
- this.txtHZXQty.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHZXQty.Location = new System.Drawing.Point(797, 232);
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);
+ this.tabControl1.Location = new System.Drawing.Point(9, 211);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
- this.tabControl1.Size = new System.Drawing.Size(1012, 372);
+ this.tabControl1.Size = new System.Drawing.Size(759, 268);
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);
+ this.tabPage1.Location = new System.Drawing.Point(4, 22);
this.tabPage1.Name = "tabPage1";
- this.tabPage1.Padding = new System.Windows.Forms.Padding(4);
- this.tabPage1.Size = new System.Drawing.Size(1004, 343);
+ this.tabPage1.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
+ this.tabPage1.Size = new System.Drawing.Size(751, 242);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "鐗╂枡淇℃伅";
this.tabPage1.UseVisualStyleBackColor = true;
@@ -785,11 +744,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);
+ this.tabPage2.Location = new System.Drawing.Point(4, 22);
this.tabPage2.Name = "tabPage2";
- this.tabPage2.Padding = new System.Windows.Forms.Padding(4);
- this.tabPage2.Size = new System.Drawing.Size(1004, 343);
+ this.tabPage2.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
+ this.tabPage2.Size = new System.Drawing.Size(751, 272);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "鏉＄爜淇℃伅";
this.tabPage2.UseVisualStyleBackColor = true;
@@ -800,23 +758,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(1061, 545);
- this.button2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.button2.Location = new System.Drawing.Point(796, 444);
+ this.button2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.button2.Name = "button2";
- this.button2.Size = new System.Drawing.Size(149, 55);
+ this.button2.Size = new System.Drawing.Size(112, 36);
this.button2.TabIndex = 150;
this.button2.Text = "涓婁竴涓墿鏂�";
this.button2.UseVisualStyleBackColor = false;
@@ -826,10 +784,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(1243, 472);
- this.button3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.button3.Location = new System.Drawing.Point(933, 391);
+ this.button3.Margin = new System.Windows.Forms.Padding(2, 2, 2, 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;
@@ -839,10 +797,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(1243, 545);
- this.button7.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.button7.Location = new System.Drawing.Point(932, 444);
+ this.button7.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.button7.Name = "button7";
- this.button7.Size = new System.Drawing.Size(149, 55);
+ this.button7.Size = new System.Drawing.Size(112, 36);
this.button7.TabIndex = 152;
this.button7.Text = "瓒呴鐢熶骇";
this.button7.UseVisualStyleBackColor = false;
@@ -850,19 +808,63 @@
//
// txtHBarCode
//
- this.txtHBarCode.Location = new System.Drawing.Point(1243, 852);
+ this.txtHBarCode.Location = new System.Drawing.Point(932, 682);
+ this.txtHBarCode.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.txtHBarCode.Name = "txtHBarCode";
- this.txtHBarCode.Size = new System.Drawing.Size(175, 25);
+ this.txtHBarCode.Size = new System.Drawing.Size(132, 21);
this.txtHBarCode.TabIndex = 153;
this.txtHBarCode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHBarCode_KeyDown);
//
+ // label5
+ //
+ this.label5.AutoSize = true;
+ this.label5.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label5.ForeColor = System.Drawing.Color.Black;
+ this.label5.Location = new System.Drawing.Point(32, 40);
+ this.label5.Name = "label5";
+ this.label5.Size = new System.Drawing.Size(72, 16);
+ this.label5.TabIndex = 142;
+ this.label5.Text = "瑙勬牸鍨嬪彿";
+ //
+ // txtHMaterModel
+ //
+ this.txtHMaterModel.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHMaterModel.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHMaterModel.Location = new System.Drawing.Point(111, 34);
+ this.txtHMaterModel.Name = "txtHMaterModel";
+ this.txtHMaterModel.ReadOnly = true;
+ this.txtHMaterModel.Size = new System.Drawing.Size(166, 30);
+ this.txtHMaterModel.TabIndex = 143;
+ //
+ // label14
+ //
+ this.label14.AutoSize = true;
+ this.label14.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label14.ForeColor = System.Drawing.Color.Black;
+ this.label14.Location = new System.Drawing.Point(6, 114);
+ this.label14.Name = "label14";
+ this.label14.Size = new System.Drawing.Size(72, 16);
+ this.label14.TabIndex = 144;
+ this.label14.Text = "鐗╂枡鍚嶇О";
+ this.label14.Click += new System.EventHandler(this.label14_Click);
+ //
+ // txtHMaterName
+ //
+ this.txtHMaterName.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHMaterName.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHMaterName.Location = new System.Drawing.Point(84, 108);
+ this.txtHMaterName.Name = "txtHMaterName";
+ this.txtHMaterName.ReadOnly = true;
+ this.txtHMaterName.Size = new System.Drawing.Size(254, 30);
+ this.txtHMaterName.TabIndex = 145;
+ //
// 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.AutoSize = true;
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.txtHBarCode);
this.Controls.Add(this.button7);
this.Controls.Add(this.button3);
@@ -882,7 +884,6 @@
this.Controls.Add(this.button4);
this.Controls.Add(this.gbUp);
this.Controls.Add(this.Tool);
- this.Margin = new System.Windows.Forms.Padding(4);
this.Name = "Sc_ICMOToBarCode";
this.Text = "蹇�熺敓鎴愭潯鐮�";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
@@ -926,7 +927,6 @@
private System.Windows.Forms.Button cmdHEmpID;
private System.Windows.Forms.Label label4;
private System.Windows.Forms.TextBox txtHMaterID;
- private System.Windows.Forms.Button cmdHMaterID;
private System.Windows.Forms.GroupBox gbUp;
private System.Windows.Forms.Button cmdHSaveBill;
private System.Windows.Forms.DateTimePicker dtpHBeginDate;
@@ -967,5 +967,9 @@
private System.Windows.Forms.Button button7;
private System.Windows.Forms.Button cmdESOP;
private System.Windows.Forms.TextBox txtHBarCode;
+ private System.Windows.Forms.Label label5;
+ private System.Windows.Forms.TextBox txtHMaterModel;
+ private System.Windows.Forms.Label label14;
+ private System.Windows.Forms.TextBox txtHMaterName;
}
}
\ No newline at end of file
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..d9a61f9 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=
@@ -428,21 +428,6 @@
</value>
</data>
<data name="cmdHEmpID.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- R0lGODlhEAAQAIYAAAAzmQBmzP///1o7AJlmAOazAMTz/9mmAEW5//nNT+W5ToPV/5TW/cyZAAyf/7Dp
- /yOn/2jD/q3h/le8/sz3/5zg/7bt/73l/7Xs/2fH/4DT///bnZXb/97//2rK/wWb/8np/6zf/1S//77x
- /73w/8Xv/1+//wmc/1jA/5Db/5LV/6rn/6Xb/zCt/33O/9X3/4LO/7jj/4PT/x+m/7nk/3XP/3PJ/3bQ
- /6Tb/5Td/zCv/3fM/029/4za/6Pf/ZHc/6Pk/////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEBAAAh+QQB
- AABBACwAAAAAEAAQAAAIqACDCBwoMIDBAAQTBjEYIcKECQYVLmQQ44KJFhBmQECYMAAOEAJYnPjgwAHH
- gQEYqAhBA4YOBDwQIDg5cYcLGyg8LOixYAFNABJkZBBRI8cDEg98ACAIlIOGGylWGOhgwMBSphUq/ACC
- wQAFClcFEiAAQICAEhZGvDAbloCCDQUAlDUrQO5AtwkKHBgQRK7duwryHmjAV2IQAoIJGxY4QK/ixYwH
- FIYcEAA7
-</value>
- </data>
- <data name="cmdHMaterID.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
R0lGODlhEAAQAIYAAAAzmQBmzP///1o7AJlmAOazAMTz/9mmAEW5//nNT+W5ToPV/5TW/cyZAAyf/7Dp
/yOn/2jD/q3h/le8/sz3/5zg/7bt/73l/7Xs/2fH/4DT///bnZXb/97//2rK/wWb/8np/6zf/1S//77x
diff --git a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
index c5f6cea..3dfb55c 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
@@ -570,6 +570,7 @@
bool bResult;
// bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ oCN.RunProc($"update Sc_StationOutBillMain set HMaker='{msg4}' where HInterID={oBill.omodel.HInterID}");
i++;
//if (bResult)
//{
diff --git a/WebAPI/Controllers/MateOutController.cs b/WebAPI/Controllers/MateOutController.cs
index 7e8258a..46abf95 100644
--- a/WebAPI/Controllers/MateOutController.cs
+++ b/WebAPI/Controllers/MateOutController.cs
@@ -807,6 +807,44 @@
}
+ //閫変腑琛ㄤ綋 鏍规嵁鍗曟嵁涓籌D杩斿洖鏀舵枡閫氱煡鍗曚竴浜涗俊鎭�
+ [Route("QCStockInCheckBill/DisBillEntryList_Webs_New_Json1")]
+ [HttpGet]
+ public object DisBillEntryList_Webs_New_Json1(long HInterID,long HEntryID)
+ {
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ ds = oCN.RunProcReturn("select * from h_v_QCStockInCheckBillList where HInterID = " + HInterID + " and HEntryID = " + HEntryID + "", "h_v_QCStockInCheckBillList");
+ 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;
+ }
+ }
+
+
//鍒锋柊琛ㄤ綋 杩斿洖鏉＄爜搴撳瓨淇℃伅
[Route("KF_ICInventoryByMaterID/GetBillEntry_TmpList_Pack")]
[HttpGet]
diff --git a/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs b/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs
index da480d9..fd4b567 100644
--- a/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs
+++ b/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs
@@ -464,5 +464,37 @@
return objJsonResult;
}
#endregion
+
+ #region[鏍规嵁鏉＄爜杩斿洖璁惧淇℃伅]
+ [Route("Gy_EquipFileMain/Gy_MouldFileBillBarCodeInfo")]
+ [HttpGet]
+ public object Gy_MouldFileBillBarCodeInfo(string HBarCode)
+ {
+ DataTable ds;
+ List<object> list = new List<object>();
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ //鑾峰彇閰嶄欢椤圭洰缂栬緫鏁版嵁
+ string sql1 = string.Format($"exec h_p_Gy_EquipFileGetInfoByBarCode {HBarCode}");
+ ds = oCN.RunProcReturn(sql1, "h_p_Gy_EquipFileGetInfoByBarCode").Tables[0];
+
+ list.Add(ds);//璁惧妗ｆ
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇璁惧淇℃伅鎴愬姛锛�";
+ objJsonResult.list = list;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛佽妫�鏌ユ潯褰㈢爜锛�" + e.ToString();
+ objJsonResult.data = null;
+ }
+ return objJsonResult;
+ }
+ #endregion
}
}
diff --git a/WebAPI/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs
index aaf700a..55345ce 100644
--- a/WebAPI/Controllers/Sc_ProcessMangementController.cs
+++ b/WebAPI/Controllers/Sc_ProcessMangementController.cs
@@ -258,6 +258,7 @@
FentityModel.Add("FISBACKFLUSH", dr1["FISBACKFLUSH"].ToString() == "1" ? true : false);// 鍊掑啿棰嗘枡
FentityModel.Add("F_bsv_Base1", new JObject() { ["Fnumber"] = dr1["FPREBDONENUMBER"].ToString() }); //鍖呰鏍囪瘑
FentityModel.Add("FLot", new JObject() { ["FNumber"] = dr1["FBATCHNO"].ToString() }); //鎵瑰彿
+ FentityModel.Add("F_bsv_Text", new JObject() { ["FNumber"] = dr1["FBATCHNO"].ToString() }); //娴佽浆鍗″彿
//鎵瑰彿
//FFLOWID FFLOWLINEID FRULEID FSTABLENAME
//f6e6eec3 - 5267 - 4f02 - 8593 - b633da508a72 3 PRD_MO2MORPT T_PRD_MOENTRY
@@ -350,6 +351,198 @@
return objJsonResult;
}
}
+
+
+
+ /// <summary>
+ /// 鐢熸垚閲戣澏浜戞潵鏂欐楠屽崟
+ /// </summary>
+ /// <param name="InterID">宸ュ簭姹囨姤鍗曚富ID</param>
+ /// <returns></returns>
+ [Route("QCStockInCheckBill/set_SaveQCStockInCheckBill_Json")]
+ [HttpGet]
+ public object set_SaveQCStockInCheckBill_Json(string HZJOrgNumber, string HMaterNumber, string HUnitNumber,
+ double HCheckQty, double HRightQty, double HBadQty,
+ string HCheckResult, string HSupNumber, string HWHNumber,
+ string HUseResult, Int64 HSeQ, Int64 HSourceInterID,
+ Int64 HSourceEntryID, string HSourceBillNo, string user,
+ Int64 HWHID, Int64 HSPID, Int64 HSupID, Int64 HKeeperID,
+ Int64 HMaterID, string HSourceBillType, Int64 HSLInterID,
+ Int64 HSLEntryID, string HSLBillNo, Int64 HSLSeQ)
+ {
+ try
+ {
+ //鑾峰彇鐢熶骇姹囨姤鍗曟渶澶nterID鍜屽崟鎹彿
+ Int64 HInterID = DBUtility.ClsPub.CreateBillID("7503", ref DBUtility.ClsPub.sExeReturnInfo);
+ string HBillNo = DBUtility.ClsPub.CreateBillCode("7503", ref DBUtility.ClsPub.sExeReturnInfo, true);
+
+ //淇濆瓨
+ oCN.BeginTran();
+ //鐢熶骇姹囨姤鍗曚富琛�
+ oCN.RunProc("Insert Into QC_POStockInCheckBillMain " +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HDate,HMaker,HMakeDate,HBillStatus,HChecker,HCheckDate" +
+ ",HYear,HPeriod,HRemark,HSupID,HMaterID" +
+ ",HInstockQty,HCheckQty,HRightQty,HBadQty,HFirstCheckEmp" +
+ ",HCheckerResult,HSteelStoveNo,HSteelCompReport,HAspect,HSize" +
+ ") " +
+ " values('7503','7503'," + HInterID.ToString() + ",'" + HBillNo + "',getdate(),'" + user + "',getdate(),2,'" + user + "',getdate()" +
+ ",DATENAME(YEAR,GETDATE()),0,''," + HSupID.ToString() + "," + HMaterID.ToString() +
+ ",'" + HCheckQty.ToString() + "','" + HCheckQty.ToString() + "','" + HRightQty.ToString() + "','" + HBadQty.ToString() + "','" + HKeeperID.ToString() + "'" +
+ ",'" + HCheckResult.ToString() + "','', '','',''" +
+ ") ");
+ //鐢熶骇姹囨姤鍗曞瓙琛�
+ oCN.RunProc("Insert into QC_POStockInCheckBillSub " +
+ " (HInterID,HEntryID,HCloseMan,HCloseType" +
+ ",HRemark,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
+ ",HRelationQty,HRelationMoney,HQCCheckClassID,HQCCheckItemID,HQCStd," +
+ "HResult,HQCRelValue,HProcCheckEmp,HProcCheckTime" +
+ ") values("
+ + HInterID.ToString() + ",1,'',''" +
+ ",''," + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo.ToString() + "','" + HSourceBillType.ToString() + "'" +
+ ",0,0,0,0,''"+
+ ",'" + HCheckResult.ToString() + "','" + HCheckResult.ToString() + "','" + HKeeperID.ToString() + "',getdate()" +
+ ") ");
+ //鍚屾閲戣澏
+ //璁块棶閲戣澏
+ var loginRet = InvokeHelper.Login();
+ var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
+ if (isSuccess == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎿嶄綔澶辫触,閲戣澏璐﹀彿鐧诲綍寮傚父銆�" + loginRet;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ JObject model = new JObject();
+ model.Add("FBillTypeID", new JObject() { ["Fnumber"] = "JYD001_SYS" }); //鍗曟嵁绫诲瀷 鏉ユ枡妫�楠屽崟JYD001_SYS
+ model.Add("FBusinessType", "1"); //涓氬姟绫诲瀷
+ model.Add("FDate", DateTime.Now.ToString("yyyy-MM-dd")); //鍗曟嵁鏃ユ湡
+ model.Add("FSourceOrgId", new JObject() { ["Fnumber"] = HZJOrgNumber.ToString() }); //鏉ユ簮缁勭粐
+ model.Add("FInspectOrgId", new JObject() { ["Fnumber"] = HZJOrgNumber.ToString() }); //璐ㄦ缁勭粐
+ model.Add("FISSYNCED", "false");// 鏄惁宸插悓姝�
+ model.Add("FBillNo", HBillNo);
+
+ JArray Fentity = new JArray();
+ JObject FentityModel = new JObject();
+ FentityModel.Add("FMaterialId", new JObject() { ["Fnumber"] = HMaterNumber.ToString() });// 鐗╂枡鍐呯爜
+ FentityModel.Add("FUnitID", new JObject() { ["Fnumber"] = HUnitNumber.ToString() });//璁￠噺鍗曚綅鍐呯爜
+ FentityModel.Add("FInspectQty", HCheckQty.ToString());// 妫�楠屾暟閲�
+ FentityModel.Add("FQualifiedQty", HRightQty.ToString());// 鍚堟牸鏁伴噺
+ FentityModel.Add("FInspectResult", HCheckResult.ToString());// 妫�楠岀粨鏋�
+ FentityModel.Add("FQCStatus", "1");// 璐ㄦ鐘舵��
+ FentityModel.Add("FIsRelated", false);// 涓嶈壇鍝佸叧鑱旀爣蹇�
+ FentityModel.Add("FSrcBillType0", "PUR_ReceiveBill");// 婧愬崟绫诲瀷
+ FentityModel.Add("FBaseUnitId", new JObject() { ["Fnumber"] = HUnitNumber.ToString() });//鍩烘湰鍗曚綅
+ FentityModel.Add("FBaseInspectQty", HCheckQty.ToString());//鍩烘湰鍗曚綅妫�楠屾暟閲�
+ FentityModel.Add("FSupplierId", new JObject() { ["Fnumber"] = HSupNumber.ToString() }); // 渚涘簲鍟�
+ FentityModel.Add("FStockId", new JObject() { ["Fnumber"] = HWHNumber.ToString() }); // 浠撳簱
+ FentityModel.Add("FInspectTimes","1"); // 妫�楠屾鏁�
+ FentityModel.Add("FTimeUnit","24");//鏃堕棿鍗曚綅
+ FentityModel.Add("FSAMPLEDAMAGEBEARER","2");//鏍锋湰鐮村潖鎵挎媴鏂�
+ FentityModel.Add("FISFIRSTINSPECT", false);//棣栨
+ FentityModel.Add("FBaseQualifiedQty", HRightQty.ToString());//鍩烘湰鍗曚綅鍚堟牸鏁�
+ FentityModel.Add("FCurrency", new JObject() { ["Fnumber"] = "PRE001" });//甯佸埆
+ FentityModel.Add("FIsSplitRow ", false);// 鏄惁鎷嗗垎琛�
+
+ JArray Fentity2 = new JArray();
+ JObject FentityModel2 = new JObject();
+ FentityModel2.Add("FPolicyMaterialId", new JObject() { ["Fnumber"] = HMaterNumber.ToString() });// 鐗╂枡鍐呯爜
+ FentityModel2.Add("FPolicyStatus", "1"); //鐘舵��
+ FentityModel2.Add("FPolicyQty", HRightQty.ToString()); //鏁伴噺
+ FentityModel2.Add("FBasePolicyQty", HRightQty.ToString()); //鍩烘湰鍗曚綅鏁伴噺
+ FentityModel2.Add("FUsePolicy", HUseResult.ToString()); //浣跨敤鍐崇瓥
+ FentityModel2.Add("FIsCheck", false); //鏄惁鎶芥
+ FentityModel2.Add("FIsDefectProcess", false); //涓嶈壇澶勭悊
+ FentityModel2.Add("FCanSale", false); //鍙攢鍞�
+ FentityModel2.Add("FIsMRBReview", false); //MRP璇勫
+ FentityModel2.Add("FIsReturn", false); //鍒ら��
+ FentityModel2.Add("FIsRelatedDefect", false); //涓嶈壇鍝佸叧鑱旀爣蹇�
+ Fentity2.Add(FentityModel2);
+ FentityModel.Add("FPolicyDetail", Fentity2);
+
+
+
+ JArray Fentity3 = new JArray();
+ JObject FentityModel3 = new JObject();
+ FentityModel3.Add("FSrcBillType", "PUR_ReceiveBill"); //婧愬崟绫诲瀷
+ FentityModel3.Add("FSrcBillNo", HSLBillNo.ToString()); //鏀舵枡閫氱煡鍗曞崟鍙�
+ FentityModel3.Add("FSrcInterId", HSLInterID.ToString()); //鏀舵枡閫氱煡鍗曚富ID
+ FentityModel3.Add("FSrcEntryId",HSLEntryID.ToString()); //鏀舵枡閫氱煡鍗曞瓙ID
+ FentityModel3.Add("FSrcEntrySeq", HSLSeQ.ToString()); //婧愬崟琛屽彿
+ FentityModel3.Add("FOrderType", new JObject() { ["FID"] = "PUR_PurchaseOrder" }); // 璁㈠崟绫诲瀷
+ FentityModel3.Add("FOrderBillNo", HSourceBillNo.ToString()); //璁㈠崟鍗曞彿
+ FentityModel3.Add("FOrderId", HSourceInterID.ToString()); //璁㈠崟涓籌D
+ FentityModel3.Add("FOrderEntryId", HSourceEntryID.ToString()); //璁㈠崟瀛怚D
+ FentityModel3.Add("FOrderEntrySeq", HSeQ.ToString()); //璁㈠崟琛屽彿
+ Fentity3.Add(FentityModel3);
+ FentityModel.Add("FReferDetail", Fentity3);
+ Fentity.Add(FentityModel);
+ model.Add("FEntity", Fentity); //鏄庣粏淇℃伅
+ JObject jsonRoot = new JObject()
+ {
+ ["Creator"] = "",
+ ["NeedUpDateFields"] = new JArray(),
+ ["NeedReturnFields"] = new JArray(),
+ ["IsDeleteEntry"] = "false",
+ ["SubSystemId"] = "",
+ ["IsVerifyBaseDataField"] = "false",
+ //["IsAutoSubmitAndAudit"] = true,//鑷姩璋冪敤鎻愪氦鍜屽鏍稿姛鑳�
+ ["Model"] = model
+ };
+
+ string result = InvokeHelper.Save("QM_InspectBill", JsonConvert.SerializeObject(jsonRoot));//淇濆瓨
+ //鍒ゆ柇淇濆瓨鏄惁鎴愬姛
+ if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
+ {
+ LogService.Write("鏉ユ枡妫�楠屽崟淇濆瓨閿欒jsonRoot:" + jsonRoot);
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = $"鏉ユ枡妫�楠屽崟鍚屾閲戣澏浜戝け璐ワ紒鍗曞彿:{HBillNo.ToString()}" + result;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鎻愪氦瀹℃牳
+ string result1 = string.Empty;
+ string result2 = string.Empty;
+ var fID = JObject.Parse(result)["Result"]["Id"].ToString();
+ var fBillNo = JObject.Parse(result)["Result"]["Number"].ToString();
+ var json = new
+ {
+ Ids = fID,
+ };
+ result1 = InvokeHelper.Submit("QM_InspectBill", JsonConvert.SerializeObject(json));//鎻愪氦
+ result2 = InvokeHelper.Audit("QM_InspectBill", JsonConvert.SerializeObject(json));//鎻愪氦
+ if (JObject.Parse(result1)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = $"鏉ユ枡妫�楠屽崟鍙凤細{fBillNo}锛屾彁浜ゅけ璐�" + result;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.Commit();
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
#endregion
/// <summary>
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index 1a457eb..489dfa5 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -9,37 +9,37 @@
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
- <publishTime>08/16/2021 17:23:16</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="bin/Antlr3.Runtime.dll">
- <publishTime>02/22/2013 08:43:40</publishTime>
+ <publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/Antlr3.Runtime.pdb">
- <publishTime>02/22/2013 08:43:40</publishTime>
+ <publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>08/22/2022 11:13:17</publishTime>
+ <publishTime>10/19/2022 09:12:14</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>08/22/2022 11:13:17</publishTime>
+ <publishTime>10/19/2022 09:12:14</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>08/22/2022 11:13:15</publishTime>
+ <publishTime>10/19/2022 09:12:13</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>08/22/2022 11:13:15</publishTime>
+ <publishTime>10/19/2022 09:12:13</publishTime>
</File>
<File Include="bin/Dapper.dll">
- <publishTime>07/22/2016 14:52:40</publishTime>
+ <publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>08/22/2022 11:13:11</publishTime>
+ <publishTime>10/19/2022 09:12:11</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>08/22/2022 11:13:11</publishTime>
+ <publishTime>10/19/2022 09:12:11</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.dll">
<publishTime>03/22/2022 13:17:26</publishTime>
@@ -69,7 +69,7 @@
<publishTime>08/25/2021 10:28:25</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>08/16/2021 17:23:13</publishTime>
+ <publishTime>03/15/2022 10:06:40</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.FormService.dll">
<publishTime>09/20/2018 19:23:20</publishTime>
@@ -84,25 +84,25 @@
<publishTime>03/19/2022 07:38:42</publishTime>
</File>
<File Include="bin/Microsoft.Azure.AppService.ApiApps.Service.dll">
- <publishTime>03/18/2015 17:02:50</publishTime>
+ <publishTime>03/19/2015 01:02:50</publishTime>
</File>
<File Include="bin/Microsoft.CSharp.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/Microsoft.Web.Infrastructure.dll">
- <publishTime>07/25/2012 11:48:56</publishTime>
+ <publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>08/22/2022 11:13:11</publishTime>
+ <publishTime>10/19/2022 09:12:11</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>08/22/2022 11:13:11</publishTime>
+ <publishTime>10/19/2022 09:12:11</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
- <publishTime>08/03/2014 20:33:56</publishTime>
+ <publishTime>08/04/2014 04:33:56</publishTime>
</File>
<File Include="bin/NPOI.dll">
<publishTime>10/23/2021 09:07:54</publishTime>
@@ -129,31 +129,31 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>08/22/2022 11:13:09</publishTime>
+ <publishTime>10/19/2022 09:12:09</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>08/22/2022 11:13:09</publishTime>
+ <publishTime>10/19/2022 09:12:09</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>08/22/2022 11:13:10</publishTime>
+ <publishTime>10/19/2022 09:12:10</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>08/22/2022 11:13:10</publishTime>
+ <publishTime>10/19/2022 09:12:10</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>08/22/2022 11:13:10</publishTime>
+ <publishTime>10/19/2022 09:12:10</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>08/22/2022 11:13:10</publishTime>
+ <publishTime>10/19/2022 09:12:10</publishTime>
</File>
<File Include="bin/stdole.dll">
<publishTime>05/09/2021 13:35:37</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
- <publishTime>02/15/2015 17:57:08</publishTime>
+ <publishTime>02/16/2015 01:57:08</publishTime>
</File>
<File Include="bin/System.Buffers.dll">
- <publishTime>07/19/2017 10:01:28</publishTime>
+ <publishTime>07/19/2017 18:01:28</publishTime>
</File>
<File Include="bin/System.ComponentModel.DataAnnotations.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
@@ -177,19 +177,19 @@
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/System.IdentityModel.Tokens.Jwt.dll">
- <publishTime>08/19/2014 10:03:34</publishTime>
+ <publishTime>08/19/2014 18:03:34</publishTime>
</File>
<File Include="bin/System.Memory.dll">
- <publishTime>04/17/2019 16:24:34</publishTime>
+ <publishTime>04/18/2019 00:24:34</publishTime>
</File>
<File Include="bin/System.Net.Http.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/System.Net.Http.Formatting.dll">
- <publishTime>11/28/2018 13:00:36</publishTime>
+ <publishTime>11/28/2018 21:00:36</publishTime>
</File>
<File Include="bin/System.Runtime.CompilerServices.Unsafe.dll">
- <publishTime>09/18/2018 19:38:10</publishTime>
+ <publishTime>09/19/2018 03:38:10</publishTime>
</File>
<File Include="bin/System.Runtime.Serialization.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
@@ -198,7 +198,7 @@
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/System.Web.Cors.dll">
- <publishTime>11/28/2018 12:58:44</publishTime>
+ <publishTime>11/28/2018 20:58:44</publishTime>
</File>
<File Include="bin/System.Web.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
@@ -213,37 +213,37 @@
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/System.Web.Helpers.dll">
- <publishTime>01/28/2015 04:04:30</publishTime>
+ <publishTime>01/28/2015 12:04:30</publishTime>
</File>
<File Include="bin/System.Web.Http.Cors.dll">
- <publishTime>11/28/2018 13:01:26</publishTime>
+ <publishTime>11/28/2018 21:01:26</publishTime>
</File>
<File Include="bin/System.Web.Http.dll">
- <publishTime>11/28/2018 13:01:00</publishTime>
+ <publishTime>11/28/2018 21:01:00</publishTime>
</File>
<File Include="bin/System.Web.Http.WebHost.dll">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="bin/System.Web.Mvc.dll">
- <publishTime>01/28/2015 04:02:18</publishTime>
+ <publishTime>01/28/2015 12:02:18</publishTime>
</File>
<File Include="bin/System.Web.Optimization.dll">
- <publishTime>02/11/2014 15:26:04</publishTime>
+ <publishTime>02/11/2014 23:26:04</publishTime>
</File>
<File Include="bin/System.Web.Razor.dll">
- <publishTime>01/28/2015 04:02:32</publishTime>
+ <publishTime>01/28/2015 12:02:32</publishTime>
</File>
<File Include="bin/System.Web.Services.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/System.Web.WebPages.Deployment.dll">
- <publishTime>01/28/2015 04:04:30</publishTime>
+ <publishTime>01/28/2015 12:04:30</publishTime>
</File>
<File Include="bin/System.Web.WebPages.dll">
- <publishTime>01/28/2015 04:04:30</publishTime>
+ <publishTime>01/28/2015 12:04:30</publishTime>
</File>
<File Include="bin/System.Web.WebPages.Razor.dll">
- <publishTime>01/28/2015 04:04:30</publishTime>
+ <publishTime>01/28/2015 12:04:30</publishTime>
</File>
<File Include="bin/System.Xml.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
@@ -252,19 +252,19 @@
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
- <publishTime>11/24/2014 11:18:48</publishTime>
+ <publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>08/22/2022 11:13:21</publishTime>
+ <publishTime>10/19/2022 09:12:16</publishTime>
</File>
<File Include="bin/WebAPI.dll.config">
<publishTime>12/15/2021 17:59:43</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>08/22/2022 11:13:21</publishTime>
+ <publishTime>10/19/2022 09:12:16</publishTime>
</File>
<File Include="bin/WebGrease.dll">
- <publishTime>07/17/2013 17:03:52</publishTime>
+ <publishTime>07/18/2013 01:03:52</publishTime>
</File>
<File Include="bin/zh-Hans/System.Net.Http.Formatting.resources.dll">
<publishTime>11/29/2018 21:26:02</publishTime>
@@ -273,58 +273,58 @@
<publishTime>11/29/2018 21:26:30</publishTime>
</File>
<File Include="Config/kdapi.config">
- <publishTime>08/16/2022 18:47:03</publishTime>
+ <publishTime>08/16/2022 22:31:46</publishTime>
</File>
<File Include="Content/bootstrap.css">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Content/bootstrap.min.css">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Content/Site.css">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="DLL/BLL.dll">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="DLL/DAL.dll">
- <publishTime>10/29/2021 19:50:53</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="DLL/DBUtility.dll">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="DLL/Model.dll">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="DLL/Newtonsoft.Json.Net35.dll">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="DLL/Pub_Class.dll">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="DLL/Pub_Control.dll">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="DLL/SQLHelper.dll">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.eot">
- <publishTime>08/16/2021 17:23:16</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.svg">
- <publishTime>08/16/2021 17:23:16</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.ttf">
- <publishTime>08/16/2021 17:23:16</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.woff">
- <publishTime>08/16/2021 17:23:16</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Global.asax">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="grpc_csharp_ext.x64.dll">
<publishTime>03/22/2022 13:17:22</publishTime>
@@ -333,7 +333,7 @@
<publishTime>03/22/2022 13:17:22</publishTime>
</File>
<File Include="Index.html">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="libgrpc_csharp_ext.x64.dylib">
<publishTime>03/19/2022 07:38:44</publishTime>
@@ -342,109 +342,109 @@
<publishTime>03/19/2022 07:38:42</publishTime>
</File>
<File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="packages.config">
- <publishTime>05/16/2022 14:22:39</publishTime>
+ <publishTime>05/07/2022 09:07:20</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.js">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.min.js">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.js">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.js">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.map">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.js">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.min.js">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.js">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Views/Scripts/modernizr-2.6.2.js">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Views/Shared/Error.cshtml">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Views/Shared/_Layout.cshtml">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Views/web.config">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Views/_ViewStart.cshtml">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/26/2022 16:04:31</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/26/2022 16:04:31</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/26/2022 16:04:31</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/26/2022 16:04:31</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/26/2022 16:04:31</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/26/2022 16:04:31</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/26/2022 16:04:31</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/26/2022 16:04:31</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/26/2022 16:04:31</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Department_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/26/2022 16:04:31</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/26/2022 16:04:31</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Group_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/26/2022 16:04:31</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/26/2022 16:04:31</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Source_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/26/2022 16:04:31</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/26/2022 16:04:31</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/26/2022 16:04:31</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/26/2022 16:04:31</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">
- <publishTime>01/14/2022 19:33:07</publishTime>
+ <publishTime>08/26/2022 16:04:31</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/26/2022 16:04:31</publishTime>
</File>
<File Include="Web References/WebS/Reference.cs">
<publishTime>12/20/2021 13:19:56</publishTime>
@@ -459,7 +459,7 @@
<publishTime>12/20/2021 13:19:56</publishTime>
</File>
<File Include="Web.config">
- <publishTime>08/22/2022 11:13:32</publishTime>
+ <publishTime>10/19/2022 09:12:31</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
--
Gitblit v1.9.1