|
|
@@ -122,7 +122,7 @@ namespace UAS_MES.Make
|
|
|
//给页面赋值
|
|
|
BaseUtil.SetFormValue(this.Controls,dt);
|
|
|
//刷新grid的历史称重信息；
|
|
|
- if (int.Parse(weight.Text) == 0)
|
|
|
+ if (double.Parse(weight.Text) == 0)
|
|
|
{
|
|
|
OperateResult.AppendText("<<重量不能等于0\n", Color.Red, palletcode);
|
|
|
return;
|
|
|
@@ -145,11 +145,11 @@ namespace UAS_MES.Make
|
|
|
sql.Append(",:result,sysdate,:inman,:workcenter,:linecode,:source,:palletcode) ");
|
|
|
dh.ExecuteSql(sql.GetString(), "insert", pa_makecode.Text, info.Rows[0]["ma_id"].ToString(), User.CurrentStepCode, User.CurrentStepName, "称重成功,栈板号:" + palletcode.Text + ",重量:" + weight.Text + "克", User.UserName, info.Rows[0]["ma_wccode"].ToString(), User.UserLineCode, User.UserSourceCode, palletcode.Text);
|
|
|
//提示信息栏显示：<< 栈板号：XXXX,重量：xxxx 克，
|
|
|
- OperateResult.AppendText("<<栈板号:" + palletcode.Text + ",重量:" + weight.Text + "克\n", Color.Green);
|
|
|
+ OperateResult.AppendText("<<栈板号:" + palletcode.Text + ",重量:" + weight.Text + pr_cartonunit.Text+ "\n", Color.Green);
|
|
|
//记录日志
|
|
|
LogicHandler.DoCommandLog(Tag.ToString(),User.UserCode,pa_makecode.Text,User.UserLineCode,User.UserSourceCode,"栈板称重","重量:" + weight.Text+"克\n",palletcode.Text,"");
|
|
|
//刷新称重计数+1
|
|
|
- weightedNum.Text = int.Parse(weightedNum.Text) + 1 + "";
|
|
|
+ weightedNum.Text = double.Parse(weightedNum.Text) + 1 + "";
|
|
|
recordResult(palletcode.Text, weight.Text, System.DateTime.Now.ToString());
|
|
|
//如果用户勾选了自动打印，调用打印, 打印成功，消息提示栏显示“打印成功”，“请输入栈板号”
|
|
|
if (autoPrint.Checked == true)
|
shim