MES前端字段补全

快乐的昕的电脑

4 天以前 359c272c0b09cc02a43bf6d6f55a8215f71fa94b

MES前端字段补全

 WebApi/Gs.BaseInfo/Services/MesItemsManager.cs

@@ -46,8 +46,8 @@
            var totalCount = 0;
            var itemsList = Db
                .Queryable<MesItems, SysOrganization, MesUnit, MesUnit, MesUnit,
                    MesUnit, MesUnit, MesUnit, MesDepots, MesItemType>(
                    (a, org, c, d, e, f, g, h, m, n) => new object[]
                    MesUnit, MesUnit, MesUnit, MesDepots, MesItemType,MesStaff>(
                    (a, org, c, d, e, f, g, h, m, n,o) => new object[]
                    {
                        JoinType.Left, a.FSubsidiary == org.Fid,
                        JoinType.Left, a.ItemUnit == c.Id.ToString(),
@@ -57,9 +57,10 @@
                        JoinType.Left, a.SubconUnit == g.Id.ToString(),
                        JoinType.Left, a.ProduceUnit == h.Id.ToString(),
                        JoinType.Left, a.DepotCode == m.DepotId.ToString(),
                        JoinType.Left, a.Fmaterialgroup == n.Id.ToString()
                        JoinType.Left, a.Fmaterialgroup == n.Id.ToString(),
                        JoinType.Left, a.Fpurchaserid == o.Id.ToString()
                    })
                .Select((a, org, c, d, e, f, g, h, m, n) => new MesItems
                .Select((a, org, c, d, e, f, g, h, m, n,o) => new MesItems
                {
                    chkInt = false,
                    FSubsidiary = "(" + org.FNumber + ")" + org.Name,
@@ -71,6 +72,7 @@
                    ProduceUnit = h.Fname,
                    DepotCode = m.DepotName,
                    Fmaterialgroup = n.Tname,
                    Fpurchaserid = o.StaffName,
                    Fforbidstatus = a.Fforbidstatus + ":" + (a.Fforbidstatus == "A" ? "正常" : "禁用"),
                    DataType = a.DataType + ":"
                        + SqlFunc.IF(a.DataType == "Z").Return("暂存")

 WebApi/Gs.BaseInfo/Services/SysDepartmentManager.cs

@@ -48,6 +48,9 @@
                        JoinType.Left, a.FParentID == c.Id.ToString()
                    }).Select((a, org, c) => new SysDepartment
                    {
                        WorkshopCenterCode = a.WorkshopCenterCode,
                        WorkshopCenterName = a.WorkshopCenterName,
                        factoryName = a.factoryName,
                        FSubsidiary = "(" + org.FNumber + ")" + org.Name,
                        FParentID = c.Departmentname,
                        Depextr4 = a.Depextr4+":"+(a.Depextr4 == "A" ? "正常" : "禁用")

 WebApi/Gs.Entity/BaseInfo/SysDepartment.cs

@@ -183,5 +183,21 @@
    [SugarColumn(ColumnName = "FParentID")]
    public string FParentID { get; set; }

 
    /// <summary>
    ///     工作中心编号
    /// </summary>
    [SugarColumn(ColumnName = "WORKSHOP_CENTER_CODE")]
    public string WorkshopCenterCode { get; set; }

    /// <summary>
    ///     工作中心名称
    /// </summary>
    [SugarColumn(ColumnName = "WORKSHOP_CENTER_NAME")]
    public string WorkshopCenterName { get; set; }

    /// <summary>
    ///     工厂名称
    /// </summary>
    [SugarColumn(ColumnName = "factory_name")]
    public string factoryName { get; set; }
}

 WebApi/Gs.HostIIS/appsettings.json

@@ -6,8 +6,8 @@
    }
  },
  "AllowedHosts": "*",
 // "ConnectionStrings": "Data Source=172.100.1.114,12468;Initial Catalog=TEST_MES;User ID=sa;Password =FuDa@2025",
  "ConnectionStrings": "Data Source=172.16.2.238,12468;Initial Catalog=TEST_MES;User ID=sa;Password =FuDa@2025",
  // "ConnectionStrings": "Data Source=172.100.1.114,12468;Initial Catalog=TEST_MES;User ID=sa;Password =FuDa@2025",
  "ConnectionStrings": "Data Source=172.100.1.114,12468;Initial Catalog=TEST_MES;User ID=sa;Password =FuDa@2025",

  "TestErpUrl": "http://192.168.1.149:8066/WebService1.asmx/MesToErpinfoTest",
  "TestErpUrl2": "http://192.168.1.149:8066/WebService1.asmx/MesToErpUpdateFlag",