From b08054592e47cb9e47cf34acb6965a08745e13ce Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期一, 20 四月 2026 10:22:19 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/条码管理/WEBSController.cs | 66 ++++++++++++++++++++++++++++++++-
1 files changed, 64 insertions(+), 2 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 c8562ff..12d03f8 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"
@@ -13075,6 +13075,60 @@
#endregion
+ #region WMS姣忔棩杩愯鐘舵�佸垎鏋愶紙姣忔棩鍒跺崟鏁伴噺锛�
+ [Route("WEBSController/GetKf_WMSDailyRunStateReport_Json")]
+ [HttpGet]
+ public object GetKf_WMSDailyRunStateReport_Json(string sWhere, string user)
+ {
+ try
+ {
+
+ Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);
+
+ string HBeginDate = dic["HBeginDate"].ToString();
+ string HEndDate = dic["HEndDate"].ToString();
+
+ List<object> columnNameList = new List<object>();
+
+ ds = oCn.RunProcReturn("exec h_p_Kf_WMSDailyRunStateReport '" + HBeginDate + "','" + HEndDate + "'", "h_p_Kf_WMSDailyRunStateReport");
+
+ if (ds.Tables[0].Rows.Count != 0 || ds != null)
+ {
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds;
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳暟鎹�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
#endregion
@@ -14883,8 +14937,8 @@
{
string sErrMsg = "";
oSystemParameter.ShowBill(ref sErrMsg);
- // 鍗庤垷瀹㈡埛
- if (oSystemParameter.omodel.WMS_CampanyName == "鍗庤垷")
+ // 鍗庤垷瀹㈡埛 宸ュ簭杩涚珯鎺ユ敹鍗� 宸ュ簭濮斿鎺ユ敹鍗� 鐢熶骇璁㈠崟 宸ュ簭娴佽浆鍗�
+ if (oSystemParameter.omodel.WMS_CampanyName == "鍗庤垷" && HSourceBillType != 3790 && HSourceBillType != 3793 && HSourceBillType != 3710 && HSourceBillType != 3772)
{
if (!string.IsNullOrWhiteSpace(HBarCode))
{
@@ -14938,6 +14992,14 @@
objJsonResult.data = null;
return objJsonResult;
}
+ if (ds.Tables[0].Columns.Contains("HBack") && DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) == 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
if (oSystemParameter.omodel.WMS_CampanyName == "鍗庤垷")
{
--
Gitblit v1.9.1