20240805

src/Khd.Core.Application/WcsTaskApplication.cs

@@ -222,7 +222,7 @@ namespace Khd.Core.Application
                 _dbContext.ChangeTracker.Entries().ToList().ForEach(e => e.Reload());
                 var wcsTask = _dbContext.WcsTask
                     .Where(t => t.taskType == 47)
-                    .Where(t => t.masterId == taskContinue.materialId)
+                    .Where(t => t.materialId == taskContinue.materialId)
                     .FirstOrDefault();
                 if (wcsTask != null)
                 {

src/Khd.Core.Wcs/Global/StaticData.cs

@@ -64,7 +64,7 @@ namespace Khd.Core.Wcs.Global
         public static List<BasePlc> basePlcs = new List<BasePlc>();
         public static List<PlcConfig> PlcConfigs { get; set; }
         public static int DeleteLogDay { get; internal set; }
-        public static List<string> BigContainerCodes = new List<string>(){ "JYHB01020001", "JYHB01020002", "JYHB01020003", "JYHB01020004"};
+        public static List<string> BigContainerCodes = new List<string>(){ "JYHB01020001", "JYHB01020002", "JYHB01020003", "JYHB01020004" };
 
         public static Dictionary<int, Dictionary<string, PlcPoint>> PlcPoints = new Dictionary<int, Dictionary<string, PlcPoint>>();
         public static Dictionary<int, Plc.S7.Plc> PlcDic = new Dictionary<int, Plc.S7.Plc>();

src/Khd.Core.Wcs/Wcs/CreateTaskByRecord.cs

@@ -1667,9 +1667,7 @@ namespace Khd.Core.Wcs.Wcs
                 try
                 {
                     dbContext.ChangeTracker.Entries().ToList().ForEach(e => e.Reload());
-                    //原材料库存
-                    var rawStock = dbContext.WmsRawStock
-                        .Where(t => t.activeFlag == "1").ToList();
+                   
                     //原材料出库记录
                     var rawOutStock = dbContext.WmsRawOutstock
                         .Where(t => t.executeStatus == "0" || t.executeStatus == "1")
@@ -1844,6 +1842,9 @@ namespace Khd.Core.Wcs.Wcs
                                 #endregion
                                 if (endEquip.equipType == 10)//CTU出库到装配区
                                 {
+                                    //原材料库存
+                                    var rawStock = dbContext.WmsRawStock
+                                        .Where(t => t.activeFlag == "1").ToList();
                                     BaseEquip endStationCodeEquip = dbContext.BaseEquip.First(t => t.objid == 10);
                                     if (!string.IsNullOrEmpty(endStationCodeEquip.endStationCode) && endStationCodeEquip.IsOut == 1)
                                     {
@@ -2068,6 +2069,8 @@ namespace Khd.Core.Wcs.Wcs
                                 }
                                 else if (endEquip.equipType == 12)//原材料到柜体验收区,背板安装
                                 {
+                                    var rawStock = dbContext.WmsRawStock
+                                   .Where(t => t.activeFlag == "1").ToList();
                                     bool hasTask = dbContext.WcsTask.Where(t => t.currPointId == endEquip.objid || t.endPointId == endEquip.objid).Any();
                                     if (!hasTask)
                                     {