From 17ee2c474c049c2ae348532c1e10773c15f9ecde Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 29 七月 2022 08:34:50 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
BaseSet/公用资料/公用基础资料/Gy_FactoryDayOff.cs | 6
WarM/条码打印/Sc_ICMOToBarCode.cs | 150 ++++++++++++++++-----
Model/车间管理/ClsSc_ProcessExchangeBillMain.cs | 3
BaseSet/公用资料/公用基础资料/Gy_FactoryDayOff.designer.cs | 80 +++++-----
WarM/条码打印/Gy_BarCodeBill.designer.cs | 31 ++--
BaseSet/公用资料/公用基础资料/Gy_FactoryDayOff.resx | 86 ++++++------
DAL/基础资料/公用基础资料/ClsGy_FactoryDayOff_Ctl.cs | 2
DAL/车间管理/ClsSc_ProcessExchangeBill.cs | 4
WarM/条码打印/Gy_BarCodeBill.cs | 6
9 files changed, 231 insertions(+), 137 deletions(-)
diff --git "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_FactoryDayOff.cs" "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_FactoryDayOff.cs"
index ea38dbe..12ea8fa 100644
--- "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_FactoryDayOff.cs"
+++ "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_FactoryDayOff.cs"
@@ -289,6 +289,12 @@
{
return false;
}
+
+
+ //if ((((int)DateTime.Parse(day).DayOfWeek)).ToString() == DayOfWeek.Thursday)
+ //{
+ // return true;
+ //}
//
if (InputMode == DBUtility.ClsPub.Enum_InputMode.InputMode_AddNew)
{
diff --git "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_FactoryDayOff.designer.cs" "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_FactoryDayOff.designer.cs"
index 106cc94..7615321 100644
--- "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_FactoryDayOff.designer.cs"
+++ "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_FactoryDayOff.designer.cs"
@@ -57,6 +57,10 @@
this.tabPage1 = new System.Windows.Forms.TabPage();
this.grdMain = new System.Windows.Forms.DataGridView();
this.tabPage2 = new System.Windows.Forms.TabPage();
+ this.label8 = new System.Windows.Forms.Label();
+ this.dtpHNoFactoryDayOffDate = new System.Windows.Forms.DateTimePicker();
+ this.label7 = new System.Windows.Forms.Label();
+ this.dtpHFactoryDayOffDate = new System.Windows.Forms.DateTimePicker();
this.label6 = new System.Windows.Forms.Label();
this.txtHBarCode = new System.Windows.Forms.TextBox();
this.cmdHEmpID = new System.Windows.Forms.Button();
@@ -79,10 +83,6 @@
this.panel1 = new System.Windows.Forms.Panel();
this.cmdLoadTree = new System.Windows.Forms.Button();
this.label3 = new System.Windows.Forms.Label();
- this.dtpHFactoryDayOffDate = new System.Windows.Forms.DateTimePicker();
- this.label7 = new System.Windows.Forms.Label();
- this.label8 = new System.Windows.Forms.Label();
- this.dtpHNoFactoryDayOffDate = new System.Windows.Forms.DateTimePicker();
this.ToolBar.SuspendLayout();
this.stTab.SuspendLayout();
this.tabPage1.SuspendLayout();
@@ -425,6 +425,38 @@
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "鍗曞紶瑙嗗浘";
//
+ // label8
+ //
+ this.label8.AutoSize = true;
+ this.label8.Location = new System.Drawing.Point(295, 83);
+ this.label8.Name = "label8";
+ this.label8.Size = new System.Drawing.Size(65, 12);
+ this.label8.TabIndex = 199;
+ this.label8.Text = "闈炲巶浼戞棩鏈�";
+ //
+ // dtpHNoFactoryDayOffDate
+ //
+ this.dtpHNoFactoryDayOffDate.Location = new System.Drawing.Point(364, 78);
+ this.dtpHNoFactoryDayOffDate.Name = "dtpHNoFactoryDayOffDate";
+ this.dtpHNoFactoryDayOffDate.Size = new System.Drawing.Size(200, 21);
+ this.dtpHNoFactoryDayOffDate.TabIndex = 198;
+ //
+ // label7
+ //
+ this.label7.AutoSize = true;
+ this.label7.Location = new System.Drawing.Point(305, 35);
+ this.label7.Name = "label7";
+ this.label7.Size = new System.Drawing.Size(53, 12);
+ this.label7.TabIndex = 197;
+ this.label7.Text = "鍘備紤鏃ユ湡";
+ //
+ // dtpHFactoryDayOffDate
+ //
+ this.dtpHFactoryDayOffDate.Location = new System.Drawing.Point(364, 30);
+ this.dtpHFactoryDayOffDate.Name = "dtpHFactoryDayOffDate";
+ this.dtpHFactoryDayOffDate.Size = new System.Drawing.Size(200, 21);
+ this.dtpHFactoryDayOffDate.TabIndex = 196;
+ //
// label6
//
this.label6.AutoSize = true;
@@ -553,9 +585,9 @@
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(29, 60);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(53, 12);
+ this.label2.Size = new System.Drawing.Size(29, 12);
this.label2.TabIndex = 2;
- this.label2.Text = "閮� 闂�";
+ this.label2.Text = "鍘備紤";
//
// txtHNumber
//
@@ -572,7 +604,7 @@
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(53, 12);
this.label1.TabIndex = 0;
- this.label1.Text = "閮ㄩ棬浠ｇ爜";
+ this.label1.Text = "鍘備紤浠ｇ爜";
//
// timer1
//
@@ -652,38 +684,6 @@
this.label3.TabIndex = 0;
this.label3.Text = "閮ㄩ棬璧勬枡-姝ｅ湪娴忚";
//
- // dtpHFactoryDayOffDate
- //
- this.dtpHFactoryDayOffDate.Location = new System.Drawing.Point(364, 30);
- this.dtpHFactoryDayOffDate.Name = "dtpHFactoryDayOffDate";
- this.dtpHFactoryDayOffDate.Size = new System.Drawing.Size(200, 21);
- this.dtpHFactoryDayOffDate.TabIndex = 196;
- //
- // label7
- //
- this.label7.AutoSize = true;
- this.label7.Location = new System.Drawing.Point(305, 35);
- this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(53, 12);
- this.label7.TabIndex = 197;
- this.label7.Text = "鍘備紤鏃ユ湡";
- //
- // label8
- //
- this.label8.AutoSize = true;
- this.label8.Location = new System.Drawing.Point(295, 83);
- this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(65, 12);
- this.label8.TabIndex = 199;
- this.label8.Text = "闈炲巶浼戞棩鏈�";
- //
- // dtpHNoFactoryDayOffDate
- //
- this.dtpHNoFactoryDayOffDate.Location = new System.Drawing.Point(364, 78);
- this.dtpHNoFactoryDayOffDate.Name = "dtpHNoFactoryDayOffDate";
- this.dtpHNoFactoryDayOffDate.Size = new System.Drawing.Size(200, 21);
- this.dtpHNoFactoryDayOffDate.TabIndex = 198;
- //
// Gy_FactoryDayOff
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -693,7 +693,7 @@
this.Controls.Add(this.splitContainer1);
this.Controls.Add(this.ToolBar);
this.Name = "Gy_FactoryDayOff";
- this.Text = "閮ㄩ棬璁剧疆";
+ this.Text = "鍘備紤璁剧疆";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Gy_FactoryDayOff_FormClosing);
this.Load += new System.EventHandler(this.Gy_FactoryDayOff_Load);
diff --git "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_FactoryDayOff.resx" "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_FactoryDayOff.resx"
index cf035ac..a437790 100644
--- "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_FactoryDayOff.resx"
+++ "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_FactoryDayOff.resx"
@@ -412,51 +412,51 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACE
- CgAAAk1TRnQBSQFMAgEBAgEAASQBAQEkAQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+ CgAAAk1TRnQBSQFMAgEBAgEAASwBAQEsAQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
AwABEAMAAQEBAAEgBgABEBIAgP+AAAj/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/
AwAB/wMAAf8DAAH/AwAB/wMADf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/
- AwAB/wMAAf8DAAH/gAAE/wEAAUEBigH/AQwBkAG5Af8BDAGQAbkB/wEMAZABuQH/AQwBkAG5Af8BDAGQ
- AbkB/wEMAZABuQH/AQwBkAG5Af8BDAGQAbkB/wEMAZABuQH/AQwBkAG5Af8BDAGQAbkB/wEMAZABuQH/
- AQwBkAG5Af8DAAn/AQABQQGKAf8BAAFBAYoB/wEAAUEBigH/AQABQQGKAf8BAAFBAYoB/wEAAUEBigH/
- AQABQQGKAf8BAAFBAYoB/wEAAUEBigH/AQABQQGKAf8BAAFBAYoB/wEAAUEBigH/AwAB/wMAAf+AAAT/
- AQABQQGKAf8B0QH2Av8BUwHaAfQB/wFIAdMB8QH/AT0BywHvAf8BMwHEAe0B/wEpAb4B6wH/AR8BuAHo
- Af8BEwGwAecB/wEJAakB5AH/AQABowHiAf8BAAGeAeAB/wEAAZoB3wH/AQwBkAG5Af8DAAn/AQABQQGK
- Af8B0QH2Av8BKAG+AesB/wEiAbkB6QH/ARoBtAHnAf8BEgGwAeYB/wELAasB5AH/AQQBpwHjAf8BAAGi
- AeEB/wEAAZ8B4QH/AQwBkAG5Af8BAAFBAYoB/wMAAf8DAAH/gAAE/wEAAUEBigH/AdEB9gL/AVkB3gH1
- Af8BTgHWAfMB/wFEAdAB8QH/ATkByQHuAf8BLwHCAewB/wEkAbwB6gH/ARoBtAHnAf8BDwGtAeUB/wEF
- AaYB4wH/AQABoQHhAf8BAAGdAeAB/wEMAZABuQH/AwAF/wEAAUEBigH/AdEB9gL/ATMBxQHuAf8BLQHB
- AesB/wEmAbwB6wH/AR4BtwHoAf8BFwGyAecB/wEPAa4B5QH/AQgBqQHkAf8BAQGlAeIB/wEAAaEB4QH/
- AQwBkAG5Af8DAAH/AQABQQGKAf8DAAH/gAAE/wEAAUEBigH/AdEB9gL/AYEB4QH3Af8BVQHaAfQB/wFK
- AdQB8gH/AT8BzAHvAf8BNQHGAe4B/wErAcAB6wH/ASABuQHpAf8BFgGyAeYB/wELAasB5QH/AQEBpQHi
- Af8BAAGfAeEB/wEMAZABuQH/AwAF/wEAAUEBigH/AdEB9gL/ATgByAHuAf8BMQHEAewB/wEqAb8B6wH/
- ASMBuwHqAf8BHAG2AegB/wEUAbAB5wH/AQ0BrAHlAf8BBgGnAeMB/wEAAaMB4gH/AQABQQGKAf8DAAH/
- AQABQQGKAf8DAAH/gAAE/wEAAUEBigH/AdEB9gL/AYYB5QH3Af8BWwHfAfUB/wFQAdgB8wH/AUYB0QHx
- Af8BOwHKAe8B/wExAcQB7QH/AScBvQHqAf8BHAG2AegB/wERAa8B5QH/AQYBqAHjAf8BAAGiAeEB/wEM
- AZABuQH/AwAB/wEAAUEBigH/AdEB9gL/AUQBzwHxAf8BPQHLAe8B/wE1AccB7gH/AS8BwgHsAf8BKAG9
- AeoB/wEgAbkB6QH/ARkBtAHnAf8BEgGwAeYB/wEKAaoB5QH/AQwBkAG5Af8DAAH/AQwBkAG5Af8BDAGQ
- AbkB/wMAAf+AAAT/AQABQQGKAf8B0QH2Av8BjAHoAfkB/wGDAeIB9wH/AVcB3AH1Af8BTQHVAfIB/wFB
- Ac4B8AH/ATcByAHuAf8BLQHBAewB/wEjAboB6gH/ARcBswHnAf8BDQGsAeUB/wEDAaYB4wH/AQwBkAG5
- Af8DAAH/AQABQQGKAf8B0QH2Av8BSQHTAfIB/wFBAc4B8AH/AToBygHuAf8BMwHFAe0B/wEtAcEB6wH/
- ASUBvAHqAf8BHgG3AegB/wEWAbIB5gH/AQ8BrgHlAf8BDAGQAbkB/wMAAf8BDAGQAbkB/wEMAZABuQH/
- AwAB/4AABP8BAAFBAYoB/wHRAfYC/wGQAesB+QH/AYgB5gH4Af8BXQHgAfYB/wFTAdkB8wH/AUgB0wHy
- Af8BPQHLAe8B/wEzAcUB7QH/ASkBvgHrAf8BHwG4AekB/wETAbAB5gH/AQgBqQHkAf8BDAGQAbkB/wMA
- Af8BAAFBAYoB/wEAAUEBigH/AQABQQGKAf8BAAFBAYoB/wEAAUEBigH/AQABQQGKAf8BAAFBAYoB/wEA
- AUEBigH/AQABQQGKAf8BAAFBAYoB/wEAAUEBigH/AQABQQGKAf8BDAGQAbkB/wE6AckB7gH/AQwBkAG5
- Af8DAAH/gAAE/wEAAUEBigH/AdEB9gL/AZMB7QH6Af8BjQHpAfkB/wGFAeQB9wH/AVoB3gH1Af8BTgHW
- AfMB/wFEAc8B8QH/ATkByQHvAf8BLwHCAewB/wElAbsB6QH/ARoBtQHnAf8BDwGtAeYB/wEMAZABuQH/
- AwAF/wEAAUEBigH/AdEB9gL/AZEB7AH6Af8BjQHpAfkB/wGKAecB+AH/AYYB5AH4Af8BgAHhAfcB/wFa
- Ad0B9QH/AVQB2gHzAf8BTgHXAfMB/wFJAdMB8QH/AUMBzwHxAf8BPQHLAe8B/wEMAZABuQH/AwAB/4AA
- BP8BAAFBAYoB/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHR
- AfYC/wHRAfYC/wHRAfYC/wHRAfYC/wEMAZABuQH/AwAF/wEAAUEBigH/AdEB9gL/AZMB7QH6Af8BkAHr
- AfkB/wGMAekB+QH/AYgB5gH4Af8BhAHjAfcB/wFdAeAB9gH/AVgB3AH1Af8B0QH2Av8B0QH2Av8B0QH2
- Av8B0QH2Av8BDAGQAbkB/wMAAf+AAAT/AQABQQGKAf8BHwGoAdMB/wEfAagB0wH/AR8BqAHTAf8BHwGo
- AdMB/wEfAagB0wH/AR8BqAHTAf8BHwGoAdMB/wEAAUEBigH/AQABQQGKAf8BAAFBAYoB/wEAAUEBigH/
- AQABQQGKAf8BAAFBAYoJ/wEAAUEBigH/AdEB9gL/AZMB7QH6Af8BkgHsAfoB/wGPAesB+QH/AYsB6AH4
- Af8BhwHlAfcB/wHRAfYC/wEAAUEBigH/AQABQQGKAf8BAAFBAYoB/wEAAUEBigH/AQABQQGKAf8BAAFB
- AYoF/4AACP8BAAFBAYoB/wG4AegB9QH/Ac4D/wHOA/8BnAP/AZwD/wEAAUEBigH/AwAh/wEAAUEBigH/
- AdEB9gL/AdEB9gL/AdEB9gL/AdEB9gL/AdEB9gL/AQABQQGKHf+AAAz/AQABQQGKAf8BAAFBAYoB/wEA
- AUEBigH/AQABQQGKAf8BAAFBAYoB/wMAKf8BAAFBAYoB/wEAAUEBigH/AQABQQGKAf8BAAFBAYoB/wEA
- AUEBiiH/gACA/4AAgP+AAAFCAU0BPgcAAT4DAAEoAwABQAMAARADAAEBAQABAQUAAYAXAAP/gQAL
+ AwAB/wMAAf8DAAH/gAAE/wEAAUABigH/AQsBkAG5Af8BCwGQAbkB/wELAZABuQH/AQsBkAG5Af8BCwGQ
+ AbkB/wELAZABuQH/AQsBkAG5Af8BCwGQAbkB/wELAZABuQH/AQsBkAG5Af8BCwGQAbkB/wELAZABuQH/
+ AQsBkAG5Af8DAAn/AQABQAGKAf8BAAFAAYoB/wEAAUABigH/AQABQAGKAf8BAAFAAYoB/wEAAUABigH/
+ AQABQAGKAf8BAAFAAYoB/wEAAUABigH/AQABQAGKAf8BAAFAAYoB/wEAAUABigH/AwAB/wMAAf+AAAT/
+ AQABQAGKAf8B0QH2Av8BUgHaAfQB/wFHAdMB8QH/ATwBywHvAf8BMgHEAe0B/wEoAb4B6wH/AR4BuAHo
+ Af8BEgGwAecB/wEIAakB5AH/AQABowHiAf8BAAGeAeAB/wEAAZoB3wH/AQsBkAG5Af8DAAn/AQABQAGK
+ Af8B0QH2Av8BJwG+AesB/wEhAbkB6QH/ARkBtAHnAf8BEQGwAeYB/wEKAasB5AH/AQMBpwHjAf8BAAGi
+ AeEB/wEAAZ8B4QH/AQsBkAG5Af8BAAFAAYoB/wMAAf8DAAH/gAAE/wEAAUABigH/AdEB9gL/AVgB3gH1
+ Af8BTQHWAfMB/wFDAdAB8QH/ATgByQHuAf8BLgHCAewB/wEjAbwB6gH/ARkBtAHnAf8BDgGtAeUB/wEE
+ AaYB4wH/AQABoQHhAf8BAAGdAeAB/wELAZABuQH/AwAF/wEAAUABigH/AdEB9gL/ATIBxQHuAf8BLAHB
+ AesB/wElAbwB6wH/AR0BtwHoAf8BFgGyAecB/wEOAa4B5QH/AQcBqQHkAf8BAAGlAeIB/wEAAaEB4QH/
+ AQsBkAG5Af8DAAH/AQABQAGKAf8DAAH/gAAE/wEAAUABigH/AdEB9gL/AYEB4QH3Af8BVAHaAfQB/wFJ
+ AdQB8gH/AT4BzAHvAf8BNAHGAe4B/wEqAcAB6wH/AR8BuQHpAf8BFQGyAeYB/wEKAasB5QH/AQABpQHi
+ Af8BAAGfAeEB/wELAZABuQH/AwAF/wEAAUABigH/AdEB9gL/ATcByAHuAf8BMAHEAewB/wEpAb8B6wH/
+ ASIBuwHqAf8BGwG2AegB/wETAbAB5wH/AQwBrAHlAf8BBQGnAeMB/wEAAaMB4gH/AQABQAGKAf8DAAH/
+ AQABQAGKAf8DAAH/gAAE/wEAAUABigH/AdEB9gL/AYYB5QH3Af8BWgHfAfUB/wFPAdgB8wH/AUUB0QHx
+ Af8BOgHKAe8B/wEwAcQB7QH/ASYBvQHqAf8BGwG2AegB/wEQAa8B5QH/AQUBqAHjAf8BAAGiAeEB/wEL
+ AZABuQH/AwAB/wEAAUABigH/AdEB9gL/AUMBzwHxAf8BPAHLAe8B/wE0AccB7gH/AS4BwgHsAf8BJwG9
+ AeoB/wEfAbkB6QH/ARgBtAHnAf8BEQGwAeYB/wEJAaoB5QH/AQsBkAG5Af8DAAH/AQsBkAG5Af8BCwGQ
+ AbkB/wMAAf+AAAT/AQABQAGKAf8B0QH2Av8BjAHoAfkB/wGDAeIB9wH/AVYB3AH1Af8BTAHVAfIB/wFA
+ Ac4B8AH/ATYByAHuAf8BLAHBAewB/wEiAboB6gH/ARYBswHnAf8BDAGsAeUB/wECAaYB4wH/AQsBkAG5
+ Af8DAAH/AQABQAGKAf8B0QH2Av8BSAHTAfIB/wFAAc4B8AH/ATkBygHuAf8BMgHFAe0B/wEsAcEB6wH/
+ ASQBvAHqAf8BHQG3AegB/wEVAbIB5gH/AQ4BrgHlAf8BCwGQAbkB/wMAAf8BCwGQAbkB/wELAZABuQH/
+ AwAB/4AABP8BAAFAAYoB/wHRAfYC/wGQAesB+QH/AYgB5gH4Af8BXAHgAfYB/wFSAdkB8wH/AUcB0wHy
+ Af8BPAHLAe8B/wEyAcUB7QH/ASgBvgHrAf8BHgG4AekB/wESAbAB5gH/AQcBqQHkAf8BCwGQAbkB/wMA
+ Af8BAAFAAYoB/wEAAUABigH/AQABQAGKAf8BAAFAAYoB/wEAAUABigH/AQABQAGKAf8BAAFAAYoB/wEA
+ AUABigH/AQABQAGKAf8BAAFAAYoB/wEAAUABigH/AQABQAGKAf8BCwGQAbkB/wE5AckB7gH/AQsBkAG5
+ Af8DAAH/gAAE/wEAAUABigH/AdEB9gL/AZMB7QH6Af8BjQHpAfkB/wGFAeQB9wH/AVkB3gH1Af8BTQHW
+ AfMB/wFDAc8B8QH/ATgByQHvAf8BLgHCAewB/wEkAbsB6QH/ARkBtQHnAf8BDgGtAeYB/wELAZABuQH/
+ AwAF/wEAAUABigH/AdEB9gL/AZEB7AH6Af8BjQHpAfkB/wGKAecB+AH/AYYB5AH4Af8BgAHhAfcB/wFZ
+ Ad0B9QH/AVMB2gHzAf8BTQHXAfMB/wFIAdMB8QH/AUIBzwHxAf8BPAHLAe8B/wELAZABuQH/AwAB/4AA
+ BP8BAAFAAYoB/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHR
+ AfYC/wHRAfYC/wHRAfYC/wHRAfYC/wELAZABuQH/AwAF/wEAAUABigH/AdEB9gL/AZMB7QH6Af8BkAHr
+ AfkB/wGMAekB+QH/AYgB5gH4Af8BhAHjAfcB/wFcAeAB9gH/AVcB3AH1Af8B0QH2Av8B0QH2Av8B0QH2
+ Av8B0QH2Av8BCwGQAbkB/wMAAf+AAAT/AQABQAGKAf8BHgGoAdMB/wEeAagB0wH/AR4BqAHTAf8BHgGo
+ AdMB/wEeAagB0wH/AR4BqAHTAf8BHgGoAdMB/wEAAUABigH/AQABQAGKAf8BAAFAAYoB/wEAAUABigH/
+ AQABQAGKAf8BAAFAAYoJ/wEAAUABigH/AdEB9gL/AZMB7QH6Af8BkgHsAfoB/wGPAesB+QH/AYsB6AH4
+ Af8BhwHlAfcB/wHRAfYC/wEAAUABigH/AQABQAGKAf8BAAFAAYoB/wEAAUABigH/AQABQAGKAf8BAAFA
+ AYoF/4AACP8BAAFAAYoB/wG4AegB9QH/Ac4D/wHOA/8BnAP/AZwD/wEAAUABigH/AwAh/wEAAUABigH/
+ AdEB9gL/AdEB9gL/AdEB9gL/AdEB9gL/AdEB9gL/AQABQAGKHf+AAAz/AQABQAGKAf8BAAFAAYoB/wEA
+ AUABigH/AQABQAGKAf8BAAFAAYoB/wMAKf8BAAFAAYoB/wEAAUABigH/AQABQAGKAf8BAAFAAYoB/wEA
+ AUABiiH/gACA/4AAgP+AAAFCAU0BPgcAAT4DAAEoAwABQAMAARADAAEBAQABAQUAAYAXAAP/gQAL
</value>
</data>
<metadata name="stTab.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
diff --git "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_FactoryDayOff_Ctl.cs" "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_FactoryDayOff_Ctl.cs"
index 5055ff5..9a404aa 100644
--- "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_FactoryDayOff_Ctl.cs"
+++ "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_FactoryDayOff_Ctl.cs"
@@ -48,7 +48,7 @@
",HHelpCode='" + oModel.HHelpCode + "'" +
",HLevel=" + oModel.HLevel +
",HParentID=" + oModel.HParentID +
- ",HFactoryDayOffDate=" + oModel.HFactoryDayOffDate +
+ ",HFactoryDayOffDate='" + oModel.HFactoryDayOffDate + "'" +
",HNoFactoryDayOffDate='" + oModel.HNoFactoryDayOffDate + "'" +
",HEndflag=" + Convert.ToString(oModel.HEndFlag ? 1 : 0) +
diff --git "a/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBill.cs" "b/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBill.cs"
index 74ca52f..d2a73ad 100644
--- "a/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBill.cs"
+++ "b/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBill.cs"
@@ -294,7 +294,7 @@
",HProdMaterName,HCusName,HWorkRemark,HImportNote,HMaterNumber_A" +
",HMaterNumber_B,HMaterNumber_C,HMaterNumber_D,HProdType,HMaterShortName" +
",HMaterIDA,HMaterIDB,HMaterIDC,HMaterIDD,HICMOEntryID" +
- ",HPicNumVer,HPicNumAssemble,HMaterTexture,HProductNum,HVerNum,HPRDORGID,HBLFlag,HWorkBillSortNo" +
+ ",HPicNumVer,HPicNumAssemble,HMaterTexture,HProductNum,HVerNum,HPRDORGID,HBLFlag,HCusNumber,HPickLabel,HPickLabelNumber,HWorkBillSortNo" +
") " +
" values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "','" + omodel.HMaker + "',getdate()," + "" + (omodel.HPrevMainSourceInterID == 0 ? omodel.HInterID : omodel.HPrevMainSourceInterID) +
"," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HBatchNo + "'," + omodel.HMainMaterID.ToString() + "," + omodel.HKeyMaterID.ToString() + "," + omodel.HNo.ToString() + ",'" + omodel.HOrderProcNO + "'" +
@@ -306,7 +306,7 @@
",'" + omodel.HProdMaterName + "','" + omodel.HCusName + "','" + omodel.HWorkRemark + "','" + omodel.HImportNote + "','" + omodel.HMaterNumber_A + "'" +
",'" + omodel.HMaterNumber_B + "','" + omodel.HMaterNumber_C + "','" + omodel.HMaterNumber_D + "','" + omodel.HProdType + "','" + omodel.HMaterShortName + "'" +
",'" + omodel.HMaterIDA + "','" + omodel.HMaterIDB + "','" + omodel.HMaterIDC + "','" + omodel.HMaterIDD + "'," + omodel.HICMOEntryID +
- ",'" + omodel.HPicNumVer + "','" + omodel.HPicNumAssemble + "','" + omodel.HMaterTexture + "','" + omodel.HProductNum + "','" + omodel.HVerNum + "','"+ omodel.HPRDORGID+ "','"+omodel.HBLFlag+"','" + omodel.HWorkBillSortNo +
+ ",'" + omodel.HPicNumVer + "','" + omodel.HPicNumAssemble + "','" + omodel.HMaterTexture + "','" + omodel.HProductNum + "','" + omodel.HVerNum + "','"+ omodel.HPRDORGID+ "','"+omodel.HBLFlag+ "','" + omodel.HCusNumber + "','" + omodel.HPickLabel + "','" + omodel.HPickLabelNumber + "','" + omodel.HWorkBillSortNo +
"') ");
sErr = sErr + "1;";
//鎻掑叆瀛愯〃
diff --git "a/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBillMain.cs" "b/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBillMain.cs"
index 6cae548..ffc552f 100644
--- "a/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBillMain.cs"
+++ "b/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBillMain.cs"
@@ -67,5 +67,8 @@
public string HSeOrderEntryID;
public string HSeOrderInterID;
public string HWorkBillSortNo;
+ public string HCusNumber;
+ public string HPickLabel;
+ public string HPickLabelNumber;
}
}
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
index d249490..b70b19d 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
@@ -3113,6 +3113,12 @@
grdMain.Rows[row + r].Cells[HMTONoCol].Value = grdMain.Rows[row].Cells[HMTONoCol].Value;
grdMain.Rows[row + r].Cells[HInnerBillNoCol].Value = grdMain.Rows[row].Cells[HInnerBillNoCol].Value;
grdMain.Rows[row + r].Cells[HMakerCol].Value = grdMain.Rows[row].Cells[HMakerCol].Value;
+ //缃戞牸鎵撳嬀
+ DataGridViewCheckBoxCell oCell = new DataGridViewCheckBoxCell();
+ oCell.ThreeState = false;
+ oCell.Value = grdMain.Rows[row].Cells[HGiveAwayFlagCol].Value;
+ oCell.Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
+ grdMain.Rows[row + r].Cells[HGiveAwayFlagCol] = oCell;
}
DBUtility.Xt_BaseBillFun.SetSumGrid(oSumGrid);
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.designer.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.designer.cs"
index e4a90dc..13b91ee 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.designer.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.designer.cs"
@@ -37,9 +37,9 @@
this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
this.AddRow = new System.Windows.Forms.ToolStripButton();
this.spRow = new System.Windows.Forms.ToolStripButton();
+ this.bc = new System.Windows.Forms.ToolStripButton();
this.DelRow = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
- this.bc = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
this.wxm = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
@@ -245,6 +245,20 @@
this.spRow.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
this.spRow.Click += new System.EventHandler(this.spRow_Click);
//
+ // bc
+ //
+ this.bc.AutoSize = false;
+ this.bc.Image = ((System.Drawing.Image)(resources.GetObject("bc.Image")));
+ this.bc.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.bc.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.bc.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.bc.Name = "bc";
+ this.bc.Size = new System.Drawing.Size(35, 47);
+ this.bc.Text = "鐢熸垚";
+ this.bc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.bc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.bc.Click += new System.EventHandler(this.bc_Click);
+ //
// DelRow
//
this.DelRow.AutoSize = false;
@@ -263,20 +277,7 @@
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
this.toolStripSeparator4.Size = new System.Drawing.Size(6, 50);
- //
- // bc
- //
- this.bc.AutoSize = false;
- this.bc.Image = ((System.Drawing.Image)(resources.GetObject("bc.Image")));
- this.bc.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.bc.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.bc.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.bc.Name = "bc";
- this.bc.Size = new System.Drawing.Size(35, 47);
- this.bc.Text = "鐢熸垚";
- this.bc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.bc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
- this.bc.Click += new System.EventHandler(this.bc_Click);
+ this.toolStripSeparator4.Visible = false;
//
// toolStripSeparator8
//
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 258363c..83a651c 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"
@@ -790,48 +790,126 @@
int LSHlen = 6; //娴佹按鍙烽暱搴�
string TM = ""; //鏉＄爜
string sPackBarCode = "";
- //HDate = dtpHBeginDate.Value.ToShortDateString();
- //HYear = ClsPub.isDate(HDate).Year.ToString().Substring(2, 2);
- //HPeriod = "0" + ClsPub.isDate(HDate).Month.ToString();
- //HPeriod = HPeriod.Substring(HPeriod.Length - 2, 2);
- //HDay = "0" + ClsPub.isDate(HDate).Day.ToString();
- //HDay = HDay.Substring(HDay.Length - 2, 2);
+ string HPrdDate = "";
+ string HBC = "";
- HDate = dtpHBeginDate.Value.ToShortDateString();
- DataSet DSet1 = oCn.RunProcReturn("select * from Gy_FactoryDayOff Where HFactoryDayOffDate='" + HDate.ToString() + "'", "Gy_FactoryDayOff", ref DBUtility.ClsPub.sExeReturnInfo);
- //鐢熸垚棣栬鏍囬
- if (DSet1 == null || DSet1.Tables[0].Rows.Count == 0)
+
+
+ HDate = dtpHBeginDate.Value.ToShortDateString();
+
+ //鍒ゆ柇褰撳墠鏃堕棿鏄惁鍦ㄥ伐浣滄椂闂存鍐�
+ string _strWorkingDayAM = "07:30";//宸ヤ綔鏃堕棿涓婂崍08:30
+ string _strWorkingDayPM = "19:30";
+ string _strWorkingDayTM = "00:00";
+ string _strWorkingDaySM = "23:59";
+ TimeSpan dspWorkingDayAM = DateTime.Parse(_strWorkingDayAM).TimeOfDay;
+ TimeSpan dspWorkingDayPM = DateTime.Parse(_strWorkingDayPM).TimeOfDay;
+ TimeSpan dspWorkingDayTM = DateTime.Parse(_strWorkingDayTM).TimeOfDay;
+ TimeSpan dspWorkingDaySM = DateTime.Parse(_strWorkingDaySM).TimeOfDay;
+
+ //string time1 = "2017-2-17 8:10:00";
+ DateTime t1 = Convert.ToDateTime(HDate);
+
+ TimeSpan dspNow = t1.TimeOfDay;
+ //1.姝ｅ父涓婄彮鏃堕棿 灏辨槸鐧界彮 濡傛灉涓嶆槸绀兼嫓澶� 灏卞線鍓嶆彁鍓嶄竴澶�
+ if (dspNow > dspWorkingDayAM && dspNow < dspWorkingDayPM)
+ {
+ HBC = "鐧界彮";
+ DataSet DSet2 = oCn.RunProcReturn("select * from Gy_FactoryDayOff Where HFactoryDayOffDate='" + HDate.ToString() + "'", "Gy_FactoryDayOff", ref DBUtility.ClsPub.sExeReturnInfo);
+ if (DSet2 == null || DSet2.Tables[0].Rows.Count == 0)
{
- HDate = DateTime.Now.ToShortDateString();
- HYear = ClsPub.isDate(HDate).Year.ToString().Substring(2, 2);
- HPeriod = "0" + ClsPub.isDate(HDate).Month.ToString();
- HPeriod = HPeriod.Substring(HPeriod.Length - 2, 2);
- HDay = "0" + ClsPub.isDate(HDate).Day.ToString();
- HDay = HDay.Substring(HDay.Length - 2, 2);
- long HTMaterID = 0;
- HTMaterID = ClsPub.isLong(grdMain.Rows[0].Cells[Fun_GetCol("HMaterID")].Value);
- string sPackStr = "ZXM" + HYear + HPeriod + HDay + HTMaterID; //澶栫鐮� 鍓嶇紑
- DataSet DsTM = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sPackStr + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿 //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
- Int64 TTM_LSH = ClsPub.isInt(DsTM.Tables[0].Rows[0][0]) + 1;
- sPackBarCode = sPackStr + TTM_LSH.ToString();
- oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sPackStr + "'");
+ HPrdDate = HDate;
}
else
{
- HDate = DBUtility.ClsPub.isStrNull(DSet1.Tables[0].Rows[0]["HNoFactoryDayOffDate"]);
- HYear = ClsPub.isDate(HDate).Year.ToString().Substring(2, 2);
- HPeriod = "0" + ClsPub.isDate(HDate).Month.ToString();
- HPeriod = HPeriod.Substring(HPeriod.Length - 2, 2);
- HDay = "0" + ClsPub.isDate(HDate).Day.ToString();
- HDay = HDay.Substring(HDay.Length - 2, 2);
- long HTMaterID = 0;
- HTMaterID = ClsPub.isLong(grdMain.Rows[0].Cells[Fun_GetCol("HMaterID")].Value);
- string sPackStr = "ZXM" + HYear + HPeriod + HDay + HTMaterID; //澶栫鐮� 鍓嶇紑
- DataSet DsTM = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sPackStr + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿 //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
- Int64 TTM_LSH = ClsPub.isInt(DsTM.Tables[0].Rows[0][0]) + 1;
- sPackBarCode = sPackStr + TTM_LSH.ToString() + "+" ;
- oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sPackStr + "'");
+ HPrdDate = DBUtility.ClsPub.isStrNull(DSet2.Tables[0].Rows[0]["HNoFactoryDayOffDate"]);
}
+ }
+ //2.澶т簬19锛�30 灏忎簬24锛�00 澶滅彮
+ if (dspNow > dspWorkingDayPM && dspNow < dspWorkingDaySM)
+ {
+ HBC = "澶滅彮";
+ DataSet DSet2 = oCn.RunProcReturn("select * from Gy_FactoryDayOff Where HFactoryDayOffDate='" + HDate.ToString() + "'", "Gy_FactoryDayOff", ref DBUtility.ClsPub.sExeReturnInfo);
+ if (DSet2 == null || DSet2.Tables[0].Rows.Count == 0)
+ {
+ HPrdDate = HDate;
+ }
+ else
+ {
+ HPrdDate = DBUtility.ClsPub.isStrNull(DSet2.Tables[0].Rows[0]["HNoFactoryDayOffDate"]);
+ }
+ }
+ //3.澶т簬00锛�00 灏忎簬7锛�30 鐧界彮 鍏堝噺涓�澶� 鍐嶅垽鏂噺浜嗕竴澶╃殑鏃ユ湡鏄笉鏄巶浼戞棩鏈�
+ if (dspNow > dspWorkingDayTM && dspNow < dspWorkingDayAM)
+ {
+ HBC = "澶滅彮";
+ HDate = DBUtility.ClsPub.isStrNull(DBUtility.ClsPub.isDate(HDate).AddDays(-1));
+ HDate = DBUtility.ClsPub.isDate(HDate).ToShortDateString();
+ DataSet DSet2 = oCn.RunProcReturn("select * from Gy_FactoryDayOff Where HFactoryDayOffDate='" + HDate.ToString() + "'", "Gy_FactoryDayOff", ref DBUtility.ClsPub.sExeReturnInfo);
+ if (DSet2 == null || DSet2.Tables[0].Rows.Count == 0)
+ {
+ HPrdDate = HDate;
+ }
+ else
+ {
+ HPrdDate = DBUtility.ClsPub.isStrNull(DSet2.Tables[0].Rows[0]["HNoFactoryDayOffDate"]);
+ }
+ }
+ HYear = ClsPub.isDate(HPrdDate).Year.ToString().Substring(2, 2);
+ HPeriod = "0" + ClsPub.isDate(HPrdDate).Month.ToString();
+ HPeriod = HPeriod.Substring(HPrdDate.Length - 2, 2);
+ HDay = "0" + ClsPub.isDate(HPrdDate).Day.ToString();
+ HDay = HDay.Substring(HPrdDate.Length - 2, 2);
+ long HTMaterID = 0;
+ HTMaterID = ClsPub.isLong(grdMain.Rows[0].Cells[Fun_GetCol("HMaterID")].Value);
+ string sPackStr = "ZXM" + HYear + HPeriod + HDay + HTMaterID; //澶栫鐮� 鍓嶇紑
+ DataSet DsTM = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sPackStr + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿 //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
+ Int64 TTM_LSH = ClsPub.isInt(DsTM.Tables[0].Rows[0][0]) + 1;
+ sPackBarCode = sPackStr + TTM_LSH.ToString() + "+";
+ oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sPackStr + "'");
+
+
+ //DataSet DSet1 = oCn.RunProcReturn("select * from Gy_FactoryDayOff Where HFactoryDayOffDate='" + HDate.ToString() + "'", "Gy_FactoryDayOff", ref DBUtility.ClsPub.sExeReturnInfo);
+
+
+ // //鐢熸垚棣栬鏍囬
+ // if (DSet1 == null || DSet1.Tables[0].Rows.Count == 0)
+ // {
+
+ // HDate = DateTime.Now.ToShortDateString();
+ // HYear = ClsPub.isDate(HDate).Year.ToString().Substring(2, 2);
+ // HPeriod = "0" + ClsPub.isDate(HDate).Month.ToString();
+ // HPeriod = HPeriod.Substring(HPeriod.Length - 2, 2);
+ // HDay = "0" + ClsPub.isDate(HDate).Day.ToString();
+ // HDay = HDay.Substring(HDay.Length - 2, 2);
+ // long HTMaterID = 0;
+ // HTMaterID = ClsPub.isLong(grdMain.Rows[0].Cells[Fun_GetCol("HMaterID")].Value);
+ // string sPackStr = "ZXM" + HYear + HPeriod + HDay + HTMaterID; //澶栫鐮� 鍓嶇紑
+ // DataSet DsTM = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sPackStr + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿 //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
+ // Int64 TTM_LSH = ClsPub.isInt(DsTM.Tables[0].Rows[0][0]) + 1;
+ // sPackBarCode = sPackStr + TTM_LSH.ToString();
+ // oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sPackStr + "'");
+ // }
+
+ // else
+ // {
+
+ // HDate = DBUtility.ClsPub.isStrNull(DSet1.Tables[0].Rows[0]["HNoFactoryDayOffDate"]);
+
+
+ // HYear = ClsPub.isDate(HDate).Year.ToString().Substring(2, 2);
+ // HPeriod = "0" + ClsPub.isDate(HDate).Month.ToString();
+ // HPeriod = HPeriod.Substring(HPeriod.Length - 2, 2);
+ // HDay = "0" + ClsPub.isDate(HDate).Day.ToString();
+ // HDay = HDay.Substring(HDay.Length - 2, 2);
+ // long HTMaterID = 0;
+ // HTMaterID = ClsPub.isLong(grdMain.Rows[0].Cells[Fun_GetCol("HMaterID")].Value);
+ // string sPackStr = "ZXM" + HYear + HPeriod + HDay + HTMaterID; //澶栫鐮� 鍓嶇紑
+ // DataSet DsTM = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sPackStr + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿 //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
+ // Int64 TTM_LSH = ClsPub.isInt(DsTM.Tables[0].Rows[0][0]) + 1;
+ // sPackBarCode = sPackStr + TTM_LSH.ToString() + "+" ;
+ // oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sPackStr + "'");
+ // }
//=============鏍规嵁鐣岄潰涓婂凡缁忓垎閰嶇殑鏁版嵁杩涜鏉＄爜鐢熸垚鍜屾墦鍗般��
//鑾峰彇鏈鐢熸垚鐨� 涓诲唴鐮�
--
Gitblit v1.9.1