From cc907883176dbcb12d4677e897493b0baf494235 Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期六, 26 七月 2025 16:16:43 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~kyy/LW_MesService
---
WebApi/Gs.Wom/WorkService/WorkTechniqueController.cs | 59 ++++++++++++++++-------------
WebApi/Gs.Wom/WorkService/WorkProController.cs | 11 +++--
2 files changed, 39 insertions(+), 31 deletions(-)
diff --git a/WebApi/Gs.Wom/WorkService/WorkProController.cs b/WebApi/Gs.Wom/WorkService/WorkProController.cs
index 95d19cf..8c7cb2c 100644
--- a/WebApi/Gs.Wom/WorkService/WorkProController.cs
+++ b/WebApi/Gs.Wom/WorkService/WorkProController.cs
@@ -38,6 +38,9 @@
[RequestMethod(RequestMethods.POST)]
public ReturnDto<PageList<dynamic>> GetListPage([FromBody] PageQuery model)
{
+
+ //(case a.isStatus when 1 then '姝ｅ父' when - 1 then '绂佺敤' else cast(a.isStatus as nvarchar(4)) end) as isStatusTxt
+
var currentPage = model.currentPage;
var everyPageSize = model.everyPageSize;
var sortName = string.IsNullOrEmpty(model.sortName)
@@ -49,7 +52,7 @@
sbSql.Append("( ");
sbSql.Append("select top 100000 ROW_NUMBER() over(order by " +
sortName + " " + model.sortOrder +
- ") as rowIndex,cast(0 as bit) as chkInt, a.*,(a.processNo+':'+a.processName) as processNoAndName,(case a.isStatus when 1 then '姝ｅ父' when -1 then '绂佺敤' else cast(a.isStatus as nvarchar(4)) end) as isStatusTxt from WORK_PROCESS a where 1=1" +
+ ") as rowIndex,cast(0 as bit) as chkInt, a.*,(a.PROC_NO+':'+a.PROC_NAME) as processNoAndName from MES_PROC_INFO a where 1=1" +
keyWhere);
sbSql.Append(") as T ");
sbSql.Append(" where T.rowindex>(" + currentPage + "-1)*" +
@@ -57,8 +60,8 @@
everyPageSize);
sbSql.Append(" order by rowindex asc ");
sbSql.Append(
- " select count(1) as intTotal from WORK_PROCESS a where 1=1 " +
- keyWhere);
+ " select count(1) as intTotal from MES_PROC_INFO a where 1=1 " +
+ keyWhere);
var dset = new DataSet();
try
{
@@ -120,7 +123,7 @@
return ReturnDto<int>.QuickReturn(default(int?),
ReturnCode.Exception, "鍒犻櫎澶辫触锛岃淇℃伅宸茶瀹℃牳锛�");
System.Text.StringBuilder sbSql = new StringBuilder();
- sbSql.Append("delete from WORK_PROCESS ");
+ sbSql.Append("delete from MES_PROC_INFO ");
sbSql.Append(" where guid in (select line from dbo.fn_split('" + sbGuid.ToString() + "',','))");
var rows = DbHelperSQL.ExecuteSql(sbSql.ToString());
rtnInt = rows;
diff --git a/WebApi/Gs.Wom/WorkService/WorkTechniqueController.cs b/WebApi/Gs.Wom/WorkService/WorkTechniqueController.cs
index 8c8b8fe..25c4145 100644
--- a/WebApi/Gs.Wom/WorkService/WorkTechniqueController.cs
+++ b/WebApi/Gs.Wom/WorkService/WorkTechniqueController.cs
@@ -49,7 +49,8 @@
var dset = new DataSet();
try
{
- dset = DbHelperSQL.RunProcedure("[work_technique_mx]", parameters, "0");
+ //dset = DbHelperSQL.RunProcedure("[work_technique_mx]", parameters, "0");
+ dset = DbHelperSQL.RunProcedure("[mes_prod_gx_mx]", parameters, "0");
if (dset != null && dset.Tables.Count > 0 &&
dset.Tables[0].Rows.Count > 0)
{
@@ -57,7 +58,7 @@
m = dr.RowToDynamic();
var _tb = dset.Tables[1].TableToDynamicList();
m.list = _tb;
- var _tb2 = dset.Tables[1].TableToDynamicList();
+ var _tb2 = dset.Tables[2].TableToDynamicList();
m.list2 = _tb2;
}
}
@@ -80,28 +81,36 @@
public ReturnDto<ExpandoObject> EditModel([FromBody] dynamic model)
{
Guid? guid = model.guid; //浜у搧涓婚敭
- string fType = model.fType;
- string fBegDate = model.fBegDate;
- string fEndDate = model.fEndDate;
- string fJingDu = model.fJingDu;
- string fCapacity = model.fCapacity;
- string fMaxWeight = model.fMaxWeight;
- string fMinWeight = model.fMinWeight;
- string fSumPeople = model.fSumPeople;
- string remark = model.remark;
+ string orgName = model.orgName;
+ string itemNo = model.itemNo;
var _sb = new StringBuilder();
var _split = "|";
foreach (var m in model.list)
{
- var _line = m.fSeq + _split
+ var _line = m.guid + _split
+ m.processNo + _split
- + m.statStatus + _split
- + m.collectionName + _split
- + m.remark + _split
+ + m.gxOrder + _split
+ + m.signingFlag + _split
+ + m.storageFlag + _split
+ m.frontProcessNo;
if (_sb.Length > 0)
_sb.Append("~");
_sb.Append(_line);
+ }
+ var _sb2 = new StringBuilder();
+ var _split2 = "|";
+ foreach (var m in model.list2)
+ {
+ var _line2 = m.guid + _split2
+ + m.workers + _split2
+ + m.hours + _split2
+ + m.capacity + _split2
+ + m.sCapacity + _split2
+ + m.lineType + _split2
+ + m.changeTime;
+ if (_sb2.Length > 0)
+ _sb2.Append("~");
+ _sb2.Append(_line2);
}
dynamic mObj = new ExpandoObject();
mObj.outMsg = "";
@@ -110,7 +119,8 @@
mObj.outNo = "";
using (var conn = new SqlConnection(DbHelperSQL.strConn))
{
- using (var cmd = new SqlCommand("[work_technique_edt]", conn))
+ //using (var cmd = new SqlCommand("[work_technique_edt]", conn))
+ using (var cmd = new SqlCommand("[mes_prod_gx_edt]", conn))
{
try
{
@@ -123,17 +133,11 @@
new("@outGuid", SqlDbType.UniqueIdentifier),
new("@outNo", SqlDbType.NVarChar, 300),
new("@inOrderGuid", CheckGuid(guid) ? guid : DBNull.Value),
- new("@fType", fType),
- new("@fBegDate", fBegDate),
- new("@fEndDate", fEndDate),
- new("@fJingDu", fJingDu),
- new("@fCapacity", fCapacity),
- new("@fMaxWeight", fMaxWeight),
- new("@fMinWeight", fMinWeight),
- new("@fSumPeople", fSumPeople),
- new("@remark", remark),
+ new("@orgName", orgName),
+ new("@itemNo", itemNo),
new("@inEdtUserGuid", _userGuid),
- new("@inLineList", _sb.ToString())
+ new("@inLineList", _sb.ToString()),
+ new("@inLineList2", _sb2.ToString())
};
parameters[0].Direction = ParameterDirection.Output;
parameters[1].Direction = ParameterDirection.Output;
@@ -241,7 +245,8 @@
var _outSum = -1;
using (var conn = new SqlConnection(DbHelperSQL.strConn))
{
- using (var cmd = new SqlCommand("[work_technique_del]", conn))
+ //using (var cmd = new SqlCommand("[work_technique_del]", conn))
+ using (var cmd = new SqlCommand("[mes_prod_gx_del]", conn))
{
try
{
--
Gitblit v1.9.3