Merge branch 'master' of http://10.2.1.24:10244/BPA_MES/PZTJ.MES

backend/BPA.MES.Base.Application/BPA.MES.Base.Application.xml

@@ -6007,6 +6007,16 @@
             工单工艺步骤Id
             </summary>
         </member>
+        <member name="P:BPA.MES.Base.Application.Services.WorkInfoCraftstepRecordUpdateInput.WorkId">
+            <summary>
+            工单Id
+            </summary>
+        </member>
+        <member name="P:BPA.MES.Base.Application.Services.WorkInfoCraftstepRecordUpdateInput.PotNum">
+            <summary>
+            锅数
+            </summary>
+        </member>
         <member name="P:BPA.MES.Base.Application.Services.WorkInfoCraftstepRecordUpdateInput.Status">
             <summary>
             状态
@@ -6125,6 +6135,11 @@
             编码
             </summary>
         </member>
+        <member name="P:BPA.MES.Base.Application.Services.WorkInfoQueryPageInput.Status">
+            <summary>
+            工单状态
+            </summary>
+        </member>
         <member name="T:BPA.MES.Base.Application.Services.WorkPublishInput">
             <summary>
             工单下发

backend/BPA.MES.Base.Application/Services/WorkInfoService/Dtos/WorkInfoDto.cs

@@ -87,6 +87,10 @@
         /// 编码
         /// </summary>
         public string Id { get; set; }
+        /// <summary>
+        /// 工单状态
+        /// </summary>
+        public WorkOrderStatusEnum? Status { get; set; }
     }
     /// <summary>
     /// 工单下发

backend/BPA.MES.Base.Application/Services/WorkInfoService/Services/WorkInfoService.cs

@@ -163,6 +163,7 @@ namespace BPA.MES.Base.Application.Services.WorkInfoService.Services
                 .LeftJoin<Pztj_WorkInfoStatusEntity>((a, b, c, d) => d.Id == SqlFunc.Subqueryable<Pztj_WorkInfoStatusEntity>().Where(s => s.WorkId == a.Id).OrderByDesc(s => s.CreateTime).Select(s => s.Id))
                 .WhereIF(!string.IsNullOrEmpty(input.Name), (a, b, c, d) => b.Name.Contains(input.Name))
                 .WhereIF(!string.IsNullOrEmpty(input.Id), (a, b, c, d) => a.Id.Contains(input.Id))
+                .WhereIF(input.Status != null,(a,b,c,d)=>d.Status==input.Status)
                 .Select((a, b, c, d) => new WorkInfoOutput
                 {
                     Id = a.Id.SelectAll(),
@@ -359,6 +360,14 @@ namespace BPA.MES.Base.Application.Services.WorkInfoService.Services
         [HttpPost]
         public async Task<bool> UpdateWorkCraftStepsStatus(WorkInfoCraftstepRecordUpdateInput input)
         {
+
+
+         var entityFrist = await _dbContext.Queryable<WorkInfoCraftstepRecordEntity>().Where(x => x.Id == input.WorkCraftstepId).FirstAsync();
+
+
+
+
+
             if (!string.IsNullOrEmpty(input.WorkId))
             {
                 bool res = await _dbContext.Updateable<WorkInfoCraftstepRecordEntity>()