|
|
@ -56,12 +56,11 @@ namespace Stone.WinModule.Standard |
|
|
|
strWhere += " [filename] like '%" + code + "%' "; |
|
|
|
} |
|
|
|
|
|
|
|
strWhere = "[IsStandard]=1 and [startDate]>='" + d1 + "' and [startDate]<='" + d2 + "' and (" + strWhere + ")"; |
|
|
|
if (cbIsDiff.Checked) |
|
|
|
{ |
|
|
|
strWhere += " and quantity > quantity_print "; |
|
|
|
} |
|
|
|
strWhere = "[IsStandard]=1 and [startDate]>='" + d1 + "' and [startDate]<='" + d2 + "' and (" + strWhere + ")"; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
private void frmJISLog_Load(object sender, EventArgs e) |
|
|
@ -256,9 +255,9 @@ namespace Stone.WinModule.Standard |
|
|
|
); |
|
|
|
} |
|
|
|
|
|
|
|
string PartNumber = dtData.Rows[0]["PartNumber"].ToString(); |
|
|
|
int quantity = Convert.ToInt32(dtData.Rows[0]["quantity"]); //本次需求货数量
|
|
|
|
int quantity_transit = Convert.ToInt32(dtData.Rows[0]["quantity_transit"]); //在途数量
|
|
|
|
string PartNumber = drData["PartNumber"].ToString(); |
|
|
|
int quantity = Convert.ToInt32(drData["quantity"]); //本次需求货数量
|
|
|
|
int quantity_transit = Convert.ToInt32(drData["quantity_transit"]); //在途数量
|
|
|
|
|
|
|
|
if (quantity_transit > 0) |
|
|
|
{ |
|
|
@ -290,10 +289,17 @@ namespace Stone.WinModule.Standard |
|
|
|
bool quantity_new = false; //是否采用新的数量来计算
|
|
|
|
if (msg2 != "") |
|
|
|
{ |
|
|
|
if (MyMessageBox.ShowQuestionPop("以下询问是否继续?\r\n" + msg2)) |
|
|
|
var dr = ShowQuestionPopDr("以下询问是否继续?\r\n" + msg2); |
|
|
|
if(dr == DialogResult.Cancel) |
|
|
|
return; |
|
|
|
if (dr==DialogResult.OK) |
|
|
|
{ |
|
|
|
quantity_new = true; |
|
|
|
} |
|
|
|
else |
|
|
|
{ |
|
|
|
quantity_new = false; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
CreateVDA(dtData, quantity_new); |
|
|
@ -378,6 +384,14 @@ namespace Stone.WinModule.Standard |
|
|
|
Odd = Convert.ToInt32(drData["quantity"]) - |
|
|
|
Convert.ToInt32(PageQty * Convert.ToInt32(drData["PackNumer"])); //计算零头
|
|
|
|
} |
|
|
|
else |
|
|
|
{ |
|
|
|
PageQty = Convert.ToInt32(Math.Floor(Convert.ToDecimal(drData["quantity_new"]) / |
|
|
|
Convert.ToDecimal(drData["PackNumer"]))); |
|
|
|
|
|
|
|
Odd = Convert.ToInt32(drData["quantity_new"]) - |
|
|
|
Convert.ToInt32(PageQty * Convert.ToInt32(drData["PackNumer"])); //计算零头
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
for (int i = 1; i <= PageQty; i++) |
|
|
@ -499,6 +513,17 @@ namespace Stone.WinModule.Standard |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
// public virtual void UpdateGridView()
|
|
|
|
// {
|
|
|
|
//
|
|
|
|
// string code = this.txtCode.Text.Trim();
|
|
|
|
// Search(code);
|
|
|
|
//
|
|
|
|
// m_Base.BindPageData(strWhere);
|
|
|
|
// m_Base.GetView(this.dgrdView);
|
|
|
|
// tlbAllCount.Text = "记录数:" + m_Base.dsMain.Tables["Data"].Rows.Count;
|
|
|
|
// }
|
|
|
|
|
|
|
|
private void chkAuto_CheckedChanged(object sender, EventArgs e) |
|
|
|
{ |
|
|
|
|
|
|
@ -714,5 +739,15 @@ namespace Stone.WinModule.Standard |
|
|
|
string partcode; |
|
|
|
int qty; |
|
|
|
} |
|
|
|
|
|
|
|
public static DialogResult ShowQuestionPopDr(string MessageInfo) |
|
|
|
{ |
|
|
|
var dr = new DialogResult(); |
|
|
|
|
|
|
|
frmMessageQuestion frm = new frmMessageQuestion(1); |
|
|
|
frm.ShowQuestion(MessageInfo); |
|
|
|
dr = frm.DialogResult; |
|
|
|
return dr; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|