Merge branch 'master' of http://43.142.96.171:8080/r/~yhj/HM_JK

xwt

7 天以前 65438b8c1f9ec323c3c2ae265561dae4ff536379

Merge branch 'master' of http://43.142.96.171:8080/r/~yhj/HM_JK

# Conflicts:
#	StandardInterface/MES.Service/Modes/LtsLlj.cs
#	StandardInterface/MES.Service/Modes/MesQaItemsDetect01.cs
#	StandardInterface/MES.Service/service/QC/LljService.cs

 StandardInterface/MES.Service/Dto/service/LLJDto.cs

@@ -20,6 +20,8 @@

    //备注
    public string? Remarks { get; set; }
    //特殊备注
    public string? Meom { get; set; }

    //==========================================
    //巡检主子表需要的数据

 StandardInterface/MES.Service/Dto/webApi/ErpCAA.cs

@@ -73,6 +73,7 @@
  public string? XS_CN { get; set; }  //小时产能
  public string? SJ_xs { get; set; }  //实际穴数
    public string? NEXT_Gx { get; set; }  //下道工序
    public string? RKS { get; set; }  //入库数
    ////委外字段
    //public string? F_ZJXF_DATETIME_YHRQ { get; set; }
    //public string? F_ZJXF_BASE_KH { get; set; }

 StandardInterface/MES.Service/Dto/webApi/ErpKc.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,19 @@
namespace MES.Service.Dto.webApi;

public class ErpKc
{
    public string? FMaterialId { get; set; }
    public string? FStockId { get; set; }
    public string? FMtoNo { get; set; }
    public string? FLot { get; set; }
    public string? FStockUnitId { get; set; }
    public string? FBaseUnitId { get; set; }
    public string? FStockStatusId { get; set; }
    public string? FBASEQTY { get; set; }
    public string? FSTOREURNOM { get; set; }
    public string? FSTOREURNUM { get; set; }
  //  public string? FOwnerId { get; set; } // æ–°å¢žè´§ä¸»ç¼–码字段
    public string? FStockOrgId { get; set; } //  æ–°å¢žåº“存组织字段
   

}

 StandardInterface/MES.Service/Dto/webApi/Inventory.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,9 @@
namespace MES.Service.Dto.webApi;

public class Inventory
{
    public string? ItemNo { get; set; } // æ–™å·
    public string? DepotCode { get; set; } // ä»“库
    public string? StockOrgNumber { get; set; } // ç”¨äºŽåº“存组织过滤
    //public string? OwnerNumber { get; set; } // æ–°å¢žè´§ä¸»ç¼–码
}

 StandardInterface/MES.Service/Dto/webApi/SRM/DeliveryItem.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,7 @@
namespace MES.Service.Dto.webApi.SRM;

public class DeliveryItem
{
    public string? DeliveryNo { get; set; }
    public string? ItemNo { get; set; }
}

 StandardInterface/MES.Service/Dto/webApi/SRM/DeliveryNoteDetail.cs

@@ -14,4 +14,6 @@
    public string? FBillNo { get; set; }
    public string? OrderlineId { get; set; }
    public string? DepotNo { get; set; }

    public string? IsGift { get; set; }
}

 StandardInterface/MES.Service/MES.Service.csproj

@@ -24,7 +24,6 @@
    </ItemGroup>

    <ItemGroup>
      <Folder Include="Dto\webApi\SRM\" />
      <Folder Include="Modes\SRM\" />
      <Folder Include="service\SRM\" />
    </ItemGroup>

 StandardInterface/MES.Service/Modes/ErpMesKc.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,49 @@
using SqlSugar;

namespace MES.Service.Modes;

[SugarTable("ERP_MES_KC")]
public class ErpMesKc
{
    [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_ERP_KC", IsPrimaryKey = true)]
    public decimal Id { get; set; }

    [SugarColumn(ColumnName = "FNUMBER")]
    public string? FNumber { get; set; }

    [SugarColumn(ColumnName = "FQTY")]
    public decimal? FQty { get; set; }

    [SugarColumn(ColumnName = "FBASEUNIT")]
    public string? FBaseUnit { get; set; }

    [SugarColumn(ColumnName = "FSTOCKUNIT")]
    public string? FStockUnit { get; set; }

    [SugarColumn(ColumnName = "FSTOCKNUMBER")]
    public string? FStockNumber { get; set; }

    [SugarColumn(ColumnName = "CREATE_DATE")]
    public DateTime? CreateDate { get; set; }

    [SugarColumn(ColumnName = "FBATCHNO")]
    public string? FBatchno { get; set; }

    [SugarColumn(ColumnName = "FMTONO")]
    public string? FMtono { get; set; }

    [SugarColumn(ColumnName = "FSTOCKSTATUS")]
    public string? FStockStatus { get; set; }

    [SugarColumn(ColumnName = "FSTOREURNOM")]
    public decimal? FStoreUrnom { get; set; }

    [SugarColumn(ColumnName = "FSTOREURNUM")]
    public decimal? FStoreUrnum { get; set; }
    [SugarColumn(ColumnName = "FOWNERID")]
    public string? FOwnerId { get; set; }
    [SugarColumn(ColumnName = "FSTOCKORGID")]
    public string? FStockOrgId { get; set; }


}

 StandardInterface/MES.Service/Modes/IqcBefore.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,34 @@
using System;
using System.Collections.Generic;
using System.Linq;
using SqlSugar;
namespace MES.Service.Modes
{
    /// <summary>
    /// 
    ///</summary>
    [SugarTable("IQC_BEFORE")]
    public class IqcBefore
    {
        /// <summary>
        ///  
        ///</summary>
         [SugarColumn(ColumnName="ID" ,IsPrimaryKey = true   )]
         public decimal Id { get; set; }
        /// <summary>
        ///  
        ///</summary>
         [SugarColumn(ColumnName="SID"    )]
         public decimal? Sid { get; set; }
        /// <summary>
        ///  
        ///</summary>
         [SugarColumn(ColumnName="ITEM_ID"    )]
         public decimal? ItemId { get; set; }
        /// <summary>
        ///  
        ///</summary>
         [SugarColumn(ColumnName="PID"    )]
         public decimal? Pid { get; set; }
    }
}

 StandardInterface/MES.Service/Modes/IqcBeforeFrom.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,49 @@
using System;
using System.Collections.Generic;
using System.Linq;
using SqlSugar;
namespace MES.Service.Modes
{
    /// <summary>
    /// 
    ///</summary>
    [SugarTable("IQC_BEFORE_FROM")]
    public class IqcBeforeFrom
    {
        /// <summary>
        ///  
        ///</summary>
         [SugarColumn(ColumnName="ID" ,IsPrimaryKey = true   )]
         public decimal Id { get; set; }
        /// <summary>
        ///  
        ///</summary>
         [SugarColumn(ColumnName="SID"    )]
         public decimal? Sid { get; set; }
        /// <summary>
        ///  
        ///</summary>
         [SugarColumn(ColumnName="USER_NAME"    )]
         public string UserName { get; set; }
        /// <summary>
        ///  
        ///</summary>
         [SugarColumn(ColumnName="ORGANIZE_ID"    )]
         public string OrganizeId { get; set; }
        /// <summary>
        ///  
        ///</summary>
         [SugarColumn(ColumnName="CHECK_USER"    )]
         public string CheckUser { get; set; }
        /// <summary>
        ///  
        ///</summary>
         [SugarColumn(ColumnName="CHECK_DATE"    )]
         public DateTime? CheckDate { get; set; }
        /// <summary>
        ///  
        ///</summary>
         [SugarColumn(ColumnName="STATUS"    )]
         public short? Status { get; set; }
    }
}

 StandardInterface/MES.Service/Modes/LtsLlj.cs

@@ -201,7 +201,9 @@
    /// </summary>
    [SugarColumn(IsIgnore = true)]
    public string? NewFngDesc { get; set; }
    [SugarColumn(IsIgnore = true)]
    //紧急放行标识
    /// <summary>
    ///     ç´§æ€¥æ”¾è¡Œæ ‡è¯†
    /// </summary>
    public int EMERGENCY { get; set; }
 
}

 StandardInterface/MES.Service/Modes/MesQaItemsDetect01.cs

@@ -459,8 +459,9 @@
    /// </summary>
    [SugarColumn(ColumnName = "MANAGER_USER")]
    public string? ManagerUser { get; set; }

    /// <summary>
    ///     ç´§æ€¥æ”¾è¡Œ
    ///     ç»ç†å®¡æ ¸äºº
    /// </summary>
    [SugarColumn(ColumnName = "MANAGER_USER")]
    public int EMERGENCY { get; set; }

 StandardInterface/MES.Service/Modes/MesQaItemsDetectDetail5.cs

@@ -173,4 +173,9 @@
    public DateTime? LastupdateDate { get; set; }

    [SugarColumn(IsIgnore = true)] public int? Unqualified { get; set; }
    /// <summary>
    ///     å¤‡æ³¨
    /// </summary>
    [SugarColumn(ColumnName = "MEOM")]
    public string? Meom { get; set; }
}

 StandardInterface/MES.Service/Modes/SRM/MesDeliveryNoteDetails.cs

@@ -63,4 +63,8 @@
    //收货仓库
    [SugarColumn(ColumnName = "DEPOT_CODE")]
    public string? DepotCode { get; set; }

    //是否赠品
    [SugarColumn(ColumnName = "IS_GIFT")]
    public string? IsGift { get; set; }
}

 StandardInterface/MES.Service/Modes/Womcaa.cs

@@ -485,6 +485,11 @@
        /// ä¸‹é“工序 
        ///</summary>
        [SugarColumn(ColumnName = "NEXT_GX")]
        public string Nextgx { get; set; }
        public string Nextgx { get; set; } 
        /// <summary>
        /// ä¸‹é“工序 
        ///</summary>
        [SugarColumn(ColumnName = "RKS")]
        public string Rks { get; set; }
    }
}

 StandardInterface/MES.Service/service/Kingdee/ErpKcManager.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,145 @@

using Kingdee.CDP.WebApi.SDK;
using MES.Service.DB;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
using System.Text;

namespace MES.Service.service.Kingdee;

public class ErpKcManager : Repository<ErpMesKc>
{
    public bool QueryStocks(Inventory inventory)
    {
        List<ErpKc> erpKc = GetErpInventory(inventory);

        // æ£€æŸ¥è¿”回结果是否为空
        if (erpKc == null || erpKc.Count == 0)
        {
            throw new NotImplementedException("返回结果为空");
        }
        else
        {
            var baseObjects = MapErpCABtoWomcab(erpKc);

            return UseTransaction(db =>
            {
                return SaveData(db, baseObjects) ? 1 : 0;
            }) > 0;
        }
    }

    #region 1.获取即时库存
    public List<ErpKc> GetErpInventory(Inventory inventory)
    {
        //注意 1：此处不再使用参数形式传入用户名及密码等敏感信息，改为在登录配置文件中设置。
        //注意 2：必须先配置第三方系统登录授权信息后，再进行业务操作，详情参考各语言版本SDK介绍中的登录配置文件说明。
        //读取配置，初始化SDK
        K3CloudApi client = new K3CloudApi();
        //用于记录结果
        StringBuilder Info = new StringBuilder();
        //业务对象标识
        string formId = "STK_Inventory";
        DateTime dt = DateTime.Now;
        //查询字段集合，即返回哪些数据，不能为空，根据不同业务单据填写不同的字段名，以下仅为示例
        //string fieldKeys = "FCode,FFileId,FRelevantObject";
        //string FilterString = "FID='-2146304'";
        string fieldKeys = "FMaterialId.FNumber,FMtoNo,FStockId.FNumber,FLot.FNumber,FStockUnitId.FNumber,FBaseUnitId.FNumber,FStockStatusId.FName,FBASEQTY,FMaterialid.FSTOREURNOM,FMaterialid.FSTOREURNUM,FStockOrgId.FNumber";
        string FilterString = string.Format(@"FMaterialId.FNumber like '%{0}%' and FStockId.FNumber like '%{1}%' and FBaseQty>0 and FStockOrgId.FNumber like'%{2}%'", inventory.ItemNo,inventory.DepotCode, inventory.StockOrgNumber);
        string OrderString = "";
        int TopRowCount = 0;
        int StartRow = 0;
        int Limit = 0;

        var param = new QueryParam()
        {
            FormId = formId,
            FieldKeys = fieldKeys,
            FilterString = FilterString,
            OrderString = OrderString,
            TopRowCount = TopRowCount,
            StartRow = StartRow,
            Limit = Limit
        };
        //调用接口
        var result = client.ExecuteBillQuery(param.ToJson());

        return result.Select(s =>
        {
            var entity = new ErpKc
            {
                FMaterialId = s[0]?.ToString(),
                FMtoNo = s[1]?.ToString(),
                FStockId = s[2]?.ToString(),
                FLot = s[3]?.ToString(),
                FStockUnitId = s[4]?.ToString(),
                FBaseUnitId = s[5]?.ToString(),
                FStockStatusId = s[6]?.ToString(),
                FBASEQTY = s[7]?.ToString() ,
                FSTOREURNOM = s[8]?.ToString(),
                FSTOREURNUM = s[9]?.ToString(),
                //  FOwnerId = s[10]?.ToString()
                FStockOrgId = s[10]?.ToString()
            };
            return entity;
        }).ToList();
    }
    #endregion


    private List<ErpMesKc> MapErpCABtoWomcab(List<ErpKc> dtoList)
    {
        var ErpMesKcList = new List<ErpMesKc>();

        foreach (var dto in dtoList)
        {
            var kc = new ErpMesKc
            {
                FNumber = dto.FMaterialId,
               // FQty = Convert.ToDecimal(dto.FBASEQTY),
                FQty = SafeParseDecimal(dto.FBASEQTY),
                FBaseUnit=dto.FBaseUnitId,
                FStockUnit=dto.FStockUnitId,
                FStockNumber=dto.FStockId,
                CreateDate=DateTime.Now,
                FBatchno=dto.FLot,
                FMtono=dto.FMtoNo,
                FStockStatus=dto.FStockStatusId,
                FStoreUrnom= Convert.ToDecimal(dto.FSTOREURNOM),
                FStoreUrnum= Convert.ToDecimal(dto.FSTOREURNUM),
                //FOwnerId=dto.FOwnerId,
                FStockOrgId = dto.FStockOrgId,

            };

            ErpMesKcList.Add(kc);
        }

        return ErpMesKcList;
    }


    private decimal SafeParseDecimal(string? input)
    {
        if (string.IsNullOrWhiteSpace(input)) return 0;

        if (decimal.TryParse(
            input,
            System.Globalization.NumberStyles.Float,
            System.Globalization.CultureInfo.InvariantCulture,
            out var result))
            return result;

        return 0; //    è·³è¿‡é”™è¯¯å­—段，给默认值
    }

    // æ’入或更新数据的方法
    private bool SaveData(SqlSugarScope db, List<ErpMesKc> kcc)
    {
        var save = base.InsertRange(kcc);
        if (save) return true;
        throw new NotImplementedException("插入失败");
    }

}

 StandardInterface/MES.Service/service/QC/LljService.cs

@@ -75,10 +75,9 @@
            //            UserName = i.Fname != null || i.Fname != "" ? i.Fname : g.Fname,
            //            CreateUserName = e.Fname
            //        }, true)
            .ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
            .ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount); 

        var emergencyValues = pageList.Select(item => item.EMERGENCY).ToList();
        //return (pageList, totalCount);
        var emergencyValues = pageList.Select(item => item.EMERGENCY).ToList(); 
        return (pageList, totalCount);
    }

@@ -128,14 +127,104 @@

    }
    //紧急放行
    //public string[] EmergencyRelease(int id)
    //{
    //    var db = SqlSugarHelper.GetInstance();
         
        
    //    int emergencyStatus = db.Queryable<MesQaItemsDetect01>() 
    //                            .Where(t => t.Id == id)
    //                            .Select(t => t.EMERGENCY) 
    //                            .First();

    //    if (emergencyStatus != 0)
    //    {
    //        return new string[] { "1", "非紧急状态，无法执行紧急放行" };
    //    }

        
    //    var outputResult = new SugarParameter("PO_RESULT", null,
    //        DbType.Int32, ParameterDirection.Output, 4000);

    //    var outputMessage = new SugarParameter("PO_MSG", null,
    //        DbType.String, ParameterDirection.Output, 4000);

    //    var parameters = new List<SugarParameter>
    //{
    //    new("P_ID", id, DbType.Int32, ParameterDirection.Input),
    //    outputResult,
    //    outputMessage
    //};

    //    db.Ado.ExecuteCommand(
    //        "BEGIN prc_MES_QA_ITEMS_update1(:P_ID, :PO_RESULT, :PO_MSG); END;",
    //        parameters.ToArray());

    //    var lotNo1 = db.Queryable<MesQaItemsDetect01>()
    //               .Where(t => t.Id == id)
    //               .Select(t => t.LotNo1)
    //               .First();

    //    var resultValue = outputResult.Value?.ToString();
    //    var messageValue = outputMessage.Value?.ToString();
    //    return new string[] { resultValue, messageValue, lotNo1?.ToString() ?? "" };
    //}

    //public string[] WithdrawEmergencyRelease(int id)
    //{
    //    var db = SqlSugarHelper.GetInstance();

      
    //    int emergencyStatus = db.Queryable<MesQaItemsDetect01>() 
    //                            .Where(t => t.Id == id)
    //                            .Select(t => t.EMERGENCY) 
    //                            .First();

    //    if (emergencyStatus != 0)
    //    {
    //        return new string[] { "1", "非紧急状态，无需撤回" };
    //    }

    //    var outputResult = new SugarParameter("PO_RESULT", null,
    //        DbType.Int32, ParameterDirection.Output, 4000);

    //    var outputMessage = new SugarParameter("PO_MSG", null,
    //        DbType.String, ParameterDirection.Output, 4000);

    //    var parameters = new List<SugarParameter>
    //{
    //    new("P_ID", id, DbType.Int32, ParameterDirection.Input),
    //    outputResult,
    //    outputMessage
    //};

    //    db.Ado.ExecuteCommand(
    //        "BEGIN prc_MES_QA_ITEMS_update2(:P_ID, :PO_RESULT, :PO_MSG); END;",
    //        parameters.ToArray());

    //    var lotNo1 = db.Queryable<MesQaItemsDetect01>()
    //               .Where(t => t.Id == id)
    //               .Select(t => t.LotNo1)
    //               .First();
        

    //    var resultValue = outputResult.Value?.ToString();
    //    var messageValue = outputMessage.Value?.ToString();
    //    return new string[] { resultValue, messageValue, lotNo1?.ToString() ?? "" };
    //}




     
    public string[] EmergencyRelease(int id)
    {
        var db = SqlSugarHelper.GetInstance();

        
        int emergencyStatus = db.Queryable<MesQaItemsDetect01>() 

        int emergencyStatus = db.Queryable<MesQaItemsDetect01>()
                                .Where(t => t.Id == id)
                                .Select(t => t.EMERGENCY) 
                                .Select(t => t.EMERGENCY)
                                .First();

        if (emergencyStatus != 0)
@@ -143,7 +232,7 @@
            return new string[] { "1", "非紧急状态，无法执行紧急放行" };
        }

        

        var outputResult = new SugarParameter("PO_RESULT", null,
            DbType.Int32, ParameterDirection.Output, 4000);

@@ -175,10 +264,10 @@
    {
        var db = SqlSugarHelper.GetInstance();

      
        int emergencyStatus = db.Queryable<MesQaItemsDetect01>() 

        int emergencyStatus = db.Queryable<MesQaItemsDetect01>()
                                .Where(t => t.Id == id)
                                .Select(t => t.EMERGENCY) 
                                .Select(t => t.EMERGENCY)
                                .First();

        if (emergencyStatus != 0)
@@ -207,12 +296,12 @@
                   .Where(t => t.Id == id)
                   .Select(t => t.LotNo1)
                   .First();
        


        var resultValue = outputResult.Value?.ToString();
        var messageValue = outputMessage.Value?.ToString();
        return new string[] { resultValue, messageValue, lotNo1?.ToString() ?? "" };
    }
    } 

    private string ExtractSubstring(string input, char startChar, char endChar)
    {
@@ -305,7 +394,9 @@
                a.FreQty,
                a.CheckQyt,
                a.FcheckResu,
                a.FcheckItemDesc,a.Funit
                a.FcheckItemDesc,
                a.Funit,
                a.Meom
            }).Select((a, b) => new MesQaItemsDetectDetail5
            {
                Id = a.Id,
@@ -327,7 +418,8 @@
                FcheckResu = a.FcheckResu,
                // FcheckItemDesc = a.FcheckItemDesc
                FcheckItemDesc = a.FspecRequ,
                Funit  =a.Funit
                Funit = a.Funit,
                Meom = a.Meom,
            }).ToList();
    }

@@ -604,6 +696,11 @@
                     it.Funit == dto.Remarks) //SetColumns是可以叠加的 å†™2个就2个字段赋值
                .Where(it => it.Id == dto.pid)
                .ExecuteCommand();
            return db.Updateable<MesQaItemsDetectDetail5>()
                 .SetColumns(it =>
                     it.Meom == dto.Meom) 
                .Where(it => it.Id == dto.pid)
                .ExecuteCommand();
        });
    }


 StandardInterface/MES.Service/service/SRM/MesDeliveryNoteBarcodeManager.cs

@@ -50,6 +50,32 @@
        return result.All(b => b);
    }

    public dynamic DeleteByItem(DeliveryItem dt)
    {
        return UseTransaction(db =>
        {
            return DeleteDataByItem(db, dt) ? 1 : 0;
        }) > 0;
    }

    public dynamic DeleteListByItem(List<DeliveryItem> dts)
    {
        var result = dts.Select(DeleteByItem).ToList();
        return result.All(b => b);
    }

    // åˆ é™¤æ•°æ®çš„方法
    private bool DeleteDataByItem(SqlSugarScope db, DeliveryItem dt)
    {
        var del = db.Deleteable<MesDeliveryNoteBarcode>().Where(s => s.DeliveryNo == dt.DeliveryNo && s.ProductCode==dt.ItemNo).ExecuteCommand() > 0;

        if (del)
        {
            return true;
        }
        throw new NotImplementedException("删除失败");
    }

    // åˆ é™¤æ•°æ®çš„方法
    private bool DeleteData(SqlSugarScope db, ErpBarcode barcode)
    {
@@ -64,7 +90,9 @@
    // åˆ é™¤æ•°æ®çš„方法
    private bool DeleteDataByShd(SqlSugarScope db, ErpDelivery delivery)
    {
        var del = db.Deleteable<MesDeliveryNoteBarcode>().Where(s => s.DeliveryNo == delivery.DeliveryNo).ExecuteCommand() > 0;
        var del = db.Deleteable<MesDeliveryNoteBarcode>().
            Where(s => s.DeliveryNo == delivery.DeliveryNo)
            .ExecuteCommand() > 0;

        if (del)
        {

 StandardInterface/MES.Service/service/SRM/MesDeliveryNoteManager.cs

@@ -112,7 +112,8 @@
                CreateDate = DateTime.Now,
                PurchaseQty = Convert.ToDecimal(s.PurchaseQty),
                IncludeQty = Convert.ToDecimal(s.IncludeQty),
                DepotCode = s.DepotNo
                DepotCode = s.DepotNo,
                IsGift = s.IsGift
            };
            return entity;
        }).ToList();

 StandardInterface/MES.Service/service/WomcaaManager.cs

@@ -210,7 +210,8 @@
            Jt=dto.JT,
            Xscn=dto.XS_CN,
            Sjxs=dto.SJ_xs,
            Nextgx=dto.NEXT_Gx
            Nextgx=dto.NEXT_Gx,
            Rks=dto.RKS,
            //沃尔新增
            // WR_F_SCDD_SCTZD = dto.F_SCDD_SCTZD
            //WR_F_SCDD_XH = dto.F_SCDD_XH

 StandardInterface/MESApplication/Controllers/BasicData/ProductionOrderController.cs

@@ -36,6 +36,7 @@
        entity.Data = JsonConvert.SerializeObject(rohIn);
        entity.Status = 1;
        entity.CreateBy = "PL017";
        entity.Route= rohIn.OrderDto.FBillNo;
        try
        {
            dynamic resultInfos = new ExpandoObject();

 StandardInterface/MESApplication/Controllers/Kingdee/ErpKcController.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,46 @@
using MES.Service.Dto.service;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using MES.Service.service;
using MES.Service.service.Kingdee;
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
using System.Dynamic;

namespace MESApplication.Controllers.Kingdee;


[ApiController]
[Route("api/[controller]")]
public class ErpKcController : ControllerBase 
{
    private readonly MessageCenterManager _manager = new();
    private readonly ErpKcManager kc = new();
    private readonly string METHOD = "POST";
    private readonly string TableName = "ERPKC";
    private readonly string URL = "http://localhost:10054/api/ErpKc/";


    //
    [HttpPost("Save")]
    public ResponseResult Save(Inventory inventory)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos = kc.QueryStocks(inventory);

            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }
}

 StandardInterface/MESApplication/Controllers/SRM/MesDeliveryNoteBarcodeController.cs

@@ -286,5 +286,94 @@
        }
    }

    [HttpPost("DeleteByItem")]
    public ResponseResult DeleteByItem(DeliveryItem dt)
    {
        var entity = new MessageCenter();
        entity.TableName = TableName;
        entity.Url = URL + "DeleteByItem";
        entity.Method = METHOD;
        entity.Data = JsonConvert.SerializeObject(dt);
        entity.Status = 1;
        entity.CreateBy = "PL017";
        try
        {
            dynamic resultInfos = new ExpandoObject();
            var save = m.DeleteByItem(dt);
            resultInfos = save;

            entity.Result = 0;
            if (save) entity.Result = 1;

            entity.DealWith = 1;
            _manager.save(entity);

            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            entity.Result = 0;

            entity.DealWith = 0;

            entity.ResultData = ex.Message;

            _manager.save(entity);

            return ResponseResult.ResponseError(ex);
        }
    }

    [HttpPost("DeleteListByItem")]
    public ResponseResult DeleteListByItem(List<DeliveryItem> dts)
    {
        var entity = new MessageCenter();
        entity.TableName = TableName;
        entity.Url = URL + "DeleteListByItem";
        entity.Method = METHOD;
        entity.Data = JsonConvert.SerializeObject(dts);
        entity.Status = 1;
        entity.CreateBy = "PL017";
        try
        {
            dynamic resultInfos = new ExpandoObject();
            var save = m.DeleteListByItem(dts);
            resultInfos = save;

            entity.Result = 0;
            if (save) entity.Result = 1;

            entity.DealWith = 1;
            _manager.save(entity);

            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            entity.Result = 0;

            entity.DealWith = 0;

            entity.ResultData = ex.Message;

            _manager.save(entity);

            return ResponseResult.ResponseError(ex);
        }
    }




}