From 7ec2fdc761acd483a621c590fae3a60af7b464ba Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期二, 04 十一月 2025 15:17:08 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhiHuiQiCe/FangCangZhiNeng
---
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs | 14
新建文件夹/WIDESEA_WMSServer/WIDESEA_ISquareCabinServices/IBusiness.cs | 11 -
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/Business.cs | 534 -----------------------------------------------------
新建文件夹/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/SquareCabin/CabinOrderController.cs | 2
新建文件夹/WIDESEA_WMSServer/WIDESEA_WMSServer/OutOrderJob.cs | 3
5 files changed, 9 insertions(+), 555 deletions(-)
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_ISquareCabinServices/IBusiness.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_ISquareCabinServices/IBusiness.cs"
index dc1cb2b..ee52eeb 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_ISquareCabinServices/IBusiness.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_ISquareCabinServices/IBusiness.cs"
@@ -6,17 +6,6 @@
{
WebResponseContent GetInOrder();
WebResponseContent GetOutOrder();
- /// <summary>
- /// 鑾峰彇涓婃父鍏ュ簱璁㈠崟
- /// </summary>
- /// <returns></returns>
- WebResponseContent GetUpstreamOrder();
- /// <summary>
- /// 鑾峰彇涓婃父鍑哄簱鍗曟暟鎹�
- /// </summary>
- /// <param name="searchDate"></param>
- /// <returns></returns>
- WebResponseContent GetUpstreamOutOrder();
/// <summary>
/// 缁欎笅娓竪cs鍏ュ簱鍗�
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/Business.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/Business.cs"
index 19cb17d..8fa2694 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/Business.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/Business.cs"
@@ -41,259 +41,6 @@
_materielInfoService = materielInfoService;
_messageInfoService = messageInfoService;
}
- #region 鑾峰彇ERP鍏ュ簱鍗�
- static string SearchInDate = "2025-10-30 00:00:00";
- /// <summary>
- /// 鑾峰彇涓婃父绯荤粺鐨勫叆搴撳崟
- /// </summary>
- /// <param name="SearchInDate"></param>
- /// <returns></returns>
- public WebResponseContent GetUpstreamOrder()
- {
- var responseContent = new WebResponseContent();
- try
- {
- // 璇锋眰鍦板潃
- var url = "http://121.37.118.63:80/GYZ2/95fck/inOrder";
- //var url = "http://127.0.0.1:4523/m2/5660322-5340849-default/363009261";
-
- if (string.IsNullOrEmpty(SearchInDate)) SearchInDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
- //// 璇锋眰鍙傛暟
- var requestData = new
- {
- searchDate = SearchInDate
- //searchDate = "2022-10-10 20:45:16" // 姝ｇ‘鐨勬牸寮�
- };
- SearchInDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
- // 鍙戣捣璇锋眰
- var result = HttpHelper.Post(url, requestData.ToJsonString());
-
- // 鍙嶅簭鍒楀寲
- var response = JsonConvert.DeserializeObject<UpstreamResponse<UpstreamOrderInfo>>(result);
-
- if (response == null || response.resultCode != "0")
- {
- // 璋冪敤寮傚父鎺ュ彛
- //SendErrorToUpstream(1, "", response.resultMsg ?? "涓婃父鎺ュ彛杩斿洖澶辫触", "");
- return responseContent.Error(response.resultMsg ?? "涓婃父鎺ュ彛杩斿洖澶辫触");
- }
-
- if (response.data == null || !response.data.Any())
- {
- return responseContent.OK("鏃犳柊鍏ュ簱鍗曟暟鎹�");
- }
- var ordernos = response.data.Select(x => x.order_no).ToList();
- // 鑾峰彇鎵�鏈夊凡瀛樺湪鐨勫叆搴撳崟鍙�
- var existingOrderNos = _cabinOrderServices.Db.CopyNew().Queryable<Dt_CabinOrder>()
- .Where(x => ordernos.Contains(x.Order_no))
- .Select(x => x.Order_no)
- .Distinct().ToList();
-
- // 杩囨护鎺夊凡瀛樺湪鐨勫叆搴撳崟
- var newOrders = response.data
- .Where(order => !existingOrderNos.Contains(order.order_no))
- .ToList();
-
- if (newOrders.Count < 1)
- {
- return responseContent.OK("鎵�鏈夊叆搴撳崟宸插瓨鍦紝鏃犻渶鏂板");
- }
-
- //瀛樺偍鍏ュ簱鍗曞彿
- List<string> orderNos = new List<string>();
- string name = string.Empty;
- MessageGroupByEnum messageGroupBy = MessageGroupByEnum.InOrderAlarm;
- MessageStatusEnum messageStatus = MessageStatusEnum.Emergency;
- foreach (var order in newOrders)
- {
- try
- {
- if (order.order_type == "1") //姝ｅ父鍏ュ簱
- {
- name = "鍒涘缓姝ｅ父鍏ュ簱鍗�";
- responseContent = _cabinOrderServices.CreateInboundOrder(order);
- if (!responseContent.Status) throw new Exception(responseContent.Message);
- List<Dt_CabinOrder>? dt_CabinOrders = responseContent.Data as List<Dt_CabinOrder>;
- if (dt_CabinOrders != null)
- _cabinOrderServices.Db.InsertNav(dt_CabinOrders).Include(x => x.Details).ExecuteCommand();
- }
- else if (order.order_type == "3")//鍏ュ簱閫�鏂�
- {
- messageGroupBy = MessageGroupByEnum.OutOrderAlarm;
- name = "鍒涘缓鍏ュ簱閫�璐у崟";
- //鍒涘缓鍑哄簱鍗�
- #region 杞崲涓哄嚭搴撳崟
- UpstramOutOrderInfo upstramOutOrderInfo = new UpstramOutOrderInfo()
- {
- order_no = order.order_no,
- order_type = order.order_type,
- warehouse_no = order.warehouse_no,
- details = new List<UpstreamOutOrderDetail>()
- };
- foreach (var item in order.details)
- {
- UpstreamOutOrderDetail detail = new UpstreamOutOrderDetail()
- {
- batch_num = item.batch_num,
- goods_no = item.goods_no,
- order_qty = item.order_qty,
- exp_date = item.exp_date,
- };
- upstramOutOrderInfo.details.Add(detail);
- }
- var content = _deliveryOrderServices.CreateOutboundOrder(upstramOutOrderInfo);
- if (!content.Status) throw new Exception(content.Message);
- #endregion
- }
- else if (order.order_type == "5")//鎶ユ孩鍏ュ簱
- {
- name = "鍒涘缓鐩樼泩鍏ュ簱鍗�";
- messageStatus = MessageStatusEnum.Undisposed;
- var content = _cabinOrderServices.CreateCheckInOrder(order);
- if (!content.Status) throw new Exception(content.Message);
- }
- }
- catch (Exception ex)
- {
- _messageInfoService.AddMessageInfo(messageGroupBy, name, ex.Message, messageStatus);
- //SendErrorToUpstream(1, "", ex.Message, "");
- //return responseContent.Error("鍚屾澶辫触: " + ex.Message);
- }
- };
- return responseContent.OK("鍚屾鍏ュ簱鍗曟垚鍔�");
-
- }
- catch (Exception ex)
- {
- // 鍏ㄥ眬寮傚父鏃讹紝涔熸帹閫佸紓甯哥粰涓婃父
- //SendErrorToUpstream(1, "", ex.Message, "");
- return responseContent.Error("鍚屾澶辫触: " + ex.Message);
- }
- }
- #endregion
-
- #region 鑾峰彇ERP鍑哄簱鍗�
- static string SearchOutDate = "2025-10-30 00:00:00";
- 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(SearchOutDate)) SearchOutDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
- //// 璇锋眰鍙傛暟
- var requestData = new
- {
- searchDate = SearchOutDate
- //searchDate = "2022-10-10 20:45:16" // 姝ｇ‘鐨勬牸寮�
- };
- SearchOutDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
-
- var result = HttpHelper.Post(url, requestData.ToJsonString());
- var response = JsonConvert.DeserializeObject<UpstreamResponse<UpstramOutOrderInfo>>(result);
-
- if (response == null || response.resultCode != "0")
- {
- //SendErrorToUpstream(3, "", response.resultMsg ?? "涓婃父鎺ュ彛杩斿洖澶辫触", "");
- return responseContent.Error(response?.resultMsg ?? "涓婃父鎺ュ彛杩斿洖澶辫触");
- }
-
- if (response.data == null || !response.data.Any())
- {
- return responseContent.OK("鏃犳柊鍑哄簱鍗曟暟鎹�");
- }
- var ordernos = response.data.Select(x => x.order_no).ToList();
- // 宸插瓨鍦ㄥ嚭搴撳崟鍙�
- var existingOutOrderNos = _deliveryOrderServices.Db.CopyNew().Queryable<Dt_DeliveryOrder>()
- .Where(x => ordernos.Contains(x.Out_no))
- .Select(x => x.Out_no)
- .Distinct().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.Count < 1)
- {
- return responseContent.OK("鎵�鏈夊嚭搴撳崟宸插瓨鍦紝鏃犻渶鏂板");
- }
-
- List<Dt_DeliveryOrder> _DeliveryOrders = new List<Dt_DeliveryOrder>();
- List<string> orderNos = new List<string>();
- string name = string.Empty;
- MessageGroupByEnum messageGroupBy = MessageGroupByEnum.OutOrderAlarm;
- MessageStatusEnum messageStatus = MessageStatusEnum.Emergency;
- foreach (var outorder in newOutOrders)
- {
- try
- {
- if (outorder.order_type == "1") // 姝ｅ父鍑哄簱鍗�
- {
- name = "鍒涘缓姝ｅ父鍑哄簱鍗�";
- var content = _deliveryOrderServices.CreateOutboundOrder(outorder);
- if (!content.Status) throw new Exception(content.Message);
- }
- else if (outorder.order_type == "2")//鍑哄簱閫�璐�
- {
- name = "鍒涘缓鍑哄簱閫�璐у崟";
- messageGroupBy = MessageGroupByEnum.InOrderAlarm;
- // 鍒涘缓鍑哄簱閫�璐у崟 - 杩欓噷闇�瑕佹牴鎹笟鍔￠�昏緫瀹炵幇
- // 鏆傛椂璺宠繃鎴栧疄鐜伴��璐ч�昏緫
- //continue;
- #region 杞崲鎴愬叆搴撳崟
- UpstreamOrderInfo order = new UpstreamOrderInfo()
- {
- order_no = outorder.order_no,
- order_type = outorder.order_type,
- warehouse_no = outorder.warehouse_no,
- details = new List<UpstreamOrderDetail>()
- };
- foreach (var item in outorder.details)
- {
- UpstreamOrderDetail detail = new UpstreamOrderDetail()
- {
- batch_num = item.batch_num,
- goods_no = item.goods_no,
- order_qty = item.order_qty,
- exp_date = item.exp_date,
- };
- order.details.Add(detail);
- }
- responseContent = _cabinOrderServices.CreateInboundOrder(order);
- if (!responseContent.Status) throw new Exception(responseContent.Message);
- List<Dt_CabinOrder>? dt_CabinOrders = responseContent.Data as List<Dt_CabinOrder>;
- if (dt_CabinOrders != null && dt_CabinOrders.Count > 0)
- _cabinOrderServices.Db.CopyNew().InsertNav(dt_CabinOrders).Include(x => x.Details).ExecuteCommand();
- #endregion
- }
- else if (outorder.order_type == "6")//鎶ユ崯鍑哄簱
- {
- name = "鍒涘缓鐩樻崯鍑哄簱鍗�";
- messageStatus = MessageStatusEnum.Undisposed;
- var content = _deliveryOrderServices.CreateCheckOutOrder(outorder);
- if (!content.Status) throw new Exception(content.Message);
- }
- }
- catch (Exception ex)
- {
- _messageInfoService.AddMessageInfo(messageGroupBy, name, ex.Message, messageStatus);
- //SendErrorToUpstream(3, "", ex.Message, "");
- //return responseContent.Error("鍚屾澶辫触: " + ex.Message);
- }
- }
- return responseContent.OK($"鍚屾鍑哄簱鍗曟垚鍔燂紝鍏眥_DeliveryOrders.Count}鏉�");
- }
- catch (Exception ex)
- {
- //SendErrorToUpstream(3, "", ex.Message, "");
- return responseContent.Error("鍚屾澶辫触: " + ex.Message);
- }
- }
- #endregion
#region 涓嬪彂绔嬪簱鍏ュ簱鍗�
public WebResponseContent EdiIn()
@@ -372,131 +119,6 @@
return WebResponseContent.Instance.Error(ex.Message);
}
}
- #region MyRegion
-
- //public WebResponseContent EdiIn1()
- //{
- // try
- // {
- // //2.鏌ヨ绗﹀悎鏉′欢鐨勮鍗曪紙琛ㄥご = 鏂板缓 && 鍖呭惈鏈夋晥鏄庣粏锛�
- // //var orders = BaseDal.Db.Queryable<Dt_CabinOrder>()
- // // .Where(o => o.OdrderStatus == "鏂板缓")
- // // .Includes(o => o.Details, d => d.MedicineGoods)
- // // .ToList();
- // //鏌ュ嚭鍖呭惈鍏ㄩ儴鐨勫叆搴撳崟锛屽寘鍚叏閮ㄦ槑缁�+涓�涓槑缁嗗搴斾竴涓晢鍝�
- // var reslut = WarehouseEnum.绔嬪簱.ObjToInt().ToString("000");
- // var orders = _cabinOrderServices.Db.CopyNew()
- // .Queryable<Dt_CabinOrder>()
- // .Where(o => o.OdrderStatus == "鏂板缓" && o.Warehouse_no == reslut)
- // .Includes(o => o.Details, d => d.MedicineGoods)
- // .ToList();
- // // 3. 鍐嶈繃婊ゆ帀涓嶇鍚堟潯浠剁殑鏄庣粏锛堝彧淇濈暀 Status=0锛�
- // foreach (var order in orders)
- // {
- // //Console.WriteLine($"璁㈠崟 {order.Order_no} 鍘熸槑缁嗘暟锛歿order.Details.Count}");
- // order.Details = order.Details.Where(d => d.Status == 0).ToList();
- // //Console.WriteLine($"璁㈠崟 {order.Order_no} 杩囨护鍚庢槑缁嗘暟锛歿order.Details.Count}");
- // }
-
-
- // if (orders.Count < 1)
- // {
- // //Console.WriteLine("娌℃湁绗﹀悎鏉′欢鐨勮鍗曢渶瑕佹帹閫�");
- // return WebResponseContent.Instance.Error("娌℃湁绗﹀悎鏉′欢鐨勮鍗曢渶瑕佹帹閫�");
- // }
- // List<Dt_CabinOrderDetail> cabinOrderDetails = new List<Dt_CabinOrderDetail>();
- // var url = "http://172.16.1.2:9357/file-admin/api/in/ediIn";
- // // 4. 閬嶅巻璁㈠崟锛岀粍瑁� DTO 骞舵帹閫�
- // foreach (var order in orders)
- // {
- // // 浠庣涓�涓湁 MedicineGoods 鐨勬槑缁嗕腑鍙栧嚭 MaterielErpType
- // string materialCode = order.Details
- // .Select(d => d.MedicineGoods?.MaterielErpType)
- // .FirstOrDefault(x => !string.IsNullOrEmpty(x)) ?? "YY"; // 榛樿鍊糦Y
-
- // var ediDto = new ToediInInfo
- // {
-
- // //瀹㈡埛浠ｇ爜
- // customerCode = "905",
- // //鐗╂枡绫诲瀷
- // materialCode = materialCode,
- // //鍏ュ簱鍗曞彿
- // externalOrderNo = order.Order_no,
- // //鍏ュ簱鍗曠被鍨�
- // inOrderType = order.Order_type == "5" ? "20" : "10",
- // //浼樺厛绾�
- // priority = 0,
- // //鏄惁鍙栨秷
- // Is_cancel = 0,
- // details = order.Details.Select(d => new ToediInDetail
- // {
- // //鎵瑰彿
- // batchNo = d.Batch_num,
- // //浜у搧
- // productCode = d.Goods_no,
- // //sku鍚嶇О
- // productName = d.MedicineGoods?.MaterielName,
- // //sku瑙勬牸
- // productSpecifications = d.MedicineGoods?.MaterielSpec,
- // //鏁伴噺
- // quantity = (int)d.Order_qty,
- // //鏁堟湡
- // validityPeriod = d.Exp_date,
- // //鐢熶骇鍘傚
- // manufacturer = d.MedicineGoods?.Factory,
- // //鎴垮彿
- // libraryNo = order.Warehouse_no,
- // }).ToList()
- // };
-
- // //var url = "http://127.0.0.1:4523/m2/5660322-5340849-default/363019549";
- // var result = HttpHelper.Post(url, ediDto.ToJsonString());
- // var resp = JsonConvert.DeserializeObject<TowcsResponse<object>>(result);
-
- // if (resp != null && resp.code == "0")
- // {
- // order.OdrderStatus = "寮�濮�";
- // foreach (var item in order.Details)
- // {
- // item.Status = 1;
- // item.OrderDetailStatus = "寮�濮�";
- // }
- // cabinOrderDetails.AddRange(order.Details);
- // // 鏇存柊琛ㄥご鐘舵��
- // //_cabinOrderServices.Db.Updateable<Dt_CabinOrder>()
- // // .SetColumns(o => new Dt_CabinOrder { OdrderStatus = "寮�濮�" })
- // // .Where(o => o.Id == order.Id)
- // // .ExecuteCommand();
-
- // // 鏇存柊鏄庣粏鐘舵�佷负宸插悓姝� //杩欓噷瑕佹槸灏嗘柊寤�--銆嬪紑濮嬬姸鎬�,鍦ㄥ悗绔帴鍙ｈ繑鍥炴垜浠殑鏃跺�欏湪杩斿洖宸插畬鎴�
- // //_cabinDetailServices.Db.Updateable<Dt_CabinOrderDetail>()
- // // .SetColumns(d => new Dt_CabinOrderDetail { Status = 1, OrderDetailStatus = "寮�濮�" })
- // // .Where(d => d.OrderId == order.Id && d.Status == 0)
- // // .ExecuteCommand();
-
- // //Console.WriteLine($"璁㈠崟 {order.Order_no} 鎺ㄩ�佹垚鍔�");
- // }
- // else
- // {
- // continue;
- // //SendErrorToUpstream(3, order.Order_no, resp?.msg ?? "WCS 鎺ㄩ�佸け璐�", "");
- // //Console.WriteLine($"璁㈠崟 {order.Order_no} 鎺ㄩ�佸け璐ワ細{resp?.msg}");
- // //return new WebResponseContent { Status = false, Message = "璁㈠崟鎺ㄩ�佸け璐�" };
- // }
- // }
- // _cabinOrderServices.UpdateData(orders);
- // _cabinDetailServices.UpdateData(cabinOrderDetails);
- // return new WebResponseContent { Status = true, Message = "鎺ㄩ�佹垚鍔�" };
- // }
- // catch (Exception ex)
- // {
-
- // Console.WriteLine("EdiIn 寮傚父锛�" + ex.Message);
- // return new WebResponseContent { Status = false, Message = ex.Message };
- // }
- //}
- #endregion
#endregion
#region 涓嬪彂绔嬪簱鍑哄簱鍗�
@@ -571,133 +193,6 @@
return WebResponseContent.Instance.Error(ex.Message);
}
}
-
- #region MyRegion
- public WebResponseContent EdiOut1()
- {
- var responseContent = new WebResponseContent();
- var WarehouseLk = WarehouseEnum.绔嬪簱.ObjToInt().ToString("000");
- try
- {
- // 1. 鏌ヨ绗﹀悎鏉′欢鐨勮鍗曪紙琛ㄥご=鏂板缓 && 鍖呭惈鏈夋晥鏄庣粏锛�
- var outOrders = _deliveryOrderServices.Db.CopyNew().Queryable<Dt_DeliveryOrder>()
- .Where(o => o.OutStatus == "鏂板缓" && o.Warehouse_no == WarehouseLk)
- .Includes(o => o.Details, d => d.MedicineGoods)
- .ToList();
-
- // 2. 鍐嶈繃婊ゆ帀涓嶇鍚堟潯浠剁殑鏄庣粏锛堝彧淇濈暀 Status=0 锛�
- foreach (var order in outOrders)
- {
- order.Details = order.Details.Where(d => d.Status == 0).ToList();
- }
-
- if (outOrders.Count < 1)
- {
- //Console.WriteLine("娌℃湁绗﹀悎鏉′欢鐨勮鍗曢渶瑕佹帹閫�");
- return responseContent.Error("娌℃湁绗﹀悎鏉′欢鐨勮鍗曢渶瑕佹帹閫�");
- }
- List<Dt_DeliveryOrderDetail> deliveryOrderDetails = new List<Dt_DeliveryOrderDetail>();
- var url = "http://172.16.1.2:9357/file-admin/api/out/ediOut";
- foreach (var order in outOrders)
- {
- try
- {
- string materialCode = "YY";//榛樿鍊�
- //鑾峰彇褰撳墠璁㈠崟鐨勭涓�涓槑缁嗛」
- var firstDetail = order.Details.FirstOrDefault();
- if (firstDetail?.MedicineGoods != null && !string.IsNullOrEmpty(firstDetail.MedicineGoods.MaterielErpType))
- {
- //濡傛灉鏉′欢婊¤冻锛屽皢鐗╂枡浠ｇ爜璁剧疆涓虹涓�涓槑缁嗛」瀵瑰簲鐨勮嵂鍝佺墿鏂欎唬鐮�
- materialCode = firstDetail.MedicineGoods.MaterielErpType;
- }
- switch (order.Out_type)
- {
- case "1"://姝ｅ父鍑哄簱
- case "3"://鍏ュ簱閫�璐�
- order.Out_type = "10";//涓�鑸氦鏄撳嚭搴撳崟
- break;
- case "6"://鐩樹簭鍑哄簱
- order.Out_type = "30";//鐩樹簭鍑哄簱鍗�
- break;
- }
- // 3. 缁勮 DTO
- var ediDto = new TowcsDto.ToediOutInfo
- {
- customerCode = "905",
- materialCode = materialCode,
- externalOrderNo = order.Out_no,
- outOrderType = order.Out_type,//20鏄洏鐐瑰嚭搴撳崟
- priority = 1,
- Is_cancel = 0,
- details = order.Details.Select(d => new TowcsDto.ToeOutdiInDetail
- {
- batchNo = d.Batch_num,
- productCode = d.Goods_no,
- productName = d.MedicineGoods?.MaterielName,
- productSpecifications = d.MedicineGoods?.MaterielModel,
- quantity = (int)d.Order_qty,
- //stocktakingDetails = order.Out_type == "3"
- // ? new List<ToOutediInStock>
- // {
- // new ToOutediInStock { palletCode = "FC00001", quantity = d.Order_qty.ToString() }
- // }
- // : null
- }).ToList()
- };
-
- // 4. 璋冪敤鎺ュ彛
- //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);
-
- if (resp != null && resp.code == "0")
- {
- order.OutStatus = "寮�濮�";
- foreach (var item in order.Details)
- {
- item.Status = 1;
- item.OotDetailStatus = "寮�濮�";
- }
- deliveryOrderDetails.AddRange(order.Details);
- // 鏇存柊琛ㄥご鐘舵��
- //_cabinDetailServices.Db.CopyNew().Updateable<Dt_DeliveryOrder>()
- // .SetColumns(o => new Dt_DeliveryOrder { OutStatus = "寮�濮�" })
- // .Where(o => o.Id == order.Id)
- // .ExecuteCommand();
-
- // 鏇存柊鏄庣粏鐘舵��
- //_deliveryOrderDetailServices.Db.CopyNew().Updateable<Dt_DeliveryOrderDetail>()
- // .SetColumns(d => new Dt_DeliveryOrderDetail { Status = 1, OotDetailStatus = "寮�濮�" })
- // .Where(d => d.DeliveryOrderId == order.Id && d.Status == 0)
- // .ExecuteCommand();
- //Console.WriteLine($"璁㈠崟 {order.Out_no} 鎺ㄩ�佹垚鍔�");
- }
- else
- {
- continue;
- //SendErrorToUpstream(3, order.Out_no, resp?.msg ?? "WCS 鎺ㄩ�佸け璐�", "");
- //Console.WriteLine($"璁㈠崟 {order.Out_no} 鎺ㄩ�佸け璐ワ細{resp?.msg}");
- }
- //鍒犻櫎鍏ㄩ儴鐘朵负宸插畬鎴愮殑鏄庣粏鍜岃〃澶达紝绉诲叆鍘嗗彶琛�
- }
- catch (Exception ex)
- {
- //SendErrorToUpstream(3, order.Out_no, ex.Message, "");
- //Console.WriteLine($"璁㈠崟 {order.Out_no} 鎺ㄩ�佸紓甯革細{ex.Message}");
- }
- }
- _deliveryOrderServices.UpdateData(outOrders);
- _deliveryOrderDetailServices.UpdateData(deliveryOrderDetails);
- return responseContent.OK("鍑哄簱璁㈠崟鎺ㄩ�佸畬鎴�");
- }
- catch (Exception ex)
- {
- //Console.WriteLine("EdiOut 寮傚父锛�" + ex.Message);
- return responseContent.Error("鍑哄簱璁㈠崟鎺ㄩ�佸け璐ワ細" + ex.Message);
- }
- }
- #endregion
#endregion
#region 鍏ュ簱瀹屾垚涓婃姤ERP
@@ -829,35 +324,6 @@
catch (Exception ex)
{
return responseContent.Error("鎵归噺澶勭悊澶辫触锛�" + ex.Message);
- }
- }
- #endregion
-
- #region 鎺ㄩ�佸紓甯镐笂鎶RP
- /// <summary>
- /// 鎺ㄩ�佸紓甯镐俊鎭粰涓婃父绯荤粺1.鍏ュ簱鍗曟帴鍙ｏ紱2.鍏ュ簱鍗曟姤瀹屾垚鎺ュ彛锛�3.鍑哄簱鍗曟帴鍙ｏ紱4.鍑哄簱鎶ュ畬鎴愭帴鍙ｏ紱5.鑽搧鍩虹淇℃伅鍚屾鎺ュ彛锛�6.渚涘簲鍟嗕俊鎭帴鍙ｏ紱7.瀹㈡埛淇℃伅鎺ュ彛锛�8.搴撳瓨
- /// </summary>
- public void SendErrorToUpstream(int type, string code, string message, string remark)
- {
- try
- {
- var url = "http://121.37.118.63:80/GYZ2/95fck/lexceptionLogog";
-
- var requestData = new
- {
- type = type.ToString(),
- code = code,
- message = message,
- remark = remark
- };
-
- var result = HttpHelper.Post(url, requestData.ToJsonString());
- // 鍙互鍙嶅簭鍒楀寲妫�鏌� resultCode 鏄惁涓�0
- }
- catch (Exception e)
- {
- // 杩欓噷涓嶈鍐嶆姏寮傚父浜嗭紝閬垮厤姝诲惊鐜�
- Console.WriteLine("寮傚父鎺ュ彛鎺ㄩ�佸け璐ワ細" + e.Message);
}
}
#endregion
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 0c1c506..fdb77d2 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"
@@ -317,7 +317,7 @@
_supplyTaskService.AddData(supplyTasks);
_inventory_BatchServices.UpdateData(batchesUp);
_inventoryInfoService.UpdateData(inventoryInfosUp);
- BaseDal.Db.CopyNew().InsertNav(entityOrder).Include(x => x.Details).ExecuteCommand();
+ BaseDal.Db.InsertNav(entityOrder).Include(x => x.Details).ExecuteCommand();
_unitOfWorkManage.CommitTran();
#endregion
}
@@ -610,9 +610,9 @@
_inventory_BatchServices.UpdateData(batchesUp);
_inventoryInfoService.UpdateData(inventoryInfosUp);
if (entityOrder.Details.Count > 0)
- BaseDal.Db.CopyNew().InsertNav(entityOrder).Include(x => x.Details).ExecuteCommand();
+ BaseDal.Db.InsertNav(entityOrder).Include(x => x.Details).ExecuteCommand();
if (entityOrderLK.Details.Count > 0)
- BaseDal.Db.CopyNew().InsertNav(entityOrderLK).Include(x => x.Details).ExecuteCommand();
+ BaseDal.Db.InsertNav(entityOrderLK).Include(x => x.Details).ExecuteCommand();
_unitOfWorkManage.CommitTran();
}
catch (Exception ex)
@@ -954,9 +954,7 @@
try
{
// 1锔忊儯 鏌ユ壘鎸囧畾鎵规涓庣墿鏂欑殑搴撳瓨淇℃伅
- var batchInfo = BaseDal.Db.CopyNew().Queryable<Dt_Inventory_Batch>()
- .Where(x => x.BatchNo == batchNo && x.MaterielCode == goodsNo)
- .First();
+ var batchInfo = _inventory_BatchServices.Repository.QueryFirst(x => x.BatchNo == batchNo && x.MaterielCode == goodsNo);
if (batchInfo == null)
return response.Error($"鏈壘鍒拌鐗╂枡 [{goodsNo}] 鎵规 [{batchNo}] 鐨勫簱瀛樹俊鎭�");
@@ -1178,7 +1176,7 @@
WebResponseContent content = new WebResponseContent();
try
{
- Dt_DeliveryOrder? cabinOrder = BaseDal.Db.CopyNew().Queryable<Dt_DeliveryOrder>().Where(x => x.Out_no == supplyTask.OrderNo && x.Warehouse_no == supplyTask.WarehouseCode).Includes(x => x.Details).First();
+ Dt_DeliveryOrder? cabinOrder = BaseDal.Db.Queryable<Dt_DeliveryOrder>().Where(x => x.Out_no == supplyTask.OrderNo && x.Warehouse_no == supplyTask.WarehouseCode).Includes(x => x.Details).First();
if (cabinOrder == null) return WebResponseContent.Instance.OK($"鍑哄簱鍗曞凡瀹屾垚");
Dt_DeliveryOrderDetail? cabinOrderDetail = cabinOrder.Details.Where(x => x.Batch_num == supplyTask.BatchNo && x.Reservoirarea == supplyTask.WarehouseCode && x.Goods_no == supplyTask.MaterielCode).FirstOrDefault();
@@ -1202,7 +1200,7 @@
//_deliveryOrderDetailServices.Repository.DeleteAndMoveIntoHty(cabinOrderDetail, OperateTypeEnum.鑷姩瀹屾垚);
}
_deliveryOrderDetailServices.Repository.UpdateData(cabinOrderDetail);
- var cabinOrder1 = BaseDal.Db.CopyNew().Queryable<Dt_DeliveryOrder>().Where(x => x.Out_no == cabinOrder.Out_no && x.Warehouse_no == supplyTask.WarehouseCode && x.Out_type != "20").Includes(x => x.Details).First();
+ var cabinOrder1 = BaseDal.Db.Queryable<Dt_DeliveryOrder>().Where(x => x.Out_no == cabinOrder.Out_no && x.Warehouse_no == supplyTask.WarehouseCode && x.Out_type != "20").Includes(x => x.Details).First();
if (!cabinOrder1.Details.Where(x => x.OotDetailStatus != "宸插畬鎴�").Any())
cabinOrder.OutStatus = "宸插畬鎴�";
Repository.UpdateData(cabinOrder);
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/SquareCabin/CabinOrderController.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/SquareCabin/CabinOrderController.cs"
index 6e22071..25723f2 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/SquareCabin/CabinOrderController.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/SquareCabin/CabinOrderController.cs"
@@ -20,7 +20,7 @@
[HttpPost, HttpGet, Route("GetUpstreamOrder"), AllowAnonymous]
public WebResponseContent GetUpstreamOrder()
{
- return _business.GetUpstreamOrder();
+ return _business.GetInOrder();
}
/// <summary>
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_WMSServer/OutOrderJob.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_WMSServer/OutOrderJob.cs"
index f29365a..a6fc209 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_WMSServer/OutOrderJob.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_WMSServer/OutOrderJob.cs"
@@ -14,9 +14,10 @@
_materielInfoService = materielInfoService;
}
//姣忛殧1绉掓墽琛屼竴娆�
- [Invoke(Begin = "2025-11-01", Interval = 1000 * 8, IsEnabled = true, SkipWhileExecuting = true)]
+ [Invoke(Begin = "2025-11-01", Interval = 1000 * 5, IsEnabled = true, SkipWhileExecuting = true)]
public void Run()
{
+ Thread.Sleep(3000);
//鑾峰彇涓婃父鍑哄簱鍗曟暟鎹�
_materielInfoService.ProductSynchronous();
_business.EdiIn();
--
Gitblit v1.9.3