1，签收送货单接口，添加签收人；2.来料检接口，添加到货时间字段

zjh

2025-06-12 0ac65b10a59bcca5b22bcf03086c8aaa36a8a525

 StandardPda/MES.Service/service/BasicData/ProductionOrderManager.cs

@@ -1,9 +1,7 @@
using System.Globalization;
using AngleSharp.Dom;
using MES.Service.DB;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using MES.Service.util;
using SqlSugar;

namespace MES.Service.service.BasicData;
@@ -83,7 +81,7 @@
        var baOrUpdate = db.Insertable(mesWomcabss).PageSize(1)
            .IgnoreColumnsNull()
            .ExecuteCommand() > 0;
        

        if (orUpdate && baOrUpdate) return true;

        throw new NotImplementedException("插入或更新失败");
@@ -117,7 +115,7 @@
        {
            Caa001 = erpDto.FBillNo,
            DepotCode = erpDto.FStockID,
            CreateDate = erpDto.FDate,// ParseDateTime(erpDto.FDate) ?? null,
            CreateDate = erpDto.FDate, // ParseDateTime(erpDto.FDate) ?? null,
            Caa004 = erpDto.FBillType,
            Caa023 = erpDto.FStatus,
            Caa006 = erpDto.FMaterialId,
@@ -126,46 +124,52 @@
            WorkGroupId = erpDto.FWorkGroupId,
            PlanId = erpDto.FPlannerID,
            Caa010 = erpDto.FPlanStartDate,
                //ParseDateTime(erpDto.FPlanStartDate) ?? null,
            //ParseDateTime(erpDto.FPlanStartDate) ?? null,
            Caa011 = erpDto.FPlanFinishDate,
            //ParseDateTime(erpDto.FPlanFinishDate) ?? null,

            PLANCONFIRMATION = erpDto.PlanConfirmation,
            StockInlimith = erpDto.FStockInLimitH,//Convert.ToDecimal(erpDto.FStockInLimitH),
            StockInlimitl = erpDto.FStockInLimitL,//Convert.ToDecimal(erpDto.FStockInLimitL),
            //PLANCONFIRMATION = erpDto.PlanConfirmation,
            StockInlimith =
                erpDto
                    .FStockInLimitH, //Convert.ToDecimal(erpDto.FStockInLimitH),
            StockInlimitl =
                erpDto
                    .FStockInLimitL, //Convert.ToDecimal(erpDto.FStockInLimitL),
            Mtono = erpDto.FMTONO,
            Lot = erpDto.FLot,
            Caa013 = erpDto.FBomId,
            //SalesOrderNo = erpDto.F_UNW_XSDDH,
            CreateType = erpDto.FCreateType,
            FSUBID = erpDto.FSUBID,
            FSUBBILLNOSEQ = erpDto.FSUBBILLNOSEQ,
            FSUBBILLNO = erpDto.FSUBBILLNO,
            //FSUBID = erpDto.FSUBID,
            //FSUBBILLNOSEQ = erpDto.FSUBBILLNOSEQ,
            //FSUBBILLNO = erpDto.FSUBBILLNO,
            SrcBillType = erpDto.FSrcBillType,
            SrcBillNo = erpDto.FSrcBillNo,
            SrcBillentryseq = erpDto.FSrcBillEntrySeq,
            FREQSRC = erpDto.FReqSrc,
            //FREQSRC = erpDto.FReqSrc,
            SaleOrderNo = erpDto.FSALEORDERNO,
            SaleOrderEntryseq = erpDto.FSaleOrderEntrySeq,
            ForceCloserid = erpDto.FFORCECLOSERID,
            CloseType = erpDto.FCloseType,
            SrcSplitBillno = erpDto.FDescription,
            SRCSPLITSEQ = erpDto.SrcSplitSeq,
            Erpid = Convert.ToDecimal(erpDto.FID),
            FSUBENTRYID = erpDto.FSUBENTRYID,
            FPURORDERNO = erpDto.FPurOrderNo,
            FPURORDERENTRYSEQ = erpDto.FPurOrderEntrySeq,//Convert.ToInt32(erpDto.FPurOrderEntrySeq),
            FBASESTOCKINQTY = Convert.ToDecimal(erpDto.FBaseStockInQty),
            FBASENOSTOCKINQTY = Convert.ToDecimal(erpDto.FBaseNoStockInQty),
            FINSTOCKOWNERID = erpDto.FInStockOwnerId,
            //SRCSPLITSEQ = erpDto.SrcSplitSeq,
            Erpid = Convert.ToDecimal(erpDto.FID)
            //FSUBENTRYID = erpDto.FSUBENTRYID,
            //FPURORDERNO = erpDto.FPurOrderNo,
            //FPURORDERENTRYSEQ =
            //erpDto
            //    .FPurOrderEntrySeq, //Convert.ToInt32(erpDto.FPurOrderEntrySeq),
            //FBASESTOCKINQTY = Convert.ToDecimal(erpDto.FBaseStockInQty),
            //FBASENOSTOCKINQTY = Convert.ToDecimal(erpDto.FBaseNoStockInQty),
            //FINSTOCKOWNERID = erpDto.FInStockOwnerId,
            //PlanConfirmation = erpDto.PlanConfirmation != null
            //    ? DateTime.ParseExact(erpDto.PlanConfirmation,
            //        "yyyy-MM-dd HH:mm:ss", null)
            //    : null,
            Typea = erpDto.TypeA,
            F_WWDD_SCTZD = erpDto.F_WWDD_SCTZD,
            F_WWDD_XH = erpDto.F_WWDD_XH,
            F_XIFG_TEXT_TZK = erpDto.F_XIFG_Text_tzk
            // Typea = erpDto.TypeA,
            // F_WWDD_SCTZD = erpDto.F_WWDD_SCTZD,
            // F_WWDD_XH = erpDto.F_WWDD_XH,
            // F_XIFG_TEXT_TZK = erpDto.F_XIFG_Text_tzk
        };

        var single = base.GetSingle(it => it.Erpid == entity.Erpid);
@@ -185,9 +189,9 @@
            var productionOrderSub = new Womcab
            {
                Cab001 = erpDto.FBillNo,
                Cab002 = erpDto.FSEQ,//Convert.ToInt32(erpDto.FSEQ),
                Cab002 = erpDto.FSEQ, //Convert.ToInt32(erpDto.FSEQ),
                Cab003 = erpDto.FMaterialID2,
                MustQty = Convert.ToDecimal(erpDto.FMustQty),
                // MustQty = Convert.ToDecimal(erpDto.FMustQty),
                Cab006 = Convert.ToDecimal(erpDto.FMustQty),
                Cab007 = Convert.ToDecimal(erpDto.FPickedQty),
                PositionNo = erpDto.FPositionNO,
@@ -203,31 +207,32 @@
                Numerator = Convert.ToDecimal(erpDto.FNumerator),
                Denominator = Convert.ToDecimal(erpDto.FDenominator),
                Erpid = Convert.ToDecimal(erpDto.FPPOMENTRYID),
                Eid = Convert.ToDecimal(erpDto.FPPOMID),
                SCRAPQTY = Convert.ToDecimal(erpDto.FFixScrapQty),
                SCRAPRATE = Convert.ToDecimal(erpDto.FScrapRate),
                MaterialType = erpDto.FMaterialType,
                //Unit2 = erpDto.FUnitID3,
                Freplacegroup = Convert.ToInt32(erpDto.FReplaceGroup),
                Eid = Convert.ToDecimal(erpDto.FPPOMID)
                // SCRAPQTY = Convert.ToDecimal(erpDto.FFixScrapQty),
                // SCRAPRATE = Convert.ToDecimal(erpDto.FScrapRate),
                // MaterialType = erpDto.FMaterialType,
                // //Unit2 = erpDto.FUnitID3,
                // Freplacegroup = Convert.ToInt32(erpDto.FReplaceGroup),
                //OwnerType = erpDto.FOwnerTypeId,
                //Owner = erpDto.FOwnerID2,

                Fisgetscrap = erpDto.FISGETSCRAP,
                Fiskeycomponent = erpDto.FISKEYCOMPONENT,
                Fsrctransorgid = erpDto.FSRCTRANSORGID,
                Fsrctransstockid = erpDto.FSRCTRANSSTOCKID,
                Fstockstatusid = erpDto.FSTOCKSTATUSID,
                Fneeddate = erpDto.FNEEDDATE != null
                    ? DateTime.ParseExact(erpDto.FNEEDDATE,
                        "yyyy-MM-dd HH:mm:ss", null)
                    : null,
                Freservetype = erpDto.FRESERVETYPE,
                Fmemo = erpDto.FMEMO,
                Typeb = erpDto.TypeB,
                ErpProductionEntryCode = erpDto.FSUBENTRYID
                // Fisgetscrap = erpDto.FISGETSCRAP,
                // Fiskeycomponent = erpDto.FISKEYCOMPONENT,
                // Fsrctransorgid = erpDto.FSRCTRANSORGID,
                // Fsrctransstockid = erpDto.FSRCTRANSSTOCKID,
                // Fstockstatusid = erpDto.FSTOCKSTATUSID,
                // Fneeddate = erpDto.FNEEDDATE != null
                //     ? DateTime.ParseExact(erpDto.FNEEDDATE,
                //         "yyyy-MM-dd HH:mm:ss", null)
                //     : null,
                // Freservetype = erpDto.FRESERVETYPE,
                // Fmemo = erpDto.FMEMO,
                // Typeb = erpDto.TypeB,
                // ErpProductionEntryCode = erpDto.FSUBENTRYID
            };

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

            productionOrderSubList.Add(productionOrderSub);