This commit is contained in:
atvstdla
2025-09-29 17:38:12 +09:00
parent 1ebbb83866
commit 5a2eeed3c4
24 changed files with 1698 additions and 1490 deletions

View File

@@ -174,6 +174,21 @@ namespace Project.Dialog
return;
}
}
if (grpApplyWMSinfo.Enabled)
{
//검색조건확인
var v = CheckDataIn(grpApplyWMSinfo);
if (v.Item1 < 1)
{
UTIL.MsgE("Target item is not specified among WMS information items");
return;
}
if (v.Item2 < 1)
{
UTIL.MsgE("Search item is not specified among WMS information items");
return;
}
}
if (grpApplySidinfo.Enabled)
{
//검색조건확인
@@ -244,6 +259,7 @@ namespace Project.Dialog
VAR.BOOL[eVarBool.Opt_ApplySIDConv] = chkApplySIDConv.Checked;
VAR.BOOL[eVarBool.Opt_ApplyJobInfo] = chkApplyJobInfo.Checked;
VAR.BOOL[eVarBool.Opt_ApplyWMSInfo] = chkApplyWMSInfo.Checked;
VAR.BOOL[eVarBool.Opt_ApplySIDInfo] = chkApplySidInfo.Checked;
VAR.BOOL[eVarBool.Opt_CheckSIDExist] = PUB.Result.vModel.CheckSIDExsit;
@@ -255,15 +271,31 @@ namespace Project.Dialog
if (SETTING.Data.SystemBypass) VAR.BOOL[eVarBool.Opt_DisablePrinter] = true;
else VAR.BOOL[eVarBool.Opt_DisablePrinter] = PUB.Result.vModel.DisablePrinter || (SETTING.Data.Disable_PrinterL && SETTING.Data.Disable_PrinterR);
//WMS Information
VAR.BOOL[eVarBool.Opt_WMS_Apply_PartNo] = checkBox47.Checked;
VAR.BOOL[eVarBool.Opt_WMS_Apply_CustCode] = checkBox46.Checked;
VAR.BOOL[eVarBool.Opt_WMS_Apply_SID] = checkBox45.Checked;
VAR.BOOL[eVarBool.Opt_WMS_Apply_VenderName] = checkBox41.Checked;
VAR.BOOL[eVarBool.Opt_WMS_Apply_batch] = chkWMSApplyBatch.Checked;
VAR.BOOL[eVarBool.Opt_WMS_Apply_qty] = false;// chkInfoApplyQty.Checked;
VAR.BOOL[eVarBool.Opt_WMS_Where_PartNo] = checkBox44.Checked;
VAR.BOOL[eVarBool.Opt_WMS_Where_CustCode] = checkBox43.Checked;
VAR.BOOL[eVarBool.Opt_WMS_Where_SID] = checkBox42.Checked;
VAR.BOOL[eVarBool.Opt_WMS_Where_VLOT] = checkBox36.Checked;
VAR.BOOL[eVarBool.Opt_WMS_Where_MC] = false;// chkInfoWhereMC.Checked;
VAR.BOOL[eVarBool.Opt_WMS_WriteServer] = false;// chkInfoSave.Checked;
//SID Information
VAR.BOOL[eVarBool.Opt_SID_Apply_PartNo] = chkInfoApplyPart.Checked;
VAR.BOOL[eVarBool.Opt_SID_Apply_CustCode] = chkInfoApplyCust.Checked;
VAR.BOOL[eVarBool.Opt_SID_Apply_SID] = chkInfoApplySID.Checked;
VAR.BOOL[eVarBool.Opt_SID_Apply_VenderName] = chkInfoApplyVender.Checked;
VAR.BOOL[eVarBool.Opt_SID_Apply_PrintPos] = chkInfoApplyPrint.Checked;
///22092[
VAR.BOOL[eVarBool.Opt_SID_Apply_batch] = chkInfoApplyBatch.Checked;
VAR.BOOL[eVarBool.Opt_SID_Apply_qty] = false;// chkInfoApplyQty.Checked;
VAR.BOOL[eVarBool.Opt_SID_Where_PartNo] = chkInfoWherePart.Checked;
VAR.BOOL[eVarBool.Opt_SID_Where_CustCode] = chkInfoWhereCust.Checked;
VAR.BOOL[eVarBool.Opt_SID_Where_SID] = chkInfoWhereSID.Checked;
@@ -375,6 +407,13 @@ namespace Project.Dialog
if (chk.Tag == null) continue;
chk.Checked = UTIL.GetBitState(dr.vOption, int.Parse(chk.Tag.ToString()));
}
foreach (var c in grpApplyWMSinfo.Controls)
{
if (c.GetType() != typeof(CheckBox)) continue;
var chk = c as CheckBox;
if (chk.Tag == null) continue;
chk.Checked = UTIL.GetBitState(dr.vWMSInfo, int.Parse(chk.Tag.ToString()));
}
foreach (var c in grpApplySidinfo.Controls)
{
if (c.GetType() != typeof(CheckBox)) continue;
@@ -418,6 +457,10 @@ namespace Project.Dialog
{
grpapplyjob.Enabled = chk.Checked;
}
if(chk.Name.Equals(chkApplyWMSInfo.Name))
{
grpApplyWMSinfo.Enabled = chk.Checked;
}
if (chk.Name.Equals(chkApplySidInfo.Name))
{
grpApplySidinfo.Enabled = chk.Checked;
@@ -474,6 +517,13 @@ namespace Project.Dialog
if (chk.Tag == null) continue;
dr.vOption = UTIL.SetBitState((ushort)dr.vOption, int.Parse(chk.Tag.ToString()), chk.Checked);
}
foreach (var c in grpApplyWMSinfo.Controls)
{
if (c.GetType() != typeof(CheckBox)) continue;
var chk = c as CheckBox;
if (chk.Tag == null) continue;
dr.vWMSInfo = UTIL.SetBitState((ushort)dr.vWMSInfo, int.Parse(chk.Tag.ToString()), chk.Checked);
}
foreach (var c in grpApplySidinfo.Controls)
{
if (c.GetType() != typeof(CheckBox)) continue;
@@ -535,8 +585,8 @@ namespace Project.Dialog
void UpdateHeight()
{
if (this.tabControl1.Visible) this.Height = 740;
else this.Height = 445;
if (this.tabControl1.Visible) this.Height = 755;
else this.Height = 380;
}
private void btOK_Click(object sender, EventArgs e)