1.仓库信息储存逻辑调整 2.生产订单接口优化。

南骏 池

2025-06-06 a4ae3bf5f1826e8e29a95da3dc2c947d713d4ebb

 MES.Service/service/BasicData/ProductionOrderManager.cs

@@ -14,12 +14,14 @@
    private readonly ProductionOrderSubManager _productionOrderSubManager =
        new();

    private string ORDERNO = "";


    //ErpWYOrder
    public bool Save(ErpWYOrder wyOrder)
    {
        var erpProductionOrderDto = wyOrder.OrderDto;
        var mesRohIn = ConvertErpToProductionOrder(erpProductionOrderDto);
        var mesRohIn = ConvertErpToProductionOrder(erpProductionOrderDto, wyOrder.Items[0].FBILLNO);
        var mesRohInDatas =
            ConvertErpToProductionOrderSub(wyOrder.Items);

@@ -75,10 +77,16 @@

        if (mesRohInDatas.Count > 0)
            db.Deleteable<ProductionOrderSub>()
                .Where(s => s.ErpHeaderId == mesRohIn.ErpId).ExecuteCommand();
                .Where(s => s.ErpProductionEntryCode == mesRohIn.ErpProductionEntryCode).ExecuteCommand();

        var orUpdate = base.Insert(mesRohIn);
        var baOrUpdate = _productionOrderSubManager.InsertRange(mesRohInDatas);
        var orUpdate = db.Insertable(mesRohIn)
            .IgnoreColumns(true).ExecuteCommand() > 0;


        var baOrUpdate = db.Insertable(mesRohInDatas).PageSize(1)
            .IgnoreColumnsNull()
            .ExecuteCommand() > 0;
        
        if (orUpdate && baOrUpdate) return true;

        throw new NotImplementedException("插入或更新失败");
@@ -92,7 +100,7 @@
    }

    private ProductionOrder ConvertErpToProductionOrder(
        ErpProductionOrderDto erpDto)
        ErpProductionOrderDto erpDto,string SUBBOM)
    {
        DateTime parsedDate;

@@ -110,7 +118,7 @@

        var productionOrder = new ProductionOrder
        {
            OrderNo = erpDto.FBillNo,
            OrderNo = SUBBOM,
            Warehouse = erpDto.FStockID,
            OrderDate = ParseDateTime(erpDto.FDate) ?? null,
            OrderType = erpDto.FBillType,
@@ -142,7 +150,7 @@
            ClosingPerson = erpDto.FFORCECLOSERID,
            ClosingType = erpDto.FCloseType,
            Remarks = erpDto.FDescription,
            ErpId = erpDto.FPPOMID,
            ErpId = erpDto.FID,
            ErpProductionEntryCode = erpDto.FSUBENTRYID,
            Purchaseorderno = erpDto.FPurOrderNo,
            Purchaseorderentryseq = Convert.ToInt32(erpDto.FPurOrderEntrySeq),
@@ -155,11 +163,10 @@
                : null,
            ReqSrc = erpDto.FReqSrc,
            SrcSplitSeq = erpDto.SrcSplitSeq,
            Typeb = erpDto.TypeB,
            Typea = erpDto.TypeA,
        };

        var single = base.GetSingle(it => it.ErpId == erpDto.FPPOMID);
        var single = base.GetSingle(it => it.ErpProductionEntryCode == erpDto.FSUBENTRYID);
        if (single != null) productionOrder.Guid = single.Guid;

        return productionOrder;
@@ -209,6 +216,7 @@
                    : null,
                Freservetype = erpDto.FRESERVETYPE,
                Fmemo = erpDto.FMEMO,
                Typeb = erpDto.TypeB,
                ErpProductionEntryCode = erpDto.FSUBENTRYID
            };