From 2a5ca0e2e98e2556bd218cade91975830e55b781 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期一, 14 四月 2025 12:16:16 +0800
Subject: [PATCH] womcaa接口表更新
---
StandardPda/MES.Service/service/WomcaaManager.cs | 64 ++++++--
StandardPda/MES.Service/service/QC/LljService.cs | 90 ++++++++----
StandardPda/MESApplication/Controllers/WomcaaController.cs | 256 ++++++++++++++++++++++++++++++++++++
3 files changed, 359 insertions(+), 51 deletions(-)
diff --git a/StandardPda/MES.Service/service/QC/LljService.cs b/StandardPda/MES.Service/service/QC/LljService.cs
index 471b21c..77f53e7 100644
--- a/StandardPda/MES.Service/service/QC/LljService.cs
+++ b/StandardPda/MES.Service/service/QC/LljService.cs
@@ -50,7 +50,9 @@
// itemIds is { Length: > 0 },
// (a, b, c) => itemIds.Contains(a.ItemId))
.WhereIF(id > 0, (a, b, d) => a.Id == id)
- .WhereIF(true, (a, b, d, e, f, g) => (g.Fcode == queryObj.createUser || g.Fcode == null))
+ .WhereIF(true,
+ (a, b, d, e, f, g) =>
+ (g.Fcode == queryObj.createUser || g.Fcode == null))
//鍔犵瓫閫夋潯浠�,鏍规嵁渚涘簲鍟嗭紝鐗╂枡缂栫爜锛岀墿鏂欏悕绉帮紝椤圭洰鎼滅储
//.WhereIF(queryObj.SearchValue != null && queryObj.SearchValue != "",
//(a, b, d) => (a.SuppName.ToLower().Contains(queryObj.SearchValue.ToLower())
@@ -60,11 +62,31 @@
//))
//鏍规嵁涓嬫媺妗嗘悳绱㈡潯浠剁瓫閫夛紙0椤圭洰, 1鐗╂枡缂栧彿, 2鐗╂枡鍚嶇О, 3渚涘簲鍟�, 4閲囪喘鍛橈級
- .WhereIF(queryObj.SelectedIndex == "0" && queryObj.SearchValue != null && queryObj.SearchValue != "", (a, b, d) => (d.ProjectCodes.ToLower().Contains(queryObj.SearchValue.ToLower())))
- .WhereIF(queryObj.SelectedIndex == "1" && queryObj.SearchValue != null && queryObj.SearchValue != "", (a, b, d) => (a.ItemNo.ToLower().Contains(queryObj.SearchValue.ToLower())))
- .WhereIF(queryObj.SelectedIndex == "2" && queryObj.SearchValue != null && queryObj.SearchValue != "", (a, b, d) => (a.ItemName.ToLower().Contains(queryObj.SearchValue.ToLower())))
- .WhereIF(queryObj.SelectedIndex == "3" && queryObj.SearchValue != null && queryObj.SearchValue != "", (a, b, d) => (a.SuppName.ToLower().Contains(queryObj.SearchValue.ToLower())))
- .WhereIF(queryObj.SelectedIndex == "4" && queryObj.SearchValue != null && queryObj.SearchValue != "", (a, b, d, e) => (e.Fname.ToLower().Contains(queryObj.SearchValue.ToLower())))
+ .WhereIF(
+ queryObj.SelectedIndex == "0" && queryObj.SearchValue != null &&
+ queryObj.SearchValue != "",
+ (a, b, d) => (d.ProjectCodes.ToLower()
+ .Contains(queryObj.SearchValue.ToLower())))
+ .WhereIF(
+ queryObj.SelectedIndex == "1" && queryObj.SearchValue != null &&
+ queryObj.SearchValue != "",
+ (a, b, d) => (a.ItemNo.ToLower()
+ .Contains(queryObj.SearchValue.ToLower())))
+ .WhereIF(
+ queryObj.SelectedIndex == "2" && queryObj.SearchValue != null &&
+ queryObj.SearchValue != "",
+ (a, b, d) => (a.ItemName.ToLower()
+ .Contains(queryObj.SearchValue.ToLower())))
+ .WhereIF(
+ queryObj.SelectedIndex == "3" && queryObj.SearchValue != null &&
+ queryObj.SearchValue != "",
+ (a, b, d) => (a.SuppName.ToLower()
+ .Contains(queryObj.SearchValue.ToLower())))
+ .WhereIF(
+ queryObj.SelectedIndex == "4" && queryObj.SearchValue != null &&
+ queryObj.SearchValue != "",
+ (a, b, d, e) => (e.Fname.ToLower()
+ .Contains(queryObj.SearchValue.ToLower())))
.OrderByDescending((a, b, d) => a.Id)
.Select((a, b, d, e, f, g) => new LtsLlj
{
@@ -221,10 +243,10 @@
var parameters = new List<SugarParameter>
{
new("P_RELEASE_NO", releaseNo,
- DbType.String, ParameterDirection.Input),
- outputResult,
- outputMessage
- };
+ DbType.String, ParameterDirection.Input),
+ outputResult,
+ outputMessage
+ };
var db = SqlSugarHelper.GetInstance();
@@ -240,8 +262,8 @@
msg[0] = resultValue;
msg[1] = messageValue;
return msg;
-
}
+
public string[] SaveSysSubmit(SysSubmit sysSubmit)
{
// 瀹氫箟杈撳嚭鍙傛暟
@@ -257,30 +279,30 @@
var parameters = new List<SugarParameter>
{
new("PI_BILLNO", sysSubmit.PI_BILLNO,
- DbType.String, ParameterDirection.Input),
- new("PI_USER", sysSubmit.PI_USER,
- DbType.String, ParameterDirection.Input),
- new("PI_SAMPLE_STATUS", sysSubmit.PI_SAMPLE_STATUS,
- DbType.String, ParameterDirection.Input),
- new("PI_SAMPLE_TYPE", sysSubmit.PI_SAMPLE_TYPE,
- DbType.String, ParameterDirection.Input),
- new("PI_SAMPLE_REASON", sysSubmit.PI_SAMPLE_REASON,
- DbType.String, ParameterDirection.Input),
- new("PI_INSPECT_TYPE", sysSubmit.PI_INSPECT_TYPE,
- DbType.String, ParameterDirection.Input),
- new("PI_SAMPLE_PREPARATION", sysSubmit.PI_SAMPLE_PREPARATION,
- DbType.String, ParameterDirection.Input),
- new("PI_URGENCY", sysSubmit.PI_URGENCY,
- DbType.String, ParameterDirection.Input),
- new("PI_FIRMWAREVERSION", sysSubmit.PI_FIRMWAREVERSION,
- DbType.String, ParameterDirection.Input),
- new("PI_HARDWAREVERSION", sysSubmit.PI_HARDWAREVERSION,
- DbType.String, ParameterDirection.Input),
- new("PI_REMARK", sysSubmit.PI_REMARK,
- DbType.String, ParameterDirection.Input),
+ DbType.String, ParameterDirection.Input),
+ new("PI_USER", sysSubmit.PI_USER,
+ DbType.String, ParameterDirection.Input),
+ new("PI_SAMPLE_STATUS", sysSubmit.PI_SAMPLE_STATUS,
+ DbType.String, ParameterDirection.Input),
+ new("PI_SAMPLE_TYPE", sysSubmit.PI_SAMPLE_TYPE,
+ DbType.String, ParameterDirection.Input),
+ new("PI_SAMPLE_REASON", sysSubmit.PI_SAMPLE_REASON,
+ DbType.String, ParameterDirection.Input),
+ new("PI_INSPECT_TYPE", sysSubmit.PI_INSPECT_TYPE,
+ DbType.String, ParameterDirection.Input),
+ new("PI_SAMPLE_PREPARATION", sysSubmit.PI_SAMPLE_PREPARATION,
+ DbType.String, ParameterDirection.Input),
+ new("PI_URGENCY", sysSubmit.PI_URGENCY,
+ DbType.String, ParameterDirection.Input),
+ new("PI_FIRMWAREVERSION", sysSubmit.PI_FIRMWAREVERSION,
+ DbType.String, ParameterDirection.Input),
+ new("PI_HARDWAREVERSION", sysSubmit.PI_HARDWAREVERSION,
+ DbType.String, ParameterDirection.Input),
+ new("PI_REMARK", sysSubmit.PI_REMARK,
+ DbType.String, ParameterDirection.Input),
outputResult,
outputMessage
- };
+ };
var db = SqlSugarHelper.GetInstance();
@@ -296,8 +318,8 @@
msg[0] = resultValue;
msg[1] = messageValue;
return msg;
-
}
+
private string ExtractSubstring(string input, char startChar, char endChar)
{
var startIndex = input.IndexOf(startChar);
diff --git a/StandardPda/MES.Service/service/WomcaaManager.cs b/StandardPda/MES.Service/service/WomcaaManager.cs
index 12dfdad..76e5a52 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,
@@ -139,13 +141,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,17 +166,37 @@
IssueType = dto.FIssueType,
Cab009 = dto.FUnitID,
SupplyType = dto.FSupplyType,
- Cab012 = Convert.ToDecimal(dto.FStdQty),
- FreplaceGroup = Convert.ToInt32(dto.FReplaceGroup),
- UseRate = Convert.ToDecimal(dto.FUseRate),
+ 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 = 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),
+ 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
diff --git a/StandardPda/MESApplication/Controllers/WomcaaController.cs b/StandardPda/MESApplication/Controllers/WomcaaController.cs
new file mode 100644
index 0000000..6ff858f
--- /dev/null
+++ b/StandardPda/MESApplication/Controllers/WomcaaController.cs
@@ -0,0 +1,256 @@
+锘縰sing System.Dynamic;
+using MES.Service.Dto.webApi;
+using MES.Service.Modes;
+using MES.Service.service;
+using MES.Service.util;
+using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json;
+
+namespace MESApplication.Controllers;
+
+[ApiController]
+[Route("api/[controller]")]
+public class WomcaaController : ControllerBase
+{
+ private readonly MessageCenterManager _manager = new();
+ private readonly WomcaaManager m = new();
+
+ private readonly string METHOD = "POST";
+
+ private readonly string TableName = "WOMCAA";
+
+ private readonly string URL = "http://localhost:10054/api/Womcaa/";
+
+ //
+ [HttpPost("Save")]
+ public ResponseResult Save(ErpWOM rohIn)
+ {
+ var entity = new MessageCenter();
+ entity.TableName = TableName;
+ entity.Url = URL + "Save";
+ entity.Method = METHOD;
+ entity.Data = JsonConvert.SerializeObject(rohIn);
+ entity.Status = 1;
+ entity.CreateBy = "PL017";
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ var save = m.Save(rohIn);
+
+ resultInfos.tbBillList = save;
+
+ entity.Result = 0;
+
+ if (save) entity.Result = 1;
+ entity.DealWith = 1;
+ _manager.save(entity);
+
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ entity.Result = 0;
+
+ entity.DealWith = 0;
+
+ entity.ResultData = ex.Message;
+
+ _manager.save(entity);
+
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ [HttpPost("SaveList")]
+ public ResponseResult SaveList(List<ErpWOM> units)
+ {
+ var entity = new MessageCenter();
+ entity.TableName = TableName;
+ entity.Url = URL + "SaveList";
+ entity.Method = METHOD;
+ entity.Data = JsonConvert.SerializeObject(units);
+ entity.Status = 1;
+ entity.CreateBy = "PL017";
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ var save = m.SaveList(units);
+ resultInfos.tbBillList = save;
+
+ entity.Result = 0;
+ if (save) entity.Result = 1;
+
+ entity.DealWith = 1;
+ _manager.save(entity);
+
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ entity.Result = 0;
+
+ entity.DealWith = 0;
+
+ entity.ResultData = ex.Message;
+
+ _manager.save(entity);
+
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 鑾峰彇鎵�鏈�
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("GetList")]
+ public ResponseResult GetList()
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.GetList();
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+
+ /// <summary>
+ /// 鏍规嵁涓婚敭鑾峰彇
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("GetById")]
+ public ResponseResult GetById(int id)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.GetById(id);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 鏍规嵁涓婚敭鍒犻櫎
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("DeleteByIds")]
+ public ResponseResult DeleteByIds([FromBody] object[] ids)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.DeleteByIds(ids);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 娣诲姞
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("Insert")]
+ public ResponseResult Add([FromBody] Womcaa data)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.Insert(data);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 娣诲姞杩斿洖鑷
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("InsertReturnIdentity")]
+ public ResponseResult InsertReturnIdentity([FromBody] Womcaa data)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.InsertReturnIdentity(data);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 淇敼
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("Update")]
+ public ResponseResult Update([FromBody] Womcaa data)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.Update(data);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+}
\ No newline at end of file
--
Gitblit v1.9.3