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 +++++++++++++++++++++++++++++++++--------------------------
1 files changed, 33 insertions(+), 26 deletions(-)
diff --git a/WebApi/Gs.Wom/WorkService/WorkTechniqueController.cs b/WebApi/Gs.Wom/WorkService/WorkTechniqueController.cs
index a2a4c54..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,6 +58,8 @@
m = dr.RowToDynamic();
var _tb = dset.Tables[1].TableToDynamicList();
m.list = _tb;
+ var _tb2 = dset.Tables[2].TableToDynamicList();
+ m.list2 = _tb2;
}
}
catch (Exception ex)
@@ -78,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 = "";
@@ -108,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
{
@@ -121,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;
@@ -239,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