From a1e829124b26476a18bbb732e835aa29ce099013 Mon Sep 17 00:00:00 2001 From: "ruoxing.wang" <88384874@qq.com> Date: Thu, 24 Apr 2025 14:26:39 +0800 Subject: [PATCH] 1 --- AddMaterial/PlanScreenStyleSheet.css | 13 +++++++++++-- InjectionPC/FrmMain2408.cs | 10 ++++++---- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/AddMaterial/PlanScreenStyleSheet.css b/AddMaterial/PlanScreenStyleSheet.css index 054aff7..15b6f88 100644 --- a/AddMaterial/PlanScreenStyleSheet.css +++ b/AddMaterial/PlanScreenStyleSheet.css @@ -5,7 +5,7 @@ } #TableLeft, #TableRight { - width:925px; height:500px;border:hidden; + width:925px; height:510px;border:hidden; } .tdTitle { @@ -14,6 +14,15 @@ .tdContent { width:580px; height:48px; /*background-color:white;*/ text-align:center; font-family:黑体; font-size:60px; font-weight:500; } +.tdTitle1 { + width:460px; height:170px; /*background-color: #B4EEB4;*/ text-align:center; font-family:黑体; font-size:72px; font-weight:500; background-color:#191970 +} +.tdContent1 { + width:500px; height:100px; /*background-color:white;*/ text-align:center; font-family:黑体; font-size:60px; font-weight:500; +} +.tdContent2 { + width:460px; height:170px; /*background-color:white;*/ text-align:center; font-family:黑体; font-size:60px; font-weight:500; +} #TableBottom, #TableSecondRow { border-right:hidden; width:1900px; } @@ -40,7 +49,7 @@ font-weight: 900; } -#content5, #content6 { +#content5, #content6,#content14, #content15, #content16 { font-size: 140px; font-weight: 900; diff --git a/InjectionPC/FrmMain2408.cs b/InjectionPC/FrmMain2408.cs index d41367c..fb168fa 100644 --- a/InjectionPC/FrmMain2408.cs +++ b/InjectionPC/FrmMain2408.cs @@ -3883,12 +3883,12 @@ namespace InjectionPC private void btnHandPrintL_Click(object sender, EventArgs e) { - UnCompletePrintBox("手动打印箱码","left"); + UnCompletePrintBox("手动打印箱码","left",true,0); } private void btnHandPrintR_Click(object sender, EventArgs e) { - UnCompletePrintBox("手动打印箱码","right"); + UnCompletePrintBox("手动打印箱码","right", true, 0); } bool? lastCheckState = null; @@ -4023,7 +4023,7 @@ namespace InjectionPC /// /// /// - bool UnCompletePrintBox(string lable,string leftOrRight,bool needConfirm = true) + bool UnCompletePrintBox(string lable,string leftOrRight,bool needConfirm = true,int needInitComBoxSizeSelect = 1) { string boxCodeL = lbPackageCodeL.Text?.Trim(); string boxCodeR = lbPackageCodeR.Text?.Trim(); @@ -4045,7 +4045,9 @@ namespace InjectionPC CompleteBoxAndPrint(dt.Rows[0], "0", lbPackageCodeL, lbCurrentlQtyL, 1); lbPackageCodeL.Text = ""; - //comBoxSizeL.SelectedIndex = -1; + if(needInitComBoxSizeSelect == 1) + comBoxSizeL.SelectedIndex = -1; + lbNeedQtyL.Text = "0"; } }