修复排产单质证书附件显示的bug

src_0nline/ShwasherSys/ShwasherSys.Application/Common/QueryAppService.cs

@@ -167,6 +167,10 @@ namespace ShwasherSys.Common
         Task<List<CustomerDefaultProduct>> GetCustomerDefaultProductByCustomerId(string customerId);  
 
         Task<List<ProductProperty>> GetProductPropertyEntity(string productPropertyType);
+
+
+        ShortMsgDetail ReadShortMsgDetailInfo(ShortMsgDetailDto input);
+
         #endregion
 
     }
@@ -761,12 +765,19 @@ namespace ShwasherSys.Common
 		public ShortMessage GetShortMsgDetailInfo(ShortMsgDetailDto input)
         {
             var entity = ShortMessageRepository.FirstOrDefault(input.MsgID);
+            //var detailInfo = ShortMsgDetailRepository.FirstOrDefault(input.Id);
+            //detailInfo.IsRead = "Y";
+            //ShortMsgDetailRepository.UpdateAsync(detailInfo);
+            return entity;
+        }
+        public ShortMsgDetail ReadShortMsgDetailInfo(ShortMsgDetailDto input)
+        {
+            //var entity = ShortMessageRepository.FirstOrDefault(input.MsgID);
             var detailInfo = ShortMsgDetailRepository.FirstOrDefault(input.Id);
             detailInfo.IsRead = "Y";
             ShortMsgDetailRepository.UpdateAsync(detailInfo);
-            return entity;
+            return detailInfo;
         }
-
         public List<CustomerSendDto> GetCustomerSendDtoByCustomerId(CustomerSendDto customerId)
         {
             var entities = CustomerSendRepository.GetAll().Where(i => i.CustomerId == customerId.CustomerId && i.IsLock == "N");

src_0nline/ShwasherSys/ShwasherSys.Application/NotificationInfo/Dto/ShortMessageCreateDto.cs

@@ -21,5 +21,7 @@ namespace ShwasherSys.NotificationInfo.Dto
 		public string RecieveUserIds  { get; set; }
 
         public string IsDelete { get; set; }
+
+        public int Level { get; set; }
     }
 }

src_0nline/ShwasherSys/ShwasherSys.Application/Order/OrderItemsApplicationService.cs

@@ -289,7 +289,7 @@ namespace ShwasherSys.Order
                 i.SurfaceColor,
                 i.Material,
                 i.PartNo,
-                OrderDate = i.OrderDate?.ToString("yyy-MM-dd"),
+                OrderDate = i.OrderDate?.ToString("yyyy-MM-dd"),
                 i.Quantity,
                 IsPartSend = i.IsPartSend == "Y" ? "是" : "否",
                 IsReport = i.IsReport == "Y" ? "需要" : "不需要",

src_0nline/ShwasherSys/ShwasherSys.Application/ProductionOrderInfo/Dto/ProductionOrderDto.cs

@@ -141,6 +141,11 @@ namespace ShwasherSys.ProductionOrderInfo.Dto
 
         public decimal MaxQuantity { get; set; }
 
+        /// <summary>
+        /// 是否上传过质量检测证书 0:未上传 1:已上传
+        /// </summary>
+        public int HasUploadZs { get; set; }
+
     }
 
     public class ProductionOrderExcelDto
@@ -162,7 +167,5 @@ namespace ShwasherSys.ProductionOrderInfo.Dto
         public string OutsourcingFactoryName { get; set; }
         public string ProcessingType { get; set; }
 		public string SemiProductNo { get; set; }
-   
-      
     }
 }

src_0nline/ShwasherSys/ShwasherSys.Application/ProductionOrderInfo/IProductionOrdersApplicationService.cs

@@ -85,5 +85,7 @@ namespace ShwasherSys.ProductionOrderInfo
         #endregion
 
         Task<bool> UploadProductionZs(ProductionZsUploadDto input);
+
+        Task DeleteProductionZs(string productionOrderNo);
     }
 }

src_0nline/ShwasherSys/ShwasherSys.Application/ProductionOrderInfo/ProductionOrdersApplicationService.cs

@@ -208,7 +208,8 @@ namespace ShwasherSys.ProductionOrderInfo
                              EnterDate = u.EnterDate,
                              InspectDate = u.InspectDate,
                              HasExported = u.HasExported,
-                             MaxQuantity = u.MaxQuantity
+                             MaxQuantity = u.MaxQuantity,
+                             HasUploadZs = u.HasUploadZs
                          };
             //逻辑删除也同时显示出来
             //var property = typeof(ProductionOrder).GetProperty("IsLock");
@@ -2331,10 +2332,12 @@ namespace ShwasherSys.ProductionOrderInfo
                 await AttachRepository.DeleteAsync(i =>
                     i.TableName == "ProductionOrders" && i.ColumnName == "ProductionOrderNo" && i.SourceKey == entity.ProductionOrderNo);
                 await CreateAttach(fileCreateDto);
+                entity.HasUploadZs = ProductionOrderUploadZsEnum.Upload.ToInt();
+                await Repository.UpdateAsync(entity);//更新质量证书状态
             }
             else
             {
-                CheckErrors(IdentityResult.Failed("上传文件信息为空！"));
+                CheckErrors(IwbIdentityResult.Failed("上传文件信息为空！"));
             }
 
             return true;
@@ -2359,6 +2362,19 @@ namespace ShwasherSys.ProductionOrderInfo
 
             return;
         }
+
+
+        public async Task DeleteProductionZs(string productionOrderNo)
+        {
+            var entity = await Repository.FirstOrDefaultAsync(a => a.ProductionOrderNo == productionOrderNo);
+            if (entity != null)
+            {
+                await AttachRepository.DeleteAsync(i =>
+                    i.TableName == "ProductionOrders" && i.ColumnName == "ProductionOrderNo" && i.SourceKey == productionOrderNo);
+                entity.HasUploadZs = ProductionOrderUploadZsEnum.UnUpload.ToInt();
+                await Repository.UpdateAsync(entity);
+            }
+        }
         #endregion
 
     }

src_0nline/ShwasherSys/ShwasherSys.Core/NotificationInfo/ShortMessage.cs

@@ -39,5 +39,9 @@ namespace ShwasherSys.NotificationInfo
         [StringLength(RecieveUserIdsMaxLength)]
         public string RecieveUserIds { get; set; }
 
+        // ÏûÏ¢¼¶±ð
+        [Required] // 1:Ò»°ã 2:ÖØÒª 3:½ô¼±
+        public int MsgLevel { get; set; }
+
     }
 }

src_0nline/ShwasherSys/ShwasherSys.Core/ProductionOrderInfo/ProductionOrder.cs

@@ -137,5 +137,10 @@ namespace ShwasherSys.ProductionOrderInfo
         [DecimalPrecision]
         public decimal MaxQuantity { get; set; }
 
+        /// <summary>
+        /// 是否上传过质量检测证书 0:未上传 1:已上传
+        /// </summary>
+        public int HasUploadZs { get; set; } = 0;
+
     }
 }

src_0nline/ShwasherSys/ShwasherSys.Core/ShwasherCoreConsts.cs

@@ -439,5 +439,12 @@
         //解锁
         UnLock = 1,
     }
-
+    //订单发货前需审核状态，0：锁定库存（冻结库存），1：解除锁定（减去仓库库存冻结部分）
+    public enum ProductionOrderUploadZsEnum
+    {
+        //上传
+        Upload = 1,
+        //未上传
+        UnUpload = 0,
+    }
 }

src_0nline/ShwasherSys/ShwasherSys.EntityFramework/Migrations/202503260610033_排产单新增是否上传质证书和短消息新增系统类型字段.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 排产单新增是否上传质证书和短消息新增系统类型字段 : IMigrationMetadata
+    {
+        private readonly ResourceManager Resources = new ResourceManager(typeof(排产单新增是否上传质证书和短消息新增系统类型字段));
+        
+        string IMigrationMetadata.Id
+        {
+            get { return "202503260610033_排产单新增是否上传质证书和短消息新增系统类型字段"; }
+        }
+        
+        string IMigrationMetadata.Source
+        {
+            get { return null; }
+        }
+        
+        string IMigrationMetadata.Target
+        {
+            get { return Resources.GetString("Target"); }
+        }
+    }
+}

src_0nline/ShwasherSys/ShwasherSys.EntityFramework/Migrations/202503260610033_排产单新增是否上传质证书和短消息新增系统类型字段.cs

@@ -0,0 +1,20 @@
+namespace ShwasherSys.Migrations
+{
+    using System;
+    using System.Data.Entity.Migrations;
+    
+    public partial class 排产单新增是否上传质证书和短消息新增系统类型字段 : DbMigration
+    {
+        public override void Up()
+        {
+            AddColumn("dbo.ProductionOrders", "HasUploadZs", c => c.Int(nullable: false));
+            AddColumn("dbo.ShortMessage", "Level", c => c.Int(nullable: false));
+        }
+        
+        public override void Down()
+        {
+            DropColumn("dbo.ShortMessage", "Level");
+            DropColumn("dbo.ProductionOrders", "HasUploadZs");
+        }
+    }
+}

src_0nline/ShwasherSys/ShwasherSys.EntityFramework/Migrations/202503260837391_updateShortMessage中Level变更成MsgLevel.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 updateShortMessage中Level变更成MsgLevel : IMigrationMetadata
+    {
+        private readonly ResourceManager Resources = new ResourceManager(typeof(updateShortMessage中Level变更成MsgLevel));
+        
+        string IMigrationMetadata.Id
+        {
+            get { return "202503260837391_updateShortMessage中Level变更成MsgLevel"; }
+        }
+        
+        string IMigrationMetadata.Source
+        {
+            get { return null; }
+        }
+        
+        string IMigrationMetadata.Target
+        {
+            get { return Resources.GetString("Target"); }
+        }
+    }
+}

src_0nline/ShwasherSys/ShwasherSys.EntityFramework/Migrations/202503260837391_updateShortMessage中Level变更成MsgLevel.cs

@@ -0,0 +1,20 @@
+namespace ShwasherSys.Migrations
+{
+    using System;
+    using System.Data.Entity.Migrations;
+    
+    public partial class updateShortMessage中Level变更成MsgLevel : DbMigration
+    {
+        public override void Up()
+        {
+            AddColumn("dbo.ShortMessage", "MsgLevel", c => c.Int(nullable: false));
+            DropColumn("dbo.ShortMessage", "Level");
+        }
+        
+        public override void Down()
+        {
+            AddColumn("dbo.ShortMessage", "Level", c => c.Int(nullable: false));
+            DropColumn("dbo.ShortMessage", "MsgLevel");
+        }
+    }
+}

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

@@ -310,6 +310,14 @@
     <Compile Include="Migrations\202502070347445_productHsCodeForCustomerDefaultProduct.Designer.cs">
       <DependentUpon>202502070347445_productHsCodeForCustomerDefaultProduct.cs</DependentUpon>
     </Compile>
+    <Compile Include="Migrations\202503260610033_排产单新增是否上传质证书和短消息新增系统类型字段.cs" />
+    <Compile Include="Migrations\202503260610033_排产单新增是否上传质证书和短消息新增系统类型字段.Designer.cs">
+      <DependentUpon>202503260610033_排产单新增是否上传质证书和短消息新增系统类型字段.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Migrations\202503260837391_updateShortMessage中Level变更成MsgLevel.cs" />
+    <Compile Include="Migrations\202503260837391_updateShortMessage中Level变更成MsgLevel.Designer.cs">
+      <DependentUpon>202503260837391_updateShortMessage中Level变更成MsgLevel.cs</DependentUpon>
+    </Compile>
     <Compile Include="Migrations\Configuration.cs" />
     <Compile Include="Migrations\SeedData\DefaultAppGuidsCreator.cs" />
     <Compile Include="Migrations\SeedData\DefaultFunctionsCreator.cs" />
@@ -364,6 +372,12 @@
     <EmbeddedResource Include="Migrations\202502070347445_productHsCodeForCustomerDefaultProduct.resx">
       <DependentUpon>202502070347445_productHsCodeForCustomerDefaultProduct.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Migrations\202503260610033_排产单新增是否上传质证书和短消息新增系统类型字段.resx">
+      <DependentUpon>202503260610033_排产单新增是否上传质证书和短消息新增系统类型字段.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Migrations\202503260837391_updateShortMessage中Level变更成MsgLevel.resx">
+      <DependentUpon>202503260837391_updateShortMessage中Level变更成MsgLevel.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/Controllers/OrderInfoController.cs

@@ -155,6 +155,7 @@ namespace ShwasherSys.Controllers
             ViewBag.OrderItemStatus = StatesAppService.GetSelectLists("OrderItems", "OrderItemStatusId",i=>i.CodeValue!="11");
             //ViewBag.OrderStatusStr = StatesAppService.GetSelectListStrs("OrderHeader", "OrderStatusId");
             ViewBag.OrderSaleType = StatesAppService.GetSelectLists("OrderHeader", "SaleType");
+            ViewBag.EmergencyLevel = StatesAppService.GetSelectLists("OrderItems", "EmergencyLevel");
             return View();
         }
        [AbpMvcAuthorize(PermissionNames.PagesOrderInfoOrderItemStatistics), AuditLog("订单明细统计")]

src_0nline/ShwasherSys/ShwasherSys.Web/Views/Layout/_MainHeader.cshtml

@@ -329,7 +329,17 @@
                             $("#sendDatetime").html(res.sendTime);
                             $("#msgContent").html(res.content);
                             $("#modal_alarm").modal("show");
-                            QueryShortMsg();
+                            //QueryShortMsg();
+                            $("#modal_alarm .setMsgRead").off('click.setMsgRead').on('click.setMsgRead', function () {
+								SaveAjax(window.appUrl + "Query/ReadShortMsgDetailInfo", {
+                                    data: { Id: detailId, MsgID: id },
+									isValidate: false,
+                                    isAlert: false,
+                                    success: function (res) {
+										$("#modal_alarm").modal("hide");
+                                    }
+                                })
+                            })
                         }
                        
                     }

src_0nline/ShwasherSys/ShwasherSys.Web/Views/NotificationInfo/ShortMsgMg.cshtml

@@ -6,7 +6,6 @@
     /**/
     ViewBag.ActiveMenu = PermissionNames.PagesNotificationInfoShortMsgMg; //The menu item will be active for this page.
     ViewBag.Title = "短消息管理";
-    
 
 }
 @section css
@@ -14,8 +13,9 @@
     <link rel="stylesheet" href="~/Content/Plugins/bootstrap-datetimepicker/css/bootstrap-datetimepicker-wr.css" />
     <link href="~/Content/Plugins/kindeditor/themes/default/default.css" rel="stylesheet" />
 }
+@*<button type="button" onclick="createNotice()">测试</button>*@
 <div class="table-box mr-4  iwb-bootstrap-table">
-    <input type="hidden" id="IsLock" value="N" />
+    <input type="hidden" id="IsLock" value="N"/>
     @Html.Action("ToolMenu", "Layout", new { pageName = ViewBag.ActiveMenu })
     <table id="table"
            data-url="/api/services/app/ShortMsgDetail/GetAllByUser"
@@ -30,14 +30,14 @@
            data-click-to-select="true"
            data-single-select="false">
         <thead>
-            <tr class="row" id="header">
-                <th data-field="state" data-checkbox="true"></th>
-                <th data-align="center" data-field="isRead" data-formatter="IsReadFormatter">是否已读</th>
-                <th data-align="center" data-field="content">消息</th>
-                <th data-align="center" data-field="sendUserID">发送人</th>
-                <th data-align="center" data-field="sendTime">发送时间</th>
-                <th data-align="center" data-formatter="ActionFormatter"></th>
-            </tr>
+        <tr class="row" id="header">
+            <th data-field="state" data-checkbox="true"></th>
+            <th data-align="center" data-field="isRead" data-formatter="IsReadFormatter">是否已读</th>
+            <th data-align="center" data-field="content">消息</th>
+            <th data-align="center" data-field="sendUserID">发送人</th>
+            <th data-align="center" data-field="sendTime">发送时间</th>
+            <th data-align="center" data-formatter="ActionFormatter"></th>
+        </tr>
         </thead>
     </table>
 </div>
@@ -136,7 +136,21 @@
              
 
             }
+
+			
         });
+
+        //function createNotice() {
+         
+        //    SaveAjax({
+	       //     url: window.appUrl + 'Common/WriteShortMessage?sendman=admin&recieveIds=admin&title=wwwww&content=qqqqqqq&isSendMail=false',
+	       //     isAlert: false,
+	       //     isValidate: false,
+	       //     success: function (res) {
+		      //      RefreshTable();
+	       //     }
+        //   });
+        //}
         function IsReadFormatter(v, r) {
             if (r.isRead==="Y") {
                 return '<span class="label label-primary">已读</span>';

src_0nline/ShwasherSys/ShwasherSys.Web/Views/OrderInfo/NotCompleteOrderItem.cshtml

@@ -6,13 +6,14 @@
 @using ShwasherSys.Models.Modal
 
 @{
-	/**/
-	ViewBag.ActiveMenu = PermissionNames.PagesOrderInfoNotCompleteOrderItem; //The menu item will be active for this page.
-	ViewBag.Title = "未完成订单明细查询";
-	bool isCanViewPrice = IsGranted(PermissionNames.PagesOrderInfoOrderMgQueryOrderPrice);
-	List<SelectListItem> OrderStatusList = ViewBag.OrderStatus;
-	List<SelectListItem> OrderSaleTypeList = ViewBag.OrderSaleType;
-	List<SelectListItem> OrderItemStatusList = new List<SelectListItem>()
+    /**/
+    ViewBag.ActiveMenu = PermissionNames.PagesOrderInfoNotCompleteOrderItem; //The menu item will be active for this page.
+    ViewBag.Title = "未完成订单明细查询";
+    bool isCanViewPrice = IsGranted(PermissionNames.PagesOrderInfoOrderMgQueryOrderPrice);
+    List<SelectListItem> OrderStatusList = ViewBag.OrderStatus;
+    List<SelectListItem> emergencyLevelList = ViewBag.EmergencyLevel;
+    List<SelectListItem> OrderSaleTypeList = ViewBag.OrderSaleType;
+    List<SelectListItem> OrderItemStatusList = new List<SelectListItem>()
 {
 new SelectListItem()
 {
@@ -20,8 +21,8 @@ Text = "未完成",
 Value = "N"
 }
 };//ViewBag.OrderItemStatus;
-	OrderItemStatusList.AddRange((List<SelectListItem>)ViewBag.OrderItemStatus);
-	List<SelectListItem> isOverdue = new List<SelectListItem>()
+    OrderItemStatusList.AddRange((List<SelectListItem>)ViewBag.OrderItemStatus);
+    List<SelectListItem> isOverdue = new List<SelectListItem>()
 {
 
 new SelectListItem()
@@ -36,27 +37,27 @@ Text = "超期",
 Value = "1"
 }
 };
-	List<SelectListItem> storeCompleteState = new List<SelectListItem>()
-	{
+    List<SelectListItem> storeCompleteState = new List<SelectListItem>()
+    {
 
-		new SelectListItem()
-		{
-			Text = "货物不齐全",
-			Value = "0"
-		}
-		,
-		new SelectListItem()
-		{
-			Text = "货物已齐",
-			Value = "1"
-		},
-		new SelectListItem()
-		{
-			Text = "货物已齐,待改包",
-			Value = "2"
-		}
-	};
-	var searchForm = new SearchFormViewModal(new List<SearchItem>()
+        new SelectListItem()
+        {
+            Text = "货物不齐全",
+            Value = "0"
+        }
+        ,
+        new SelectListItem()
+        {
+            Text = "货物已齐",
+            Value = "1"
+        },
+        new SelectListItem()
+        {
+            Text = "货物已齐,待改包",
+            Value = "2"
+        }
+    };
+    var searchForm = new SearchFormViewModal(new List<SearchItem>()
 {
 
 new SearchItem("sendDate", "发货日期",FiledType.D,ExpType.GreaterOrEqual),
@@ -64,15 +65,15 @@ new SearchItem("sendDate", "到",FiledType.D,ExpType.LessOrEqual),
 new SearchItem("customerId", "客户编号").SetSearchIcon("query_customer_modal"),
 new SearchItem("isOverdue", "已超过送货日期").SetSearchItem(isOverdue),
     new SearchItem("orderNo", "订单流水号"),
-	new SearchItem("saleType", "内销/外销",FiledType.Inull,ExpType.Equal).SetSearchItem(OrderSaleTypeList),
+    new SearchItem("saleType", "内销/外销",FiledType.Inull,ExpType.Equal).SetSearchItem(OrderSaleTypeList),
 new SearchItem("orderItemStatusId", "订单明细状态",FiledType.Inull,ExpType.Equal).SetSearchItem(OrderItemStatusList,isAddBlank:false),
-	new SearchItem("productName", "产品名称"),
-	new SearchItem("model", "规格"),
-	new SearchItem("material", "材质"),
-	new SearchItem("surfaceColor", "表色"),
-	new SearchItem("partNo", "零件号"),
-	new SearchItem("stockNo", "客户订单号"),
-	new SearchItem("StoreCompleteState", "是否库齐",FiledType.I,ExpType.Equal).SetSearchItem(storeCompleteState),
+    new SearchItem("productName", "产品名称"),
+    new SearchItem("model", "规格"),
+    new SearchItem("material", "材质"),
+    new SearchItem("surfaceColor", "表色"),
+    new SearchItem("partNo", "零件号"),
+    new SearchItem("stockNo", "客户订单号"),
+    new SearchItem("StoreCompleteState", "是否库齐",FiledType.I,ExpType.Equal).SetSearchItem(storeCompleteState),
 }, false);
 }
 @section css{
@@ -124,35 +125,36 @@ new SearchItem("orderItemStatusId", "订单明细状态",FiledType.Inull,ExpType
            data-single-select="false"
            data-show-jumpto="true">
         <thead>
-            <tr class="row" id="header">
-                <th data-field="state" data-checkbox="true"></th>
-                <th data-align="center" data-field="orderNo" data-width="100">订单流水号</th>
-                <th data-align="center" data-field="stockNo">客户订单号</th>
-                <th data-align="center" data-field="customerName">客户</th>
-                <th data-align="center" data-field="orderDate" data-formatter="OrderDateFormatter">订单日期</th>
-                <th data-align="center" data-field="partNo">零件号</th>
-                <th data-align="center" data-field="productName">产品名称</th>
-                <th data-align="center" data-field="model">型号</th>
-                <th data-align="center" data-field="material">材质</th>
-                <th data-align="center" data-field="surfaceColor">表色</th>
-                <th data-align="center" data-field="rigidity">硬度</th>
-                <th data-align="center" data-field="quantity" data-formatter="QuantityFormatter">数量</th>
-                <th data-align="center" data-field="isSendQuantity">已发数量</th>
-                <th data-align="center" data-field="remainingQuantity">剩余数</th>
-                <th data-align="center" data-field="sendDate" data-formatter="SendDateFormatter">送货日期</th>
-                @*<th data-align="center" data-field="saleType" data-formatter="SaleTypeFormatter">外销/内销</th>
-                <th data-align="center" data-field="isReport" data-formatter="IsReportFormatter">检验报告</th>*@
-                <th data-align="center" data-field="isPartSend" data-formatter="IsPartSendFormatter">部分送货</th>
-                <th data-align="center" data-field="orderItemStatusName" data-formatter="OrderItemStatusFormatter">状态</th>
-                <th data-align="center" data-field="storeCompleteState" data-formatter="StoreCompleteStateFormatter">是否库齐</th>
-                <th data-align="center" data-field="productNo">产品编号</th>
-                @if (isCanViewPrice)
-                {
-                    <th data-align="center" data-field="currencyId">货币</th>
-                    <th data-align="center" data-field="totalPrice" data-formatter="TotalPriceFormatter">含税总价</th>
-                    <th data-align="center" data-field="afterTaxTotalPrice" data-formatter="TotalPriceFormatter">不含税总价</th>
-                }
-            </tr>
+			<tr class="row" id="header">
+				<th data-field="state" data-checkbox="true"></th>
+				<th data-align="center" data-field="orderNo" data-width="100">订单流水号</th>
+				<th data-align="center" data-field="stockNo">客户订单号</th>
+				<th data-align="center" data-field="customerName">客户</th>
+				<th data-align="center" data-field="orderDate" data-formatter="OrderDateFormatter">订单日期</th>
+				<th data-align="center" data-field="partNo">零件号</th>
+				<th data-align="center" data-field="productName">产品名称</th>
+				<th data-align="center" data-field="model">型号</th>
+				<th data-align="center" data-field="material">材质</th>
+				<th data-align="center" data-field="surfaceColor">表色</th>
+				<th data-align="center" data-field="rigidity">硬度</th>
+				<th data-align="center" data-field="quantity" data-formatter="QuantityFormatter">数量</th>
+				<th data-align="center" data-field="isSendQuantity">已发数量</th>
+				<th data-align="center" data-field="remainingQuantity">剩余数</th>
+				<th data-align="center" data-field="sendDate" data-formatter="SendDateFormatter">送货日期</th>
+				@*<th data-align="center" data-field="saleType" data-formatter="SaleTypeFormatter">外销/内销</th>
+		<th data-align="center" data-field="isReport" data-formatter="IsReportFormatter">检验报告</th>*@
+				@*<th data-align="center" data-field="isPartSend" data-formatter="IsPartSendFormatter">部分送货</th>*@
+			    <th data-align="center" data-field="emergencyLevel" data-formatter="EmergencyLevelFormatter">紧急程度</th>
+				<th data-align="center" data-field="orderItemStatusName" data-formatter="OrderItemStatusFormatter">状态</th>
+				<th data-align="center" data-field="storeCompleteState" data-formatter="StoreCompleteStateFormatter">是否库齐</th>
+				<th data-align="center" data-field="productNo">产品编号</th>
+				@if (isCanViewPrice)
+				{
+					<th data-align="center" data-field="currencyId">货币</th>
+					<th data-align="center" data-field="totalPrice" data-formatter="TotalPriceFormatter">含税总价</th>
+					<th data-align="center" data-field="afterTaxTotalPrice" data-formatter="TotalPriceFormatter">不含税总价</th>
+				}
+			</tr>
         </thead>
     </table>
 </div>
@@ -426,7 +428,16 @@ new SearchItem("orderItemStatusId", "订单明细状态",FiledType.Inull,ExpType
             var orderDate = new Date(v);
             return '<span style="text-decoration:underline;" >' + orderDate.Format('yyyy-MM-dd') + '</span>';
         }
-
+		function EmergencyLevelFormatter(v, r) {
+			let result = '';
+			var name = $('#hid-emergencyLevel option[value="' + v + '"]').text();
+			if (v === 1) {
+				result += '<span class="label label-success">' + name + '</span>';
+			} else {
+				result += '<span class="label label-danger">' + name + '</span>';
+			}
+			return result;
+		}
 
     </script>
     <script>
@@ -515,6 +526,14 @@ new SearchItem("orderItemStatusId", "订单明细状态",FiledType.Inull,ExpType
             return len;
         }
     </script>
+   
 
+}
+<section style="display: none">
+    <select id="hid-type">
+        <option value=""></option>
+    </select>
 
-}
+    @Html.DropDownList("hid-emergencyLevel", emergencyLevelList);
+    @*@Html.DropDownList("hide-StoreHouses", storeHouses)*@
+</section>

src_0nline/ShwasherSys/ShwasherSys.Web/Views/OrderInfo/OrderStatusMg.cshtml

@@ -1748,7 +1748,7 @@ new SearchItem("saleMan", "业务员",showField:"saleManName").SetSearchIcon("qu
         function EmergencyLevelFormatter(v, r) {
             let result = '';
             var name = $('#hid-emergencyLevel option[value="' + v + '"]').text();
-            if (v === '1') {
+            if (v === 1) {
                 result += '<span class="label label-success">' + name + '</span>';
             } else {
                 result += '<span class="label label-danger">' + name + '</span>';

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

@@ -4,7 +4,7 @@
 @using ShwasherSys.Models.Modal
 @model List<SelectListItem>[]
 <section>
-	<div class="modal fade" id="ApplyEnterStoreModal" role="dialog" tabindex="-1" aria-labelledby="ModalLabel" aria-hidden="true">
+	<div class="modal fade" id="ApplyEnterStoreModal" role="dialog" tabindex="-1" aria-labelledby="ModalLabel" >
 		<div class="modal-dialog  modal-dialog-centered" role="document">
 			<div class="modal-content" style="min-width: 850px;">
 
@@ -77,7 +77,7 @@
 </section>
 <section>
 	<!--Main Modal-->
-	<div class="modal fade" id="modalEnterQuantity" role="dialog" tabindex="-1" aria-labelledby="ModalLabel" aria-hidden="true">
+	<div class="modal fade" id="modalEnterQuantity" role="dialog" tabindex="-1" aria-labelledby="ModalLabel" >
 		<div class="modal-dialog  modal-dialog-centered" role="document">
 			<div class="modal-content" style="min-width: 850px;">
 				@Html.Partial("Modals/_ModalHeader", new ModalHeaderViewModel("修改申请数量", ""))
@@ -104,7 +104,7 @@
 
 <section>
 	<!--Main Modal-->
-	<div class="modal fade" id="RmStoreUseModal" role="dialog" tabindex="-1" aria-labelledby="ModalLabel" aria-hidden="true">
+	<div class="modal fade" id="RmStoreUseModal" role="dialog" tabindex="-1" aria-labelledby="ModalLabel" >
 		<div class="modal-dialog  modal-dialog-centered" role="document">
 			<div class="modal-content" style="min-width: 850px;">
 				@Html.Partial("Modals/_ModalHeader", new ModalHeaderViewModel("原料使用情况", ""))
@@ -135,7 +135,7 @@
 
 <section>
 	<!--Main Modal-->
-	<div class="modal fade" id="BindOrderModal" role="dialog" tabindex="-1" aria-labelledby="ModalLabel" aria-hidden="true">
+	<div class="modal fade" id="BindOrderModal" role="dialog" tabindex="-1" aria-labelledby="ModalLabel" >
 		<div class="modal-dialog  modal-dialog-centered" role="document" style="width: 1000px;">
 			<div class="modal-content" style="min-width: 850px;">
 				@Html.Partial("Modals/_ModalHeader", new ModalHeaderViewModel("订单绑定", ""))
@@ -184,7 +184,7 @@
 </section>
 <section>
 	<!--Main Modal-->
-	<div class="modal fade" id="ExtendOrderModal" role="dialog" tabindex="-1" aria-labelledby="ModalLabel" aria-hidden="true">
+	<div class="modal fade" id="ExtendOrderModal" role="dialog" tabindex="-1" aria-labelledby="ModalLabel" >
 		<div class="modal-dialog  modal-dialog-centered" role="document" style="width: 1000px;">
 			<div class="modal-content" style="min-width: 850px;">
 				@Html.Partial("Modals/_ModalHeader", new ModalHeaderViewModel("订单绑定", ""))
@@ -219,7 +219,7 @@
 </section>
 
 <section>
-	<div class="modal fade" id="SelectMoldModal" role="dialog" tabindex="-1" aria-labelledby="ModalLabel" aria-hidden="true">
+	<div class="modal fade" id="SelectMoldModal" role="dialog" tabindex="-1" aria-labelledby="ModalLabel" >
 		<div class="modal-dialog  modal-dialog-centered" role="document">
 			<div class="modal-content" style="min-width: 450px;">
 				@Html.Partial("Modals/_ModalHeader", new ModalHeaderViewModel("模具-(非强制选择可直接保存开始生产)", ""))
@@ -241,7 +241,7 @@
 </section>
 
 <section>
-	<div id="modal_zs_Import" class="modal fade" role="dialog" tabindex="-1" aria-labelledby="ModalLabel" aria-hidden="true">
+	<div id="modal_zs_Import" class="modal fade" role="dialog" tabindex="-1" aria-labelledby="ModalLabel" >
 		<div class="modal-dialog  modal-dialog-centered" role="document">
 			<div class="modal-content">
 				@Html.Partial("Modals/_ModalHeader", new ModalHeaderViewModel("质量证书导入", ""))
@@ -271,7 +271,7 @@
 							{
 								Id="downloadFile",
 								InputStr = "<div class=\"col-md-10\">" +
-										   "<button  type=\"button\" class=\"btn btn-success waves-effect\"  style=\"min-width: 100px; background-color: #678ceb;border: 1px solid #678ceb;\" onclick=\"show_file_zs(this)\"><span style=\"color:red;\" class=\"zs_file_path\"></span>查看</button></div>"
+										   "<button  type=\"button\" class=\"btn btn-success waves-effect\"  style=\"min-width: 1px; background-color: #678ceb;border: 1px solid #678ceb;\" onclick=\"show_file_zs(this)\"><span style=\"color:red;\" class=\"zs_file_path\"></span></button><button type=\"button\" class=\"btn btn-danger del-zs-file\">删除</button></div>"
 							}
 								};
 				}
@@ -990,11 +990,12 @@
 		}
 	</script>
 
-	<script id="formatter">
+    <script id="formatter">
 		function SemiProductNoFormatter(v, r) {
 			let res = '<span class="table-action" onclick="f_ShowImage(this,\'' + r.semiProductNo + '\')">' + v + '</span>';
 			res += (r.productionOrderStatus != 1 && r.productionOrderStatus != 7 && r.productionOrderNo.length == 7) ? `<span class="table-action" onclick="f_selectMold(${r.id})">模具</span>` : '';
-			res += `<span class="table-action" onclick="f_open_zzs_modal('${r.productionOrderNo}')">质证书</span>`;
+			res += r.hasUploadZs == 1 ?
+				`<span class="table-action" onclick="show_file_zs('${r.productionOrderNo}')">质证书</span><i  class="iconfont icon-edit" onclick="f_open_zzs_modal('${r.productionOrderNo}')"></i>` : `<span class="table-action" onclick="f_open_zzs_modal('${r.productionOrderNo}')">质证书</span>`
 			return res
 		}
 
@@ -1190,34 +1191,73 @@
 				isAlert: false,
 				isValidate: false,
 				success: function (res) {
-					$("#modal_zs_Import .zs_file_path").text('')
+					$("#modal_zs_Import .zs_file_path").text('未上传')
 					$("#modal_zs_Import .custom-file-label").text('')
+					$("#modal_zs_Import .del-zs-file").hide()
 					if (res && res.length > 0) {
 						let filepath = res[0].filePath;
 						let fileName = filepath.split(/[\\/]/).pop()
 						$("#modal_zs_Import .zs_file_path").data("path", filepath)
 						$("#modal_zs_Import .zs_file_path").text(fileName)
+						$("#modal_zs_Import .del-zs-file").show()
+
+						$("#modal_zs_Import .del-zs-file").off('click.del-zs-file').on('click.del-zs-file', (e) => {//绑定删除文件事件
+							abp.message.confirm("确认删除上传的附件","确认删除？",function(){
+							     SaveAjax({
+				                        url: window.appUrl + "ProductionOrders/DeleteProductionZs?productionOrderNo=" + pNo,
+				                        isAlert: false,
+				                        isValidate: false,
+				                        success: function (res) {
+								                   $("#modal_zs_Import .zs_file_path").data("path", '')
+                                                   $("#modal_zs_Import .zs_file_path").text('未上传')
+											       $("#modal_zs_Import .del-zs-file").hide() //文件删除按钮隐藏起来
+											       RefreshTable();
+                                          }
+                                        });
+							
+							 })
+						})
 					}
 					OpenModal(window.appUrl + "ProductionOrders/UploadProductionZs",
 						{
 							data: { productionOrderNo: pNo, constraintExt:"pdf,jpg,png,JPG,PNG"},
 							modal: $("#modal_zs_Import"),
-							success: function () { $("#modal_zs_Import").modal("hide");  }
+							success: function () { $("#modal_zs_Import").modal("hide");  RefreshTable(); }
 						});
 				}
 			});
 		}
 		function show_file_zs(that) {
-			const path = $(that).find('.zs_file_path').data("path")
-			if (path) {
-				const parts = path.split('.');
-				let fileExt = parts.length > 1 ? parts.pop() : '';
-				if (officeFileExt.indexOf(fileExt) > 0) {
-					OpenFile(path, 'office', { height: 800 });
-				} else {
-					OpenFile(path, null, { height: 800 });
+			const openFile = (path) => {
+				if (path) {
+					const parts = path.split('.');
+					let fileExt = parts.length > 1 ? parts.pop() : '';
+					if (officeFileExt.indexOf(fileExt) > 0) {
+						OpenFile(path, 'office', { height: 800 });
+					} else {
+						OpenFile(path, 'img', { height: 800 });
+					}
 				}
 			}
+			if (typeof that === "string") { //如果传入的参数是排产单编号 ProductionOrderNo，直接查询附件表中的path
+				SaveAjax({
+					url: window.appUrl + "Common/GetAttachFile",
+					data: { TableName: 'ProductionOrders', ColName: 'ProductionOrderNo', Key: that },
+					isAlert: false,
+					isValidate: false,
+					success: function (res) {
+						if (res && res.length > 0) {
+							let f0 = res[0]
+							openFile(f0.filePath)
+						}
+					}
+				})
+			} else {//如果是dom，获取dom里的path
+				const path = $(that).find('.zs_file_path').data("path")
+				openFile(path)
+			}
+
+			
 		}
 		function FileCheck(that, id) {
 			var $fileName = $(that).closest(".col-md-10").find('input[name=fileName]');

src_0nline/ShwasherSys/ShwasherSys.Web/Views/Shared/_Layout.cshtml

@@ -10,6 +10,8 @@
     var foot = SettingManager.GetSettingValue(SettingNames.HtmlPagesFooter);
     var version = SettingManager.GetSettingValue(SettingNames.AdminSystemVersion);
     string currentUser =  AbpSession.UserName;
+    var currentUserId =  AbpSession.UserId??0;
+
     //AlertList alerts;
     //IocManager.Instance.Using<IAlertManager>(alertManager => alerts = alertManager.Alerts);
 }
@@ -174,7 +176,7 @@
                     </div>
                     <div class="modal-footer" style="text-align: center;">
                         <button type="button" class="btn btn-default waves-effect" data-dismiss="modal" style="min-width: 100px; background: #FFFFFF; border: 1px solid #DDDDDD;">取消</button>
-                       
+                        <button type="button" class="btn btn-default waves-effect setMsgRead" data-dismiss="modal" style="min-width: 100px; background: #008080; color: #ffffff; border: 1px solid #ffffff;"  >已读</button>
                     </div>
                 </div>
             </div>
@@ -213,7 +215,7 @@
                                 close: 'animated bounceOut'
                             }
                         }).show();
-                        QueryShortMsg();
+                        QueryShortMsg(data.Id);
                     }
                 }
             } catch (e) {
@@ -221,7 +223,7 @@
             }
         }
     };
-   function QueryShortMsg() {
+   function QueryShortMsg(new_id) {
        SaveAjax({
            url: window.appUrl+"ShortMsgDetail/GetMsgByUser",
            isValidate: false,
@@ -231,12 +233,15 @@
                    $("#alarmCount").html(res.total);
                    var content = '<li>';
                    content += '<ul class="menu">';
+                   let show_detail_id;
                    res.items.forEach(function(r) {
                        content += ' <li onclick="ShowMsg(' + r.msgID + ',' + r.id + ')">';
                        content += '  <a href="#">';
                        content += '  <i class="iconfont icon-icon-notice" ></i>' + r.title;
                        content += '   </a>';
                        content += '  </li>';
+                       show_detail_id = show_detail_id ? show_detail_id : r.id  //模态窗弹出只显示第一个
+					   new_id = new_id ? new_id : r.msgID //模态窗弹出只显示第一个
                    });
                    content += '  </ul>';
                    content += '   </li>';
@@ -245,6 +250,9 @@
                    }
 
                    $("#alarmInfo").html(content);
+				   //if (new_id) { //模态窗弹出只显示第一个
+					  // ShowMsg(new_id, show_detail_id)
+       //            }
                } else {
                    $("#alarmCount").html("0");
                }