From 0ac65b10a59bcca5b22bcf03086c8aaa36a8a525 Mon Sep 17 00:00:00 2001
From: zjh <2207896513@qq.com>
Date: 星期四, 12 六月 2025 20:42:41 +0800
Subject: [PATCH] 1，签收送货单接口，添加签收人；2.来料检接口，添加到货时间字段
---
StandardPda/MES.Service/service/WomcaaManager.cs | 84 ++++++++++++++++++++++++++++++++---------
1 files changed, 65 insertions(+), 19 deletions(-)
diff --git a/StandardPda/MES.Service/service/WomcaaManager.cs b/StandardPda/MES.Service/service/WomcaaManager.cs
index 91db2b7..5e72408 100644
--- a/StandardPda/MES.Service/service/WomcaaManager.cs
+++ b/StandardPda/MES.Service/service/WomcaaManager.cs
@@ -78,7 +78,7 @@
{
var entity = new Womcaa
{
- Erpid = Convert.ToInt32(dto.Id),
+ Erpid = Convert.ToInt64(dto.Id),
Caa001 = dto.FBillNo,
Caa021 = dto.FWorkShopID,
RoutingId = dto.FRoutingId,
@@ -105,9 +105,11 @@
CreateType = dto.FCreateType,
Caa018 = !string.IsNullOrEmpty(dto.PLAN_ID)
- ? Convert.ToInt32(dto.PLAN_ID)
+ ? Convert.ToInt64(dto.PLAN_ID)
: null,
- Caa019 = Convert.ToInt32(dto.PLAN_SEQ),
+ Caa019 = !string.IsNullOrEmpty(dto.PLAN_SEQ)
+ ? Convert.ToInt64(dto.PLAN_SEQ)
+ : null,
Caa020 = dto.PLAN_NUM,
SrcBillType = dto.FSrcBillType,
SrcBillNo = dto.FSrcBillNo,
@@ -128,6 +130,14 @@
var single = base.GetSingle(it => it.Erpid == entity.Erpid);
if (single != null) entity.Id = single.Id;
+ //Caa006 = dto.FMaterialId,
+ var mesLinkU9 = Db.Queryable<MesLinkU9>()
+ .Where(x => x.U9Id == dto.FMaterialId
+ && x.OrgId == dto.FPrdOrgId
+ && x.TableType == "MES_ITEMS").First();
+
+ if (mesLinkU9 != null) entity.Caa006 = mesLinkU9.MesId;
+
return entity;
}
@@ -139,13 +149,21 @@
{
var womcab = new Womcab
{
- Erpid = Convert.ToDecimal(dto.ID),
+ Erpid = !string.IsNullOrEmpty(dto.ID)
+ ? Convert.ToDecimal(dto.ID)
+ : throw new Exception("瀛愯〃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),
+ Cab006 = !string.IsNullOrEmpty(dto.FNeedQty)
+ ? Convert.ToDecimal(dto.FNeedQty)
+ : null,
+ MustQty = !string.IsNullOrEmpty(dto.FMustQty)
+ ? Convert.ToDecimal(dto.FMustQty)
+ : null,
+ Cab007 = !string.IsNullOrEmpty(dto.FPickedQty)
+ ? Convert.ToDecimal(dto.FPickedQty)
+ : null,
PositionNo = dto.FPositionNO,
SupplyOrganization = dto.FChildSupplyOrgId,
IssuingOrganization = dto.FSupplyOrg,
@@ -156,18 +174,38 @@
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 = Convert.ToInt32(dto.FIsKeyItem),
- Numerator = Convert.ToDecimal(dto.FNumerator),
- Denominator = Convert.ToDecimal(dto.FDenominator),
- Pid = Convert.ToDecimal(dto.FID),
- Eid = Convert.ToDecimal(dto.FID)
- // SCRAPQTY = Convert.ToDecimal(dto.FFixScrapQty),
- // SCRAPRATE = Convert.ToDecimal(dto.FScrapRate),
- // Typeb = dto.TypeB,
+ Cab012 = !string.IsNullOrEmpty(dto.FStdQty)
+ ? Convert.ToDecimal(dto.FStdQty)
+ : null,
+ FreplaceGroup = !string.IsNullOrEmpty(dto.FReplaceGroup)
+ ? Convert.ToInt64(dto.FReplaceGroup)
+ : null,
+ UseRate = !string.IsNullOrEmpty(dto.FUseRate)
+ ? Convert.ToDecimal(dto.FUseRate)
+ : null,
+ MaterialType = dto.FMaterialType,
+ Cab014 = !string.IsNullOrEmpty(dto.FIsKeyItem)
+ ? Convert.ToInt64(dto.FIsKeyItem)
+ : null,
+ Numerator = !string.IsNullOrEmpty(dto.FNumerator)
+ ? Convert.ToDecimal(dto.FNumerator)
+ : null,
+ Denominator = !string.IsNullOrEmpty(dto.FDenominator)
+ ? Convert.ToDecimal(dto.FDenominator)
+ : null,
+ Pid = !string.IsNullOrEmpty(dto.FID)
+ ? Convert.ToDecimal(dto.FID)
+ : throw new Exception("鐖秈d涓嶅厑璁镐负绌�"),
+ Eid = !string.IsNullOrEmpty(dto.FID)
+ ? Convert.ToDecimal(dto.FID)
+ : throw new Exception("鐖秈d涓嶅厑璁镐负绌�"),
+ Scrapqty = !string.IsNullOrEmpty(dto.FFixScrapQty)
+ ? Convert.ToDecimal(dto.FFixScrapQty)
+ : null,
+ Scraprate = !string.IsNullOrEmpty(dto.FScrapRate)
+ ? Convert.ToDecimal(dto.FScrapRate)
+ : null,
+ TypeB = dto.TypeB
// WR_F_XIFG_Base_qtr = dto.F_XIFG_Base_qtr,
// WR_F_XIFG_Base_83g = dto.F_XIFG_Base_83g
};
@@ -176,6 +214,14 @@
.Where(s => s.Erpid == womcab.Erpid).Single();
if (entity != null) womcab.Id = entity.Id;
+ //Cab003 = dto.FMaterialID
+ var mesLinkU9 = Db.Queryable<MesLinkU9>()
+ .Where(x => x.U9Id == dto.FMaterialID
+ && x.OrgId == "1002011210000095"
+ && x.TableType == "MES_ITEMS").First();
+
+ if (mesLinkU9 != null) womcab.Cab003 = mesLinkU9.MesId;
+
womcabList.Add(womcab);
}
--
Gitblit v1.9.3