Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

Conflicts:
	ProductionMgr/Tnb.ProductionMgr/Tnb.ProductionMgr.csproj

ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PADPackageTaskPageOutput.cs

@@ -187,5 +187,22 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
         /// </summary>
         public string di { get; set; }
         
+        /// <summary>
+        /// 上料库位id
+        /// </summary>
+        public string? upmat_location_id { get; set; }
+        public string? upmat_location_code { get; set; }
+    
+        /// <summary>
+        /// 下料库位id
+        /// </summary>
+        public string? downmat_location_id { get; set; }
+        public string? downmat_location_code { get; set; }
+    
+        /// <summary>
+        /// 入库仓库id
+        /// </summary>
+        public string? instock_warehouse_id { get; set; }
+        
     }
 }

ProductionMgr/Tnb.ProductionMgr/PrdPackReportService.cs

@@ -473,7 +473,10 @@ namespace Tnb.ProductionMgr
                     third_equip_code = l.equip_code,
                     weight_name = l.label_point,
                     category_id = b.category_id,
-                    as_location_id = f.as_location_id
+                    as_location_id = f.as_location_id,
+                    upmat_location_id = f.upmat_location_id,
+                    downmat_location_id = f.as_location_id,
+                    instock_warehouse_id = f.as_location_id,
                 })
                 .MergeTable()
                 .OrderBy($"{input.sidx} {input.sort}")
@@ -487,6 +490,16 @@ namespace Tnb.ProductionMgr
                         BasLocation basLocation = await _db.Queryable<BasLocation>().SingleAsync(x => x.id == item.as_location_id);
                         item.as_location_code = basLocation.location_code;
                     }
+                    if (item.upmat_location_id!=null && !item.upmat_location_id.IsEmpty())
+                    {
+                        BasLocation basLocation = await _db.Queryable<BasLocation>().SingleAsync(x => x.id == item.upmat_location_id);
+                        item.upmat_location_code = basLocation.location_code;
+                    }
+                    if (item.downmat_location_id!=null && !item.downmat_location_id.IsEmpty())
+                    {
+                        BasLocation basLocation = await _db.Queryable<BasLocation>().SingleAsync(x => x.id == item.downmat_location_id);
+                        item.downmat_location_code = basLocation.location_code;
+                    }
 
                     if (item.schedule_type == 2)
                     {

ProductionMgr/Tnb.ProductionMgr/RedisDataService.cs

@@ -106,7 +106,7 @@ namespace Tnb.ProductionMgr
                     ["DevName"] = device,
                     ["token"] = _eleCtlCfg.token,
                     ["TagName"] = eqpDaq3.label_point,
-                    ["Value"] = "false",
+                    ["Value"] = "true",
                 };
                 Log.Information($"称重完成参数:{JsonConvert.SerializeObject(dicCommand2)}");
                 for (int i = 0; i < 5; i++)

ProductionMgr/Tnb.ProductionMgr/Tnb.ProductionMgr.csproj

@@ -6,6 +6,8 @@
     <Nullable>enable</Nullable>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
     <Configurations>Debug;Release;tianyi</Configurations>
+    <DebugType>full</DebugType>
+    <DebugSymbols>true</DebugSymbols>
 	<ServerGarbageCollection>false</ServerGarbageCollection>
   </PropertyGroup>