Browse Source

调整。

master
yibo 7 years ago
parent
commit
95231ef53b
9 changed files with 19 additions and 12 deletions
  1. +2
    -1
      ButcherFactory.Form/CarcassInStore_/CarcassInStoreForm.cs
  2. +2
    -1
      ButcherFactory.Form/CarcassTakeOut_/CarcassTakeOutForm.cs
  3. +2
    -1
      ButcherFactory.Form/SegmentInStore_/SegmentInStoreForm.cs
  4. +2
    -1
      ButcherFactory.Form/SegmentPickUp_/SegmentPickUpForm.cs
  5. +4
    -3
      ButcherFactory.Form/SegmentProductionAuto_/SegmentProductionAutoForm.cs
  6. +3
    -2
      ButcherFactory.Form/SegmentProduction_/SegmentProductionForm.cs
  7. +2
    -1
      ButcherFactory.Form/SegmentProduction_/SegmentProductionPrint.cs
  8. +1
    -1
      ButcherFactory.Form/SegmentProduction_/SegmentProductionPrint.html
  9. +1
    -1
      ButcherFactory.Form/SegmentProduction_/SegmentProductionPrint1.html

+ 2
- 1
ButcherFactory.Form/CarcassInStore_/CarcassInStoreForm.cs View File

@ -126,7 +126,8 @@ namespace ButcherFactory.CarcassInStore_
var arr = strErrorWeight.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries).Select(x => int.Parse(x)).OrderBy(x => x);
errorWeight.AddRange(arr);
}
workUnitSelect.EBindComboBox<WorkUnit>(x => x.ID == config.WorkUnitID);
var m = config.WorkUnitID;
workUnitSelect.EBindComboBox<WorkUnit>(x => x.ID == m, top: 100);
BindGoods();
BindGrid();


+ 2
- 1
ButcherFactory.Form/CarcassTakeOut_/CarcassTakeOutForm.cs View File

@ -98,7 +98,8 @@ namespace ButcherFactory.CarcassTakeOut_
productBatchSelect.EBindComboBox<ProductBatch>(x => x.Date == DateTime.Today, 6, "Date");
var config = XmlUtil.DeserializeFromFile<CarcassTakeOutFormConfig>();
workUnitSelect.EBindComboBox<WorkUnit>(x => x.ID == config.WorkUnitID);
var m = config.WorkUnitID;
workUnitSelect.EBindComboBox<WorkUnit>(x => x.ID == m, top: 100);
BindGoods();
BindGrid();


+ 2
- 1
ButcherFactory.Form/SegmentInStore_/SegmentInStoreForm.cs View File

@ -81,7 +81,8 @@ namespace ButcherFactory.SegmentInStore_
BaseInfoSyncRpc.SyncBaseInfo<Store>();
}
var config = XmlUtil.DeserializeFromFile<SegmentInStoreFormConfig>();
storeSelect.EBindComboBox<Store>(x => x.ID == config.StoreID);
var m = config.StoreID;
storeSelect.EBindComboBox<Store>(x => x.ID == m);
BindInStoreGrid();
BindExceptionGrid();
BindBackGrid();


+ 2
- 1
ButcherFactory.Form/SegmentPickUp_/SegmentPickUpForm.cs View File

@ -98,7 +98,8 @@ namespace ButcherFactory.SegmentPickUp_
productBatchSelect.EBindComboBox<ProductBatch>(x => x.Date == DateTime.Today, 6, "Date");
var config = XmlUtil.DeserializeFromFile<SegmentPickUpConfig>();
workUnitSelect.EBindComboBox<WorkUnit>(x => x.ID == config.WorkUnitID);
var m = config.WorkUnitID;
workUnitSelect.EBindComboBox<WorkUnit>(x => x.ID == m, top: 100);
BindGoods();
BindGrid();


+ 4
- 3
ButcherFactory.Form/SegmentProductionAuto_/SegmentProductionAutoForm.cs View File

@ -100,9 +100,10 @@ namespace ButcherFactory.SegmentProductionAuto_
BaseInfoSyncRpc.SyncBaseInfo<WorkUnit>();
BaseInfoSyncRpc.SyncProductBatch(1);
}
productBatchSelect.EBindComboBox<ProductBatch>(x => x.Date == DateTime.Today, 6, "Date");
productBatchSelect.EBindComboBox<ProductBatch>(null, 6, "Date");
config = XmlUtil.DeserializeFromFile<NotAuto.SegmentProductionFormConfig>();
workUnitSelect.EBindComboBox<WorkUnit>(x => x.ID == config.WorkUnitID, top: 100);
var m = config.WorkUnitID;
workUnitSelect.EBindComboBox<WorkUnit>(x => x.ID == m, top: 100);
BindGoods();
BindGrid();
@ -279,7 +280,7 @@ namespace ButcherFactory.SegmentProductionAuto_
{
if (historyDataGrid.CurrentRow == null)
return;
if (MessageBox.Show( "确定删除选中记录?","删除确认", MessageBoxButtons.OKCancel) != DialogResult.OK)
if (MessageBox.Show("确定删除选中记录?", "删除确认", MessageBoxButtons.OKCancel) != DialogResult.OK)
return;
var item = historyDataGrid.CurrentRow.DataBoundItem as SegmentProduction;
SegmentProductionBL.SetAsDelete(item.ID, item.BarCode);


+ 3
- 2
ButcherFactory.Form/SegmentProduction_/SegmentProductionForm.cs View File

@ -100,7 +100,8 @@ namespace ButcherFactory.SegmentProduction_
}
productBatchSelect.EBindComboBox<ProductBatch>(x => x.Date == DateTime.Today, 6, "Date");
var config = XmlUtil.DeserializeFromFile<SegmentProductionFormConfig>();
workUnitSelect.EBindComboBox<WorkUnit>(x => x.ID == config.WorkUnitID);
var m = config.WorkUnitID;
workUnitSelect.EBindComboBox<WorkUnit>(x => x.ID == m, top: 100);
BindGoods();
BindGrid();
@ -161,7 +162,7 @@ namespace ButcherFactory.SegmentProduction_
historyDataGrid.FirstDisplayedScrollingRowIndex = 0;
historyDataGrid.Refresh();
if (barPrintCheck.Checked)
SegmentProductionPrint.Print(entity, batchDate,"");
SegmentProductionPrint.Print(entity, batchDate, "");
}
void BindGrid()


+ 2
- 1
ButcherFactory.Form/SegmentProduction_/SegmentProductionPrint.cs View File

@ -23,7 +23,8 @@ namespace ButcherFactory.SegmentProduction_
dt = DateTime.Today;
var dic = new Dictionary<string, string>();
dic.Add("$Goods_Name", entity.Goods_Name);
dic.Add("$Goods_Spec", entity.Goods_Spec);
//dic.Add("$Goods_Spec", entity.Goods_Spec);
dic.Add("$Weight", entity.Weight.ToString("#0.##"));
dic.Add("$Date", dt.Value.ToString("yyyy/MM/dd"));
var imgUrl = string.Format(IMGFILE, id);
var url = string.Format(AppContext.ConnectInfo.TraceBackUrl + "?code={0}", entity.BarCode);


+ 1
- 1
ButcherFactory.Form/SegmentProduction_/SegmentProductionPrint.html View File

@ -16,7 +16,7 @@
</head>
<body>
<div style='font-size:16px;'>品名:$Goods_Name</div>
<div style='margin-top:10px;font-size:14px;'>规格:$Goods_Spec &nbsp;&nbsp;生产日期:$Date</div>
<div style='margin-top:10px;font-size:14px;'>重量:$Weight KG &nbsp;&nbsp;生产日期:$Date</div>
<table align='center' style='width:100%;margin-top:5px;border-collapse:collapse;border-width:1px;line-height:15px;'>
<tr><td>执行标准:</td><td>GB/T9959.2-2008</td><td rowspan='3'><img src='$ImageUrl' style='margin:-5px 0px -5px 20px;' /></td></tr>
<tr><td>储存条件:</td><td>0~4℃保存</td></tr>


+ 1
- 1
ButcherFactory.Form/SegmentProduction_/SegmentProductionPrint1.html View File

@ -16,7 +16,7 @@
</head>
<body>
<div style='font-size:16px;'>品名:$Goods_Name</div>
<div style='margin-top:10px;font-size:14px;'>规格:$Goods_Spec &nbsp;&nbsp;生产日期:$Date</div>
<div style='margin-top:10px;font-size:14px;'>重量:$Weight KG &nbsp;&nbsp;生产日期:$Date</div>
<table align='center' style='width:100%;margin-top:5px;border-collapse:collapse;border-width:1px;line-height:15px;'>
<tr><td>执行标准:</td><td>GB/T9959.2-2008</td><td rowspan='3'><img src='$ImageUrl' style='margin:-5px 0px -5px 20px;' /></td></tr>
<tr><td>储存条件:</td><td>-18℃以下保存</td></tr>


Loading…
Cancel
Save