From f0b15e2fc7bdccb18d27cba0c9dfd667e36c20a6 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期三, 24 七月 2024 17:56:46 +0800
Subject: [PATCH] 不良评审申请单,选着工序流转卡,查询数据增加过滤条件,设备故障登记单,生产质量汇报单,异常反馈单, 取样单,增加字段保存
---
WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
index 1cfaf5b..5e17f82 100644
--- a/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
@@ -528,7 +528,8 @@
return new ApiResult<DataSet> { code = -1, msg = "ID涓嶈兘涓虹┖" };
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
string sql =string.Format(@"select A.HInterID,b.HEntryID,A.HBillStatus,A.HBillNo,A.HDate,A.HContext,A.HDescription,A.HRemark,
- A.HQty,A.HSendType,
+ A.HQty,A.HSendType,a.HForm,a.HChangeNote,a.HNote,a.HBadProcMan,f1.HName HBadProcManName,
+ a.HQEMan,f2.HName HQEManName,a.HSourceID,s.HName HSourceName,a.HShiftsID,s1.HName HShiftsName,
A.HDeptID,D.HName HDeptName, A.HSendMan,
A.HReceiveMan,A.HCopyMan,A.HHasten,
A.HLevel,A.HMaterNumber,A.HMaterName,A.HMaterModel,
@@ -540,6 +541,10 @@
left join Gy_Department D on A.HDeptID=D.HItemID
left join Gy_Employee f on A.HHandleEmpID=f.HItemID
left join Gy_ErrMsgBackType g on A.HErrMsgBackTypeID=g.HItemID
+ left join Gy_Employee f1 on a.HBadProcMan=f1.HItemID
+ left join Gy_Employee f2 on a.HQEMan=f2.HItemID
+ left join Gy_Source s on a.HSourceID=s.HItemID
+ left join Gy_Shifts s1 on a.HShiftsID=s1.HItemID
where A.HInterID='" + HID + "' and b.HEntryID='" + HEntryID + "'");
var dataSet = oCN.RunProcReturn(sql, "OA_ErrMsgBackBillMain");
if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
--
Gitblit v1.9.1