diff --git a/CowOutputClient/CowOutputClient.csproj b/CowOutputClient/CowOutputClient.csproj
index a095f7d..ae42df2 100644
--- a/CowOutputClient/CowOutputClient.csproj
+++ b/CowOutputClient/CowOutputClient.csproj
@@ -67,6 +67,9 @@
OperateWindow.xaml
+
+ ProductCatalogSequenceWindow.xaml
+
SelectedProductWindow.xaml
@@ -98,6 +101,10 @@
MSBuild:Compile
Designer
+
+ Designer
+ MSBuild:Compile
+
Designer
MSBuild:Compile
diff --git a/CowOutputClient/OperateWindow.xaml b/CowOutputClient/OperateWindow.xaml
index 1759bb6..85cb7c8 100644
--- a/CowOutputClient/OperateWindow.xaml
+++ b/CowOutputClient/OperateWindow.xaml
@@ -18,7 +18,7 @@
-
+
@@ -77,8 +77,8 @@ Property="HorizontalContentAlignment" Value="Center">
-
-
+
+
@@ -92,6 +92,7 @@ Property="HorizontalContentAlignment" Value="Center">
+
diff --git a/CowOutputClient/OperateWindow.xaml.cs b/CowOutputClient/OperateWindow.xaml.cs
index 50af1c8..863d7f6 100644
--- a/CowOutputClient/OperateWindow.xaml.cs
+++ b/CowOutputClient/OperateWindow.xaml.cs
@@ -77,6 +77,7 @@ namespace CowOutputClient
output.Set("Department_ID", wpfUser.Department_ID);
output.Set("Domain_ID", long.Parse(domain_ID));
output.Set("Employee_ID", wpfUser.Employee_ID ?? 0);
+ output.Set("ProductTeam_ID", mTeam.ProductTeam_ID);
var batch = (ProductBatch)combProductBatch.SelectedItem;
output.Set("ProductBatch_ID", batch.Batch_ID);
output.Set("Product_Batch", batch.Batch);
@@ -91,7 +92,7 @@ namespace CowOutputClient
details.Add(inputDetail);
}
output.Set("Details", details);
- var list = RpcFacade.Call>("/MainSystem/B3_HaoYue/Rpcs/B3CowButcherManageRpc/CreateOutput", output,mTeam.ProductTeam_ID,false,null);
+ var list = RpcFacade.Call>("/MainSystem/B3_HaoYue/Rpcs/B3CowButcherManageRpc/CreateOutput", output,mTeam.ProductTeam_ID,false,null,mTeam.Name);
if (list.Count() > 0) {
var outputId = list[0].Value;
WeightInfoBL.UpdateOutputId(selectedItems.Select(x => x.ID).ToArray(),outputId);
@@ -111,7 +112,7 @@ namespace CowOutputClient
gridProductPlan.ItemsSource = resultList;
}
- WindowUtil.Inf("生成产出单No." + outputId);
+ WindowUtil.Inf("创建产出单No." + outputId);
}
}
@@ -384,6 +385,7 @@ namespace CowOutputClient
output.Set("ProductBatch_ID", batch.Batch_ID);
output.Set("Product_Batch", batch.Batch);
output.Set("Date", DateTime.Now);
+ output.Set("ProductTeam_ID", mTeam.ProductTeam_ID);
var details = new ManyList("/MainSystem/B3CowButcherManage/BO/Output_Detail");
var inputDetail = new RpcObject("/MainSystem/B3CowButcherManage/BO/Output_Detail");
@@ -393,7 +395,7 @@ namespace CowOutputClient
details.Add(inputDetail);
output.Set("Details", details);
}
- var list = RpcFacade.Call>("/MainSystem/B3_HaoYue/Rpcs/B3CowButcherManageRpc/CreateOutput", output, mTeam.ProductTeam_ID, true, selectedItem.DetailID);
+ var list = RpcFacade.Call>("/MainSystem/B3_HaoYue/Rpcs/B3CowButcherManageRpc/CreateOutput", output, mTeam.ProductTeam_ID, true, selectedItem.DetailID,mTeam.Name);
if (list == null) {
ProductPlanBL.UpdateButhcerDetailFinish(selectedItem.DetailID);
var butDetails = gridProductPlan.ItemsSource as List;
@@ -540,14 +542,11 @@ namespace CowOutputClient
private void btnTare_Click_1(object sender, RoutedEventArgs e)
{
- var w = ConfigurationManager.AppSettings["Weight"];
- if (!string.IsNullOrEmpty(w)) {
- ComWeight.Text = w;
+ var keypadWindow = new Keypad(this);
+ if (keypadWindow.ShowDialog() == true && !string.IsNullOrEmpty(keypadWindow.Result)) {
+ tare = decimal.Parse(keypadWindow.Result);
+ btnTare.Content = keypadWindow.Result;
}
- if (string.IsNullOrEmpty(ComWeight.Text))
- WindowUtil.Err("称上没有重量");
- tare = decimal.Parse(ComWeight.Text);
- btnTare.Content = ComWeight.Text;
}
private void btnClear_Click_1(object sender, RoutedEventArgs e)
diff --git a/CowOutputClient/ProductCatalogSequenceWindow.xaml b/CowOutputClient/ProductCatalogSequenceWindow.xaml
new file mode 100644
index 0000000..df4564a
--- /dev/null
+++ b/CowOutputClient/ProductCatalogSequenceWindow.xaml
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/CowOutputClient/ProductCatalogSequenceWindow.xaml.cs b/CowOutputClient/ProductCatalogSequenceWindow.xaml.cs
new file mode 100644
index 0000000..fa5fb65
--- /dev/null
+++ b/CowOutputClient/ProductCatalogSequenceWindow.xaml.cs
@@ -0,0 +1,82 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+using KeyPad;
+using WeighBusiness.BL;
+using WeighBusiness.BO;
+
+namespace CowOutputClient
+{
+ public partial class ProductCatalogSequenceWindow : Window
+ {
+ private List catalogs = new List();
+ List detailIds = new List();
+
+ public ProductCatalogSequenceWindow()
+ {
+ InitializeComponent();
+ }
+
+ private void Grid_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+ {
+ DragMove();
+ }
+
+ private void Window_Loaded(object sender, RoutedEventArgs e)
+ {
+ BindProductCatalogs();
+ }
+
+ private void BindProductCatalogs()
+ {
+ ProductCatalogPanel.Children.Clear();
+ catalogs = ProductCatalogBL.GetProductCatalogs();
+ if (catalogs.Count() > 0) {
+ foreach (var catalog in catalogs) {
+ var txtCatalog = new TextBlock() { Text = catalog.Name, FontSize = 20, TextWrapping = TextWrapping.Wrap, TextAlignment = TextAlignment.Center };
+ var txtCatalogSequence = new TextBox() { Text = (catalog.Sequence == null ? string.Empty : catalog.Sequence.ToString()), FontSize = 20, TextWrapping = TextWrapping.Wrap, TextAlignment = TextAlignment.Center, Tag = catalog, Margin = new Thickness(10, 10, 0, 0) };
+ txtCatalogSequence.PreviewMouseDown += (object sende, MouseButtonEventArgs args) => {
+ var keypadWindow = new Keypad(this);
+ if (keypadWindow.ShowDialog() == true && !string.IsNullOrEmpty(keypadWindow.Result)) {
+ int num;
+ if(int.TryParse(keypadWindow.Result,out num)){
+ txtCatalogSequence.Text = num.ToString();
+ var cata = (ProductCatalog)txtCatalogSequence.Tag;
+ cata.Sequence = num;
+ }else{
+ throw new ApplicationException("输入的数字不正确");
+ }
+ }
+ };
+ var border = new Border();
+ border.BorderThickness = new Thickness(1, 1, 1, 1);
+ border.BorderBrush = Brushes.Black;
+ border.Child = txtCatalog;
+ border.Margin = new Thickness(10, 10, 0, 0);
+ ProductCatalogPanel.Children.Add(border);
+ ProductCatalogPanel.Children.Add(txtCatalogSequence);
+ }
+ }
+ }
+
+ private void btnClose_Click_1(object sender, RoutedEventArgs e)
+ {
+ this.DialogResult = false;
+ }
+
+ private void btnSave_Click_1(object sender, RoutedEventArgs e)
+ {
+ ProductCatalogBL.UpdateSequence(catalogs);
+ this.DialogResult = true;
+ }
+ }
+}
diff --git a/CowOutputClient/SelectedProductWindow.xaml b/CowOutputClient/SelectedProductWindow.xaml
index 6af9870..07525e6 100644
--- a/CowOutputClient/SelectedProductWindow.xaml
+++ b/CowOutputClient/SelectedProductWindow.xaml
@@ -30,9 +30,10 @@
-
-
-
+
+
+
+
diff --git a/CowOutputClient/SelectedProductWindow.xaml.cs b/CowOutputClient/SelectedProductWindow.xaml.cs
index 1cdd6c3..2e96c63 100644
--- a/CowOutputClient/SelectedProductWindow.xaml.cs
+++ b/CowOutputClient/SelectedProductWindow.xaml.cs
@@ -22,7 +22,7 @@ namespace CowOutputClient
{
private List catalogsDetails = new List();
List detailIds = new List();
-
+ bool? useSequenceWindow = null;
public SelectedProductWindow()
{
InitializeComponent();
@@ -112,7 +112,7 @@ namespace CowOutputClient
private void btnClose_Click_1(object sender, RoutedEventArgs e)
{
- this.DialogResult = false;
+ this.DialogResult = useSequenceWindow == true ? true : false;
}
private void btnSave_Click_1(object sender, RoutedEventArgs e)
@@ -120,5 +120,13 @@ namespace CowOutputClient
ProductCatalogBL.UpdateProductCatalogDetails(catalogsDetails.Where(x => x.IsSelected));
this.DialogResult = true;
}
+
+ private void btnSequence_Click_1(object sender, RoutedEventArgs e)
+ {
+ useSequenceWindow = new ProductCatalogSequenceWindow().ShowDialog();
+ if (useSequenceWindow == true) {
+ BindProductCatalogs();
+ }
+ }
}
}
diff --git a/CowOutputClient/app.config b/CowOutputClient/app.config
index 9d664e4..84e6ee1 100644
--- a/CowOutputClient/app.config
+++ b/CowOutputClient/app.config
@@ -6,9 +6,9 @@
-
+
-
+
diff --git a/FireBirdUtil/SqlHelper/CreateTableHelper.cs b/FireBirdUtil/SqlHelper/CreateTableHelper.cs
index e026f93..b315851 100644
--- a/FireBirdUtil/SqlHelper/CreateTableHelper.cs
+++ b/FireBirdUtil/SqlHelper/CreateTableHelper.cs
@@ -35,17 +35,11 @@ namespace FireBirdUtil.SqlHelpers
private void AlterTable(string database,string tableName)
{
- //if (tableName == "PSInfo")
- //{
- // AddColumnToTable(database, "PSINFO", "BILLSET", "varchar(100)");
- // AddColumnToTable(database, "PSINFO", "WINDOWSET", "varchar(100)");
- // AddColumnToTable(database, "PSINFO", "GOODSINSTORE_ID", "Integer");
- //}
- //else if (tableName == "ProduceBatch")
- //{
- // AddColumnToTable(database, "PRODUCEBATCH", "MAINNUMBER", "decimal(18,6)");
- // AddColumnToTable(database, "PRODUCEBATCH", "BILLID", "Integer");
- //}
+ if (tableName == "ProductCatalog") {
+ AddColumnToTable(database, "PRODUCTCATALOG", "SEQUENCE", "Integer");
+ } else if (tableName == "ButcherDetail") {
+ AddColumnToTable(database, "BUTCHERDETAIL", "DELIVERYDATE", "TIMESTAMP");
+ }
//else if (tableName == "ProduceIntake")
//{
// AddColumnToTable(database, "PRODUCEINTAKE", "OUTGOODS_ID", "Integer");
diff --git a/WeighBusiness/BL/ProductCatalogBL.cs b/WeighBusiness/BL/ProductCatalogBL.cs
index c5be8d3..6d570bc 100644
--- a/WeighBusiness/BL/ProductCatalogBL.cs
+++ b/WeighBusiness/BL/ProductCatalogBL.cs
@@ -193,10 +193,10 @@ namespace WeighBusiness.BL
string errorMessage;
using (var she = new SqlHelperEx()) {
she.CreateTransaction();
- var sql = SqlUtil.GetDeleteSql(TableNames.生产计划);
+ var sql = SqlUtil.GetDeleteSql(TableNames.客户端产品分类);
she.ExecuteNonQuery(sql, out success, out errorMessage);
if (success) {
- var sql3 = SqlUtil.GetDeleteSql(TableNames.生产计划分割明细);
+ var sql3 = SqlUtil.GetDeleteSql(TableNames.客户端产品分类明细);
she.ExecuteNonQuery(sql3, out success, out errorMessage);
}
if (!success)
@@ -209,7 +209,7 @@ namespace WeighBusiness.BL
public static List GetProductCatalogs()
{
- var table = SqlHelperEx.DoQuery("select ProductCatalog_ID,Name from {0}".FormatWith(TableNames.客户端产品分类));
+ var table = SqlHelperEx.DoQuery("select ProductCatalog_ID,Name,Sequence from {0} order by Sequence asc".FormatWith(TableNames.客户端产品分类));
if (table.Rows.Count == 0)
return new List();
var list = new List();
@@ -217,6 +217,7 @@ namespace WeighBusiness.BL
var catalog = new ProductCatalog();
catalog.ProductCatalog_ID = (long)(int.Parse(row[0].ToString()));
catalog.Name = row[1].ToString();
+ catalog.Sequence = DataTypeUtil.GetIntNullNum(row[2]);
list.Add(catalog);
}
return list;
@@ -266,6 +267,23 @@ namespace WeighBusiness.BL
she.Commit();
}
}
+
+ public static void UpdateSequence(List catalogs)
+ {
+ foreach (var catalog in catalogs) {
+ string updateSql = string.Format("update " + TableNames.客户端产品分类 + " set Sequence = {0} where ProductCatalog_ID ={1}", catalog.Sequence == null?"null":catalog.Sequence.ToString(), catalog.ProductCatalog_ID);
+ bool success = true;
+ using (var she = new SqlHelperEx()) {
+ she.CreateTransaction();
+ she.ExecuteNonQuery(updateSql, out success);
+ if (!success) {
+ she.Rollback();
+ } else {
+ she.Commit();
+ }
+ }
+ }
+ }
}
public class ProCataGoods : INotifyPropertyChanged
diff --git a/WeighBusiness/BL/ProductPlanBL.cs b/WeighBusiness/BL/ProductPlanBL.cs
index e14dc71..264f590 100644
--- a/WeighBusiness/BL/ProductPlanBL.cs
+++ b/WeighBusiness/BL/ProductPlanBL.cs
@@ -67,8 +67,8 @@ namespace WeighBusiness.BL
if (butcherDetails.Count() > 0) {
foreach (var detail in butcherDetails) {
string insertSql = InsertUtil.GetInsertSql(TableNames.生产计划分割明细,
- new string[] { "ProductPlan_ID", "DetailID", "Goods_Code", "Goods_Name", "Goods_Spec", "Goods_MainUnit", "Goods_ID", "PlanNumber", "IsFinish", "Department_Name", "Remark" },
- new string[] { detail.ProductPlan_ID.ToString(), detail.DetailID.ToString(), detail.Goods_Code, detail.Goods_Name, detail.Goods_Spec, detail.Goods_MainUnit, detail.Goods_ID.ToString(), detail.PlanNumber == null ? "null" : detail.PlanNumber.Value.ToString(),detail.IsFinish?"1":"0",detail.Department_Name,detail.Remark });
+ new string[] { "ProductPlan_ID", "DetailID", "Goods_Code", "Goods_Name", "Goods_Spec", "Goods_MainUnit", "Goods_ID", "PlanNumber", "IsFinish", "Department_Name", "Remark", "DeliveryDate" },
+ new string[] { detail.ProductPlan_ID.ToString(), detail.DetailID.ToString(), detail.Goods_Code, detail.Goods_Name, detail.Goods_Spec, detail.Goods_MainUnit, detail.Goods_ID.ToString(), detail.PlanNumber == null ? "null" : detail.PlanNumber.Value.ToString(), detail.IsFinish ? "1" : "0", detail.Department_Name, detail.Remark, detail.DeliveryDate == null ? "null" : detail.DeliveryDate.Value.ToString() });
she.ExecuteNonQuery(insertSql, out success, out errorMessage);
if (!success && !string.IsNullOrEmpty(errorMessage)) {
she.Rollback();
@@ -245,6 +245,7 @@ namespace WeighBusiness.BL
butcherDetail.PlanNumber = detail.Get("PlanNumber");
butcherDetail.Department_Name = detail.Get("Department_Name");
butcherDetail.Remark = detail.Get("Remark");
+ butcherDetail.DeliveryDate = detail.Get("DeliveryDate");
butcherList.Add(butcherDetail);
}
}
@@ -316,7 +317,7 @@ namespace WeighBusiness.BL
public static List GetButcherDetails(DateTime date,DateTime startDate,long planTeamID)
{
var list = new List();
- var sql = "select a.Goods_ID, a.Goods_Name,a.Goods_Spec,a.Goods_MainUnit,a.PlanNumber,a.DetailID,e.FinishNumber,a.Department_Name,a.Remark from {0} a inner join {1} b on a.ProductPlan_ID = b.ProductPlan_ID inner join {2} c on c.Goods_ID = a.Goods_ID inner join {3} d on c.ProductTeam_ID = d.ProductTeam_ID left outer join {4} e on a.DetailID = e.DetailID where a.IsFinish = 0 and d.ProductTeam_ID = {5}".FormatWith(TableNames.生产计划分割明细, TableNames.生产计划, TableNames.生产班组产出明细, TableNames.生产班组, TableNames.生产计划分割明细完工数量,planTeamID);
+ var sql = "select a.Goods_ID, a.Goods_Name,a.Goods_Spec,a.Goods_MainUnit,a.PlanNumber,a.DetailID,e.FinishNumber,a.Department_Name,a.Remark,a.DeliveryDate from {0} a inner join {1} b on a.ProductPlan_ID = b.ProductPlan_ID inner join {2} c on c.Goods_ID = a.Goods_ID inner join {3} d on c.ProductTeam_ID = d.ProductTeam_ID left outer join {4} e on a.DetailID = e.DetailID where a.IsFinish = 0 and d.ProductTeam_ID = {5} order by a.DeliveryDate asc".FormatWith(TableNames.生产计划分割明细, TableNames.生产计划, TableNames.生产班组产出明细, TableNames.生产班组, TableNames.生产计划分割明细完工数量, planTeamID);
if (!string.IsNullOrEmpty(sql)) {
var table = SqlHelperEx.DoQuery(sql);
foreach (DataRow row in table.Rows) {
@@ -330,6 +331,11 @@ namespace WeighBusiness.BL
outDetail.FinishNum = DataTypeUtil.GetDecimalNum(row[6]);
outDetail.Department_Name = (string)row[7];
outDetail.Remark = (string)row[8];
+ var deliveryDate = DataTypeUtil.GetDateTimeNullData(row[9]);
+ if (deliveryDate != null) {
+ outDetail.DeliveryDate = deliveryDate.Value.Date;
+ outDetail.DeliveryDateStr = deliveryDate.Value.Date.ToShortDateString();
+ }
list.Add(outDetail);
}
}
@@ -347,6 +353,8 @@ namespace WeighBusiness.BL
public decimal? PlanNumber { get; set; }
public string Department_Name { get; set; }
public string Remark { get; set; }
+ public DateTime? DeliveryDate { get; set; }
+ public string DeliveryDateStr { get; set; }
private decimal? mFinishNum;
public decimal? FinishNum
{
diff --git a/WeighBusiness/BO/ButcherDetail.cs b/WeighBusiness/BO/ButcherDetail.cs
index 033a471..1143cf3 100644
--- a/WeighBusiness/BO/ButcherDetail.cs
+++ b/WeighBusiness/BO/ButcherDetail.cs
@@ -23,5 +23,6 @@ namespace WeighBusiness.BO
public bool IsFinish { get; set; }
public string Department_Name { get; set; }
public string Remark { get; set; }
+ public DateTime? DeliveryDate { get; set; }
}
}
diff --git a/WeighBusiness/BO/CreateTables/CreateButcherDetail.cs b/WeighBusiness/BO/CreateTables/CreateButcherDetail.cs
index bbb8781..b10c074 100644
--- a/WeighBusiness/BO/CreateTables/CreateButcherDetail.cs
+++ b/WeighBusiness/BO/CreateTables/CreateButcherDetail.cs
@@ -24,6 +24,7 @@ namespace WeighBusiness.BO.CreateTables
cth.AddField(new FieldInfo() { FieldName = "IsFinish", FieldType = FBType.Boolean, IsNotNull = true });
cth.AddField(new FieldInfo() { FieldName = "Department_Name", FieldType = FBType.Varchar, FieldTypeParams = "(100)" });
cth.AddField(new FieldInfo() { FieldName = "Remark", FieldType = FBType.Varchar, FieldTypeParams = "(100)" });
+ cth.AddField(new FieldInfo() { FieldName = "DeliveryDate", FieldType = FBType.Timestamp });
base.AddFields(cth);
}
}
diff --git a/WeighBusiness/BO/CreateTables/CreateProductCatalog.cs b/WeighBusiness/BO/CreateTables/CreateProductCatalog.cs
index aded42a..bf947bf 100644
--- a/WeighBusiness/BO/CreateTables/CreateProductCatalog.cs
+++ b/WeighBusiness/BO/CreateTables/CreateProductCatalog.cs
@@ -16,6 +16,7 @@ namespace WeighBusiness.BO.CreateTables
cth.AddField(new FieldInfo() { FieldName = "ProductCatalog_ID", FieldType = FBType.Integer, IsNotNull = true });
cth.AddField(new FieldInfo() { FieldName = "RowVersion", FieldType = FBType.Integer, IsNotNull = true });
cth.AddField(new FieldInfo() { FieldName = "Name", FieldType = FBType.Varchar, FieldTypeParams = "(100)", IsNotNull = true });
+ cth.AddField(new FieldInfo() { FieldName = "Sequence", FieldType = FBType.Integer, IsNotNull = false });
base.AddFields(cth);
}
diff --git a/WeighBusiness/BO/ProductCatalog.cs b/WeighBusiness/BO/ProductCatalog.cs
index 6de4071..d827e36 100644
--- a/WeighBusiness/BO/ProductCatalog.cs
+++ b/WeighBusiness/BO/ProductCatalog.cs
@@ -17,6 +17,7 @@ namespace WeighBusiness.BO
public long ProductCatalog_ID { get; set; }
public string Name { get; set; }
public int RowVersion { get; set; }
+ public int? Sequence { get; set; }
}
}