分步式调拨

sjz

2025-09-02 5612526544b3532c5efc9c002d1c97b4af286bd1

分步式调拨

 MES.Service/Dto/webApi/FbsDb/ErpDb.cs

@@ -3,6 +3,6 @@

public class ErpDb
{
    public FbsDbA FbsDbA { get; set; }
    public List<FbsDbB> FbsDbBs { get; set; }
    public FbsDbA erpDbcka { get; set; }
    public List<FbsDbB> erpDbckB { get; set; }
}

 MES.Service/Dto/webApi/FbsDb/FbsDbA.cs

@@ -4,8 +4,8 @@

public class FbsDbA
{
    public string erpid { get; set; }
    public string type { get; set; }
    public string Erpid { get; set; }
    public string Type { get; set; }
    public string? FBillNo { get; set; }
    public string? FBillTypeID { get; set; }
    public string? FDocumentStatus { get; set; }
@@ -15,7 +15,7 @@
    public string? sq_bm { get; set; }
    public string? FAPPORGID { get; set; }
    public string? FDate { get; set; }
    public string? FCreateDate { get; set; }
    public string? FCreateBy { get; set; }
    public string? FOwnerTypeIdHead { get; set; }
    public string? FOwnerTypeInIdHead {  get; set; }
    public string? FRemarks { get; set; }

 MES.Service/Modes/FBSDB/MesInvItemMoveItems.cs

@@ -1,7 +1,173 @@

using SqlSugar;

namespace MES.Service.Modes.FBSDB;

internal class MesInvItemMoveItems
/// <summary>
///     è°ƒæ‹¨å•æ˜Žç»†
/// </summary>
[SugarTable("MES_INV_ITEM_MOVE_ITEMS")]
public class MesInvItemMoveItems
{
    /// <summary>
    ///     ID
    /// </summary>
    [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
    public decimal Id { get; set; }

    /// <summary>
    ///     ä¸»è¡¨id
    /// </summary>
    [SugarColumn(ColumnName = "ITEM_MOVE_ID")]
    public decimal? ItemMoveId { get; set; }

    /// <summary>
    ///     ç‰©æ–™å†…码
    /// </summary>
    [SugarColumn(ColumnName = "ITEM_ID")]
    public decimal? ItemId { get; set; }

    /// <summary>
    ///     ç‰©æ–™ç¼–号
    /// </summary>
    [SugarColumn(ColumnName = "ITEM_NO")]
    public string? ItemNo { get; set; }

    /// <summary>
    ///     ç”³è¯·æ•°é‡
    /// </summary>
    [SugarColumn(ColumnName = "SQ_NUM")]
    public decimal? SqNum { get; set; }

    /// <summary>
    ///     å¤‡æ³¨
    /// </summary>
    [SugarColumn(ColumnName = "REMARK")]
    public string? Remark { get; set; }

    /// <summary>
    ///     é¡¹æ¬¡
    /// </summary>
    [SugarColumn(ColumnName = "LINE_NO")]
    public decimal? LineNo { get; set; }

    /// <summary>
    ///     è°ƒæ‹¨å•å·
    /// </summary>
    [SugarColumn(ColumnName = "BILL_NO")]
    public string? BillNo { get; set; }

    /// <summary>
    ///     è°ƒå‡ºçŠ¶æ€
    /// </summary>
    [SugarColumn(ColumnName = "MOVE_OUT")]
    public decimal? MoveOut { get; set; }

    /// <summary>
    ///     è°ƒå…¥çŠ¶æ€
    /// </summary>
    [SugarColumn(ColumnName = "MOVE_IN")]
    public decimal? MoveIn { get; set; }

    /// <summary>
    ///     åˆ›å»ºäºº
    /// </summary>
    [SugarColumn(ColumnName = "CREATE_BY")]
    public string? CreateBy { get; set; }

    /// <summary>
    ///     åˆ›å»ºæ—¶é—´
    /// </summary>
    [SugarColumn(ColumnName = "CREATE_DATE")]
    public DateTime? CreateDate { get; set; }

    /// <summary>
    ///     æœ€åŽæ›´æ–°äºº
    /// </summary>
    [SugarColumn(ColumnName = "LASTUPDATE_BY")]
    public string? LastupdateBy { get; set; }

    /// <summary>
    ///     æœ€åŽæ›´æ–°æ—¶é—´
    /// </summary>
    [SugarColumn(ColumnName = "LASTUPDATE_DATE")]
    public DateTime? LastupdateDate { get; set; }

    /// <summary>
    ///     å•ä½
    /// </summary>
    [SugarColumn(ColumnName = "ITEM_UNIT")]
    public decimal? ItemUnit { get; set; }

    /// <summary>
    ///     æ˜¯å¦åŒæ­¥
    /// </summary>
    [SugarColumn(ColumnName = "IS_TB")]
    public decimal? IsTb { get; set; }

    /// <summary>
    ///     è°ƒå‡ºè´§ä¸»ç±»åž‹
    /// </summary>
    [SugarColumn(ColumnName = "FOWNERTYPEID")]
    public string? FOwnerTypeId { get; set; }

    /// <summary>
    ///     è°ƒå‡ºè´§ä¸»
    /// </summary>
    [SugarColumn(ColumnName = "FOWNERID")]
    public string? FOwnerId { get; set; }

    /// <summary>
    ///     è°ƒå‡ºä»“库
    /// </summary>
    [SugarColumn(ColumnName = "FSTOCKID")]
    public string? FStockId { get; set; }

    /// <summary>
    ///     è°ƒå…¥è´§ä¸»ç±»åž‹
    /// </summary>
    [SugarColumn(ColumnName = "FOWNERTYPEINID")]
    public string? FOwnerTypeInId { get; set; }

    /// <summary>
    ///     è°ƒå…¥è´§ä¸»
    /// </summary>
    [SugarColumn(ColumnName = "FOWNERINID")]
    public string? FOwnerInId { get; set; }

    /// <summary>
    ///     è°ƒå…¥ä»“库
    /// </summary>
    [SugarColumn(ColumnName = "FSTOCKINID")]
    public string? FStockInId { get; set; }

    /// <summary>
    ///     è°ƒå‡ºç»„织
    /// </summary>
    [SugarColumn(ColumnName = "FSTOCKORGID")]
    public decimal? FStockOrgId { get; set; }

    /// <summary>
    ///     è°ƒå…¥ç»„织
    /// </summary>
    [SugarColumn(ColumnName = "FSTOCKORGINID")]
    public decimal? FStockOrgInId { get; set; }

    /// <summary>
    ///     è°ƒå‡ºæ‰¹å·
    /// </summary>
    [SugarColumn(ColumnName = "FLOT")]
    public string? FLot { get; set; }

    /// <summary>
    ///     è®¡åˆ’跟踪号
    /// </summary>
    [SugarColumn(ColumnName = "FMTONO")]
    public string? FMtono { get; set; }

    /// <summary>
    ///     è°ƒæ‹¨å‡ºåº“è¡Œid
    /// </summary>
    [SugarColumn(ColumnName = "ERPID")]
    public decimal? ErpId { get; set; }

}

 MES.Service/Modes/FBSDB/MesInvItemMoves.cs

@@ -1,8 +1,186 @@

using SqlSugar;

namespace MES.Service.Modes.FBSDB;

internal class MesInvItemMoves
/// <summary>
///     è°ƒæ‹¨ç”³è¯·å•
/// </summary>
[SugarTable("MES_INV_ITEM_MOVES")]
public class MesInvItemMoves
{
    /// <summary>
    ///     ID
    /// </summary>
    [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
    public decimal Id { get; set; }

    /// <summary>
    ///     ç§»åº“单号
    /// </summary>
    [SugarColumn(ColumnName = "BILL_NO")]
    public string? BillNo { get; set; }

    /// <summary>
    ///     åˆ›å»ºäºº
    /// </summary>
    [SugarColumn(ColumnName = "CREATE_BY")]
    public string? CreateBy { get; set; }

    /// <summary>
    ///     åˆ›å»ºæ—¶é—´
    /// </summary>
    [SugarColumn(ColumnName = "CREATE_DATE")]
    public DateTime? CreateDate { get; set; }

    /// <summary>
    ///     æœ€åŽæ›´æ–°äºº
    /// </summary>
    [SugarColumn(ColumnName = "LASTUPDATE_BY")]
    public string? LastupdateBy { get; set; }

    /// <summary>
    ///     æœ€åŽæ›´æ–°æ—¶é—´
    /// </summary>
    [SugarColumn(ColumnName = "LASTUPDATE_DATE")]
    public DateTime? LastupdateDate { get; set; }

    /// <summary>
    ///     å®¡æ ¸çŠ¶æ€
    /// </summary>
    [SugarColumn(ColumnName = "STATUS")]
    public decimal? Status { get; set; }

    /// <summary>
    ///     å¤‡æ³¨
    /// </summary>
    [SugarColumn(ColumnName = "REMARK")]
    public string? Remark { get; set; }

    /// <summary>
    ///     å•æ®ç±»åž‹ID
    /// </summary>
    [SugarColumn(ColumnName = "BILL_TYPE_ID")]
    public decimal? BillTypeId { get; set; }

    /// <summary>
    ///     äº‹åŠ¡ç±»åž‹ç¼–码
    /// </summary>
    [SugarColumn(ColumnName = "TRANSACTION_NO")]
    public decimal? TransactionNo { get; set; }

    /// <summary>
    ///     å®¡æ ¸äºº
    /// </summary>
    [SugarColumn(ColumnName = "CHECKUSER")]
    public string? CheckUser { get; set; }

    /// <summary>
    ///     å®¡æ ¸æ—¶é—´
    /// </summary>
    [SugarColumn(ColumnName = "CHECKDATE")]
    public DateTime? CheckDate { get; set; }

    /// <summary>
    ///     å·²å›žå†™SAP
    /// </summary>
    [SugarColumn(ColumnName = "SAPSTATUS")]
    public decimal? SapStatus { get; set; }

    /// <summary>
    ///     å·¥åŽ‚
    /// </summary>
    [SugarColumn(ColumnName = "FACTORY")]
    public string? Factory { get; set; }

    /// <summary>
    ///     å…¬å¸
    /// </summary>
    [SugarColumn(ColumnName = "COMPANY")]
    public string? Company { get; set; }

    /// <summary>
    ///     æ˜¯å¦æŽ¨é€ERP
    /// </summary>
    [SugarColumn(ColumnName = "TS")]
    public decimal? Ts { get; set; }

    /// <summary>
    ///     0未调拨1调出2调入
    /// </summary>
    [SugarColumn(ColumnName = "DB_STATUS")]
    public string? DbStatus { get; set; }

    /// <summary>
    ///     çŠ¶æ€
    /// </summary>
    [SugarColumn(ColumnName = "MSG")]
    public string? Msg { get; set; }

    /// <summary>
    ///     çŠ¶æ€
    /// </summary>
    [SugarColumn(ColumnName = "STATES")]
    public string? States { get; set; }

    /// <summary>
    ///     æ¥æºå•æ®
    /// </summary>
    [SugarColumn(ColumnName = "SOURCE_NO")]
    public string? SourceNo { get; set; }

    /// <summary>
    ///     erp头id
    /// </summary>
    [SugarColumn(ColumnName = "ERPID")]
    public decimal? Erpid { get; set; }

    /// <summary>
    ///     å•æ®ç±»åž‹
    /// </summary>
    [SugarColumn(ColumnName = "FBILLTYPEID")]
    public string? FBillTypeId { get; set; }

    /// <summary>
    ///     å•æ®çŠ¶æ€
    /// </summary>
    [SugarColumn(ColumnName = "FDOCUMENTSTATUS")]
    public string? FDocumentStatus { get; set; }

    /// <summary>
    ///     è°ƒæ‹¨æ–¹å‘
    /// </summary>
    [SugarColumn(ColumnName = "FTRANSFERDIRECT")]
    public string? FTransferDirect { get; set; }

    /// <summary>
    ///     è°ƒæ‹¨ç±»åž‹
    /// </summary>
    [SugarColumn(ColumnName = "FTRANSTYPE")]
    public string? FTransType { get; set; }

    /// <summary>
    ///     ä¸šåŠ¡ç±»åž‹
    /// </summary>
    [SugarColumn(ColumnName = "FBUSINESSTYPE")]
    public string? FBusinessType { get; set; }

    /// <summary>
    ///     è°ƒå‡ºè´§ä¸»ç±»åž‹
    /// </summary>
    [SugarColumn(ColumnName = "FOWNERTYPEIDHEAD")]
    public string? FOwnerTypeIdHead { get; set; }

    /// <summary>
    ///     è°ƒå…¥è´§ä¸»ç±»åž‹
    /// </summary>
    [SugarColumn(ColumnName = "FOWNERTYPEINIDHEAD")]
    public string? FOwnerTypeInIdHead { get; set; }

    /// <summary>
    ///     ç”³è¯·ç»„织
    /// </summary>
    [SugarColumn(ColumnName = "FAPPORGID")]
    public decimal? FAppOrgId { get; set; }

    [SugarColumn(IsIgnore = true)] public string? Type { get; set; }
}

 MES.Service/bin/Release/net8.0/MES.Service.dll

Binary files differ

 MES.Service/bin/Release/net8.0/MES.Service.pdb

Binary files differ

 MES.Service/service/BasicData/MesDeliveryNoteManager.cs

@@ -14,9 +14,7 @@
    {
        var erpDelivery = delivery.ErpDelivery;
        var mesDeliveryNote = GetMesDeliveryNote(erpDelivery);
        var mesDeliveryNoteDetails = GetMesDeliveryNoteDetails(
            delivery.ErpDeliveryData, erpDelivery.DeliveryNo,
            mesDeliveryNote.Status);
        var mesDeliveryNoteDetails = GetMesDeliveryNoteDetails(delivery.ErpDeliveryData, erpDelivery.DeliveryNo,mesDeliveryNote.Status);

        return UseTransaction(db =>
        {
@@ -25,16 +23,10 @@
                case "2":
                case "4":
                case "5":
                    return SaveOrUpdateData(db, mesDeliveryNote,
                        mesDeliveryNoteDetails)
                        ? 1
                        : 0;
                    return SaveOrUpdateData(db, mesDeliveryNote,mesDeliveryNoteDetails) ? 1 : 0;
                case "3":
                case "6":
                    return DeleteData(db, mesDeliveryNote,
                        mesDeliveryNoteDetails)
                        ? 1
                        : 0;
                    return DeleteData(db, mesDeliveryNote,mesDeliveryNoteDetails) ? 1 : 0;
                default:
                    throw new NotImplementedException(
                        $"type没有{erpDelivery.Type}这个类型");
@@ -44,35 +36,37 @@


    // æ›´æ–°æ•°æ®çš„方法
    private bool DeleteData(SqlSugarScope db, MesDeliveryNote mesDeliveryNote,
        List<MesDeliveryNoteDetails> mesDeliveryNoteDetails)
    private bool DeleteData(SqlSugarScope db, MesDeliveryNote mesDeliveryNote,List<MesDeliveryNoteDetails> mesDeliveryNoteDetails)
    {
        var decimals = mesDeliveryNoteDetails.Select(s => s.Id).ToArray();
        var update = base.DeleteById(mesDeliveryNote.Id);
        var insertOrUpdate = db.Deleteable<MesDeliveryNoteDetails>()
            .Where(s => s.DeliveryNo == mesDeliveryNote.DeliveryNo)
            .ExecuteCommand() > 0;
        var insertOrUpdate = db.Deleteable<MesDeliveryNoteDetails>().Where(s => s.DeliveryNo == mesDeliveryNote.DeliveryNo).ExecuteCommand() > 0;

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

    // æ’入或更新数据的方法
    private bool SaveOrUpdateData(SqlSugarScope db,
        MesDeliveryNote mesDeliveryNote,
        List<MesDeliveryNoteDetails> mesDeliveryNoteDetails)
    private bool SaveOrUpdateData(SqlSugarScope db,MesDeliveryNote mesDeliveryNote,List<MesDeliveryNoteDetails> mesDeliveryNoteDetails)
    {
        if (mesDeliveryNote.Id != null) base.DeleteById(mesDeliveryNote.Id);
        if (mesDeliveryNote.Id != null)
        {
            base.DeleteById(mesDeliveryNote.Id);
        }

        if (mesDeliveryNoteDetails.Count > 0)
            db.Deleteable<MesDeliveryNoteDetails>()
                .Where(s => s.DeliveryNo == mesDeliveryNote.DeliveryNo)
                .ExecuteCommand();

        {
            db.Deleteable<MesDeliveryNoteDetails>().Where(s => s.DeliveryNo == mesDeliveryNote.DeliveryNo).ExecuteCommand();
        }
        var orUpdate = base.Insert(mesDeliveryNote);
        var baOrUpdate =
            mesDeliveryNoteManager.InsertRange(mesDeliveryNoteDetails);
        if (orUpdate && baOrUpdate) return true;
        var baOrUpdate = mesDeliveryNoteManager.InsertRange(mesDeliveryNoteDetails);
        if (orUpdate && baOrUpdate)
        {
            return true;
        }
        throw new NotImplementedException("插入或更新失败");
    }


 MES.Service/service/BasicData/MesRohInManager.cs

@@ -12,8 +12,7 @@
    {
        var rohInErpRohIn = rohIn.ErpRohIn;
        var mesRohIn = GetMesRohIn(rohInErpRohIn);
        var mesRohInDatas =
            GetMesRohInDatas(rohIn.ErpRohinDatas, rohInErpRohIn.Type);
        var mesRohInDatas =GetMesRohInDatas(rohIn.ErpRohinDatas, rohInErpRohIn.Type);

        return UseTransaction(db =>
        {

 MES.Service/service/BasicData/SalesDeliveryNoticeManager.cs

@@ -175,7 +175,7 @@
                LotNumber = erpDto.FLot, //批号
                SrcBillNo = erpDto.FSrcBillNo, //源单编号
                PriceQty = erpDto.FPriceUnitQty, //计价数量
                OwnerId = erpDto.FOwnerIdHead, //货主
                OwnerId = erpDto.FOwnerId, //货主
                InventoryUnit = erpDto.FStockUnitID, //库存单位
                InventoryQuantity = Convert.ToDecimal(erpDto.FStockQty), //库存数量
                PlanDeliveryDate = ParseDateTime(erpDto.FPlanDeliveryDate), //计划发货日期

 MES.Service/service/FBSDB/FbsDbBManager.cs

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


using MES.Service.DB;
using MES.Service.Modes.FBSDB;

namespace MES.Service.service.FBSDB;

public class FbsDbBManager : Repository<MesInvItemMoveItems>
{
}

 MES.Service/service/FBSDB/FbsDbManager.cs

@@ -1,8 +1,159 @@


using MES.Service.DB;
using MES.Service.Dto.webApi;
using MES.Service.Dto.webApi.FbsDb;
using MES.Service.Modes;
using MES.Service.Modes.FBSDB;
using MES.Service.service.BasicData;
using SqlSugar;

namespace MES.Service.service.FBSDB;

internal class FbsDbManager
public class FbsDbManager:Repository<MesInvItemMoves>
{
    private readonly FbsDbBManager _dbBManager = new();

    public bool SaveList(List<ErpDb> dbs)
    {
        var result = dbs.Select(Save).ToList();
        return result.All(b => b);
    }

    public bool Save(ErpDb dbs)
    {
        var dba = dbs.erpDbcka;
        var mesDbA = FbaDbA(dba);
        var mesDbB = FbsDbB(dbs.erpDbckB,dba.FBillNo);
        return UseTransaction(db =>
        {
            switch (dba.Type)
            {
                case "3":
                    return DeleteData(db, mesDbA, mesDbB) ? 1 : 0;
                case "1":
                case "2":
                case "4":
                case "5":
                    return SaveOrUpdateData(db, mesDbA, mesDbB) ? 1 : 0;
                default:
                    throw new NotImplementedException($"type没有{dba.Type}这个类型");
            }
        }) > 0;
    }

    // æ’入或更新数据的方法
    private bool SaveOrUpdateData(SqlSugarScope db, MesInvItemMoves fbsdba, List<MesInvItemMoveItems> fbsdbb)
    {
        if (fbsdba.Id != null)
        {
            base.DeleteById(fbsdba.Id);
        }

        if (fbsdbb.Count > 0)
        {
            db.Deleteable<MesInvItemMoveItems>().Where(s => s.ItemMoveId == fbsdba.Erpid).ExecuteCommand();
        }
        var orUpdate = base.Insert(fbsdba);
        var baOrUpdate = _dbBManager.InsertRange(fbsdbb);
        if (orUpdate && baOrUpdate)
        {
            return true;
        }
        throw new NotImplementedException("插入或更新失败");
    }

    private bool DeleteData(SqlSugarScope db, MesInvItemMoves mesDbA, List<MesInvItemMoveItems> mesDbB)
    {
        var decimals = mesDbB.Select(s => s.Id).ToArray();
        var update = base.DeleteById(mesDbA.Id);
        var insertOrUpdate = db.Deleteable<MesInvItemMoveItems>().In(decimals).ExecuteCommand() > 0;

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

    private MesInvItemMoves FbaDbA(FbsDbA dto)
    {

        var entity = new MesInvItemMoves
        {
            Erpid = Convert.ToDecimal(dto.Erpid),
            BillNo = dto.FBillNo,
            CreateBy = dto.FCreateBy,
            CreateDate = dto.FDate != null ? DateTime.ParseExact(dto.FDate, "yyyy-MM-dd HH:mm:ss", null) : null,
            Status = 1,
            Remark = dto.FRemarks,
            BillTypeId = 300,
            TransactionNo = 302,
            SapStatus = 0,
            Factory = "1000",
            Company = "1000",
            Ts =0,
            DbStatus="未调拨",
            FBillTypeId=dto.FBillTypeID,
            FDocumentStatus=dto.FDocumentStatus,
            FTransferDirect=dto.FTransferDirect,
            FTransType=dto.FTRANSTYPE,
            FBusinessType=dto.FBusinessType,
            FOwnerTypeIdHead=dto.FOwnerTypeIdHead,
            FOwnerTypeInIdHead=dto.FOwnerTypeInIdHead,
            FAppOrgId=Convert.ToDecimal(dto.FAPPORGID)

        };

        var single = base.GetSingle(it => it.Erpid == entity.Erpid);
        if (single != null)
        {
            entity.Id = single.Id;
        }

        return entity;
    }

    private List<MesInvItemMoveItems> FbsDbB(List<FbsDbB> dtoList,string billno)
    {
        var dbList = new List<MesInvItemMoveItems>();

        foreach (var dto in dtoList)
        {
            var entitys = new MesInvItemMoveItems
            {
                ErpId = Convert.ToDecimal(dto.erpid),
                ItemMoveId = Convert.ToDecimal(dto.eid),
                ItemId =Convert.ToDecimal(dto.FMATERIALID),
                ItemUnit = Convert.ToDecimal(dto.FUNITID),
                SqNum = Convert.ToDecimal(dto.FQty),
                Remark = dto.FNote,
                BillNo = billno,
                MoveIn = 0,
                MoveOut = 0,
                CreateDate = DateTime.Now,
                IsTb = 0,
                FOwnerTypeId = dto.FOwnerTypeId,
                FOwnerId = dto.FOwnerId,
                FStockId = dto.FStockId,
                FOwnerTypeInId = dto.FOwnerTypeInId,
                FOwnerInId = dto.FOwnerInId,
                FStockInId = dto.FStockInId,
                FStockOrgId = Convert.ToDecimal(dto.FStockOrgId),
                FStockOrgInId = Convert.ToDecimal(dto.FStockOrgInId),
                FLot=dto.FLot,
                FMtono=dto.FMtoNo
            };

            var entity = Db.Queryable<MesInvItemMoveItems>().Where(s => s.ErpId == entitys.ErpId).Single();
            if (entity != null)
            {
                entitys.Id = entity.Id;
            }

            dbList.Add(entitys);
        }

        return dbList;
    }
}

 MES.Service/service/WomcaaManager.cs

@@ -22,10 +22,8 @@
    public bool Save(ErpWOM wom)
    {
        var womErpCaa = wom.ErpCaa;
        var mesWomcaa = MapErpCAAtoWomcaa(womErpCaa, wom.ErpCabs[0].FXSHTBH,
            wom.ErpCabs[0].F_ZJXF_HSDJ);
        var mesWomcabs =
            MapErpCABtoWomcab(wom.ErpCabs);
        var mesWomcaa = MapErpCAAtoWomcaa(womErpCaa, wom.ErpCabs[0].FXSHTBH,wom.ErpCabs[0].F_ZJXF_HSDJ);
        var mesWomcabs = MapErpCABtoWomcab(wom.ErpCabs);

        return UseTransaction(db =>
        {
@@ -45,8 +43,7 @@
        }) > 0;
    }

    private bool UpdateData(SqlSugarScope db, Womcaa mesWomcaa,
        List<Womcab> mesWomcabs)
    private bool UpdateData(SqlSugarScope db, Womcaa mesWomcaa,List<Womcab> mesWomcabs)
    {
        if (mesWomcaa.Id != null)
        {
@@ -135,7 +132,7 @@
        {
            return true;
        }
        throw new NotImplementedException("更新失败");
        throw new NotImplementedException("删除失败");
    }

    private Womcaa MapErpCAAtoWomcaa(ErpCAA dto, string? fxshtbh, string? hsdj)
@@ -257,7 +254,7 @@
                ProcNo = dto.F_ZJXF_SSGX
            };

            var entity = Db.Queryable<Womcab>().Where(s => s.Erpid == womcab.Erpid).Single();
            var entity = Db.Queryable<Womcab>().Where(s => s.Erpid == womcab.Erpid && s.Eid==womcab.Eid).Single();
            if (entity != null)
            {
                womcab.Id = entity.Id;

 MES.Service/service/WomcaaWWManager.cs

@@ -37,9 +37,7 @@
                case "1":
                case "2":
                case "4":
                    return SaveOrUpdateDataWw(db, mesWomcaa, mesWomcabs)
                        ? 1
                        : 0;
                    return SaveOrUpdateDataWw(db, mesWomcaa, mesWomcabs) ? 1 : 0;
                case "5":
                    return UpdateData(db, mesWomcaa, mesWomcabs) ? 1 : 0;
                default:
@@ -257,7 +255,7 @@
                SalesOrder = dto.F_WWC_TEXT
            };

            var entity = Db.Queryable<Womcab>().Where(s => s.Erpid == womcab.Erpid).Single();
            var entity = Db.Queryable<Womcab>().Where(s => s.Erpid == womcab.Erpid && s.Eid==womcab.Eid).Single();
            if (entity != null)
            {
                womcab.Id = entity.Id;

 MESApplication/Controllers/FBSDB/FbsDbController.cs

@@ -1,6 +1,128 @@
namespace MESApplication.Controllers.FBSDB;
using MES.Service.Dto.webApi;
using MES.Service.Dto.webApi.FbsDb;
using MES.Service.Modes;
using MES.Service.service;
using MES.Service.service.FBSDB;
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
using System.Dynamic;

public class FbsDbController
namespace MESApplication.Controllers.FBSDB;

/// <summary>
///  è°ƒæ‹¨
/// </summary>
[ApiController]
[Route("api/Dbcka")]
public class FbsDbController :ControllerBase
{

    private readonly MessageCenterManager _manager = new();
    private readonly FbsDbManager m = new();

    private readonly string METHOD = "POST";

    private readonly string TableName = "Dbcka";

    private readonly string URL = "http://localhost:10054/api/Dbcka/";

    /// <summary>
    ///  æ–°å¢ž
    /// </summary>
    [HttpPost("Save")]
    public ResponseResult Save(ErpDb db)
    {
        var entity = new MessageCenter();
        entity.TableName = TableName;
        entity.Url = URL + "Save";
        entity.Method = METHOD;
        entity.Data = JsonConvert.SerializeObject(db);
        entity.Status = 1;
        entity.CreateBy = "PL017";
        try
        {
            dynamic resultInfos = new ExpandoObject();
            var save = m.Save(db);

            resultInfos.tbBillList = 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);
        }
    }
    /// <summary>
    ///  æ–°å¢žæ‰¹é‡
    /// </summary>
    [HttpPost("SaveList")]
    public ResponseResult SaveList(List<ErpDb> dbs)
    {
        var entity = new MessageCenter();
        entity.TableName = TableName;
        entity.Url = URL + "SaveList";
        entity.Method = METHOD;
        entity.Data = JsonConvert.SerializeObject(dbs);
        entity.Status = 1;
        entity.CreateBy = "PL017";
        try
        {
            dynamic resultInfos = new ExpandoObject();
            var save = m.SaveList(dbs);
            resultInfos.tbBillList = 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);
        }
    }

}

 MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -5,7 +5,7 @@
<Project>
  <PropertyGroup>
    <_PublishTargetUrl>E:\Tool\TLM\TLM_JK\MESApplication\bin\Release\net8.0\publish\</_PublishTargetUrl>
    <History>True|2025-07-23T05:05:59.4942121Z||;True|2025-07-23T10:12:43.2843130+08:00||;True|2025-07-22T15:29:46.8848508+08:00||;False|2025-07-22T15:29:15.2781716+08:00||;False|2025-07-22T15:26:28.6544573+08:00||;True|2025-07-16T14:28:49.8020385+08:00||;True|2025-07-15T14:10:46.5966766+08:00||;True|2025-07-15T13:47:28.9454088+08:00||;True|2025-07-15T13:47:02.7000977+08:00||;False|2025-07-15T13:46:13.1024314+08:00||;True|2025-06-23T11:21:29.8285053+08:00||;True|2025-06-23T10:42:44.4782901+08:00||;True|2025-06-13T11:39:26.7350436+08:00||;False|2025-06-13T11:38:43.8884292+08:00||;True|2025-06-13T11:00:43.8087373+08:00||;True|2025-05-16T15:10:24.9670924+08:00||;True|2025-05-15T14:40:01.9090441+08:00||;True|2025-05-15T14:37:16.5010870+08:00||;True|2025-05-14T11:08:53.5234495+08:00||;True|2025-05-10T11:32:49.9307363+08:00||;True|2025-05-09T18:04:27.4863117+08:00||;True|2025-04-16T18:13:28.4207378+08:00||;True|2025-04-11T18:24:26.3046003+08:00||;True|2025-03-26T10:03:35.1416945+08:00||;True|2025-03-24T14:54:31.6912596+08:00||;True|2025-03-04T15:36:06.8726998+08:00||;True|2025-03-04T15:07:10.0825281+08:00||;True|2025-02-28T12:01:45.7353138+08:00||;True|2025-02-27T18:49:51.8648828+08:00||;True|2025-02-24T18:08:27.1066831+08:00||;True|2025-02-14T20:58:59.6306239+08:00||;True|2025-02-12T18:28:32.5741267+08:00||;True|2024-12-28T09:06:17.0669698+08:00||;True|2024-12-26T14:45:42.2002555+08:00||;True|2024-12-26T13:03:07.9325085+08:00||;True|2024-12-26T11:43:04.0852484+08:00||;True|2024-12-21T22:33:39.6121285+08:00||;True|2024-12-16T14:40:36.9800141+08:00||;True|2024-12-14T16:23:42.9536129+08:00||;True|2024-12-11T15:50:13.8959852+08:00||;True|2024-12-11T10:47:42.1561088+08:00||;True|2024-12-08T18:32:27.3909077+08:00||;True|2024-12-06T16:30:29.0031886+08:00||;True|2024-12-05T16:20:00.9907217+08:00||;True|2024-12-05T16:19:41.4441561+08:00||;True|2024-12-05T16:19:22.9404769+08:00||;True|2024-12-05T11:07:30.6547548+08:00||;True|2024-12-03T17:12:24.9349522+08:00||;True|2024-11-27T11:05:24.9761937+08:00||;True|2024-11-19T08:57:10.9008301+08:00||;True|2024-11-18T21:02:57.0481324+08:00||;True|2024-11-05T17:25:48.6360448+08:00||;True|2024-11-05T17:16:08.2144948+08:00||;True|2024-10-28T11:56:24.2694762+08:00||;True|2024-10-28T11:40:56.4512491+08:00||;True|2024-10-28T11:28:42.4509497+08:00||;True|2024-10-28T11:11:11.1286907+08:00||;True|2024-10-28T10:09:42.4378313+08:00||;True|2024-10-28T09:57:51.0792947+08:00||;True|2024-10-23T17:07:23.7741858+08:00||;True|2024-10-22T14:34:55.4526970+08:00||;True|2024-10-17T16:37:53.4763504+08:00||;True|2024-10-13T14:04:45.3666662+08:00||;True|2024-10-13T12:30:16.7294894+08:00||;True|2024-10-13T12:22:13.5740642+08:00||;True|2024-09-26T17:43:56.9592414+08:00||;True|2024-09-25T09:56:59.0722612+08:00||;True|2024-09-20T16:35:40.9416105+08:00||;True|2024-09-13T15:42:08.2824743+08:00||;True|2024-08-20T17:12:00.2924570+08:00||;True|2024-08-17T10:57:05.6670396+08:00||;True|2024-08-17T10:56:46.8068041+08:00||;True|2024-08-16T14:09:17.0526491+08:00||;True|2024-08-15T08:40:32.8134665+08:00||;True|2024-08-14T10:00:27.7017207+08:00||;True|2024-08-14T08:54:44.8284031+08:00||;True|2024-08-07T10:32:10.3689256+08:00||;True|2024-08-05T15:45:03.0864530+08:00||;True|2024-08-03T09:59:13.7916520+08:00||;True|2024-07-31T17:27:28.1965929+08:00||;True|2024-07-31T15:27:34.7943845+08:00||;True|2024-07-30T15:04:50.5849235+08:00||;True|2024-07-30T14:09:06.2877325+08:00||;True|2024-07-29T16:11:30.4493940+08:00||;True|2024-07-23T14:30:34.4591002+08:00||;True|2024-07-22T14:17:39.8186158+08:00||;True|2024-04-10T12:55:31.3963752+08:00||;True|2024-04-08T13:59:25.5487203+08:00||;True|2024-04-06T09:30:09.5350539+08:00||;True|2024-04-06T08:46:05.8814658+08:00||;True|2024-04-05T14:06:52.0448024+08:00||;True|2024-04-05T12:47:46.0561601+08:00||;True|2024-02-26T08:46:22.0988887+08:00||;True|2024-02-24T19:17:13.6770376+08:00||;True|2024-02-24T14:32:37.4450337+08:00||;True|2024-02-23T10:22:06.5150173+08:00||;True|2024-02-22T13:19:56.6997993+08:00||;True|2024-02-22T10:53:17.7929585+08:00||;True|2024-02-21T17:08:06.5553444+08:00||;True|2024-02-19T16:24:37.4912012+08:00||;</History>
    <History>True|2025-08-15T06:25:19.3531965Z||;True|2025-08-14T17:32:25.7508344+08:00||;False|2025-08-14T17:31:56.8464506+08:00||;True|2025-08-12T19:41:36.3893617+08:00||;True|2025-08-09T09:29:59.0486574+08:00||;True|2025-08-06T13:22:48.4388593+08:00||;True|2025-08-02T16:57:47.8520200+08:00||;True|2025-07-23T13:05:59.4942121+08:00||;True|2025-07-23T10:12:43.2843130+08:00||;True|2025-07-22T15:29:46.8848508+08:00||;False|2025-07-22T15:29:15.2781716+08:00||;False|2025-07-22T15:26:28.6544573+08:00||;True|2025-07-16T14:28:49.8020385+08:00||;True|2025-07-15T14:10:46.5966766+08:00||;True|2025-07-15T13:47:28.9454088+08:00||;True|2025-07-15T13:47:02.7000977+08:00||;False|2025-07-15T13:46:13.1024314+08:00||;True|2025-06-23T11:21:29.8285053+08:00||;True|2025-06-23T10:42:44.4782901+08:00||;True|2025-06-13T11:39:26.7350436+08:00||;False|2025-06-13T11:38:43.8884292+08:00||;True|2025-06-13T11:00:43.8087373+08:00||;True|2025-05-16T15:10:24.9670924+08:00||;True|2025-05-15T14:40:01.9090441+08:00||;True|2025-05-15T14:37:16.5010870+08:00||;True|2025-05-14T11:08:53.5234495+08:00||;True|2025-05-10T11:32:49.9307363+08:00||;True|2025-05-09T18:04:27.4863117+08:00||;True|2025-04-16T18:13:28.4207378+08:00||;True|2025-04-11T18:24:26.3046003+08:00||;True|2025-03-26T10:03:35.1416945+08:00||;True|2025-03-24T14:54:31.6912596+08:00||;True|2025-03-04T15:36:06.8726998+08:00||;True|2025-03-04T15:07:10.0825281+08:00||;True|2025-02-28T12:01:45.7353138+08:00||;True|2025-02-27T18:49:51.8648828+08:00||;True|2025-02-24T18:08:27.1066831+08:00||;True|2025-02-14T20:58:59.6306239+08:00||;True|2025-02-12T18:28:32.5741267+08:00||;True|2024-12-28T09:06:17.0669698+08:00||;True|2024-12-26T14:45:42.2002555+08:00||;True|2024-12-26T13:03:07.9325085+08:00||;True|2024-12-26T11:43:04.0852484+08:00||;True|2024-12-21T22:33:39.6121285+08:00||;True|2024-12-16T14:40:36.9800141+08:00||;True|2024-12-14T16:23:42.9536129+08:00||;True|2024-12-11T15:50:13.8959852+08:00||;True|2024-12-11T10:47:42.1561088+08:00||;True|2024-12-08T18:32:27.3909077+08:00||;True|2024-12-06T16:30:29.0031886+08:00||;True|2024-12-05T16:20:00.9907217+08:00||;True|2024-12-05T16:19:41.4441561+08:00||;True|2024-12-05T16:19:22.9404769+08:00||;True|2024-12-05T11:07:30.6547548+08:00||;True|2024-12-03T17:12:24.9349522+08:00||;True|2024-11-27T11:05:24.9761937+08:00||;True|2024-11-19T08:57:10.9008301+08:00||;True|2024-11-18T21:02:57.0481324+08:00||;True|2024-11-05T17:25:48.6360448+08:00||;True|2024-11-05T17:16:08.2144948+08:00||;True|2024-10-28T11:56:24.2694762+08:00||;True|2024-10-28T11:40:56.4512491+08:00||;True|2024-10-28T11:28:42.4509497+08:00||;True|2024-10-28T11:11:11.1286907+08:00||;True|2024-10-28T10:09:42.4378313+08:00||;True|2024-10-28T09:57:51.0792947+08:00||;True|2024-10-23T17:07:23.7741858+08:00||;True|2024-10-22T14:34:55.4526970+08:00||;True|2024-10-17T16:37:53.4763504+08:00||;True|2024-10-13T14:04:45.3666662+08:00||;True|2024-10-13T12:30:16.7294894+08:00||;True|2024-10-13T12:22:13.5740642+08:00||;True|2024-09-26T17:43:56.9592414+08:00||;True|2024-09-25T09:56:59.0722612+08:00||;True|2024-09-20T16:35:40.9416105+08:00||;True|2024-09-13T15:42:08.2824743+08:00||;True|2024-08-20T17:12:00.2924570+08:00||;True|2024-08-17T10:57:05.6670396+08:00||;True|2024-08-17T10:56:46.8068041+08:00||;True|2024-08-16T14:09:17.0526491+08:00||;True|2024-08-15T08:40:32.8134665+08:00||;True|2024-08-14T10:00:27.7017207+08:00||;True|2024-08-14T08:54:44.8284031+08:00||;True|2024-08-07T10:32:10.3689256+08:00||;True|2024-08-05T15:45:03.0864530+08:00||;True|2024-08-03T09:59:13.7916520+08:00||;True|2024-07-31T17:27:28.1965929+08:00||;True|2024-07-31T15:27:34.7943845+08:00||;True|2024-07-30T15:04:50.5849235+08:00||;True|2024-07-30T14:09:06.2877325+08:00||;True|2024-07-29T16:11:30.4493940+08:00||;True|2024-07-23T14:30:34.4591002+08:00||;True|2024-07-22T14:17:39.8186158+08:00||;True|2024-04-10T12:55:31.3963752+08:00||;True|2024-04-08T13:59:25.5487203+08:00||;True|2024-04-06T09:30:09.5350539+08:00||;True|2024-04-06T08:46:05.8814658+08:00||;True|2024-04-05T14:06:52.0448024+08:00||;True|2024-04-05T12:47:46.0561601+08:00||;True|2024-02-26T08:46:22.0988887+08:00||;</History>
    <LastFailureDetails />
  </PropertyGroup>
</Project>

 MESApplication/bin/Release/net8.0/MES.Service.dll

Binary files differ

 MESApplication/bin/Release/net8.0/MES.Service.pdb

Binary files differ

 MESApplication/bin/Release/net8.0/MESApplication.dll

Binary files differ

 MESApplication/bin/Release/net8.0/MESApplication.exe

Binary files differ

 MESApplication/bin/Release/net8.0/MESApplication.pdb

Binary files differ

 MESApplication/bin/Release/net8.0/MESApplication.xml

@@ -858,6 +858,21 @@
            </summary>
            <returns></returns>
        </member>
        <member name="T:MESApplication.Controllers.FBSDB.FbsDbController">
            <summary>
             è°ƒæ‹¨
            </summary>
        </member>
        <member name="M:MESApplication.Controllers.FBSDB.FbsDbController.Save(MES.Service.Dto.webApi.FbsDb.ErpDb)">
            <summary>
             æ–°å¢ž
            </summary>
        </member>
        <member name="M:MESApplication.Controllers.FBSDB.FbsDbController.SaveList(System.Collections.Generic.List{MES.Service.Dto.webApi.FbsDb.ErpDb})">
            <summary>
             æ–°å¢žæ‰¹é‡
            </summary>
        </member>
        <member name="M:MESApplication.Controllers.QC.MesLineUserController.GetList">
            <summary>
                èŽ·å–所有

 MESApplication/bin/Release/net8.0/publish/MES.Service.dll

Binary files differ

 MESApplication/bin/Release/net8.0/publish/MES.Service.pdb

Binary files differ

 MESApplication/bin/Release/net8.0/publish/MESApplication.dll

Binary files differ

 MESApplication/bin/Release/net8.0/publish/MESApplication.exe

Binary files differ

 MESApplication/bin/Release/net8.0/publish/MESApplication.pdb

Binary files differ

 MESApplication/bin/Release/net8.0/publish/MESApplication.xml

@@ -858,6 +858,21 @@
            </summary>
            <returns></returns>
        </member>
        <member name="T:MESApplication.Controllers.FBSDB.FbsDbController">
            <summary>
             è°ƒæ‹¨
            </summary>
        </member>
        <member name="M:MESApplication.Controllers.FBSDB.FbsDbController.Save(MES.Service.Dto.webApi.FbsDb.ErpDb)">
            <summary>
             æ–°å¢ž
            </summary>
        </member>
        <member name="M:MESApplication.Controllers.FBSDB.FbsDbController.SaveList(System.Collections.Generic.List{MES.Service.Dto.webApi.FbsDb.ErpDb})">
            <summary>
             æ–°å¢žæ‰¹é‡
            </summary>
        </member>
        <member name="M:MESApplication.Controllers.QC.MesLineUserController.GetList">
            <summary>
                èŽ·å–所有