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

ProductionMgr/Tnb.ProductionMgr.Entities/Entity/ErpEntity/ErpBdMaterial.cs

@@ -61,5 +61,7 @@ namespace Tnb.ProductionMgr.Entities.Entity.ErpEntity
         /// mes物料类型
         /// </summary>
         public string DEFNAME { get; set; }
+        
+        public string UDI { get; set; }
     }
 }

ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs

@@ -4092,6 +4092,15 @@ namespace Tnb.ProductionMgr
         {
             return await _db.Queryable<PrdMoTask>().SingleAsync(x => x.id == id);
         }
+        
+        [HttpPost]
+        public async Task<OrganizeEntity> GetWorkstationByPosition(string id)
+        {
+            return await _db.Queryable<PositionEntity>()
+                .LeftJoin<OrganizeEntity>((a,b)=>a.OrganizeId==b.Id && b.Category==DictConst.RegionCategoryWorkstationCode)
+                .Select((a,b)=>b)
+                .FirstAsync(x => x.Id == id);
+        }
     }
 
 

ProductionMgr/Tnb.ProductionMgr/TimeWorkService.cs

@@ -1071,6 +1071,7 @@ namespace Tnb.ProductionMgr
                                 category_id = categoryId,
                                 unit_id = unitId,
                                 state = "1",
+                                di = erpBdMaterial.UDI,
                                 create_time = DateTime.Now
                             };
                             insertMaterial.Add(basMaterial);
@@ -1120,6 +1121,7 @@ namespace Tnb.ProductionMgr
                                 .SetColumns(x => x.material_standard == erpBdMaterial.MATERIALTYPE)
                                 .SetColumns(x => x.unit_id == unitId)
                                 .SetColumns(x => x.name == erpBdMaterial.NAME)
+                                .SetColumns(x => x.di == erpBdMaterial.UDI)
                                 .Where(x => x.id == materialId)
                                 .ExecuteCommandAsync();