From 6d3eca191a75ab2f4229e4514b36f04ec79bc0fe Mon Sep 17 00:00:00 2001
From: xwt <2740516069@qq.com>
Date: 星期三, 09 七月 2025 13:58:46 +0800
Subject: [PATCH] llj排序
---
StandardInterface/MES.Service/service/BasicData/Production/ProductionOrderManager.cs | 72 ++++++++++++++++++++++-------------
1 files changed, 45 insertions(+), 27 deletions(-)
diff --git a/StandardInterface/MES.Service/service/BasicData/Production/ProductionOrderManager.cs b/StandardInterface/MES.Service/service/BasicData/Production/ProductionOrderManager.cs
index e2943de..31efed9 100644
--- a/StandardInterface/MES.Service/service/BasicData/Production/ProductionOrderManager.cs
+++ b/StandardInterface/MES.Service/service/BasicData/Production/ProductionOrderManager.cs
@@ -50,12 +50,25 @@
List<Womcab> mesRohInDatas)
{
var decimals = mesRohInDatas.Select(s => s.Id).ToArray();
- var update = base.DeleteById(womcaaWW.Id);
- var insertOrUpdate = db
- .Deleteable<Womcab>().In(decimals)
- .ExecuteCommand() > 0;
- if (update && insertOrUpdate) return true;
+ var update = true;
+ if (womcaaWW != null)
+ {
+ if (womcaaWW.Id != null)
+ {
+ update = base.DeleteById(womcaaWW.Id);
+ }
+ }
+ var insertOrUpdate = true;
+ if (decimals != null || decimals.Length > 0)
+ {
+ insertOrUpdate = db.Deleteable<Womcab>().In(decimals).ExecuteCommand() > 0;
+ }
+
+ if (update && insertOrUpdate)
+ {
+ return true;
+ }
throw new NotImplementedException("鏇存柊澶辫触");
}
@@ -113,7 +126,7 @@
var entity = new Womcaa
{
- Caa001 = erpDto.ppbombillno, /// 鍗曞彿
+ Caa001 = erpDto.FBillNo, /// 鍗曞彿
//Caa001 = erpDto.FBillNo,
DepotCode = erpDto.FStockID,
CreateDate = erpDto.FDate, // ParseDateTime(erpDto.FDate) ?? null,
@@ -129,7 +142,7 @@
Caa011 = erpDto.FPlanFinishDate,
//ParseDateTime(erpDto.FPlanFinishDate) ?? null,
- PLANCONFIRMATION = erpDto.PlanConfirmation,
+ Planconfirmation = erpDto.PlanConfirmation,
StockInlimith =
erpDto
.FStockInLimitH, //Convert.ToDecimal(erpDto.FStockInLimitH),
@@ -141,36 +154,41 @@
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,
+ Caa020 = 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,
+ Srcsplitseq = erpDto.SrcSplitSeq,
Erpid = Convert.ToDecimal(erpDto.FID),
- FSUBENTRYID = erpDto.FSUBENTRYID,
- FPURORDERNO = erpDto.FPurOrderNo,
- FPURORDERENTRYSEQ =
+ Fsubentryid = Convert.ToDecimal(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,
+ Fbasestockinqty = erpDto.FBaseStockInQty,
+ Fbasenostockinqty = 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
+ // F_WWDD_SCTZD = erpDto.F_WWDD_SCTZD,
+ // F_WWDD_XH = erpDto.F_WWDD_XH,
+ //F_XIFG_TEXT_TZK = erpDto.F_XIFG_Text_tzk
+ WwOrg=erpDto.WW_ZZ,
+ CgOrg=erpDto.CG_ZZ,
+ SuppId=erpDto.FSUPPLIERID,
+
};
var single = base.GetSingle(it => it.Erpid == entity.Erpid);
@@ -209,8 +227,8 @@
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),
+ Scrapqty = Convert.ToDecimal(erpDto.FFixScrapQty),
+ Scraprate = Convert.ToDecimal(erpDto.FScrapRate),
MaterialType = erpDto.FMaterialType,
//Unit2 = erpDto.FUnitID3,
Freplacegroup = Convert.ToInt32(erpDto.FReplaceGroup),
@@ -230,10 +248,10 @@
Fmemo = erpDto.FMEMO,
Typeb = erpDto.TypeB,
ErpProductionEntryCode = erpDto.FSUBENTRYID,
- FOWNERTYPEID = erpDto.FOwnerTypeId,
- F_XIFG_BASE_RE5 = erpDto.F_XIFG_Base_re5,
- FUNITID2 = erpDto.FUnitID2,
- FUNITID3 = erpDto.FUnitID3
+ // FOWNERTYPEID = erpDto.FOwnerTypeId,
+ // F_XIFG_BASE_RE5 = erpDto.F_XIFG_Base_re5,
+ // FUNITID2 = erpDto.FUnitID2,
+ //FUNITID3 = erpDto.FUnitID3
};
var single =
--
Gitblit v1.9.3