From 3713a17fe36d877ce3e588c1dc08526fc8afffdc Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期四, 23 十月 2025 09:26:31 +0800
Subject: [PATCH] 111
---
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs | 424 +++++++++++++++++++++++++++++++++++++---------------
1 files changed, 303 insertions(+), 121 deletions(-)
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs"
index e3bf0e9..f13690c 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs"
@@ -55,17 +55,308 @@
/// </summary>
/// <param name = "searchDate" ></ param >
/// < returns ></ returns >
+ //public WebResponseContent GetUpstreamOutOrder()
+ //{
+ // var responseContent = new WebResponseContent();
+ // try
+ // {
+ // var url = "http://121.37.118.63:80/GYZ2/95fck/outOrder";
+ // //var url = "http://127.0.0.1:4523/m1/5660322-5340849-default/GYZ2/95fck/outOrder";
+ // if (string.IsNullOrEmpty(SearchDate)) SearchDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+ // //// 璇锋眰鍙傛暟
+ // var requestData = new
+ // {
+ // searchDate = SearchDate
+ // //searchDate = "2022-10-10 20:45:16" // 姝ｇ‘鐨勬牸寮�
+ // };
+ // SearchDate = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd HH:mm:ss");
+
+ // var result = HttpHelper.Post(url, requestData.ToJsonString());
+ // var response = JsonConvert.DeserializeObject<UpstreamResponse<UpstramOutOrderInfo>>(result);
+
+ // if (response.resultCode != "0")
+ // {
+ // SendErrorToUpstream(3, "", response.resultMsg ?? "涓婃父鎺ュ彛杩斿洖澶辫触", "");
+ // return responseContent.Error(response.resultMsg ?? "涓婃父鎺ュ彛杩斿洖澶辫触");
+ // }
+
+ // if (response.data == null || !response.data.Any())
+ // {
+ // return responseContent.OK("鏃犳柊鍑哄簱鍗曟暟鎹�");
+ // }
+
+ // // 宸插瓨鍦ㄥ嚭搴撳崟鍙�
+ // var existingOutOrderNos = BaseDal.Db.Queryable<Dt_DeliveryOrder>()
+ // .Select(x => x.Out_no)
+ // .ToList();
+
+ // // 鏂板嚭搴撳崟
+ // var newOutOrders = response.data
+ // .Where(outorder => !existingOutOrderNos.Contains(outorder.order_no))
+ // .ToList();
+
+ // List<string> order_no = newOutOrders.Select(x => x.order_no).ToList();
+
+ // if (!newOutOrders.Any())
+ // {
+ // return responseContent.OK("鎵�鏈夊嚭搴撳崟宸插瓨鍦紝鏃犻渶鏂板");
+ // }
+
+ // Db.Ado.BeginTran();
+ // try
+ // {
+ // List<Dt_DeliveryOrder> _DeliveryOrders = new List<Dt_DeliveryOrder>();
+ // List<string> orderNos = new List<string>();
+
+ // foreach (var outorder in newOutOrders)
+ // {
+ // bool skipOrder = false; // 鏍囪鏄惁璺宠繃璇ュ嚭搴撳崟
+
+ // // 濡傛灉杩欎釜鍑哄簱鍗曠被鍨嬩笉绛変簬1锛屽睘浜庡嚭搴撻��璐э紙瑕佸叆璐т笂娓镐紶杩囨潵鐨勬暟閲忎负璐熸暟锛�
+ // if (outorder.order_type != "1")
+ // {
+ // // 鍒涘缓鍑哄簱閫�璐у崟 - 杩欓噷闇�瑕佹牴鎹笟鍔￠�昏緫瀹炵幇
+ // // 鏆傛椂璺宠繃鎴栧疄鐜伴��璐ч�昏緫
+ // continue;
+ // }
+ // else if (outorder.order_type == "1") // 姝ｅ父鍑哄簱鍗�
+ // {
+ // // 鎺掗櫎鐗规畩鑽搧,鐗规畩鑽搧鐩存帴鎻掑叆
+ // if (outorder.warehouse_no != "001" && (outorder.warehouse_no == "010" || outorder.warehouse_no == "003" || outorder.warehouse_no == "017"))
+ // {
+ // var entityOrder = new Dt_DeliveryOrder
+ // {
+ // Out_no = outorder.order_no,
+ // Out_type = outorder.order_type,
+ // Client_no = outorder.client_no,
+ // Client_name = outorder.client_name,
+ // Account_time = outorder.account_time,
+ // Warehouse_no = outorder.warehouse_no,
+ // OutStatus = "鏂板缓",
+ // Details = outorder.details.Select(d => new Dt_DeliveryOrderDetail
+ // {
+ // Goods_no = d.goods_no,
+ // Order_qty = Math.Abs(d.order_qty), // 鍑哄簱鏁伴噺杞负姝ｆ暟
+ // Batch_num = d.batch_num,
+ // Exp_date = d.exp_date,
+ // OotDetailStatus = "鏂板缓",
+ // Status = 2, // pad骞冲簱锛屾棤闇�鍚屾
+ // }).ToList()
+ // };
+ // _DeliveryOrders.Add(entityOrder);
+ // }
+ // else // 甯歌鑽搧001鎴跨粰绔嬪簱,瑕佹槸鏈夋暣绠卞氨缁欏钩搴�
+ // {
+ // var entityOrder = new Dt_DeliveryOrder
+ // {
+ // Out_no = outorder.order_no,
+ // Out_type = outorder.order_type,
+ // Client_no = outorder.client_no,
+ // Client_name = outorder.client_name,
+ // Account_time = outorder.account_time,
+ // Warehouse_no = outorder.warehouse_no,
+ // OutStatus = "鏂板缓",
+ // Details = new List<Dt_DeliveryOrderDetail>()
+ // };
+
+ // // 閬嶅巻鍑哄簱鏄庣粏
+ // foreach (var item in outorder.details)
+ // {
+ // // 灏嗕笂娓稿嚭搴撴暟閲忚浆涓烘鏁�
+ // decimal orderQty = Math.Abs((decimal)item.order_qty);
+
+ // #region 鏍规嵁鐗╂枡缂栫爜鏌ヨ鐗╂枡淇℃伅
+ // var medication = BaseDal.Db.Queryable<Dt_MaterielInfo>()
+ // .Where(m => m.MaterielCode == item.goods_no)
+ // .First();
+
+ // // 濡傛灉鐗╂枡淇℃伅涓嶅瓨鍦紝璺宠繃鏁翠釜鍑哄簱鍗�
+ // if (medication == null)
+ // {
+ // skipOrder = true;
+ // Console.WriteLine($"璺冲嚭澶勫簱鍗� {outorder.order_no}锛屽師鍥狅細鏈壘鍒板晢鍝� [{item.goods_no}] 鐨勭墿鏂欎俊鎭��");
+ // break;
+ // }
+
+ // // 鑻ョ墿鏂欎笉瀛樺湪鎴� MaterielSourceType 涓虹┖锛屽垯璺宠繃鏁翠釜鍑哄簱鍗�
+ // if (medication == null || !Enum.IsDefined(typeof(MaterielSourceTypeEnum), medication.MaterielSourceType))
+ // {
+ // skipOrder = true;
+ // break;
+ // }
+ // #endregion
+
+ // /// 鏍规嵁鐗╂枡淇℃伅澶у皬浠跺睘鎬у尯鍒嗘槸鍚︿粠绔嬪簱鍑哄簱 // 澶т欢浠庡钩搴撳嚭搴�
+ // if (medication.MaterielSourceType == MaterielSourceTypeEnum.PurchasePart) // 濡傛灉鐗╂枡鏄ぇ浠�
+ // {
+ // var orderDetail = new Dt_DeliveryOrderDetail()
+ // {
+ // Reservoirarea = outorder.warehouse_no,
+ // Goods_no = item.goods_no,
+ // Order_qty = orderQty,
+ // Batch_num = item.batch_num,
+ // Exp_date = item.exp_date,
+ // OotDetailStatus = "鏂板缓",
+ // Status = 2 // 骞冲簱锛屾棤闇�鍚屾
+ // };
+ // entityOrder.Details.Add(orderDetail);
+ // }
+ // else
+ // {
+ // Dt_DeliveryOrderDetail orderDetail = null;
+
+ // // 璁＄畻鏁寸鍜屾暎浠舵暟閲�
+ // var ys = orderQty % medication.BoxQty; // 涓嶈兘鏁撮櫎绠辫鐨勬暎浠舵暟
+ // var xs = (int)(orderQty / medication.BoxQty); // 鏁寸鏁伴噺锛堜繚鐣欐暣鏁帮級
+
+ // #region 浠庣珛搴撳嚭搴撴暎浠�
+
+ // #region 鍒ゆ柇鏄惁鏈夋暎浠�
+ // if (ys > 0 && medication.Business_qty >= ys)
+ // {
+ // orderDetail = new Dt_DeliveryOrderDetail()
+ // {
+ // Reservoirarea = outorder.warehouse_no,
+ // Goods_no = item.goods_no,
+ // Order_qty = ys,
+ // Batch_num = item.batch_num,
+ // Exp_date = item.exp_date,
+ // OotDetailStatus = "鏂板缓",
+ // Status = 0 // 绔嬪簱锛岄渶瑕佸悓姝ョ粰WCS
+ // };
+ // medication.Business_qty -= ys;
+ // }
+ // else
+ // {
+ // // 绔嬪簱搴撳瓨涓嶈冻锛屾暎浠朵篃浠庡钩搴撳嚭
+ // orderDetail = new Dt_DeliveryOrderDetail()
+ // {
+ // Reservoirarea = outorder.warehouse_no,
+ // Goods_no = item.goods_no,
+ // Order_qty = ys,
+ // Batch_num = item.batch_num,
+ // Exp_date = item.exp_date,
+ // OotDetailStatus = "鏂板缓",
+ // Status = 2 // 骞冲簱
+ // };
+ // }
+ // #endregion
+
+ // #region 鍒ゆ柇绔嬪簱搴撳瓨鏄惁瓒冲鍑烘暣绠�
+ // while (medication.Business_qty >= medication.BoxQty && xs > 0)
+ // {
+ // xs--;
+ // if (orderDetail == null)
+ // {
+ // orderDetail = new Dt_DeliveryOrderDetail()
+ // {
+ // Reservoirarea = outorder.warehouse_no,
+ // Goods_no = item.goods_no,
+ // Order_qty = medication.BoxQty,
+ // Batch_num = item.batch_num,
+ // Exp_date = item.exp_date,
+ // OotDetailStatus = "鏂板缓",
+ // Status = 0 // 绔嬪簱
+ // };
+ // medication.Business_qty -= medication.BoxQty;
+ // }
+ // else
+ // {
+ // orderDetail.Order_qty += medication.BoxQty;
+ // medication.Business_qty -= medication.BoxQty;
+ // }
+ // }
+
+ // if (orderDetail != null)
+ // entityOrder.Details.Add(orderDetail);
+ // #endregion
+
+ // #endregion
+
+ // #region 鍓╀綑鏁翠欢浠庡钩搴撳嚭搴�
+ // if (xs > 0)
+ // {
+ // orderDetail = new Dt_DeliveryOrderDetail()
+ // {
+ // Reservoirarea = outorder.warehouse_no,
+ // Goods_no = item.goods_no,
+ // Order_qty = medication.BoxQty * xs,
+ // Batch_num = item.batch_num,
+ // Exp_date = item.exp_date,
+ // OotDetailStatus = "鏂板缓",
+ // Status = 2 // 骞冲簱
+ // };
+ // entityOrder.Details.Add(orderDetail);
+ // }
+ // #endregion
+ // }
+
+ // // 鏇存柊鐗╂枡淇℃伅
+ // _basicService.MaterielInfoService.Repository.UpdateData(medication);
+
+ // }
+
+ // // 濡傛灉璺宠繃璇ュ崟锛屽垯鐩存帴continue锛屼笉淇濆瓨
+ // if (skipOrder)
+ // {
+ // Console.WriteLine($"璺冲嚭澶勫簱鍗� {outorder.order_no}锛屽洜涓哄瓨鍦ㄦ湭瀹氫箟鐗╂枡灞炴�х殑鍟嗗搧銆�");
+ // continue;
+ // }
+
+ // // 纭繚鍑哄簱鍗曟湁鏄庣粏鎵嶆坊鍔�
+ // if (entityOrder.Details.Any())
+ // {
+ // _DeliveryOrders.Add(entityOrder);
+ // orderNos.Add(outorder.order_no);
+ // }
+ // }
+ // }
+ // }
+
+ // // 鎵归噺鎻掑叆鍑哄簱鍗曞拰鏄庣粏
+ // if (_DeliveryOrders.Any())
+ // {
+ // BaseDal.Db.InsertNav(_DeliveryOrders).Include(x => x.Details).ExecuteCommand();
+ // }
+
+ // Db.Ado.CommitTran();
+ // var tex= CreateSupplyTask(order_no);
+ // if (!tex)
+ // {
+ // return responseContent.Error("鍒涘缓渚涘簲浠诲姟澶辫触");
+ // }
+ // return responseContent.OK($"鍚屾鍑哄簱鍗曟垚鍔燂紝鍏眥_DeliveryOrders.Count}鏉�");
+ // }
+ // catch (Exception ex)
+ // {
+ // Db.Ado.RollbackTran();
+ // SendErrorToUpstream(3, "", ex.Message, "");
+ // return responseContent.Error("鍚屾澶辫触: " + ex.Message);
+ // }
+ // }
+ // catch (Exception ex)
+ // {
+ // SendErrorToUpstream(3, "", ex.Message, "");
+ // return responseContent.Error("鍚屾澶辫触: " + ex.Message);
+ // }
+ //}
+
+
public WebResponseContent GetUpstreamOutOrder()
{
var responseContent = new WebResponseContent();
try
{
- //var url = "http://121.37.118.63:80/GYZ2/95fck/outOrder";
- var url = "http://127.0.0.1:4523/m1/5660322-5340849-default/GYZ2/95fck/outOrder";
+ var url = "http://121.37.118.63:80/GYZ2/95fck/outOrder";
+ //var url = "http://127.0.0.1:4523/m1/5660322-5340849-default/GYZ2/95fck/outOrder";
+ if (string.IsNullOrEmpty(SearchDate)) SearchDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+ //// 璇锋眰鍙傛暟
var requestData = new
{
- searchDate = "2022-10-10 20:45:16"
+ searchDate = SearchDate
+ //searchDate = "2022-10-10 20:45:16" // 姝ｇ‘鐨勬牸寮�
};
+ SearchDate = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd HH:mm:ss");
var result = HttpHelper.Post(url, requestData.ToJsonString());
var response = JsonConvert.DeserializeObject<UpstreamResponse<UpstramOutOrderInfo>>(result);
@@ -118,7 +409,7 @@
else if (outorder.order_type == "1") // 姝ｅ父鍑哄簱鍗�
{
// 鎺掗櫎鐗规畩鑽搧,鐗规畩鑽搧鐩存帴鎻掑叆
- if (outorder.warehouse_no != "001" && outorder.warehouse_no != "澶т欢骞冲簱")
+ if (outorder.warehouse_no != "001" && (outorder.warehouse_no == "010" || outorder.warehouse_no == "003" || outorder.warehouse_no == "017"))
{
var entityOrder = new Dt_DeliveryOrder
{
@@ -202,7 +493,7 @@
Dt_DeliveryOrderDetail orderDetail = null;
// 璁＄畻鏁寸鍜屾暎浠舵暟閲�
- var ys = orderQty % medication.BoxQty; // 涓嶈兘鏁撮櫎绠辫鐨勬暎浠舵暟
+ var ys = orderQty % medication.BoxQty; // 涓嶈兘鏁撮櫎绠辫鐨勬暎浠舵暟
var xs = (int)(orderQty / medication.BoxQty); // 鏁寸鏁伴噺锛堜繚鐣欐暣鏁帮級
#region 浠庣珛搴撳嚭搴撴暎浠�
@@ -221,20 +512,6 @@
Status = 0 // 绔嬪簱锛岄渶瑕佸悓姝ョ粰WCS
};
medication.Business_qty -= ys;
- }
- else
- {
- // 绔嬪簱搴撳瓨涓嶈冻锛屾暎浠朵篃浠庡钩搴撳嚭
- orderDetail = new Dt_DeliveryOrderDetail()
- {
- Reservoirarea = outorder.warehouse_no,
- Goods_no = item.goods_no,
- Order_qty = ys,
- Batch_num = item.batch_num,
- Exp_date = item.exp_date,
- OotDetailStatus = "鏂板缓",
- Status = 2 // 骞冲簱
- };
}
#endregion
@@ -314,9 +591,11 @@
{
BaseDal.Db.InsertNav(_DeliveryOrders).Include(x => x.Details).ExecuteCommand();
}
+ //涓嬪彂鍑哄簱鍗曚换鍔＄粰wcs
+
Db.Ado.CommitTran();
- var tex= CreateSupplyTask(order_no);
+ var tex = CreateSupplyTask(order_no);
if (!tex)
{
return responseContent.Error("鍒涘缓渚涘簲浠诲姟澶辫触");
@@ -337,53 +616,6 @@
}
}
-
- /// <summary>
- /// 鍒涘缓渚涘簲浠诲姟
- /// </summary>
- /// <param name="outorder">鍑哄簱鍗曚俊鎭�</param>
- /// <param name="item">鍑哄簱鏄庣粏椤�</param>
- /// <param name="medication">鐗╂枡淇℃伅</param>
- /// <param name="quantity">浠诲姟鏁伴噺</param>
- /// <param name="taskType">浠诲姟绫诲瀷锛�0锛氬嚭搴擄紝1锛氬叆搴擄紝2锛氱洏鐐圭瓑锛�</param>
- /// <param name="remark">澶囨敞</param>
- /// <returns>浠诲姟瀵硅薄</returns>
- //private bool CreateSupplyTask(List<string> order_no)
- //{
- // // 鍏堣幏鍙栫鍚堟潯浠剁殑涓昏〃ID
- // var mainOrderIds = BaseDal.Db.Queryable<Dt_DeliveryOrder>()
- // .Where(x => order_no.Contains(x.Out_no))
- // .Select(x => x.Id)
- // .ToList();
-
- // // 鐩存帴鏌ヨ瀛愯〃鏁版嵁
- // List<Dt_DeliveryOrderDetail> filteredDetails = BaseDal.Db.Queryable<Dt_DeliveryOrderDetail>()
- // .Where(d => mainOrderIds.Contains(d.DeliveryOrderId) && d.OotDetailStatus == "鏂板缓")
- // .ToList();
-
- // foreach (var item in filteredDetails)
- // {
- // new Dt_SupplyTask
- // {
- // TaskNum = GetNextTaskNum(), // 闇�瑕佸疄鐜拌幏鍙栦笅涓�涓换鍔＄紪鍙风殑鏂规硶
- // PalletCode = null, // 鏍规嵁涓氬姟閫昏緫璁剧疆鎵樼洏缂栧彿
- // BatchNo = item.Batch_num,
- // MaterielCode = item.Goods_no,
- // MaterielName = medication?.MaterielName, // 浠庣墿鏂欎俊鎭幏鍙�
- // MaterielSpec = medication?.MaterielSpec, // 浠庣墿鏂欎俊鎭幏鍙�
- // TaskType = 0, // 0-鍑哄簱浠诲姟
- // TaskStatus = item.Status ==0 ? 0:1, // 0-鏂板缓
- // WarehouseCode = outorder.warehouse_no,
- // LocationCode = "绔嬪簱", // 绔嬪簱浠诲姟鐨勮揣浣嶇紪鍙峰浐瀹氫负"绔嬪簱"
- // StockQuantity = quantity,
- // SupplyQuantity = 0, // 鍒濆鐩樼偣鏁颁负0
- // OrderNo = outorder.order_no, // 鍏宠仈鍑哄簱鍗曞彿
- // Dispatchertime = DateTime.Now,
- // Remark = remark
- // };
- // }
-
- //}
private bool CreateSupplyTask(List<string> order_no)
{
@@ -479,56 +711,6 @@
return randomNum;
}
- /// <summary>
- /// 鍒涘缓渚涘簲浠诲姟
- /// </summary>
- /// <param name="outorder">鍑哄簱鍗曚俊鎭�</param>
- /// <param name="item">鍑哄簱鏄庣粏椤�</param>
- /// <param name="medication">鐗╂枡淇℃伅</param>
- /// <param name="quantity">浠诲姟鏁伴噺</param>
- /// <param name="taskType">浠诲姟绫诲瀷锛�0锛氬嚭搴擄紝1锛氬叆搴擄紝2锛氱洏鐐圭瓑锛�</param>
- /// <param name="remark">澶囨敞</param>
- /// <returns>浠诲姟瀵硅薄</returns>
- //private Dt_SupplyTask CreateSupplyTask(UpstramOutOrderInfo outorder, dynamic item, Dt_MaterielInfo medication, decimal quantity, int taskType, string remark)
- //{
- // return new Dt_SupplyTask
- // {
- // TaskNum = GetNextTaskNum(), // 闇�瑕佸疄鐜拌幏鍙栦笅涓�涓换鍔＄紪鍙风殑鏂规硶
- // PalletCode = null, // 鏍规嵁涓氬姟閫昏緫璁剧疆鎵樼洏缂栧彿
- // BatchNo = item.batch_num,
- // MaterielCode = item.goods_no,
- // MaterielName = medication?.MaterielName, // 浠庣墿鏂欎俊鎭幏鍙�
- // MaterielSpec = medication?.MaterielSpec, // 浠庣墿鏂欎俊鎭幏鍙�
- // TaskType = taskType, // 0-鍑哄簱浠诲姟
- // TaskStatus = 0, // 0-鏂板缓
- // WarehouseCode = outorder.warehouse_no,
- // LocationCode = "绔嬪簱", // 绔嬪簱浠诲姟鐨勮揣浣嶇紪鍙峰浐瀹氫负"绔嬪簱"
- // StockQuantity = quantity,
- // SupplyQuantity = 0, // 鍒濆鐩樼偣鏁颁负0
- // OrderNo = outorder.order_no, // 鍏宠仈鍑哄簱鍗曞彿
- // Dispatchertime = DateTime.Now,
- // Remark = remark
- // };
- //}
-
-
-
-
- /// <summary>
- /// 鑾峰彇涓嬩竴涓换鍔＄紪鍙�
- /// </summary>
- /// <returns>浠诲姟缂栧彿</returns>
- private int GetNextTaskNum()
- {
- // 杩欓噷闇�瑕佹牴鎹偍鐨勫簭鍒楃敓鎴愰�昏緫鏉ュ疄鐜�
- // 鍋囪浣跨敤鏁版嵁搴撳簭鍒�
- return BaseDal.Db.Ado.GetInt("SELECT NEXT VALUE FOR SeqTaskNum");
- // 鎴栬�呭鏋滄槸鑷ID锛屽彲浠ユ彃鍏ュ悗鑾峰彇
- }
-
-
-
-
/// <summary>
/// 鍑哄簱鍗曟帹閫佺粰 WCS
@@ -575,7 +757,7 @@
customerCode = "905",
materialCode = materialCode,
externalOrderNo = order.Out_no,
- outOrderType = order.Out_type == "1" ? "10" : order.Out_type == "2" ? "20" : "30",
+ outOrderType = order.Out_type == "1" ? "10" : order.Out_type == "3" ? "20" : "30",//鍑哄簱鍗曠被鍨嬫槸1灏辨槸姝ｅ父鐨勶紝3灏辨槸鐩樼偣
priority = 1,
Is_cancel = 0,
details = order.Details.Select(d => new TowcsDto.ToeOutdiInDetail
@@ -595,8 +777,8 @@
};
// 4. 璋冪敤鎺ュ彛
- //var url = "http://172.16.1.2:9357/file-admin/api/out/ediOut";
- var url = "http://127.0.0.1:4523/m2/5660322-5340849-default/363076920";
+ var url = "http://172.16.1.2:9357/file-admin/api/out/ediOut";
+ //var url = "http://127.0.0.1:4523/m2/5660322-5340849-default/363076920";
var result = HttpHelper.Post(url, ediDto.ToJsonString());
var resp = JsonConvert.DeserializeObject<TowcsDto.TowcsResponse<object>>(result);
@@ -611,7 +793,7 @@
// 鏇存柊鏄庣粏鐘舵��
BaseDal.Db.Updateable<Dt_DeliveryOrderDetail>()
- .SetColumns(d => new Dt_DeliveryOrderDetail { Status = 1, OotDetailStatus = "宸插畬鎴�" })
+ .SetColumns(d => new Dt_DeliveryOrderDetail { Status = 1, OotDetailStatus = "寮�濮�" })
.Where(d => d.DeliveryOrderId == order.Id && d.Status == 0)
.ExecuteCommand();
Console.WriteLine($"璁㈠崟 {order.Out_no} 鎺ㄩ�佹垚鍔�");
--
Gitblit v1.9.3