From 464f5a591e5d02fe0873505a119e17a576945ca6 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期五, 19 七月 2024 17:21:44 +0800
Subject: [PATCH] 报工台跳转异常反馈单 弹窗获取 设备编码
---
WebAPI/Controllers/条码管理/WEBSController.cs | 113 ++++++++++++++++++++++++++++++++++----------------------
1 files changed, 69 insertions(+), 44 deletions(-)
diff --git "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs" "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
index 8e74584..6d9b83c 100644
--- "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
+++ "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
@@ -3778,31 +3778,55 @@
[HttpGet]
public object get_SourceBarCode_MateOut_Json(Int64 HInterID, string HBillNo, string HBillType, string HSourceBillNo, string HSourceBillType, string HMaker, Double HPTQty, Int64 HPlanMode, Int64 HFIFOWhID, Int64 HStockOrgID)
{
- try
+ //鑾峰彇绯荤粺鍙傛暟
+ string sErrMsg = "";
+ if (oSystemParameter.ShowBill(ref sErrMsg) == true)
{
- WebSoBar = oWebs.get_SourceBarCode_MateOut(HInterID, HBillNo, HBillType, HSourceBillNo, HSourceBillType, HMaker, HPTQty, HPlanMode, HFIFOWhID, HStockOrgID, ref DBUtility.ClsPub.sErrInfo);
- if (WebSoBar == null)
+ if (oSystemParameter.omodel.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟鏄惁涓虹鏈変簯妯″紡,N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡
+ {
+ if(HSourceBillType == "1214")
+ {
+ //閲嶆柊鍚屾鐢熶骇鍙戞枡閫氱煡鍗�
+ Kf_MateOutRequestBillController obill = new Kf_MateOutRequestBillController();
+ objJsonResult = obill.GetKf_MateOutRequestBill_Sync_Json(HSourceBillNo, HSourceBillType);
+ }
+ }
+
+ try
+ {
+ WebSoBar = oWebs.get_SourceBarCode_MateOut(HInterID, HBillNo, HBillType, HSourceBillNo, HSourceBillType, HMaker, HPTQty, HPlanMode, HFIFOWhID, HStockOrgID, ref DBUtility.ClsPub.sErrInfo);
+ if (WebSoBar == null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛";
+ objJsonResult.data = WebSoBar;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
+ objJsonResult.Message = "鎵弿婧愬崟鏉＄爜澶辫触锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
- else
- {
- objJsonResult.code = "0";
- objJsonResult.count = 1;
- objJsonResult.Message = "鎴愬姛";
- objJsonResult.data = WebSoBar;
- return objJsonResult;
- }
+
}
- catch (Exception e)
+ else
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鎵弿婧愬崟鏉＄爜澶辫触锛�" + e.ToString();
+ objJsonResult.Message = "鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg;
objJsonResult.data = null;
return objJsonResult;
}
@@ -6186,26 +6210,7 @@
HSupIDs = ds.Tables[0].Rows[0]["HItemID"].ToString();
}
- string HSourceInterIDs = "0";
- string HSourceEntryIDs = "0";
string HSourceBillNos = "0";
- string HUnitIDs = "0";
- //鏌ヨ閲囪喘璁㈠崟
- ds = oCn.RunProcReturn(@"select a.HInterID,b.HEntryID,a.HBillNo,b.HUnitID from Cg_POOrderBillMain a
-inner join Cg_POOrderBillSub b on a.HInterID = b.HInterID where HBillNo='" + str[3] + "' and b.HMaterID=" + HMaterIDs, "Cg_POOrderBillMain");
- if (ds.Tables[0].Rows.Count == 0)
- {
- //sErrMsg = "鏉＄爜瑙ｆ瀽澶辫触,璇风‘璁ゆ潯鐮侀噰璐鍗曟槸鍚︽纭�!";
- //return null;
- }
- else
- {
- HSourceInterIDs = ds.Tables[0].Rows[0]["HInterID"].ToString();
- HSourceEntryIDs = ds.Tables[0].Rows[0]["HEntryID"].ToString();
- HSourceBillNos = ds.Tables[0].Rows[0]["HBillNo"].ToString();
- HUnitIDs = ds.Tables[0].Rows[0]["HUnitID"].ToString();
- }
-
string HInnerBillNos = "";
//鏌ヨ鍐呴儴閲囪喘璁㈠崟鍙�
ds = oCn.RunProcReturn(@" select * from h_v_IF_POInStockList where 閲囪喘璁㈠崟鍙�= '" + str[3] + "' ", "h_v_IF_POInStockList");
@@ -6218,7 +6223,27 @@
else
{
HInnerBillNos = ds.Tables[0].Rows[0]["鍐呴儴閲囪喘璁㈠崟鍙�"].ToString();
+ HSourceBillNos = ds.Tables[0].Rows[0]["閲囪喘璁㈠崟鍙�"].ToString();
}
+
+ string HSourceInterIDs = "0";
+ string HSourceEntryIDs = "0";
+ string HUnitIDs = "0";
+ //鏌ヨ閲囪喘璁㈠崟
+ ds = oCn.RunProcReturn(@"select a.HInterID,b.HEntryID,a.HBillNo,b.HUnitID from Cg_POOrderBillMain a
+inner join Cg_POOrderBillSub b on a.HInterID = b.HInterID where HBillNo='" + HSourceBillNos + "' and b.HMaterID=" + HMaterIDs, "Cg_POOrderBillMain");
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ //sErrMsg = "鏉＄爜瑙ｆ瀽澶辫触,璇风‘璁ゆ潯鐮侀噰璐鍗曟槸鍚︽纭�!";
+ //return null;
+ }
+ else
+ {
+ HSourceInterIDs = ds.Tables[0].Rows[0]["HInterID"].ToString();
+ HSourceEntryIDs = ds.Tables[0].Rows[0]["HEntryID"].ToString();
+ HUnitIDs = ds.Tables[0].Rows[0]["HUnitID"].ToString();
+ }
+
double HQty = double.Parse(str[6]);
//鏃ユ湡鑾峰彇鏂瑰紡
@@ -7476,20 +7501,20 @@
DataSet ds1 = oCn.RunProcReturn(sql1, "Gy_getCusBarCodeBill_Temp");
if (ds1 != null && ds1.Tables[0].Rows.Count == 0)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "淇敼澶辫触锛佸師鍥狅細淇敼鍚庣殑鍗曟嵁鍙峰湪鏈彁浜ょ殑缂撳瓨鍒楄〃涓笉瀛樺湪锛�";
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛";
objJsonResult.data = null;
return objJsonResult;
}
-
-
-
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "鎴愬姛";
- objJsonResult.data = ds1.Tables[0];
- return objJsonResult;
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛";
+ objJsonResult.data = ds1.Tables[0];
+ return objJsonResult;
+ }
}
catch (Exception e)
{
--
Gitblit v1.9.1