客户新增产品标准导入数据库，分配单模板更改，界面微调整

src_0nline/ShwasherSys/ShwasherSys.Application/ProductInfo/Standard/Dto/StandardDetailDto.cs

@@ -27,6 +27,8 @@ namespace ShwasherSys.ProductInfo.Dto
 		public string StandardAbbr { get; set; }
 		public string StandardAbbrName { get; set; }
 		public string StandardFullName { get; set; }
+
+        public string Model { get; set; }
 	}
     
 }

src_0nline/ShwasherSys/ShwasherSys.Application/ProductInfo/StandardsApplicationService.cs

@@ -188,7 +188,8 @@ namespace ShwasherSys.ProductInfo
 					StandardAbbrName = lua.StandardAbbrName,
 					StandardAbbr = lua.StandardAbbr,
 					StandardFullName = lua.StandardName,
-					Specs = detail.Specs
+					Specs = detail.Specs,
+					Model = detail.Model
 				};
 
 			if (input.SearchList != null && input.SearchList.Count > 0)
@@ -273,53 +274,67 @@ namespace ShwasherSys.ProductInfo
 			//	await StandardCatalogRepository.InsertAsync(catalog);
 			//}
 
-			using var stream = File.OpenRead("C:\\Users\\Lenovo\\Desktop\\项目文档目录\\shwasher\\标准明细整理-导入数据.xlsx");
+			using var stream = File.OpenRead("D:\\workstation\\Iwb-workstation-2022\\Shwasher\\docs\\2025-垫圈标准\\标准明细整理-导入数据.xlsx");
 			var rows = (await stream.QueryAsync(true)).ToList();
 			//rows[0].序号
-
-			foreach (dynamic row in rows)
-			{
-				//var ss = row["序号"];
-				int standardId = Convert.ToInt32(row.编号);
-				string standardName = row.名称 + "";
-				string specs = row.规格 + "";
-				string innerDiameter1 = SplitEx(row.内径);
-				string innerDiameter2 = SplitEx(row.内径, 1);
-
-				string outDiameter1 = SplitEx(row.外径);
-				string outDiameter2 = SplitEx(row.外径, 1);
-				string thickness1 = SplitEx(row.厚度);
-				string thickness2 = SplitEx(row.厚度, 1);
-				string innerChamfer1 = SplitEx(row.内倒角);
-				string innerChamfer2 = SplitEx(row.内倒角, 1);
-				string outChamfer1 = SplitEx(row.外倒角);
-				string outChamfer2 = SplitEx(row.外倒角, 1);
-				string height1 = SplitEx(row.高度);
-				string height2 = SplitEx(row.高度, 1);
-
-				string thousandWeigh = row.千件重 + "";
-
-				StandardDetail detail = new StandardDetail()
-				{
-					StandardId = standardId,
-					StandardName = standardName,
-					Specs = specs,
-					InnerDiameter1 = Convert.ToDecimal(innerDiameter1),
-					InnerDiameter2 = Convert.ToDecimal(innerDiameter2),
-					OutDiameter1 = Convert.ToDecimal(outDiameter1),
-					OutDiameter2 = Convert.ToDecimal(outDiameter2),
-					OutChamfer1 = Convert.ToDecimal(outChamfer1),
-					OutChamfer2 = Convert.ToDecimal(outChamfer2),
-					InnerChamfer1 = Convert.ToDecimal(innerChamfer1),
-					InnerChamfer2 = Convert.ToDecimal(innerChamfer2),
-					Thickness1 = Convert.ToDecimal(thickness1),
-					Thickness2 = Convert.ToDecimal(thickness2),
-					Height1 = Convert.ToDecimal(height1),
-					Height2 = Convert.ToDecimal(height2),
-					ThousandWeigh = Convert.ToDecimal(thousandWeigh.IsNullOrEmpty() ? "0" : thousandWeigh)
-				};
-				await StandardDetailRepository.InsertAsync(detail);
-			}
+            try
+            {
+                foreach (dynamic row in rows)
+                {
+                    //var ss = row["序号"];
+                    int standardId = Convert.ToInt32(row.编号);
+                    if (standardId == 0)
+                    {
+						break;
+                    }
+                    string standardName = row.名称 + "";
+                    string specs = row.规格 + "";
+                    string innerDiameter1 = SplitEx(row.内径);
+                    string innerDiameter2 = SplitEx(row.内径, 1);
+
+                    string outDiameter1 = SplitEx(row.外径);
+                    string outDiameter2 = SplitEx(row.外径, 1);
+                    string thickness1 = SplitEx(row.厚度);
+                    string thickness2 = SplitEx(row.厚度, 1);
+                    string innerChamfer1 = SplitEx(row.内倒角);
+                    string innerChamfer2 = SplitEx(row.内倒角, 1);
+                    string outChamfer1 = SplitEx(row.外倒角);
+                    string outChamfer2 = SplitEx(row.外倒角, 1);
+                    string height1 = SplitEx(row.高度);
+                    string height2 = SplitEx(row.高度, 1);
+
+                    string thousandWeigh = row.千件重 + "";
+                    string modelName = row.型号 + "";
+
+                    StandardDetail detail = new StandardDetail()
+                    {
+                        StandardId = standardId,
+                        StandardName = standardName,
+                        Specs = specs,
+                        InnerDiameter1 = Convert.ToDecimal(innerDiameter1),
+                        InnerDiameter2 = Convert.ToDecimal(innerDiameter2),
+                        OutDiameter1 = Convert.ToDecimal(outDiameter1),
+                        OutDiameter2 = Convert.ToDecimal(outDiameter2),
+                        OutChamfer1 = Convert.ToDecimal(outChamfer1),
+                        OutChamfer2 = Convert.ToDecimal(outChamfer2),
+                        InnerChamfer1 = Convert.ToDecimal(innerChamfer1),
+                        InnerChamfer2 = Convert.ToDecimal(innerChamfer2),
+                        Thickness1 = Convert.ToDecimal(thickness1),
+                        Thickness2 = Convert.ToDecimal(thickness2),
+                        Height1 = Convert.ToDecimal(height1),
+                        Height2 = Convert.ToDecimal(height2),
+                        ThousandWeigh = Convert.ToDecimal(thousandWeigh.IsNullOrEmpty() ? "0" : thousandWeigh),
+                        Model = modelName
+                    };
+                    await StandardDetailRepository.InsertAsync(detail);
+                }
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine(e);
+                throw;
+            }
+			
 		}
 
 		private string SplitEx(dynamic input, int index = 0)
@@ -337,7 +352,10 @@ namespace ShwasherSys.ProductInfo
 			}else if (str.IndexOf("/", StringComparison.Ordinal) > 0)
 			{
 				split = str?.Split(new[] { '/' }, StringSplitOptions.None);
-			}
+			}else if (str.IndexOf("-", StringComparison.Ordinal) > 0)
+            {
+                split = str?.Split(new[] { '-' }, StringSplitOptions.None);
+            }
 			else
 			{
 				return str.Trim();

src_0nline/ShwasherSys/ShwasherSys.Core/ProductInfo/Standard.cs

@@ -129,7 +129,7 @@ namespace ShwasherSys.ProductInfo
 		public decimal? ThousandWeigh { get; set; }
 
 
-
+        public string Model { get; set; }
 
 	}
 }

src_0nline/ShwasherSys/ShwasherSys.EntityFramework/Migrations/202504081005070_updateStandardAddModel.Designer.cs

@@ -0,0 +1,29 @@
+// <auto-generated />
+namespace ShwasherSys.Migrations
+{
+    using System.CodeDom.Compiler;
+    using System.Data.Entity.Migrations;
+    using System.Data.Entity.Migrations.Infrastructure;
+    using System.Resources;
+    
+    [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")]
+    public sealed partial class updateStandardAddModel : IMigrationMetadata
+    {
+        private readonly ResourceManager Resources = new ResourceManager(typeof(updateStandardAddModel));
+        
+        string IMigrationMetadata.Id
+        {
+            get { return "202504081005070_updateStandardAddModel"; }
+        }
+        
+        string IMigrationMetadata.Source
+        {
+            get { return null; }
+        }
+        
+        string IMigrationMetadata.Target
+        {
+            get { return Resources.GetString("Target"); }
+        }
+    }
+}

src_0nline/ShwasherSys/ShwasherSys.EntityFramework/Migrations/202504081005070_updateStandardAddModel.cs

@@ -0,0 +1,20 @@
+namespace ShwasherSys.Migrations
+{
+    using System;
+    using System.Data.Entity.Migrations;
+    
+    public partial class updateStandardAddModel : DbMigration
+    {
+        public override void Up()
+        {
+            AddColumn("dbo.StandardDetail", "Model", c => c.String());
+            //AddColumn("dbo.N_ViewOrderItems", "CustomerRowNo", c => c.String());
+        }
+        
+        public override void Down()
+        {
+            //DropColumn("dbo.N_ViewOrderItems", "CustomerRowNo");
+            DropColumn("dbo.StandardDetail", "Model");
+        }
+    }
+}

src_0nline/ShwasherSys/ShwasherSys.EntityFramework/ShwasherSys.EntityFramework.csproj

@@ -326,6 +326,10 @@
     <Compile Include="Migrations\202503310624028_updateOrderItems.Designer.cs">
       <DependentUpon>202503310624028_updateOrderItems.cs</DependentUpon>
     </Compile>
+    <Compile Include="Migrations\202504081005070_updateStandardAddModel.cs" />
+    <Compile Include="Migrations\202504081005070_updateStandardAddModel.Designer.cs">
+      <DependentUpon>202504081005070_updateStandardAddModel.cs</DependentUpon>
+    </Compile>
     <Compile Include="Migrations\Configuration.cs" />
     <Compile Include="Migrations\SeedData\DefaultAppGuidsCreator.cs" />
     <Compile Include="Migrations\SeedData\DefaultFunctionsCreator.cs" />
@@ -392,6 +396,9 @@
     <EmbeddedResource Include="Migrations\202503310624028_updateOrderItems.resx">
       <DependentUpon>202503310624028_updateOrderItems.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Migrations\202504081005070_updateStandardAddModel.resx">
+      <DependentUpon>202504081005070_updateStandardAddModel.cs</DependentUpon>
+    </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />

src_0nline/ShwasherSys/ShwasherSys.Web/Views/ProductInfo/Standards.cshtml

@@ -156,7 +156,7 @@
             //       </button>
             //    `);
 
-            //$("#Tool1 button").hide();
+            $("#Tool1 button").hide();
             //initQueryTable();
             let changeHeight = function (bEle, aEle, mouseMoveAreaEle) {
 				$("#table").bootstrapTable('resetView', { height: bEle.height() - 35 });
@@ -261,7 +261,7 @@
         //     }
         function importData() {
             abp.ajax({
-                url: '/api/services/app/Standards/ImportData2',
+                url: '/api/services/app/Standards/ImportData',
                 async: true,
                 type: "Post",
                 contentType: 'application/json',

src_0nline/ShwasherSys/ShwasherSys.Web/Views/ProductionInfo/OutProductionOrderMg.cshtml

@@ -49,30 +49,31 @@ new SearchItem("partNo","零件号"),
            data-click-to-select="true"
            data-single-select="false">
         <thead>
-            <tr class="row" id="header">
+			<tr class="row" id="header">
 
-                <th data-field="state" data-checkbox="true"></th>
-                <th data-align="center" data-field="productionOrderNo">排产单号</th>
-                <th data-align="center" data-field="partNo">零件号</th>
-                <th data-align="center" data-field="semiProductName">名称</th>
-                <th data-align="center" data-field="model">规格</th>
-                @*<th data-align="center" data-field="outsourcingFactory">外协厂商</th>*@
-                <th data-align="center" data-field="outsourcingFactoryName">外协厂商</th>
-                <th data-align="center" data-field="quantity">排产数量</th>
-                <th data-align="center" data-field="processingType" data-formatter="ProcessingTypeFormatter">加工类型</th>
-                <th data-align="center" data-field="remark">备注</th>
-                <th data-align="center" data-field="planProduceDate" data-formatter="PlanDateFormatter">计划完成时间</th>
-                @*<th data-align="center" data-field="stoveNo">炉号</th>
-                    <th data-align="center" data-field="carNo">车号</th>*@
-                <th data-align="center" data-field="surfaceColor">表色</th>
-                <th data-align="center" data-field="rigidity">硬度</th>
-                <th data-align="center" data-field="material">材质</th>
-                <th data-align="center" data-field="productionOrderStatus" data-formatter="ProductionOrderStatusFormatter">状态</th>
-                <th data-align="center" data-field="kgWeight">千件重</th>
-                <th data-align="center" data-field="enterDate" data-formatter="DateFormatter">入库时间</th>
-                <th data-align="center" data-field="semiProductNo">半成品编码</th>
-                <th data-align="center" data-formatter="ActionFormatter">操作</th>
-            </tr>
+				<th data-field="state" data-checkbox="true"></th>
+				<th data-align="center" data-field="productionOrderNo">排产单号</th>
+				<th data-align="center" data-field="partNo">零件号</th>
+				<th data-align="center" data-field="semiProductName">名称</th>
+				<th data-align="center" data-field="model">规格</th>
+				@*<th data-align="center" data-field="outsourcingFactory">外协厂商</th>*@
+				<th data-align="center" data-field="outsourcingFactoryName">外协厂商</th>
+				<th data-align="center" data-field="quantity">排产数量</th>
+				<th data-align="center" data-field="timeCreated">创建时间</th>
+				<th data-align="center" data-field="processingType" data-formatter="ProcessingTypeFormatter">加工类型</th>
+				<th data-align="center" data-field="remark">备注</th>
+				<th data-align="center" data-field="planProduceDate" data-formatter="PlanDateFormatter">计划完成时间</th>
+				@*<th data-align="center" data-field="stoveNo">炉号</th>
+		<th data-align="center" data-field="carNo">车号</th>*@
+				<th data-align="center" data-field="surfaceColor">表色</th>
+				<th data-align="center" data-field="rigidity">硬度</th>
+				<th data-align="center" data-field="material">材质</th>
+				<th data-align="center" data-field="productionOrderStatus" data-formatter="ProductionOrderStatusFormatter">状态</th>
+				<th data-align="center" data-field="kgWeight">千件重</th>
+				<th data-align="center" data-field="enterDate" data-formatter="DateFormatter">入库时间</th>
+				<th data-align="center" data-field="semiProductNo">半成品编码</th>
+				<th data-align="center" data-formatter="ActionFormatter">操作</th>
+			</tr>
         </thead>
     </table>
 </div>

src_0nline/ShwasherSys/ShwasherSys.Web/Views/ProductionInfo/RePlatingOutStoreApplyMg.cshtml

@@ -206,8 +206,8 @@ new SearchItem("productNo","成品编码").SetSearchIcon("query_Product_modal"),
 
         function f_RefuseApply(id) {
             //console.log("cancef_RefuseApplylApply", id);
-            abp.message.confirm("确认取消返镀申请?",
-                "取消返镀",
+			abp.message.confirm("确认取消改镀申请?",
+                "取消改镀",
                 function() {
                     abp.ajax({
                         url: window.appUrl + 'ProductionOrders/CancelFinishOutStoreApply',
@@ -315,11 +315,11 @@ new SearchItem("productNo","成品编码").SetSearchIcon("query_Product_modal"),
             var str = '<span class="table-action">暂无操作</span>';;
             if (!r.isConfirm && !r.isClose) { //&&r.applyOutStoreSourceTypeFormatter===5
                 str = `<span class="table-action" onclick="f_createProductionOrder(\'${r.id
-                    }\',\'${r.productionOrderNo}\')"><i class="iconfont icon-right"></i>返镀创建流转单</span>`;
+                    }\',\'${r.productionOrderNo}\')"><i class="iconfont icon-right"></i>改镀创建流转单</span>`;
                 str += `<span class="table-action" onclick="f_RefuseApply(\'${r.id
-                    }\')"><i class="iconfont icon-right"></i>拒绝返镀</span>`;
+                    }\')"><i class="iconfont icon-right"></i>拒绝改镀</span>`;
                 str += `<span class="table-action" onclick="f_ExportApply(\'${r.id
-                    }\')"><i class="iconfont icon-right"></i>导出返镀申请</span>`;
+                    }\')"><i class="iconfont icon-right"></i>导出改镀申请</span>`;
             }
 
             return str;