diff --git a/ButcherTraceBack/ButcherTraceBack.csproj b/ButcherTraceBack/ButcherTraceBack.csproj index 9a79c8d..9f6784a 100644 --- a/ButcherTraceBack/ButcherTraceBack.csproj +++ b/ButcherTraceBack/ButcherTraceBack.csproj @@ -13,13 +13,16 @@ Properties ButcherTraceBack ButcherTraceBack - v4.0 + v4.6 false true + + + true @@ -29,6 +32,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -37,6 +41,7 @@ TRACE prompt 4 + false @@ -45,10 +50,14 @@ + + + + + ..\..\web1\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll - @@ -56,10 +65,6 @@ True ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - True - ..\packages\Microsoft.Net.Http.2.0.30506.0\lib\net40\System.Net.Http.dll - ..\packages\Microsoft.AspNet.WebApi.Core.4.0.30506.0\lib\net40\System.Web.Http.dll @@ -86,6 +91,7 @@ True ..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.Razor.dll + @@ -105,15 +111,21 @@ - + + + + + + + + + - - @@ -129,6 +141,8 @@ + + diff --git a/ButcherTraceBack/Global.asax.cs b/ButcherTraceBack/Global.asax.cs index 580536d..68d1710 100644 --- a/ButcherTraceBack/Global.asax.cs +++ b/ButcherTraceBack/Global.asax.cs @@ -14,7 +14,7 @@ namespace ButcherTraceBack { protected void Application_Start() { - WebApiConfig.Register(GlobalConfiguration.Configuration); + //WebApiConfig.Register(GlobalConfiguration.Configuration); RouteConfig.RegisterRoutes(RouteTable.Routes); } } diff --git a/ButcherTraceBack/Views/CodeView/Index - back.cshtml b/ButcherTraceBack/Views/CodeView/Index - back.cshtml new file mode 100644 index 0000000..ba0096e --- /dev/null +++ b/ButcherTraceBack/Views/CodeView/Index - back.cshtml @@ -0,0 +1,84 @@ +@model ButcherTraceBack.Models.TraceBackInfo + +@{ + Layout = null; +} + + + + + + + 追溯信息 @Model.Code + + + + + + + + + + + + + + + 商品名称: @Model.Goods_Name + + 生产日期: @Model.SendDate + + + + + + + + + + + + + + + + + + 检验日期: @Model.SendDate + + + + + + 出厂日期: @Model.SendDate + + + + + + + 生猪产地:@Model.PigFarmAddress + 动检证号:@Model.TestingNo + 动检结果:@Model.TestingResult + 动检人员:@Model.TestingMan + 养 殖 户:@Model.Farmer + 生猪定点屠宰代码:260912011 + 屠宰批次:@Model.ButcherBatch + 发货客户:@Model.SendCustomer + 货运车牌:@Model.CarNo + + @**@ + + + + + + + + + + diff --git a/ButcherTraceBack/Views/CodeView/Index.cshtml b/ButcherTraceBack/Views/CodeView/Index.cshtml index ba0096e..af8b36d 100644 --- a/ButcherTraceBack/Views/CodeView/Index.cshtml +++ b/ButcherTraceBack/Views/CodeView/Index.cshtml @@ -16,18 +16,11 @@ - - - - - 商品名称: @Model.Goods_Name - - 生产日期: @Model.SendDate - + @@ -38,34 +31,23 @@ - - - - - - - 检验日期: @Model.SendDate - - - - - - 出厂日期: @Model.SendDate - - - - + + 生猪产地:@Model.PigFarmAddress - 动检证号:@Model.TestingNo - 动检结果:@Model.TestingResult - 动检人员:@Model.TestingMan 养 殖 户:@Model.Farmer - 生猪定点屠宰代码:260912011 + @*动检证号:@Model.TestingNo *@ + 动检人员:耿建平 + 动检结果:合格 + 生产日期:@Model.SendDate 屠宰批次:@Model.ButcherBatch - 发货客户:@Model.SendCustomer + @*生猪定点屠宰代码:260912011*@ + 销 售 商:@Model.SendCustomer 货运车牌:@Model.CarNo + 生 产 商:青岛新万福食品有限公司 + 住 所:莱西市珠海路5号 + 生产地址:青岛市莱西市珠海路5号 @**@ diff --git a/ButcherTraceBack/Views/FreshView/Index - back.cshtml b/ButcherTraceBack/Views/FreshView/Index - back.cshtml new file mode 100644 index 0000000..62accd1 --- /dev/null +++ b/ButcherTraceBack/Views/FreshView/Index - back.cshtml @@ -0,0 +1,78 @@ +@model ButcherTraceBack.Models.FreshTraceBack + +@{ + Layout = null; +} + + + + + + + 追溯信息 @Model.Code + + + + + + + + + + + + + + + + + + + + + + + + + @if (!Model.Goods_Name.Contains("冻")) + { + 检验日期: @Model.ProductDate + } + + + + + + @*出厂日期: @Model.SendDate*@ + + + + + + + @*养 殖 场:@Model.Farm_Name *@ + 动检结果:@Model.TestingResult + 动检人员:@Model.TestingMan + @if (!Model.Goods_Name.Contains("冻")) + { + 屠宰日期:@Model.ButcherDate + @*生产批次:@Model.ProductBatch *@ + 入库日期:@Model.InStoreDate + } + @*发货时间:@Model.SendDate *@ + @*发货客户:@Model.SendCustomer *@ + @*货运车牌:@Model.CarNo *@ + + + + + + + + + + diff --git a/ButcherTraceBack/Views/FreshView/Index.cshtml b/ButcherTraceBack/Views/FreshView/Index.cshtml index 3e39106..eaefd82 100644 --- a/ButcherTraceBack/Views/FreshView/Index.cshtml +++ b/ButcherTraceBack/Views/FreshView/Index.cshtml @@ -21,15 +21,7 @@ - - - - 商品名称: @Model.Goods_Name规格:@Model.Goods_Spec - - - 重量:@Model.Weight KG生产日期: @Model.ProductDate - - + @@ -40,34 +32,25 @@ - - - - - - - 检验日期: @Model.ProductDate - - - - - - @*出厂日期: @Model.SendDate*@ - - - - - 养 殖 场:@Model.Farm_Name - 动检结果:@Model.TestingResult - 动检人员:@Model.TestingMan - 屠宰日期:@Model.ButcherDate - @*生产批次:@Model.ProductBatch *@ - 入库日期:@Model.InStoreDate + + + @*养 殖 场:@Model.Farm_Name *@ + 动检人员:耿建平 + 动检结果:合格 + @if (Model.Goods_Name != null && !Model.Goods_Name.Contains("冻")) + { + 屠宰日期:@Model.ButcherDate + @*生产批次:@Model.ProductBatch *@ + 入库日期:@Model.InStoreDate + } @*发货时间:@Model.SendDate *@ @*发货客户:@Model.SendCustomer *@ @*货运车牌:@Model.CarNo *@ + 生 产 商:青岛新万福食品有限公司 + 住 所:莱西市珠海路5号 + 生产地址:青岛市莱西市珠海路5号 diff --git a/ButcherTraceBack/Web.config b/ButcherTraceBack/Web.config index 5dec34c..7dbc673 100644 --- a/ButcherTraceBack/Web.config +++ b/ButcherTraceBack/Web.config @@ -3,8 +3,17 @@ + - + + +--> \ No newline at end of file diff --git a/ButcherTraceBack/images/wanfu01.jpg b/ButcherTraceBack/images/wanfu01.jpg index a73b04d..b80f4bc 100644 Binary files a/ButcherTraceBack/images/wanfu01.jpg and b/ButcherTraceBack/images/wanfu01.jpg differ diff --git a/ButcherTraceBack/images/wanfu02.jpg b/ButcherTraceBack/images/wanfu02.jpg index eb354c7..a866be5 100644 Binary files a/ButcherTraceBack/images/wanfu02.jpg and b/ButcherTraceBack/images/wanfu02.jpg differ diff --git a/ButcherTraceBack/images/wanfu03.jpg b/ButcherTraceBack/images/wanfu03.jpg index 9e2c96d..1747609 100644 Binary files a/ButcherTraceBack/images/wanfu03.jpg and b/ButcherTraceBack/images/wanfu03.jpg differ diff --git a/ButcherTraceBack/images/wanfu04.jpg b/ButcherTraceBack/images/wanfu04.jpg index 0308d9e..edffe84 100644 Binary files a/ButcherTraceBack/images/wanfu04.jpg and b/ButcherTraceBack/images/wanfu04.jpg differ diff --git a/ButcherTraceBack/images/wanfu05.jpg b/ButcherTraceBack/images/wanfu05.jpg index 8fb933f..6df5c3e 100644 Binary files a/ButcherTraceBack/images/wanfu05.jpg and b/ButcherTraceBack/images/wanfu05.jpg differ diff --git a/ButcherTraceBack/images/wanfu06.jpg b/ButcherTraceBack/images/wanfu06.jpg index b569454..4612739 100644 Binary files a/ButcherTraceBack/images/wanfu06.jpg and b/ButcherTraceBack/images/wanfu06.jpg differ diff --git a/ButcherTraceBack/images2/wanfu01.jpg b/ButcherTraceBack/images2/wanfu01.jpg new file mode 100644 index 0000000..a73b04d Binary files /dev/null and b/ButcherTraceBack/images2/wanfu01.jpg differ diff --git a/ButcherTraceBack/images2/wanfu02.jpg b/ButcherTraceBack/images2/wanfu02.jpg new file mode 100644 index 0000000..eb354c7 Binary files /dev/null and b/ButcherTraceBack/images2/wanfu02.jpg differ diff --git a/ButcherTraceBack/images2/wanfu03.jpg b/ButcherTraceBack/images2/wanfu03.jpg new file mode 100644 index 0000000..9e2c96d Binary files /dev/null and b/ButcherTraceBack/images2/wanfu03.jpg differ diff --git a/ButcherTraceBack/images2/wanfu04.jpg b/ButcherTraceBack/images2/wanfu04.jpg new file mode 100644 index 0000000..0308d9e Binary files /dev/null and b/ButcherTraceBack/images2/wanfu04.jpg differ diff --git a/ButcherTraceBack/images2/wanfu05.jpg b/ButcherTraceBack/images2/wanfu05.jpg new file mode 100644 index 0000000..8fb933f Binary files /dev/null and b/ButcherTraceBack/images2/wanfu05.jpg differ diff --git a/ButcherTraceBack/images2/wanfu06.jpg b/ButcherTraceBack/images2/wanfu06.jpg new file mode 100644 index 0000000..b569454 Binary files /dev/null and b/ButcherTraceBack/images2/wanfu06.jpg differ diff --git a/ButcherTraceBack/images/wanfu07.jpg b/ButcherTraceBack/images2/wanfu07.jpg similarity index 100% rename from ButcherTraceBack/images/wanfu07.jpg rename to ButcherTraceBack/images2/wanfu07.jpg diff --git a/ButcherTraceBack/images/wanfu08.jpg b/ButcherTraceBack/images2/wanfu08.jpg similarity index 100% rename from ButcherTraceBack/images/wanfu08.jpg rename to ButcherTraceBack/images2/wanfu08.jpg diff --git a/ButcherTraceBack/images/wanfu09.jpg b/ButcherTraceBack/images2/wanfu09.jpg similarity index 100% rename from ButcherTraceBack/images/wanfu09.jpg rename to ButcherTraceBack/images2/wanfu09.jpg diff --git a/UpgradeLog.htm b/UpgradeLog.htm new file mode 100644 index 0000000..eccb166 Binary files /dev/null and b/UpgradeLog.htm differ
+ 商品名称: @Model.Goods_Name +
生产日期: @Model.SendDate
检验日期: @Model.SendDate
出厂日期: @Model.SendDate
- 商品名称: @Model.Goods_Name -
检验日期: @Model.ProductDate
- 商品名称: @Model.Goods_Name规格:@Model.Goods_Spec -
- 重量:@Model.Weight KG生产日期: @Model.ProductDate -