From 3db477ccda04b391872cbd570b7d1c1253e1f6e0 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 23 五月 2023 14:11:00 +0800
Subject: [PATCH] 生产订单备注字段改成白坯要求，底部备注下推流转卡的时候带到流转卡底部备注中去 生产订单 已经下推过 流转卡或 生产入库单 或生产领料单 后，就不能删除； 生产资源新增模块增加 负责人 HEmpID int 字段（gy_Employee） 非必录入，打印的时候打印出来 生产订单列表里增加关闭和反关闭按钮（在生产订单编辑模块里有这个功能，将一样的功能复制出来），列表显示关闭状态 工序流转卡维护列表增加当前工序过滤条件（下拉框形式，取值取工序列表） 网格选中行， 背景行 浅蓝色 显示；（优先改 生产订单列表，流转卡列表，出站单列表，进站单列表）（最好改JS底层方法）
---
WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs | 258 +++++++++++++++++++++++++++++++++++++--------------
1 files changed, 185 insertions(+), 73 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
index c4c808d..0f37b65 100644
--- a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
+++ b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
@@ -98,11 +98,13 @@
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);
}
else
{
+ LogService.Write("鐢ㄦ埛:" + msg4 + ",鏃ユ湡:" + DateTime.Now + ",淇敼宸ュ簭娴佽浆鍗″崟鎹�:" + oBill.omodel.HBillNo);
bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
}
if (bResult)
@@ -449,8 +451,17 @@
oBill.omodel.HQty = HPlanQty;
}
+ for (int j = 0; j < oBill.DetailColl.Count; j++)
+ {
+ oBill.DetailColl[j].HRelationQty_In = 0;
+ oBill.DetailColl[j].HRelationQty_Out = 0;
+ oBill.DetailColl[j].HRelationQty_Bad = 0;
+ }
+
//淇濆瓨瀹屾瘯鍚庡鐞�
bool bResult;
+
+ LogService.Write("鐢ㄦ埛:" + msg4 + ",鏃ユ湡:" + DateTime.Now + ",鏂板宸ュ簭娴佽浆鍗″崟鎹�:" + oBill.omodel.HBillNo);
bResult = oBill.AddBill(ref sReturn);
if (bResult)
@@ -571,6 +582,8 @@
bool bResult=false;
if (msg5 == "2")
{
+ LogService.Write("鐢ㄦ埛:" + msg6 + ",鏃ユ湡:" + DateTime.Now + ",鏂板宸ュ簭娴佽浆鍗″崟鎹�:" + oBill.omodel.HBillNo);
+
bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
}
oBill.DetailColl.Clear();
@@ -805,7 +818,7 @@
/// <returns></returns>
[Route("Sc_ProcessExchangeBill/DeltetProcessExchangeBillByID")]
[HttpGet]
- public object DeltetProcessExchangeBillByID(string HInterID,int HPRDORGID, string user)
+ public object DeltetProcessExchangeBillByID(string HInterID, int HPRDORGID, string user)
{
//缂栬緫鏉冮檺
if (!DBUtility.ClsPub.Security_Log("Sc_ProcessExchangeBill_Drop", 1, false, user))
@@ -817,84 +830,99 @@
return objJsonResult;
}
- Int64 lngBillKey = 0;
- lngBillKey = DBUtility.ClsPub.isLong(HInterID);
- if (lngBillKey == 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鍗曟嵁ID涓虹┖锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
-
- //鍒犻櫎鍓嶅垽鏂叧鑱旀暟閲�
- SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
- DataSet ds;
- ds = oCn.RunProcReturn("select ct from ( " +
- " select 1 ct from Sc_StationInBillMain Where HProcExchInterID=" + lngBillKey + " " +
- " union all " +
- " select 1 from Sc_StationOutBillMain Where HProcExchInterID=" + lngBillKey + " ) as a ", "Sc_ProcExchReportSub");
- if (ds.Tables[0].Rows.Count != 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "娴佽浆鍗″凡缁忔湁涓嬫父杩涘嚭绔欏崟鍚庯紝涓嶅厑璁稿垹闄わ紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
-
-
DAL.ClsSc_ProcessExchangeBill oBill = new DAL.ClsSc_ProcessExchangeBill();
- DBUtility.ClsPub.HOrgID = HPRDORGID;
- if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
+
+ string[] HBillNo = HInterID.Split(',');
+
+ string HBillNo_S = "";
+
+ foreach (var item in HBillNo)
{
- string sReturn = "";
- if (oSystemParameter.ShowBill(ref sReturn))
+ Int64 lngBillKey = 0;
+ lngBillKey = DBUtility.ClsPub.isLong(item);
+
+ DBUtility.ClsPub.HOrgID = HPRDORGID;
+ if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
{
- if (oSystemParameter.omodel.Sc_ProcessExchangeBill_DeleterAndMakerMustSame == "Y")
+ if (lngBillKey == 0)
{
- if (oBill.omodel.HMaker != user)
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍙�:"+ oBill .omodel.HBillNo+ "鍗曟嵁ID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //鍒犻櫎鍓嶅垽鏂叧鑱旀暟閲�
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ DataSet ds;
+ ds = oCn.RunProcReturn("select ct from ( " +
+ " select 1 ct from Sc_StationInBillMain Where HProcExchInterID=" + lngBillKey + " " +
+ " union all " +
+ " select 1 from Sc_StationOutBillMain Where HProcExchInterID=" + lngBillKey + " ) as a ", "Sc_ProcExchReportSub");
+ if (ds.Tables[0].Rows.Count != 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍙�:" + oBill.omodel.HBillNo + "娴佽浆鍗″凡缁忔湁涓嬫父杩涘嚭绔欏崟鍚庯紝涓嶅厑璁稿垹闄わ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ string sReturn = "";
+ if (oSystemParameter.ShowBill(ref sReturn))
+ {
+ if (oSystemParameter.omodel.Sc_ProcessExchangeBill_DeleterAndMakerMustSame == "Y")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鍙兘鍒犻櫎鏈汉鐨勫崟鎹紒";
- objJsonResult.data = null;
- return objJsonResult;
+ if (oBill.omodel.HMaker != user && (user != "admin" && user != "Admin"))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍙�:" + oBill.omodel.HBillNo + "鍙兘鍒犻櫎鏈汉鐨勫崟鎹紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
}
}
- }
- if (oBill.omodel.HBillStatus > 1)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鍗曟嵁褰撳墠澶勪簬涓嶈兘鍒犻櫎鐘舵��,涓嶈兘鍒犻櫎锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- if (oBill.omodel.HChecker != "")
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鍗曟嵁宸茬粡瀹℃牳,涓嶈兘鍒犻櫎锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
+ if (oBill.omodel.HBillStatus > 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍙�:" + oBill.omodel.HBillNo + "鍗曟嵁褰撳墠澶勪簬涓嶈兘鍒犻櫎鐘舵��,涓嶈兘鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
- bool IsDete = oBill.DeleteBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
- if (IsDete)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 1;
- objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
- objJsonResult.data = null;
- return objJsonResult;
+ if (oBill.omodel.HChecker != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍙�:" + oBill.omodel.HBillNo + "鍗曟嵁宸茬粡瀹℃牳,涓嶈兘鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ HBillNo_S += oBill.omodel.HBillNo + ",";
}
else
{
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈壘鍒�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ HBillNo_S = HBillNo_S.Substring(0, HBillNo_S.Length - 1);
+ LogService.Write("鐢ㄦ埛:" + user + ",鏃ユ湡:" + DateTime.Now + ",鍒犻櫎宸ュ簭娴佽浆鍗″崟鎹�:" + HBillNo_S);
+
+ foreach (var item in HBillNo)
+ {
+ bool IsDete = oBill.DeleteBill(long.Parse(item), ref DBUtility.ClsPub.sExeReturnInfo);
+ if (!IsDete)
+ {
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
@@ -902,14 +930,11 @@
return objJsonResult;
}
}
- else
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鍗曟嵁鏈壘鍒�";
- objJsonResult.data = null;
- return objJsonResult;
- }
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
}
#endregion
@@ -1219,5 +1244,92 @@
}
#endregion
+
+
+ #region 鍗曟嵁鍙樻洿 椤甸潰鍒濆鍖�
+ [Route("Sc_ProcessExchangeBill/GetProcessExchangeBillMain_Change_init")]
+ [HttpGet]
+ public object GetProcessExchangeBillMain_Change_init(string HInterID)
+ {
+ try
+ {
+ if (string.IsNullOrEmpty(HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛丠InterID涓嶈兘涓虹┖";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+
+ ds = oCN.RunProcReturn("select * from h_v_Sc_ProcessExchangeBillQuery where hmainid = " + HInterID + " ", "h_v_Sc_ProcessExchangeBillQuery");
+
+ if (ds==null||ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛佷笉瀛樺湪宸ュ簭娴佽浆鍗�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鍗曟嵁鍙樻洿 淇濆瓨
+ [Route("Sc_ProcessExchangeBill/GetProcessExchangeBillMain_Change_save")]
+ [HttpGet]
+ public object GetProcessExchangeBillMain_Change_save(string HInterID,string HMaterModel2)
+ {
+ try
+ {
+ if (string.IsNullOrEmpty(HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛丠InterID涓嶈兘涓虹┖";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+
+ oCN.BeginTran();
+ oCN.RunProc("update Sc_ProcessExchangeBillMain set HMaterModel2 = '" + HMaterModel2 + "' where HInterID = " + HInterID + "");
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ 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
--
Gitblit v1.9.1