From 1b5e5394b2162f110a1813ef4374348a119cc810 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期二, 15 十月 2024 17:48:46 +0800
Subject: [PATCH] 生产质量汇报单添加工序字段；工序出站汇报单列表添加下推生产质量汇报单功能；出站汇报单工序工价字段添加权限控制
---
WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
WebAPI/Controllers/LMESController.cs | 2 +-
DAL/生产管理/ClsSc_QualityReportBill.cs | 6 ++++--
3 files changed, 53 insertions(+), 3 deletions(-)
diff --git "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_QualityReportBill.cs" "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_QualityReportBill.cs"
index 30f3306..38df890 100644
--- "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_QualityReportBill.cs"
+++ "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_QualityReportBill.cs"
@@ -88,7 +88,7 @@
",HMaterID,HUnitID,HQty,HResult,HEmpID,HSourceID,HBadReasonID" +
",HICMOInterID,HICMOEntryID,HICMOBillNo,HProcExchInterID,HProcExchEntryID,HProcExchBillNo" +
",HBarCode,HReportType,HBadProcID" +
- ",HAddr,HMaker,HMakeDate" +
+ ",HAddr,HMaker,HMakeDate,HProcID" +
") values(" +
"" + omodel.HInterID.ToString() + "" +
"," + oSub.HEntryID.ToString() + "" +
@@ -122,6 +122,7 @@
"','" + oSub.HAddr + "'" +
",'" + oSub.HMaker + "'" +
",'" + oSub.HMakeDate.ToShortDateString() + "'" +
+ "," + oSub.HProcID +
") ";
oCn.RunProc(subSql);
}
@@ -221,7 +222,7 @@
",HMaterID,HUnitID,HQty,HResult,HEmpID,HSourceID,HBadReasonID" +
",HICMOInterID,HICMOEntryID,HICMOBillNo,HProcExchInterID,HProcExchEntryID,HProcExchBillNo" +
",HBarCode,HReportType,HBadProcID" +
- ",HAddr,HMaker,HMakeDate" +
+ ",HAddr,HMaker,HMakeDate,HProcID" +
") values(" +
"" + omodel.HInterID.ToString() + "" +
"," + oSub.HEntryID.ToString() + "" +
@@ -255,6 +256,7 @@
",'" + oSub.HAddr + "'" +
",'" + oSub.HMaker + "'" +
",'" + oSub.HMakeDate.ToShortDateString() + "'" +
+ "," + oSub.HProcID +
") ";
oCn.RunProc(subSql);
}
diff --git a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
index 72b6cde..ef6dc55 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
@@ -3829,5 +3829,53 @@
}
}
#endregion
+
+ #region 涓嬫帹璐ㄩ噺姹囨姤鍗曟椂杩斿洖宸ュ簭鍑虹珯姹囨姤鍗曚俊鎭�
+ [Route("Cj_StationOutBill/PushDownBackInfo")]
+ [HttpGet]
+ public object PushDownBackInfo(string linterid, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ ds = oCN.RunProcReturn("select * from h_v_Sc_StationOutBill_PushDownBackInfo where hmainid in (" + linterid + ")", "h_v_Sc_StationOutBill_PushDownBackInfo");
+
+ if (ds.Tables[0].Rows.Count > 0 && ds != null)
+ {
+ //娣诲姞鍒楀悕
+ 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 = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.list = columnNameList;
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳暟鎹�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/LMESController.cs b/WebAPI/Controllers/LMESController.cs
index 72f4c77..c63108f 100644
--- a/WebAPI/Controllers/LMESController.cs
+++ b/WebAPI/Controllers/LMESController.cs
@@ -1456,7 +1456,7 @@
if (oSystemParameter.ShowBill(ref Ret))
{
//鍒ゆ柇瀹㈡埛涓洪緳灞辨苯閰�
- if (oSystemParameter.omodel.WMS_CampanyName == "榫欏北姹介厤")
+ if (oSystemParameter.omodel.WMS_CampanyName == "榫欏北姹介厤" || oSystemParameter.omodel.WMS_CampanyName == "娣诲悍绉戞妧")
{
//鍒ゆ柇鏄惁鏈夋煡璇㈠伐浠锋潈闄�
if (!DBUtility.ClsPub.Security_Log("Gy_RoutingBill_CheckProcPrice", 1, false, UserName))
--
Gitblit v1.9.1