From 4e213607fd1bd97281460cc9424292200b5a857d Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期三, 15 四月 2026 17:01:09 +0800
Subject: [PATCH] 1.来料检验单 保存时存入组织字段，2.报工平台调整异常反馈的时候，增加流转卡生产订单字段返回 3.优化设备故障维修全流程页面与功能
---
WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs | 140 ++++++++++++++++++++++++++++++++--------------
1 files changed, 98 insertions(+), 42 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
index 42bae7c..5e21d64 100644
--- a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
+++ b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
@@ -10,6 +10,7 @@
using System.Web.Http;
using System.Windows.Forms;
using WebAPI.Models;
+using System.Linq;
namespace WebAPI.Controllers
{
@@ -51,6 +52,7 @@
string msg4 = sArray[2].ToString();
string msg5 = sArray[3].ToString();
string HBillSubType = sArray[4].ToString();
+ string msg6 = sArray.Length > 5 ? sArray[5] : ""; // 杩欓噷瀹夊叏浜�
string HComputerName = SystemInformation.ComputerName; //璁惧鍚嶇О
string UserName = "";
@@ -90,7 +92,7 @@
{
UserName = oItem.HMaker; //鍒跺崟浜�
oItem.HBillType = "3772";
- oItem.HBillSubType = HBillSubType == "SUB" ? HBillSubType : "3772";
+ oItem.HBillSubType = HBillSubType == "SUB" ? HBillSubType : oItem.HBillSubType;
oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
oItem.HDate = HBillSubType == "SUB" ? DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd")) : oItem.HDate;
@@ -123,59 +125,65 @@
oBill.DetailColl.Add(oItemSub);
}
+
+ //杩斿伐琛ㄤ綋鏁版嵁
+ //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+ List<Model.Sc_ProcessExchangeBillSub_HRelationBack> ls2 = new List<Model.Sc_ProcessExchangeBillSub_HRelationBack>();
+
+ if (!string.IsNullOrEmpty(msg6))
+ {
+ // 鍙湁 msg6 涓嶄负绌烘墠璧拌繖閲�
+ msg6 = msg6.Substring(1, msg6.Length - 2);
+ msg6 = msg6.Replace("\\", "");
+ msg6 = msg6.Replace("\n", "");
+
+ // 杩欓噷蹇呴』浼� msg6锛屼笉鏄� msg3锛侊紒锛�
+ ls2 = oListModels.getObjectByJson_Sc_ProcessExchangeBillSub_HRelationBack(msg6);
+ }
+
+ int i2 = 0;
+ foreach (Model.Sc_ProcessExchangeBillSub_HRelationBack oItemSub2 in ls2)
+ {
+ i2++;
+ oItemSub2.HEntryID = i2;
+ oItemSub2.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+
+ // 鍦ㄨ繖閲岀洿鎺ョ粰榛樿鍊硷紒
+ // ======================
+ oItemSub2.HProcExchInterID = oItemSub2.HProcExchInterID > 0 ? oItemSub2.HProcExchInterID : 0;
+ oItemSub2.HProcExchEntryID = oItemSub2.HProcExchEntryID > 0 ? oItemSub2.HProcExchEntryID : 0;
+ oItemSub2.HProcExchBillNo = string.IsNullOrEmpty(oItemSub2.HProcExchBillNo) ? "" : oItemSub2.HProcExchBillNo;
+
+ oItemSub2.HICMOInterID = oItemSub2.HICMOInterID > 0 ? oItemSub2.HICMOInterID : 0;
+ oItemSub2.HICMOEntryID = oItemSub2.HICMOEntryID > 0 ? oItemSub2.HICMOEntryID : 0;
+ oItemSub2.HICMOBillNo = string.IsNullOrEmpty(oItemSub2.HICMOBillNo) ? "" : oItemSub2.HICMOBillNo;
+
+ oItemSub2.HStationOutInterID = oItemSub2.HStationOutInterID > 0 ? oItemSub2.HStationOutInterID : 0;
+ oItemSub2.HStationOutBillNo = string.IsNullOrEmpty(oItemSub2.HStationOutBillNo) ? "" : oItemSub2.HStationOutBillNo;
+
+ oBill.DetailColl2.Add(oItemSub2);
+ }
+
+
+
//淇濆瓨
//淇濆瓨瀹屾瘯鍚庡鐞�
bool bResult;
if (msg5 == "xz")
{
LogService.Write("鐢ㄦ埛:" + msg4 + ",鏃ユ湡:" + DateTime.Now + ",鏂板宸ュ簭娴佽浆鍗″崟鎹�:" + oBill.omodel.HBillNo);
- // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
- bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
- //娴嬭瘯璇彞===========================================================================================================
- string msg_str = "";
- string sql_str = "select a.HQty HQty_Main,b.HQty HQty_Sub " +
- "from Sc_ProcessExchangeBillMain as a " +
- "inner join Sc_ProcessExchangeBillSub as b on a.HInterID = b.HInterID " +
- "where a.HInterID = " + oBill.omodel.HInterID;
- DataSet ds_str = oCN.RunProcReturn(sql_str, "Sc_ProcessExchangeBillMain");
- if (ds_str.Tables[0].Rows.Count > 0)
- {
- msg_str = "HQty_Main:" + ds_str.Tables[0].Rows[0]["HQty_Main"].ToString() + ";HQty_Sub:";
- for (int j = 0; j < ds_str.Tables[0].Rows.Count; j++)
- {
- msg_str += ds_str.Tables[0].Rows[j]["HQty_Sub"].ToString() + ",";
- }
- }
- //==============================================================================================================
-
-
- oCN.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + msg4 + "','" + HComputerName + "','" + "鏂板宸ュ簭娴佽浆鍗″崟鎹細" + oBill.omodel.HBillNo + msg_str + "','LMES-宸ュ簭娴佽浆鍗℃ā鍧�','" + DBUtility.ClsPub.IPAddress + "','鏂板鍗曟嵁'", ref DBUtility.ClsPub.sExeReturnInfo);
+ oCN.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + msg4 + "','" + HComputerName + "','" + "鏂板宸ュ簭娴佽浆鍗″崟鎹細" + oBill.omodel.HBillNo + "','LMES-宸ュ簭娴佽浆鍗℃ā鍧�','" + DBUtility.ClsPub.IPAddress + "','鏂板鍗曟嵁'", ref DBUtility.ClsPub.sExeReturnInfo);
}
else
{
LogService.Write("鐢ㄦ埛:" + msg4 + ",鏃ユ湡:" + DateTime.Now + ",淇敼宸ュ簭娴佽浆鍗″崟鎹�:" + oBill.omodel.HBillNo);
+
bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
-
- //娴嬭瘯璇彞===========================================================================================================
- string msg_str = "";
- string sql_str = "select a.HQty HQty_Main,b.HQty HQty_Sub " +
- "from Sc_ProcessExchangeBillMain as a " +
- "inner join Sc_ProcessExchangeBillSub as b on a.HInterID = b.HInterID " +
- "where a.HInterID = " + oBill.omodel.HInterID;
- DataSet ds_str = oCN.RunProcReturn(sql_str, "Sc_ProcessExchangeBillMain");
- if (ds_str.Tables[0].Rows.Count > 0)
- {
- msg_str = "HQty_Main:" + ds_str.Tables[0].Rows[0]["HQty_Main"].ToString() + ";HQty_Sub:";
- for (int j = 0; j < ds_str.Tables[0].Rows.Count; j++)
- {
- msg_str += ds_str.Tables[0].Rows[j]["HQty_Sub"].ToString() + ",";
- }
- }
- //==============================================================================================================
-
- oCN.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + msg4 + "','" + HComputerName + "','" + "淇敼宸ュ簭娴佽浆鍗″崟鎹細" + oBill.omodel.HBillNo + msg_str + "','LMES-宸ュ簭娴佽浆鍗℃ā鍧�','" + DBUtility.ClsPub.IPAddress + "','淇敼鍗曟嵁'", ref DBUtility.ClsPub.sExeReturnInfo);
+
+ oCN.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + msg4 + "','" + HComputerName + "','" + "淇敼宸ュ簭娴佽浆鍗″崟鎹細" + oBill.omodel.HBillNo + "','LMES-宸ュ簭娴佽浆鍗℃ā鍧�','" + DBUtility.ClsPub.IPAddress + "','淇敼鍗曟嵁'", ref DBUtility.ClsPub.sExeReturnInfo);
}
if (bResult)
{
@@ -207,7 +215,6 @@
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "[0000-1-050]淇濆瓨鎴愬姛锛�";
- //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
objJsonResult.data = 1;
return objJsonResult;
}
@@ -2846,5 +2853,54 @@
}
#endregion
+ #region[鏂板鏃惰幏鍙栬〃浣撴暟鎹�(杩斿伐鐢宠鍗�)]
+ [Route("Sc_ProcessExchangeBill/GetProcExchangeWorkBackList")]
+ [HttpGet]
+ public object GetProcExchangeWorkBackList(string HInterID)
+ {
+ DataSet ds;
+ try
+ {
+
+ //鎷嗗垎骞惰繃婊ゅ嚭鏈夋晥鏁板瓧ID
+ var idList = HInterID.Split(',') // 1. 鎸夐�楀彿鍒嗗壊瀛楃涓�
+ .Select(s => s.Trim()) // 2. 鍘婚櫎姣忎釜鍏冪礌鐨勭┖鏍�
+ .Where(s => int.TryParse(s, out _)) // 3. 鍙繚鐣欒兘杞垚鏁板瓧鐨勫瓧绗︿覆
+ .ToList(); // 4. 杞垚List闆嗗悎
+
+ // 鏋勫缓瀹夊叏鐨� IN 瀛愬彞
+ string inClause = string.Join(",", idList);
+
+ List<object> columnNameList = new List<object>();
+
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ ds = oCN.RunProcReturn("select * from h_v_Sc_ProcExchWorkBackBillList_Query where 1=1 and hmainid in (" + inClause + ")", "h_v_Sc_ProcExchWorkBackBillList_Query");
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.list = columnNameList;
+ objJsonResult.Message = "[0000-1-037]鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[0000-1-038]娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
}
}
\ No newline at end of file
--
Gitblit v1.9.1