From 8ba0722979e389a8a2f5835022a7d305ab215c08 Mon Sep 17 00:00:00 2001
From: xwt <2740516069@qq.com>
Date: 星期四, 24 七月 2025 17:52:26 +0800
Subject: [PATCH] 来料检增加字段
---
StandardInterface/MES.Service/service/WomcaaManager.cs | 121 ++++++++++++++++++++++++++-------------
1 files changed, 80 insertions(+), 41 deletions(-)
diff --git a/StandardInterface/MES.Service/service/WomcaaManager.cs b/StandardInterface/MES.Service/service/WomcaaManager.cs
index 7769901..c1584c4 100644
--- a/StandardInterface/MES.Service/service/WomcaaManager.cs
+++ b/StandardInterface/MES.Service/service/WomcaaManager.cs
@@ -60,7 +60,7 @@
.IgnoreColumns(true).ExecuteCommand() > 0;
//鎵归噺鎻掑叆蹇界暐绌哄瓧娈�
- var baOrUpdate = db.Insertable(mesWomcabs).PageSize(1)
+ var baOrUpdate = db.Insertable(mesWomcabs).PageSize(10)
.IgnoreColumnsNull()
.ExecuteCommand() > 0;
@@ -72,13 +72,27 @@
List<Womcab> mesWomcabs)
{
var decimals = mesWomcabs.Select(s => s.Id).ToArray();
- var update = base.DeleteById(mesWomcaa.Id);
- var insertOrUpdate = db
- .Deleteable<Womcab>().In(decimals)
- .ExecuteCommand() > 0;
- if (update && insertOrUpdate) return true;
+ var update = true;
+ if (mesWomcaa != null)
+ {
+ if (mesWomcaa.Id != null)
+ {
+ update = base.DeleteById(mesWomcaa.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("鏇存柊澶辫触");
+
}
private Womcaa MapErpCAAtoWomcaa(ErpCAA dto)
@@ -154,7 +168,7 @@
var entity = new Womcaa
{
Erpid = Convert.ToInt32(dto.Id), /// ERPID
- Caa001 = dto.ppbombillno, /// 鍗曞彿
+ Caa001 = dto.FBillNo, /// 鍗曞彿
Caa021 = dto.FWorkShopID, /// 宸ヤ綔杞﹂棿
RoutingId = dto.FRoutingId, /// 宸ヨ壓璺嚎
WorkShopId = dto.FREMWorkShopId, /// 浜х嚎
@@ -177,7 +191,8 @@
Mtono = dto.FMTONO, /// 璁″垝璺熻釜鍙�
Lot = dto.FLot, /// 鎵瑰彿
Caa013 = dto.FBomId, /// BOM鐗堟
-
+ Caa015 = dto.CAA015, //閿�鍞鍗曞彿
+ Caa015Head = dto.CAA015_line, //閿�鍞鍗曡鍙�
CreateType = dto.FCreateType, /// 鐢熸垚鏂瑰紡
Caa018 = !string.IsNullOrEmpty(dto.PLAN_ID)
? Convert.ToInt32(dto.PLAN_ID)
@@ -193,14 +208,25 @@
CloseType = dto.FCloseType, /// 缁撴绫诲瀷
SrcSplitBillno = dto.FSrcSplitBillNo, /// 婧愭媶鍒嗚鍗曠紪鍙�
Caa016 = dto.FDescription, /// 澶囨敞
- BTBZ = dto.BTBZ, /// 澶囨敞
+ Btbz = dto.BTBZ, /// 澶囨敞
PrdOrg = dto.FPrdOrgId, /// 鐢熶骇缁勭粐ID
TrustOrg = dto.FEnTrustOrgId, /// 濮旀墭缁勭粐ID
Typea = dto.TypeA, /// 鍗曟嵁鐘舵��
-
-
+ RkOrg = dto.RK_ORG, //鍏ュ簱缁勭粐
+ Rcn=dto.RCN, //鏃ヤ骇鑳�
+ Cglineid=dto.CG_LINE_ID, //閲囪喘璁㈠崟琛宨d
+ Kh=dto.KH,
+ Khjc=dto.KH_JCZL,
+ Scph=dto.SC_PH,
+ Moldno=dto.MOLd_no,
+ Oldmoldno=dto.Old_mold_no,
+ Jt=dto.JT,
+ Xscn=dto.XS_CN,
+ Sjxs=dto.SJ_xs,
+ Nextgx=dto.NEXT_Gx,
+ Rks=dto.RKS,
//娌冨皵鏂板
- WR_F_SCDD_SCTZD = dto.F_SCDD_SCTZD
+ // WR_F_SCDD_SCTZD = dto.F_SCDD_SCTZD
//WR_F_SCDD_XH = dto.F_SCDD_XH
};
@@ -220,42 +246,55 @@
var womcab = new Womcab
{
Erpid = Convert.ToDecimal(dto.ID),
- Cab001 = dto.FBillNo,
- Cab002 = dto.FSeq,
- Cab003 = dto.FMaterialID,
- Cab006 = Convert.ToDecimal(dto.FNeedQty),
- MustQty = Convert.ToDecimal(dto.FMustQty),
- Cab007 = Convert.ToDecimal(dto.FPickedQty),
- PositionNo = dto.FPositionNO,
- SupplyOrganization = dto.FChildSupplyOrgId,
- IssuingOrganization = dto.FSupplyOrg,
- OwnerId = dto.FOwnerID,
- Mtono = dto.FMTONO,
- Lot = dto.FLot,
- DepotCode = dto.FStockID,
- IssueType = dto.FIssueType,
- Cab009 = dto.FUnitID,
- SupplyType = dto.FSupplyType,
- Cab012 = Convert.ToDecimal(dto.FStdQty),
- Freplacegroup = Convert.ToInt32(dto.FReplaceGroup),
- UseRate = Convert.ToDecimal(dto.FUseRate),
- MaterialType = dto.FMaterialType,
- Cab014 = dto.FIsKeyItem,
- Numerator = Convert.ToDecimal(dto.FNumerator),
- Denominator = Convert.ToDecimal(dto.FDenominator),
+ Cab001 = dto.FBillNo, //鍗曟嵁缂栧彿
+ Cab002 = dto.FSeq, //搴忓彿
+ Cab003 = dto.FMaterialID, //瀛愰」鐗╂枡缂栫爜
+ Cab006 = Convert.ToDecimal(dto.FNeedQty), //闇�姹傛暟閲�
+ MustQty = Convert.ToDecimal(dto.FMustQty), //搴斿彂鏁伴噺
+ Cab007 = Convert.ToDecimal(dto.FPickedQty), //宸查鏁伴噺
+ PositionNo = dto.FPositionNO, //浣嶇疆鍙�
+ SupplyOrganization = dto.FChildSupplyOrgId, //渚涘簲缁勭粐
+ IssuingOrganization = dto.FSupplyOrg, //鍙戞枡缁勭粐
+ OwnerId = dto.FOwnerID, //璐т富
+ Mtono = dto.FMTONO, //璁″垝璺熻釜鍙�
+ Lot = dto.FLot, //鎵瑰彿
+ DepotCode = dto.FStockID, //浠撳簱
+ IssueType = dto.FIssueType, //鍙戞枡鏂瑰紡
+ Cab008 = dto.GY, //宸ヨ壓
+ Cab009 = dto.FUnitID, //鍗曚綅
+ SupplyType = dto.FSupplyType, //渚涘簲绫诲瀷
+ Cab012 = Convert.ToDecimal(dto.FStdQty), // 鏍囧噯鐢ㄩ噺
+ // Freplacegroup = Convert.ToInt32(dto.FReplaceGroup),
+ UseRate = Convert.ToDecimal(dto.FUseRate), //浣跨敤姣斾緥
+ MaterialType = dto.FMaterialType, //瀛愰」绫诲瀷
+ Cab014 = Convert.ToInt32(dto.FIsKeyItem), //鏇夸唬涓绘枡
+ Numerator = Convert.ToDecimal(dto.FNumerator), //鍒嗗瓙
+ Denominator = Convert.ToDecimal(dto.FDenominator), //鍒嗘瘝
Pid = Convert.ToDecimal(dto.PID),
Eid = Convert.ToDecimal(dto.PID),
- SCRAPQTY = Convert.ToDecimal(dto.FFixScrapQty),
- SCRAPRATE = Convert.ToDecimal(dto.FScrapRate),
- Typeb = dto.TypeB,
- WR_F_XIFG_Base_qtr = dto.F_XIFG_Base_qtr
+ Scrapqty = Convert.ToDecimal(dto.FFixScrapQty), //鍥哄畾鎹熻��
+ Scraprate = Convert.ToDecimal(dto.FScrapRate), //鍙樺姩鎹熻�楃巼
+ Wlsl=dto.WLSL,
+ Khwlbm=dto.KWWLBM,
+ Khwlmc =dto.KHWLMC,
+ Slzz=dto.SLZZ,
+ Slbm=dto.SLBM,
+ Xqbm=dto.XQBM,
+ Xqzz=dto.XQZZ,
+ // Typeb = dto.TypeB,
+ // WR_F_XIFG_Base_qtr = dto.F_XIFG_Base_qtr
//WR_F_XIFG_Base_83g = dto.F_XIFG_Base_83g
};
var entity = Db.Queryable<Womcab>()
.Where(s => s.Erpid == womcab.Erpid).Single();
- if (entity != null) womcab.Id = entity.Id;
-
+ if (entity != null)
+ {
+ // 鍒犻櫎宸叉湁鐨� Erpid 鐩稿叧鐨� Womcab 鏁版嵁
+ // Db.Deleteable<Womcab>().Where(s => s.Erpid == womcab.Erpid).ExecuteCommand();
+ womcab.Id = entity.Id;
+ }
+
womcabList.Add(womcab);
}
--
Gitblit v1.9.3