From cf3e135b3441adcc3d58e13bcacecdde12c62a7c Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期三, 25 六月 2025 09:35:10 +0800
Subject: [PATCH] 凯贝超聚变客户条码生成、客户条码列表模块打印预览功能增加只允许打印一次控制
---
WebAPI/ListModels.cs | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index 74bc0df..ba58962 100644
--- a/WebAPI/ListModels.cs
+++ b/WebAPI/ListModels.cs
@@ -8,6 +8,7 @@
using WebAPI.Code;
using Model;
using System.Data;
+using System.Text.RegularExpressions;
namespace WebAPI
{
@@ -223,6 +224,30 @@
{
jsonString = "[" + jsonString.ToString() + "]";
List<Model.ClsKf_SellOutBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsKf_SellOutBillSub>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 瀹㈡埛鏍囩鍙嶅簭鍒楀寲
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsSc_CustomerTagInfoMain> getCustomerTagInfoMainByJson(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsSc_CustomerTagInfoMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_CustomerTagInfoMain>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 瀹㈡埛鏍囩鍙嶅簭鍒楀寲瀛愯〃
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsSc_CustomerTagInfoSub> getCustomerTagInfoSubByJson(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsSc_CustomerTagInfoSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_CustomerTagInfoSub>>(jsonString);
return list;
}
@@ -2142,7 +2167,10 @@
/// <returns></returns>
public List<Models.ClsGy_Material_Model> getObjectByJson_Gy_Material(string jsonString)
{
- jsonString = "[" + jsonString.ToString() + "]";
+ if (Regex.IsMatch(jsonString, @"^\[.*\]$") == false)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ }
List<Models.ClsGy_Material_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsGy_Material_Model>>(jsonString);
return list;
}
--
Gitblit v1.9.1