From 481c3fdeda9ee782807ae770a4d78e1eb0b73ce6 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期三, 04 二月 2026 10:17:07 +0800
Subject: [PATCH] 小卫组托缓存列表，小卫组托修复，app小卫拆箱
---
WebAPI/Controllers/CJGL/Cj_CheckBarcodeController.cs | 67 +++++++++++++++++++++++++++++++--
1 files changed, 62 insertions(+), 5 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Cj_CheckBarcodeController.cs b/WebAPI/Controllers/CJGL/Cj_CheckBarcodeController.cs
index 1bf08df..66a42cd 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,12 +68,12 @@
[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)
{
@@ -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,62 @@
}
#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
+
}
}
\ No newline at end of file
--
Gitblit v1.9.1