From 56a9ece7e0394587d60f0ea78293c03b63db95d0 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期四, 07 八月 2025 13:07:24 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs | 58 +++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 35 insertions(+), 23 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
index d47a47c..19f2697 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
@@ -200,7 +200,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "绌虹櫧鐮�,鏉″舰鐮佷笉鑳戒负绌猴紒";
+ objJsonResult.Message = "[0000-2-019]绌虹櫧鐮�,鏉″舰鐮佷笉鑳戒负绌猴紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -238,6 +238,18 @@
{
if (oSystemParameter.omodel.WMS_CampanyName == "鏉窞鏂帿灏�")
{
+ ds = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessExchangeBillList where 鍗曟嵁鍙�= '" + BillNo_PGD + "'", "h_v_Sc_ProcessExchangeBillList");
+ }
+ }
+ break;
+ case "OP"://娴佽浆鍗�
+ sErr = "";
+ if (oSystemParameter.ShowBill(ref sErr))
+ {
+ if (oSystemParameter.omodel.WMS_CampanyName == "娴疯瘹")
+ {
+ //鍚屾宸ュ簭娴佽浆鍗�
+ oCN.RunProc("exec h_p_IFCLD_ERPSourceBillToLocal_ProcExchAndRouting '" + BillNo_PGD + "'");
ds = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessExchangeBillList where 鍗曟嵁鍙�= '" + BillNo_PGD + "'", "h_v_Sc_ProcessExchangeBillList");
}
}
@@ -369,25 +381,25 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏈煡璇㈠埌鏉＄爜淇℃伅锛�";
+ objJsonResult.Message = "[0000-2-020]鏈煡璇㈠埌鏉＄爜淇℃伅锛�";
objJsonResult.data = null;
if(BillNoType == "PRO")
{
ds = oCN.RunProcReturn("select * from h_v_Gy_ProcessList where HItemID = '" + BillNo + "'", "h_v_Gy_ProcessList");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
- objJsonResult.Message = "鏈煡璇㈠埌鏉＄爜淇℃伅锛�";
+ objJsonResult.Message = "[0000-2-020]鏈煡璇㈠埌鏉＄爜淇℃伅锛�";
}
else
{
- objJsonResult.Message = "鐢ㄦ埛鏈叧鑱旂浉鍏冲伐搴忔垨娴佽浆鍗℃棤姝ゅ伐搴忥紝濡傛湁闇�瑕佽缁存姢";
+ objJsonResult.Message = "[3790-2-010]鐢ㄦ埛鏈叧鑱旂浉鍏冲伐搴忔垨娴佽浆鍗℃棤姝ゅ伐搴忥紝濡傛湁闇�瑕佽缁存姢";
}
}
return objJsonResult;
}
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
+ objJsonResult.Message = "[0000-1-037]Sucess锛�";
objJsonResult.data = ds.Tables[0];
return objJsonResult;
}
@@ -395,7 +407,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.Message = "[0000-1-038]Exception锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
@@ -458,7 +470,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "绌虹櫧鐮�,鏉″舰鐮佷笉鑳戒负绌猴紒";
+ objJsonResult.Message = "[0000-2-019]绌虹櫧鐮�,鏉″舰鐮佷笉鑳戒负绌猴紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -472,7 +484,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏈煡璇㈠埌鏉″舰鐮佷俊鎭紒";
+ objJsonResult.Message = "[0000-2-020]鏈煡璇㈠埌鏉″舰鐮佷俊鎭紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -480,7 +492,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "閿欒锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0][1]);
+ objJsonResult.Message = "[0000-1-038]閿欒锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0][1]);
objJsonResult.data = null;
return objJsonResult;
}
@@ -493,7 +505,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍒锋柊澶辫触,鏃犳暟鎹樉绀猴紒";
+ objJsonResult.Message = "[0000-1-045]鍒锋柊澶辫触,鏃犳暟鎹樉绀猴紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -501,14 +513,14 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏌ユ棤鏁版嵁!";
+ objJsonResult.Message = "[0000-1-045]鏌ユ棤鏁版嵁!";
objJsonResult.data = null;
return objJsonResult;
}
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "缁戝畾鎴愬姛锛�";
+ objJsonResult.Message = "[0000-1-037]缁戝畾鎴愬姛锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -516,7 +528,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.Message = "[0000-1-038]Exception锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
@@ -1678,7 +1690,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鐢ㄦ埛缂栫爜涓嶈兘涓虹┖锛�";
+ objJsonResult.Message = "[0000-2-021]鐢ㄦ埛缂栫爜涓嶈兘涓虹┖锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -1689,13 +1701,13 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏈煡璇㈠埌宸ュ簭淇℃伅锛�";
+ objJsonResult.Message = "[0000-2-022]鏈煡璇㈠埌宸ュ簭淇℃伅锛�";
objJsonResult.data = null;
return objJsonResult;
}
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
+ objJsonResult.Message = "[0000-1-037]Sucess锛�";
objJsonResult.data = ds.Tables[0];
return objJsonResult;
}
@@ -1703,7 +1715,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.Message = "[0000-1-038]Exception锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
@@ -1712,7 +1724,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鎵嬪姩杈撳叆妯″紡";
+ objJsonResult.Message = "[0000-2-024]鎵嬪姩杈撳叆妯″紡";
objJsonResult.data = "";
return objJsonResult;
}
@@ -1728,7 +1740,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鐢ㄦ埛缂栫爜涓嶈兘涓虹┖锛�";
+ objJsonResult.Message = "[0000-2-021]鐢ㄦ埛缂栫爜涓嶈兘涓虹┖锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -1739,7 +1751,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏈煡璇㈠埌宸ュ簭淇℃伅锛�";
+ objJsonResult.Message = "[0000-2-022]鏈煡璇㈠埌宸ュ簭淇℃伅锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -1753,7 +1765,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.Message = "[0000-1-038]Exception锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
@@ -1762,7 +1774,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鎵嬪姩杈撳叆妯″紡";
+ objJsonResult.Message = "[0000-2-024]鎵嬪姩杈撳叆妯″紡";
objJsonResult.data = "";
return objJsonResult;
}
@@ -1776,7 +1788,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "绯荤粺鍙傛暟寮傚父";
+ objJsonResult.Message = "[0000-2-023]绯荤粺鍙傛暟寮傚父";
objJsonResult.data = "";
return objJsonResult;
}
--
Gitblit v1.9.1