1
hao
7 天以前 ea4002e9f17e4659cf1905250780f5e0a5b17473
1
已修改5个文件
23 ■■■■■ 文件已修改
StandardInterface/MES.Service/Modes/MesItems.cs 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardInterface/MES.Service/service/BasicData/Material/MesItemsManager.cs 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardInterface/MES.Service/service/BasicData/Production/ProductionOrderManager.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardInterface/MESApplication/Controllers/SRM/MesDeliveryNoteBarcodeController.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardInterface/MESApplication/appsettings.json 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardInterface/MES.Service/Modes/MesItems.cs
@@ -487,5 +487,20 @@
    /// </summary>
    [SugarColumn(ColumnName = "MJBM")]
    public string? MJBM { get; set; }
    /// <summary>
    ///     客户物料编码
    /// </summary>
    [SugarColumn(ColumnName = "KHWLBM")]
    public string? Khwlbm { get; set; }
    /// <summary>
    ///     颜色
    /// </summary>
    [SugarColumn(ColumnName = "YS")]
    public string? Ys { get; set; }
    /// <summary>
    ///     下道工序
    /// </summary>
    [SugarColumn(ColumnName = "NEXT_GX")]
    public string? NesxGx { get; set; }
}
StandardInterface/MES.Service/service/BasicData/Material/MesItemsManager.cs
@@ -219,6 +219,9 @@
            F_BZGS     =item.F_BZGS,
            WLFZMC=item.F_FZMC,
            MJBM =item.MJBM,
            Khwlbm =item.KHWLBM,
            Ys=item.YS,
            NesxGx=item.NEXT_GX,
        };
    }
StandardInterface/MES.Service/service/BasicData/Production/ProductionOrderManager.cs
@@ -144,6 +144,7 @@
            Fsubid = erpDto.FSUBID,
            Fsubbillnoseq = erpDto.FSUBBILLNOSEQ,
            Fsubbillno = erpDto.FSUBBILLNO,
            Caa020 = erpDto.FSUBBILLNO,
            SrcBillType = erpDto.FSrcBillType,
            SrcBillNo = erpDto.FSrcBillNo,
            SrcBillentryseq = erpDto.FSrcBillEntrySeq,
StandardInterface/MESApplication/Controllers/SRM/MesDeliveryNoteBarcodeController.cs
@@ -210,6 +210,7 @@
        entity.Data = JsonConvert.SerializeObject(delivery);
        entity.Status = 1;
        entity.CreateBy = "PL017";
        entity.Route= delivery.DeliveryNo;
        try
        {
            dynamic resultInfos = new ExpandoObject();
@@ -296,6 +297,7 @@
        entity.Data = JsonConvert.SerializeObject(dt);
        entity.Status = 1;
        entity.CreateBy = "PL017";
        entity.Route=dt.DeliveryNo;
        try
        {
            dynamic resultInfos = new ExpandoObject();
StandardInterface/MESApplication/appsettings.json
@@ -10,6 +10,6 @@
  "AppSettings": {
    "TestErpUrl": "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfo",
    "ProductionErpUrl": "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfoFormal",
    "DataBaseConn": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.1.22)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = hm_prd; Password=hmprd"
    "DataBaseConn": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.1.22)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = test_dev; Password=hmprd"
  }
}