StandardPda/MES.Service/service/BasicData/ProductionOrderManager.cs
@@ -128,7 +128,7 @@
            Caa011 = erpDto.FPlanFinishDate,
            //ParseDateTime(erpDto.FPlanFinishDate) ?? null,
            PLANCONFIRMATION = erpDto.PlanConfirmation,
            //PLANCONFIRMATION = erpDto.PlanConfirmation,
            StockInlimith =
                erpDto
                    .FStockInLimitH, //Convert.ToDecimal(erpDto.FStockInLimitH),
@@ -140,36 +140,36 @@
            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);
@@ -191,7 +191,7 @@
                Cab001 = erpDto.FBillNo,
                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,
@@ -207,28 +207,28 @@
                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 =