提交代码

MicroServices/Business/Business.Application/ResourceExamineManagement/ResourceExamineAppService.cs

@@ -2919,7 +2919,7 @@ namespace Business.ResourceExamineManagement
                     if (nbrs.Any())
                     {
                         //查出没有备料完成的数据
-                        var noCompletedList = nbrs.Where(x => (x.TransType == "PrevProcess" && x.Ufld1 != "completed") || x.Status.ToUpper() != "C").ToList();
+                        var noCompletedList = nbrs.Where(x => (x.TransType == "PrevProcess" && x.PretreatmentState != "completed") || x.Status.ToUpper() != "C").ToList();
                         if (noCompletedList.Any())
                         {
                             //代表还有没有备料完成
@@ -5380,7 +5380,7 @@ namespace Business.ResourceExamineManagement
                                     break;
                                 }
                                 //需要前处理，但是前处理还未完成
-                                if (nbr.TransType == "PrevProcess" && nbr.Ufld1 != "completed")
+                                if (nbr.TransType == "PrevProcess" && nbr.PretreatmentState != "completed")
                                 {
                                     flag = false;
                                     break;

MicroServices/Business/Business.Application/SystemJobManagement/SystemJobAppService.cs

@@ -1146,7 +1146,7 @@ namespace Business.SystemJobManagement
                     var plists = polists.Where(x => x.po_id == po.Id).ToList();
                     foreach (var dtl in dtls)
                     {
-                        var plist = plists.Find(x => x.ItemNum == dtl.ItemNum);
+                        var plist = plists.Find(x => x.ItemNum == dtl.ItemNum && x.polist_row == dtl.Line);
                         if (plist != null)
                         {
                             plist.state = dtl.Status == null ? 1 : dtl.Status.ToUpper() == "C" ? 0 : 1;
@@ -1157,8 +1157,8 @@ namespace Business.SystemJobManagement
                             plist = new srm_po_list();
                             plist.po_id = po.Id;
                             plist.po_billno = po.po_billno;
+                            plist.polist_row = dtl.Line;
                             plist.GenerateNewId(help.NextId());
-                            plist.polist_row = dtl.ReqLine;
                             plist.pr_purchase_id = po.supplier_id;
                             plist.pr_purchase_name = po.supplier_name;
                             var icitem = itemList.Find(a => a.number == dtl.ItemNum);

MicroServices/Business/Business.Domain/StructuredDB/MES/IC/NbrMaster.cs

@@ -1,4 +1,5 @@
-using Microsoft.EntityFrameworkCore;
+using Amazon.Runtime.Internal.Util;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -58,9 +59,9 @@ namespace Business.Domain
         public string Status { get; set; }
 
         /// <summary>
-        /// 前处理状态
+        /// SAP单号
         /// </summary>
-        [Comment("前处理状态")]
+        [Comment("SAP单号")]
         public string Ufld1 { get; set; }
 
         /// <summary>
@@ -153,5 +154,11 @@ namespace Business.Domain
         /// </summary>
         [Comment("前处理领料单")]
         public string TransType { get; set; }
+
+        /// <summary>
+        /// 前处理状态
+        /// </summary>
+        [Comment("前处理状态")]
+        public string PretreatmentState { get; set; }
     }
 }