From fd991e354648eacbf449b4b3fceafedfbaa4201f Mon Sep 17 00:00:00 2001
From: dytyqx <1342948614@qq.com>
Date: 星期一, 09 三月 2026 11:03:55 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/CJGL/Cj_CheckBarcodeController.cs | 147 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 141 insertions(+), 6 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Cj_CheckBarcodeController.cs b/WebAPI/Controllers/CJGL/Cj_CheckBarcodeController.cs
index 1bf08df..e220215 100644
--- a/WebAPI/Controllers/CJGL/Cj_CheckBarcodeController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_CheckBarcodeController.cs
@@ -22,11 +22,11 @@
#region 涓夌爜鍚堜竴锛屽垽鏂壂鎻忕墿鏂欐潯鐮佺粦瀹氫俊鎭槸鍚︿竴鑷�
[Route("CheckBarcodeController/Get_BarCode_BarcodeCheck")]
[HttpGet]
- public object CheckBarcode(string HBarCode_Pallet, string HBarCode_Destination, string HBarCode_MiddleBox, string HBarCode_SN, int HBarCodeType,int HInterID, string HBillNo,string HMaker)
+ public object CheckBarcode(string HBarCode_Pallet, string HBarCode_Destination, string HBarCode_MiddleBox, string HBarCode_SN, int HBarCodeType, int HInterID, string HBillNo, string HMaker, string HBillType)
{
try
{
- ds = oCn.RunProcReturn("exec h_p_Cj_CheckBarcodeBing '" + HBarCode_Pallet + "','" + HBarCode_Destination + "','" + HBarCode_MiddleBox + "','" + HBarCode_SN + "','" + HBarCodeType + "'," + HInterID + ",'" + HBillNo + "','" + HMaker + "'", "h_p_Cj_CheckBarcodeBing");
+ ds = oCn.RunProcReturn("exec h_p_Cj_CheckBarcodeBing '" + HBarCode_Pallet + "','" + HBarCode_Destination + "','" + HBarCode_MiddleBox + "','" + HBarCode_SN + "','" + HBarCodeType + "'," + HInterID + ",'" + HBillNo + "','" + HMaker + "','" + HBillType + "'", "h_p_Cj_CheckBarcodeBing");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -68,15 +68,15 @@
[Route("CheckBarcodeController/Save_BarCode_BarcodeCheck")]
[HttpGet]
- public object Save_BarCode_BarcodeCheck(Int64 HInterID, string HBillNo)
+ public object Save_BarCode_BarcodeCheck(Int64 HInterID, string HBillNo, string HBillType)
{
try
{
oCn.BeginTran();
- DataSet ds = oCn.RunProcReturn("exec h_p_WMS_BarCodeBingCheckBill_Insert " + HInterID.ToString() + ",'" + HBillNo + "'", "h_p_WMS_BarCodeBingCheckBill_Insert");
+ DataSet ds = oCn.RunProcReturn("exec h_p_WMS_BarCodeBingCheckBill_Insert " + HInterID.ToString() + ",'" + HBillNo + "','" + HBillType + "'", "h_p_WMS_BarCodeBingCheckBill_Insert");
if (ds == null || ds.Tables[0].Rows.Count == 0)
- {
+ {
oCn.RollBack();
objJsonResult.code = "0";
@@ -93,7 +93,7 @@
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //澶辫触锛�
+ objJsonResult.Message = ds.Tables[0].Rows[0]["HBackRemark"].ToString(); //澶辫触锛�
objJsonResult.data = null;
return objJsonResult;
}
@@ -122,5 +122,140 @@
}
#endregion
+
+ #region 鎷嗙灏忓崼
+ [Route("CheckBarcodeController/UnpackMiddleBox")]
+ [HttpGet]
+ public object UnpackMiddleBox(string HBarCode_Middle, int signal, string HMaker, string HDate)
+ {
+ try
+ {
+ if (signal == 1)//鎵爜
+ {
+ DataSet ds = oCn.RunProcReturn("select a.HCaseCode 涓鐮�,a.HBarCode 瀵瑰簲鐨凷N鐮�,b.HNumber 鐗╂枡浠ｇ爜,b.HName 鐗╂枡鍚嶇О from Gy_CaseCodeRelation a left join Gy_Material b on a.HMaterID=b.HItemID where HCaseCode='" + HBarCode_Middle + "'", "Gy_CaseCodeRelation");
+ if (ds.Tables[0].Rows[0]["涓鐮�"].ToString() == "" || ds == null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏉＄爜涓嶅瓨鍦紒璇锋鏌ユ槸鍚﹁绠�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+
+ }
+
+ else
+ {
+ oCn.BeginTran();
+ oCn.RunProc("delete from Gy_CaseCodeRelation where HCaseCode='" + HBarCode_Middle + "'");
+ DataSet dss = oCn.RunProcReturn("select * from Gy_BarCodeBill where HBarCode=' " + HBarCode_Middle + "'", "Gy_BarCodeBill");
+ if (dss != null && dss.Tables.Count > 0)
+ {
+ oCn.RunProc("delete from Gy_BarCodeBill where HBarCode='" + HBarCode_Middle + "'");
+ }
+ oCn.RunProc("insert into System_log VALUES('" + HDate + "','" + HMaker + "',''," + "'灏忓崼鎷嗙鏉＄爜" + HBarCode_Middle + "'," + "'APP-涓鐮佹媶绠�'" + ",''," + "'鍒犻櫎鏉＄爜')");
+ oCn.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ }
+ catch (Exception)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "閿欒璇疯仈绯荤鐞嗗憳";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region sn瑁呯灏忓崼
+ [Route("CheckBarcodeController/PackedBoxSn")]
+ [HttpGet]
+ public object PackedBoxSn(string HBarCode, string HMaker, string HDate)
+ {
+ try
+ {
+ DataSet ds = oCn.RunProcReturn("select a.HBarCode sn鐮�,a.HItemID,b.Hname 鐗╂枡鍚嶇О,b.hnumber 鐗╂枡浠ｇ爜 from Gy_BarCodeBill a LEFT JOIN Gy_Material b on a.hmaterid=b.hitemid where HBarCode='" + HBarCode + "'", "Gy_BarCodeBill");
+ if(ds.Tables[0].Rows.Count==0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "璇n鐮佷笉瀛樺湪锛岃妫�鏌ワ紒锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ DataSet dss = oCn.RunProcReturn("select * from Gy_CaseCodeRelation where HBarCode='" + HBarCode + "'", "Gy_CaseCodeRelation");
+ int counts=dss.Tables[0].Rows.Count;
+ if (counts > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "璇n鐮佸凡缁忚绠憋紝璇锋鏌ワ紒锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+
+ #region sn瑁呯灏忓崼鎻愪氦
+ [Route("CheckBarcodeController/submitPackedBoxSn")]
+ [HttpGet]
+ public object submitPackedBoxSn(string HItemIDs, string HMaker, string HDate)
+ {
+ try
+ {
+ DataSet ds = oCn.RunProcReturn("exec h_p_Gy_CaseCodeBySN '"+ HItemIDs+ "'", "h_p_Gy_CaseCodeBySN");
+ if (ds.Tables[0].Rows[0]["HBack"] == "2")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "涓鐮佸凡瀛樺湪璇烽噸鏂扮敓鎴�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
\ No newline at end of file
--
Gitblit v1.9.1