From b98df034707a61fd2857dbccd5a232605076ca59 Mon Sep 17 00:00:00 2001
From: lg <123456>
Date: 星期四, 20 十一月 2025 10:26:08 +0800
Subject: [PATCH] 标准版初始化
---
WebApi/Gs.BaseInfo/Services/MesItemsManager.cs | 147 +++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 135 insertions(+), 12 deletions(-)
diff --git a/WebApi/Gs.BaseInfo/Services/MesItemsManager.cs b/WebApi/Gs.BaseInfo/Services/MesItemsManager.cs
index 3d58c25..28c32ad 100644
--- a/WebApi/Gs.BaseInfo/Services/MesItemsManager.cs
+++ b/WebApi/Gs.BaseInfo/Services/MesItemsManager.cs
@@ -1,7 +1,4 @@
-锘縰sing System.Data;
-using System.Data.SqlClient;
-using System.Dynamic;
-using System.Text;
+锘縰sing Gs.BaseInfo.Models;
using Gs.Entity.BaseInfo;
using Gs.Entity.Sys;
using Gs.Toolbox;
@@ -11,6 +8,10 @@
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using SqlSugar;
+using System.Data;
+using System.Data.SqlClient;
+using System.Dynamic;
+using System.Text;
using SqlDataAdapter = System.Data.SqlClient.SqlDataAdapter;
namespace Gs.BaseInfo.Services;
@@ -41,12 +42,12 @@
try
{
var _sbWhere = new StringBuilder(" 1=1" + query.keyWhere);
- var _sbBy =new StringBuilder(query.sortName + " " + query.sortOrder);
+ var _sbBy = new StringBuilder(query.sortName + " " + query.sortOrder);
var totalCount = 0;
var itemsList = Db
.Queryable<MesItems, SysOrganization, MesUnit, MesUnit, MesUnit,
- MesUnit, MesUnit, MesUnit, MesDepots>(
- (a, org, c, d, e, f, g, h, m) => new object[]
+ MesUnit, MesUnit, MesUnit, MesDepots, MesItemType>(
+ (a, org, c, d, e, f, g, h, m, n) => new object[]
{
JoinType.Left, a.FSubsidiary == org.Fid,
JoinType.Left, a.ItemUnit == c.Id.ToString(),
@@ -55,10 +56,12 @@
JoinType.Left, a.Storeunit == f.Id.ToString(),
JoinType.Left, a.SubconUnit == g.Id.ToString(),
JoinType.Left, a.ProduceUnit == h.Id.ToString(),
- JoinType.Left, a.DepotCode == m.DepotId.ToString()
+ JoinType.Left, a.DepotCode == m.DepotId.ToString(),
+ JoinType.Left, a.Fmaterialgroup == n.Id.ToString()
})
- .Select((a, org, c, d, e, f, g, h, m) => new MesItems
+ .Select((a, org, c, d, e, f, g, h, m, n) => new MesItems
{
+ chkInt = false,
FSubsidiary = "(" + org.FNumber + ")" + org.Name,
ItemUnit = c.Fname,
Fpurchaseunitid = d.Fname,
@@ -67,6 +70,7 @@
SubconUnit = g.Fname,
ProduceUnit = h.Fname,
DepotCode = m.DepotName,
+ Fmaterialgroup = n.Tname,
Fforbidstatus = a.Fforbidstatus + ":" + (a.Fforbidstatus == "A" ? "姝ｅ父" : "绂佺敤"),
DataType = a.DataType + ":"
+ SqlFunc.IF(a.DataType == "Z").Return("鏆傚瓨")
@@ -93,7 +97,7 @@
}
}
-
+
/// <summary>
/// 璇诲彇
/// </summary>
@@ -130,6 +134,42 @@
return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default, "璇诲彇澶辫触锛�");
}
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [RequestMethod(RequestMethods.POST)]
+ public ReturnDto<ExpandoObject> GetModelByOrg([FromBody] dynamic model)
+ {
+ string itemNo = model.itemNo;
+ string orgId = model.orgId;
+ dynamic m = new ExpandoObject();
+ SqlParameter[] parameters =
+ {
+ new("@inItemNo", itemNo),
+ new("@inOrgId", orgId),
+ };
+ var dset = new DataSet();
+ try
+ {
+ dset = DbHelperSQL.RunProcedure("[prc_item_detailByOrg]", parameters, "0");
+ if (dset != null && dset.Tables.Count > 0 &&
+ dset.Tables[0].Rows.Count > 0)
+ {
+ var dr = dset.Tables[0].Rows[0];
+ m = dr.RowToDynamic();
+ return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success, "璇诲彇鎴愬姛锛�");
+ }
+ return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default, "璇诲彇澶辫触锛屾壘涓嶅埌璇ョ墿鏂欙紒");
+ }
+ catch (Exception ex)
+ {
+ LogHelper.Debug(ToString(), ex.Message);
+ return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default, "璇诲彇澶辫触锛�" + ex.Message.ToString());
+ }
+ }
+
/// <summary>
/// 璇诲彇鍒楄〃锛屾敮鎸佸垎椤�
@@ -144,6 +184,7 @@
string sortName = model.sortName;
string keyWhere = model.keyWhere;
string keyType = model.keyType;
+ string keyWord = model.keyWord; //杩欎釜pguid锛屼綔涓烘柟妗堢殑涓婚敭
var dset = new DataSet();
try
{
@@ -161,7 +202,7 @@
new("@inSortOrder", ""),
new("@inQueryWhere", keyWhere),
new("@inP1",keyType),//褰撲负锛氭楠岄」鐩紝iqc,ipqc,fqc鏃讹紝鍏嶆鏃� 鐗瑰埆鍔犱笂杩囨护鏉′欢
- new("@inP2", "")
+ new("@inP2", keyWord) //杩欎釜pguid锛屼綔涓烘柟妗堢殑涓婚敭
};
foreach (var parameter in parameters)
cmd.Parameters.Add(parameter);
@@ -223,7 +264,7 @@
System.Text.StringBuilder sbJoin = new StringBuilder();
sbJoin.Append(" FROM MES_ITEMS [a]");
sbJoin.Append(" Left JOIN [SYS_ORGANIZATION] [Org] ON ( [a].[FSubsidiary] = [Org].[FID] )");
- sbJoin.Append(" left join SYS_USER_BIND b on (b.userGuid='"+ keyType + "' and b.aboutGuid=a.guid)");
+ sbJoin.Append(" left join SYS_USER_BIND b on (b.userGuid='" + keyType + "' and b.aboutGuid=a.item_id and b.fType='鐗╂枡鍒嗗尯')");
sbJoin.Append(" where 1=1 ");
sbJoin.Append(keyWhere);
var sbSql = new StringBuilder();
@@ -276,4 +317,86 @@
ReturnCode.Success, "璇诲彇鎴愬姛");
}
+
+ /// <summary>
+ /// 鎵归噺璁剧疆鎻愬墠鍒拌揣鏃ユ湡
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [RequestMethod(RequestMethods.POST)]
+ public ReturnDto<int?> SetDays([FromBody] dynamic model)
+ {
+ string guidList = model.guidList;
+ string bz10 = model.bz10;
+ string percent = model.percent;
+ string bz09 = model.bz09;
+ if (string.IsNullOrEmpty(bz09))
+ bz09 = null;
+
+ int rtnInt = (int)ReturnCode.Default;
+
+ // 鏋勫缓瑕佹洿鏂扮殑瀛楁锛堝彧鍖呭惈闈炵┖鍊硷級
+ var setParts = new List<string>();
+ var parameters = new List<SqlParameter>();
+
+ if (!string.IsNullOrWhiteSpace(bz10))
+ {
+ setParts.Add("bz10 = @bz10");
+ parameters.Add(new SqlParameter("@bz10", SqlDbType.NVarChar) { Value = bz10.Trim() });
+ }
+
+ if (!string.IsNullOrWhiteSpace(percent))
+ {
+ setParts.Add("loss_percent = @percent");
+ parameters.Add(new SqlParameter("@percent", SqlDbType.NVarChar) { Value = percent.Trim() });
+ }
+
+ if (!string.IsNullOrWhiteSpace(bz09))
+ {
+ setParts.Add("bz09 = @bz09");
+ parameters.Add(new SqlParameter("@bz09", SqlDbType.NVarChar) { Value = bz09.Trim() });
+ }
+
+ if (setParts.Count == 0)
+ {
+ // 娌℃湁鍙洿鏂扮殑瀛楁
+ return ReturnDto<int>.QuickReturn(default(int?), ReturnCode.Exception, "娌℃湁闇�瑕佹洿鏂扮殑瀛楁");
+ }
+
+ // 鏋勫缓 SQL锛屼娇鐢ㄥ弬鏁板寲閬垮厤娉ㄥ叆
+ var sql = new StringBuilder();
+ sql.Append("UPDATE MES_ITEMS SET ");
+ sql.Append(string.Join(", ", setParts));
+ sql.Append(" WHERE guid IN (SELECT line FROM dbo.fn_split(@guidList,','))");
+
+ try
+ {
+ using (var conn = new SqlConnection(DbHelperSQL.strConn))
+ using (var cmd = new SqlCommand(sql.ToString(), conn))
+ {
+ // 娣诲姞 guidList 鍙傛暟
+ cmd.Parameters.Add(new SqlParameter("@guidList", SqlDbType.NVarChar) { Value = guidList ?? string.Empty });
+
+ // 娣诲姞鍙兘鐨勬洿鏂板瓧娈靛弬鏁�
+ foreach (var p in parameters)
+ cmd.Parameters.Add(p);
+
+ conn.Open();
+ var rows = cmd.ExecuteNonQuery();
+ rtnInt = rows;
+ }
+ }
+ catch (Exception ex)
+ {
+ LogHelper.Debug(this.ToString(), "SetDays error锛�" + ex.Message);
+ rtnInt = (int)ReturnCode.Exception;
+ return ReturnDto<int>.QuickReturn(default(int?), ReturnCode.Exception, "鎿嶄綔澶辫触锛�" + ex.Message);
+ }
+
+ if (rtnInt > 0)
+ return ReturnDto<int>.QuickReturn(default(int?), ReturnCode.Success, "鎿嶄綔鎴愬姛锛�");
+ else
+ return ReturnDto<int>.QuickReturn(default(int?), ReturnCode.Exception, "鎿嶄綔澶辫触锛岃閲嶈瘯锛�");
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.3