From 2b49f7643d15b74889d190f216630559006ed93a Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期一, 01 十二月 2025 09:48:43 +0800
Subject: [PATCH] pad和后端的优化
---
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/NewBusiness.cs | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/NewBusiness.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/NewBusiness.cs"
index 3ebd163..b080530 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/NewBusiness.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/NewBusiness.cs"
@@ -5,6 +5,7 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using WIDESEA_Common;
using WIDESEA_Core;
using WIDESEA_Core.Helper;
using WIDESEA_ISquareCabinServices;
@@ -22,7 +23,7 @@
// WebResponseContent content = new WebResponseContent();
// try
// {
- // var url = "http://121.37.118.63:80/GYZ2/95fck/inOrder";
+ // var url = "http://192.168.1.100:80/GYZ2/95fck/inOrder";
// string GetOutOrderDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
// if (string.IsNullOrEmpty(SearchInOrderDate)) SearchInOrderDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
// var requestData = new { searchDate = SearchInOrderDate };
@@ -107,7 +108,7 @@
// WebResponseContent content = new WebResponseContent();
// try
// {
- // //var url = "http://121.37.118.63:80/GYZ2/95fck/outOrder";
+ // //var url = "http://192.168.1.100:80/GYZ2/95fck/outOrder";
// var url = "http://127.0.0.1:4523/m2/5660322-5340849-default/366751306?apifoxApiId=366751306";
// string GetOutOrderDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
// if (string.IsNullOrEmpty(SearchOutOrderDate)) SearchOutOrderDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
@@ -187,14 +188,14 @@
WebResponseContent content = new WebResponseContent();
try
{
- var url = "http://121.37.118.63:80/GYZ2/95fck/inOrder";
+ var url = "http://192.168.1.100:80/GYZ2/95fck/inOrder";
string GetOutOrderDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
if (string.IsNullOrEmpty(SearchInOrderDate)) SearchInOrderDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
var requestData = new { searchDate = SearchInOrderDate };
var result = HttpHelper.Post(url, requestData.ToJsonString());
var response = JsonConvert.DeserializeObject<UpstreamResponse<UpstreamOrderInfo>>(result);
- if (response == null) return content;
- if (response.data.Count < 1)
+ if (response == null || response.data == null) return content;
+ if (response.data.Count < 1 )
{
SearchInOrderDate = GetOutOrderDate;
return content;
@@ -239,13 +240,13 @@
else if (order.order_type == "3")//鍏ュ簱閫�鏂�
{
#region 杞崲涓哄嚭搴撳崟
- UpstramOutOrderInfo upstramOutOrderInfo = new UpstramOutOrderInfo()
+ UpstramOutOrderInfo upstramOutOrderInfo = new UpstramOutOrderInfo()
{
order_no = order.order_no,
order_type = order.order_type,
- client_no=order.supplier_no,
- client_name=order.supplier_name,
- account_time=order.account_time,
+ client_no = order.supplier_no,
+ client_name = order.supplier_name,
+ account_time = order.account_time,
warehouse_no = order.warehouse_no,
details = new List<UpstreamOutOrderDetail>()
};
@@ -286,6 +287,10 @@
}
#endregion
+
+
+
+
#region 鑾峰彇ERP鍑哄簱鍗�
static string SearchOutOrderDate = "2025-11-01 00:00:00";
public WebResponseContent GetOutOrder()
@@ -293,14 +298,15 @@
WebResponseContent content = new WebResponseContent();
try
{
- var url = "http://121.37.118.63:80/GYZ2/95fck/outOrder";
+ //var url = "http://192.168.1.100:80/GYZ2/95fck/outOrder";
+ var url = "http://127.0.0.1:4523/m1/5660322-5340849-default/GYZ2/95fck/outOrder";
string GetOutOrderDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
if (string.IsNullOrEmpty(SearchOutOrderDate)) SearchOutOrderDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
var requestData = new { searchDate = SearchOutOrderDate };
var result = HttpHelper.Post(url, requestData.ToJsonString());
var response = JsonConvert.DeserializeObject<UpstreamResponse<UpstramOutOrderInfo>>(result);
- if (response == null) return content;
+ if (response == null || response.data == null) return content;
if (response.data.Count < 1)
{
SearchOutOrderDate = GetOutOrderDate;
--
Gitblit v1.9.3