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

ProductionMgr/Tnb.ProductionMgr.Entitys/Dto/PrdManage/EquipmentListOutput.cs

@@ -10,7 +10,7 @@ namespace Tnb.ProductionMgr.Entitys.Dto
     /// <summary>
     /// 设备列表输出参数
     /// </summary>
-    public class EquipmentListOutput : EqpEquipment
+    public class EquipmentListOutput //: EqpEquipment 不能直接继承实体类
     {
         /// <summary>
         /// 任务单数量

ProductionMgr/Tnb.ProductionMgr.Entitys/Tnb.ProductionMgr.Entitys.csproj

@@ -9,7 +9,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\BasicData\Tnb.BasicData.Interfaces\Tnb.BasicData.Interfaces.csproj" />
     <ProjectReference Include="..\..\common\Tnb.Common\Tnb.Common.csproj" />
   </ItemGroup>
 

ProductionMgr/Tnb.ProductionMgr/WorkOrderSchedulingService.cs

@@ -50,7 +50,7 @@ namespace Tnb.ProductionMgr
             foreach (var item in multi)
             {
                 MoldsEntity entity = new();
-                entity.Id = SnowflakeIdHelper.NextId();
+                entity.id = SnowflakeIdHelper.NextId();
                 entity.MoldCode = $"m00{index}";
                 entity.MoldName = "磨具" + index;
                 entity.ItemId = item.pId;
@@ -68,7 +68,7 @@ namespace Tnb.ProductionMgr
                     var dic = new Dictionary<string, object>
                     {
                         {"id",item.EqpId },
-                        { "mold_id", item.Id} 
+                        { "mold_id", item.id} 
                     };
                     var row2 = await db.Updateable(dic).AS("eqp_equipment")
                         .WhereColumns("id").