From 5588fc5697a6c639f7b5c11e1865de9bc5481546 Mon Sep 17 00:00:00 2001
From: chenhaozhe <gaozhechen26@gmail.com>
Date: 星期日, 26 十月 2025 21:47:22 +0800
Subject: [PATCH] 添加 来料检验单 生产入库检验单 出厂检验单 根据物料带出检验方案 接口
---
WebAPI/Controllers/华远datamapping/QC_CheckNote_PNL_TempController.cs | 360 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 335 insertions(+), 25 deletions(-)
diff --git "a/WebAPI/Controllers/\345\215\216\350\277\234datamapping/QC_CheckNote_PNL_TempController.cs" "b/WebAPI/Controllers/\345\215\216\350\277\234datamapping/QC_CheckNote_PNL_TempController.cs"
index 0ff28db..977ca39 100644
--- "a/WebAPI/Controllers/\345\215\216\350\277\234datamapping/QC_CheckNote_PNL_TempController.cs"
+++ "b/WebAPI/Controllers/\345\215\216\350\277\234datamapping/QC_CheckNote_PNL_TempController.cs"
@@ -142,7 +142,7 @@
int HPosition_x = list[0].HPosition_x;
int HPosition_y = list[0].HPosition_y;
string HCheckProc = list[0].HCheckProc;
- short HPageIndex = list[0].HPageIndex;
+ string HPageIndex = list[0].HPageIndex;
string HBadReason = list[0].HBadReason;
string HMaker = list[0].HMaker;
DateTime HMakeDate = list[0].HMakeDate;
@@ -181,16 +181,16 @@
}
//=========================================================
- DataSet ds_exits = oCN.RunProcReturn("select HBarCode from QC_CheckNote_PNL_Temp where HSetNo = N'" + HSetNo + "'" +
- "AND HPCSNo = N'" + HPCSNo + "'", "QC_CheckNote_PNL_Temp");
- if (ds_exits.Tables[0].Rows.Count > 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "SET缂栧彿鎴朠CS缂栧彿宸插瓨鍦紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
+ //DataSet ds_exits = oCN.RunProcReturn("select HBarCode from QC_CheckNote_PNL_Temp where HSetNo = N'" + HSetNo + "'" +
+ // "AND HPCSNo = N'" + HPCSNo + "'", "QC_CheckNote_PNL_Temp");
+ //if (ds_exits.Tables[0].Rows.Count > 0)
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "SET缂栧彿鎴朠CS缂栧彿宸插瓨鍦紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
StringBuilder sb = new StringBuilder();
sb.Append("Insert Into QC_CheckNote_PNL_Temp(HBarCode, HSetNo, HPCSNo, HPosition_x,HPosition_y,HCheckProc,HPageIndex ,HBadReason, HMaker, HMakeDate) Values(");
@@ -203,7 +203,7 @@
sb.Append("N'" + HPageIndex + "',");
sb.Append("N'" + HBadReason + "',");
sb.Append("N'" + HMaker + "',");
- sb.Append("N'" + HMakeDate + "')");
+ sb.Append("N'" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "')");
string sql = sb.ToString();
sb.Clear();
@@ -232,6 +232,130 @@
return objJsonResult;
}
//=========================================================
+
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏂板鎴愬姛锛�";
+ //objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鎵归噺娣诲姞QC_CheckNote_PNL_Temp
+ [Route("QC_CheckNote_PNL_TempController/BatchAddBill")]
+ [HttpPost]
+ public object BatchAddBill([FromBody] JObject oMain)
+ {
+ try
+ {
+ var _value = oMain["oMain"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string msg3 = sArray[1].ToString();//褰撳墠浜�
+
+ //鍒ゆ柇鏉冮檺
+ if (!ClsPub.Security_Log("QC_CheckNote_PNL_Temp_Edit", 1, false, msg3))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁淇敼鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //鍙嶅簭鍒楀寲
+ //msg2 = "[" + msg2.ToString() + "]";
+ List<Models.ClsQC_CheckNote_PNL_Temp> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsQC_CheckNote_PNL_Temp>>(msg2);
+
+ oCN.BeginTran();
+ for (int i = 0; i < list.Count; i++)
+ {
+ int HItemID = list[i].HItemID;
+ string HBarCode = list[i].HBarCode;
+ string HSetNo = list[i].HSetNo;
+ string HPCSNo = list[i].HPCSNo;
+ int HPosition_x = list[i].HPosition_x;
+ int HPosition_y = list[i].HPosition_y;
+ string HCheckProc = list[i].HCheckProc;
+ string HPageIndex = list[i].HPageIndex;
+ string HBadReason = list[i].HBadReason;
+ string HMaker = list[i].HMaker;
+ DateTime HMakeDate = list[i].HMakeDate;
+
+ DataSet ds_editCheck;
+ //淇濆瓨鍓嶆帶鍒�=========================================
+ ds_editCheck = oCN.RunProcReturn("Exec h_p_QC_CheckNote_PNL_Temp_BeforeSaveCtrl " + msg3 + ",'1'", "h_p_QC_CheckNote_PNL_Temp_BeforeSaveCtrl");
+ if (ds_editCheck == null)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨鍓嶅垽鏂け璐ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds_editCheck.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //=========================================================
+
+ StringBuilder sb = new StringBuilder();
+ sb.Append("Insert Into QC_CheckNote_PNL_Temp(HBarCode, HSetNo, HPCSNo, HPosition_x,HPosition_y,HCheckProc,HPageIndex ,HBadReason, HMaker, HMakeDate) Values(");
+ sb.Append("N'" + HBarCode + "',");
+ sb.Append("N'" + HSetNo + "',");
+ sb.Append("N'" + HPCSNo + "',");
+ sb.Append("N'" + HPosition_x + "',");
+ sb.Append("N'" + HPosition_y + "',");
+ sb.Append("N'" + HCheckProc + "',");
+ sb.Append("N'" + HPageIndex + "',");
+ sb.Append("N'" + HBadReason + "',");
+ sb.Append("N'" + HMaker + "',");
+ sb.Append("N'" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "')");
+ string sql = sb.ToString();
+ sb.Clear();
+ ds = oCN.RunProcReturn(sql, "QC_CheckNote_PNL_Temp");
+
+ //淇濆瓨鍚庢帶鍒�=========================================
+ ds_editCheck = oCN.RunProcReturn("Exec h_p_QC_CheckNote_PNL_Temp_AfterSaveCtrl " + msg3 + ",'1'", "h_p_QC_CheckNote_PNL_Temp_AfterSaveCtrl");
+ if (ds_editCheck == null)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨鍚庡垽鏂け璐ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+
+ }
+ if (DBUtility.ClsPub.isStrNull(ds_editCheck.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "" + DBUtility.ClsPub.isStrNull(ds_editCheck.Tables[0].Rows[0]["HBackRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //=========================================================
+ }
oCN.Commit();
objJsonResult.code = "1";
@@ -362,7 +486,7 @@
int HPosition_x = list[0].HPosition_x;
int HPosition_y = list[0].HPosition_y;
string HCheckProc = list[0].HCheckProc;
- short HPageIndex = list[0].HPageIndex;
+ string HPageIndex = list[0].HPageIndex;
string HBadReason = list[0].HBadReason;
string HMaker = list[0].HMaker;
DateTime HMakeDate = list[0].HMakeDate;
@@ -400,16 +524,16 @@
}
//=========================================================
- DataSet ds_exits = oCN.RunProcReturn("select HBarCode from QC_CheckNote_PNL_Temp where HSetNo = N'" + HSetNo + "'" +
- "AND HPCSNo = N'" + HPCSNo + "' AND HItemID != " + HItemID, "QC_CheckNote_PNL_Temp");
- if (ds_exits.Tables[0].Rows.Count > 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "SET缂栧彿鎴朠CS缂栧彿宸插瓨鍦紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
+ //DataSet ds_exits = oCN.RunProcReturn("select HBarCode from QC_CheckNote_PNL_Temp where HSetNo = N'" + HSetNo + "'" +
+ // "AND HPCSNo = N'" + HPCSNo + "' AND HItemID != " + HItemID, "QC_CheckNote_PNL_Temp");
+ //if (ds_exits.Tables[0].Rows.Count > 0)
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "SET缂栧彿鎴朠CS缂栧彿宸插瓨鍦紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
StringBuilder sb = new StringBuilder();
sb.Append("Update QC_CheckNote_PNL_Temp set ");
@@ -422,7 +546,9 @@
sb.Append("HCheckProc=N'" + HCheckProc + "',");
sb.Append("HBadReason=N'" + HBadReason + "',");
sb.Append("HMaker=N'" + HMaker + "',");
- sb.Append("HMakeDate=N'" + HMakeDate + "'");
+ sb.Append("HMakeDate=N'" + HMakeDate + "',");
+ sb.Append("HModifyMan=N'" + msg3 + "',");
+ sb.Append("HModifyDate=getdate()");
sb.Append(" Where HItemID = " + HItemID);
string sql = sb.ToString();
@@ -471,6 +597,190 @@
return objJsonResult;
}
}
- #endregion
+ #endregion
+
+ #region 瀹℃牳PNL妫�楠屼俊鎭�
+ [Route("QC_CheckNote_PNL_TempController/CheckBill")]
+ [HttpGet]
+ public object CheckBill(int HInterID, string user, int IsAudit)
+ {
+ try
+ {
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("QC_CheckNote_PNL_Temp_Check", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ var ds = oCN.RunProcReturn("select top 1 HCheckMan from QC_CheckNote_PNL_Temp where HItemID=" + HInterID, "QC_CheckNote_PNL_Temp");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ if (IsAudit == 0) //瀹℃牳鍒ゆ柇
+ {
+ if (string.IsNullOrEmpty(ds.Tables[0].Rows[0]["HCheckMan"].ToString()) != true)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+ {
+ if (string.IsNullOrEmpty(ds.Tables[0].Rows[0]["HCheckMan"].ToString()) == true)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶉渶瑕佸弽瀹℃牳!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+
+ oCN.BeginTran();
+
+ if (IsAudit == 0) //瀹℃牳鍒ゆ柇
+ {
+ //瀹℃牳鍓嶆帶鍒�=========================================
+ ds = oCN.RunProcReturn("Exec h_p_QC_CheckNote_PNL_BeforeCheckCtrl " + HInterID + ",'" + user + "'", "h_p_QC_CheckNote_PNL_BeforeCheckCtrl");
+ if (ds == null)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳鍓嶅垽鏂け璐ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //=========================================================
+
+ oCN.RunProc("update QC_CheckNote_PNL_Temp set HCheckMan='" + user + "',HCheckDate=getdate() where HItemID=" + HInterID);
+
+ //瀹℃牳鍚庢帶鍒�=========================================
+ DataSet ds2 = oCN.RunProcReturn("Exec h_p_QC_CheckNote_PNL_AfterCheckCtrl " + HInterID + ",'" + user + "'", "h_p_QC_CheckNote_PNL_AfterCheckCtrl");
+ if (ds2 == null)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳鍚庡垽鏂け璐ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //=========================================================
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳鎴愬姛";
+ objJsonResult.data = null;
+ }
+ if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+ {
+ //鍙嶅鏍稿墠鎺у埗=========================================
+ ds = oCN.RunProcReturn("Exec h_p_QC_CheckNote_PNL_BeforeUnCheckCtrl " + HInterID + ",'" + user + "'", "h_p_QC_CheckNote_PNL_BeforeUnCheckCtrl");
+ if (ds == null)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳鍓嶅垽鏂け璐ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //=========================================================
+
+ oCN.RunProc("update QC_CheckNote_PNL_Temp set HCheckMan='',HCheckDate=null where HItemID=" + HInterID);
+
+
+ //鍙嶅鏍稿悗鎺у埗=========================================
+ DataSet ds2 = oCN.RunProcReturn("Exec h_p_QC_CheckNote_PNL_AfterUnCheckCtrl " + HInterID + ",'" + user + "'", "h_p_QC_CheckNote_PNL_AfterUnCheckCtrl");
+ if (ds2 == null)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳鍚庡垽鏂け璐ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //=========================================================
+
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍告垚鍔�";
+ objJsonResult.data = null;
+ }
+
+
+
+ oCN.Commit();
+
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触鎴栬�呭弽瀹℃牳澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ }
+ #endregion
}
}
--
Gitblit v1.9.1