From 1f53d71884bb7f6264da7f2b2a1adb5351a8e420 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期五, 14 一月 2022 09:12:55 +0800
Subject: [PATCH] 修改了生产领料扫描多源单方法
---
WebAPI/Controllers/SCGL/Sc_PackUnionBillController.cs | 58 ++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 46 insertions(+), 12 deletions(-)
diff --git a/WebAPI/Controllers/SCGL/Sc_PackUnionBillController.cs b/WebAPI/Controllers/SCGL/Sc_PackUnionBillController.cs
index 54a7fcb..3cc1665 100644
--- a/WebAPI/Controllers/SCGL/Sc_PackUnionBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_PackUnionBillController.cs
@@ -75,7 +75,7 @@
objJsonResult.data = null;
return objJsonResult;
}
- DLL.ClsKf_MateOutBackBill oBill = new DLL.ClsKf_MateOutBackBill();
+ DAL.ClsSc_PackUnionBill oBill = new DAL.ClsSc_PackUnionBill();
if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
{
if (oBill.omodel.HBillStatus > 1)
@@ -102,23 +102,57 @@
objJsonResult.data = null;
return objJsonResult;
}
- bool IsDete = oBill.DeleteBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo);
- if (IsDete)
+ ds = oCn.RunProcReturn("Select * from Sc_PackUnionBillMain where HinterID='" + lngBillKey, "Sc_PackUnionBillMain");
+ var HBarCode_Pack = ds.Tables[0].Rows[0]["HBarCode_Pack"].ToString();
+ if (ds.Tables.Count < 1)
{
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "涓嶅瓨鍦ㄧ鐮�";
objJsonResult.data = null;
return objJsonResult;
}
else
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
- objJsonResult.data = null;
- return objJsonResult;
+ //鍒ゆ柇鏄惁鍏ュ簱
+ ds = oCn.RunProcReturn("select * from Sc_ScanLineInStock where HBarCode_Pack='" + HBarCode_Pack + "'", "Sc_ScanLineInStock");
+ if (ds != null && ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "-1";
+ objJsonResult.Message = "璇ョ鏉＄爜宸插叆搴撲笉鍏佽鍙栨秷!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ds = oCn.RunProcReturn("Select 1 from Gy_BarCodeBill where HBarCode='" + HBarCode_Pack + "'", "Gy_BarCodeBill");
+ if (ds == null && ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "-1";
+ objJsonResult.Message = "鏃犳晥绠辨潯鐮�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ ds = oCn.RunProcReturn("Select 1 from Gy_BarCodeBill where HBarCode='" + HBarCode_Pack + "' and HStopflag='1'", "Gy_BarCodeBill");
+ if (ds != null && ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "-1";
+ objJsonResult.Message = "姝ょ鏉＄爜宸蹭綔搴�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
}
+
+ oCn.BeginTran();
+ oCn.RunProc("Update Gy_BarCodeBill set HStopflag='1' where HBarCode='" + HBarCode_Pack + "'");
+ oCn.RunProc("Delete From Sc_PackUnionBillSub_Sum where HBarCode_Pack='" + HBarCode_Pack + "'");
+ oCn.RunProc("Delete From Sc_PackUnionBillSub where HInterID='" + lngBillKey + "'");
+ oCn.RunProc("Delete From Sc_PackUnionBillMain where HInterID='" + lngBillKey + "'");
+ oCn.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
}
else
{
@@ -149,4 +183,4 @@
}
#endregion
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.1