From 9dd3335301f79d7462bf4acb41ba6456cd6e74e1 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 31 八月 2023 10:46:40 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WarM/条码打印/Sc_ICMOToBarCode.cs |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.cs"
index f90e6ff..eff6b81 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"
@@ -992,8 +992,17 @@
 
 
                         //绠卞彿鐢熸垚瑙勫垯  鏃ユ湡 +  鏈哄彴 + 鐝 +  鐗╂枡   鍙鑾峰彇鏈�澶х殑娴佹按鍙�
+                        string sBoxYear;
+                        string sBoxPeriod;
+                        string sBoxDay;
+                        DateTime HBoxDate = DBUtility.ClsPub.isDate(DBUtility.ClsPub.GetServerDate(0));
+                        sBoxYear = HBoxDate.Year.ToString().Substring(2, 2);
+                        sBoxPeriod = "0" +  HBoxDate.Month.ToString();
+                        sBoxPeriod = HPeriod.Substring(HPeriod.Length - 2, 2);
+                        sBoxDay = "0" + HBoxDate.Day.ToString();
+                        sBoxDay = HDay.Substring(HDay.Length - 2, 2);
                         HJT = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[Fun_GetCol("璁惧")].Value);
-                        HXH = HYear + HPeriod + HDay + HBC + HJT + HMaterNumber;
+                        HXH = sBoxYear + sBoxPeriod + sBoxDay + HBC + HJT + HMaterNumber;
                         Ds99 = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + HXH + "'", "h_p_WMS_GetMaxNo");    //鑾峰彇鏈�澶ф祦姘村彿
                         LSH3 = ClsPub.isLong(Ds99.Tables[0].Rows[0][0]) + 1;
                         LSH4 = LSH3.ToString();

--
Gitblit v1.9.1