From 55142f3214485c7ec12c5e414a56519f66a1eb1d Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期五, 17 十月 2025 19:54:47 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhiHuiQiCe/FangCangZhiNeng
---
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs | 352 ++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 245 insertions(+), 107 deletions(-)
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs"
index 415829a..0c7ff24 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs"
@@ -32,7 +32,6 @@
{
public class CabinOrderServices : ServiceBase<Dt_CabinOrder, IRepository<Dt_CabinOrder>>, ICabinOrderServices
{
-
static string SearchDate = "";
private readonly IBasicService _basicService;
private readonly IMedicineGoodsServices _medicineGoodsServices;
@@ -54,104 +53,8 @@
_supplyTaskService = supplyTaskService;
}
- /// <summary>
- /// 鑾峰彇涓婃父绯荤粺鐨勫叆搴撳崟
- /// </summary>
- /// <param name="searchDate"></param>
- /// <returns></returns>
- //public WebResponseContent GetUpstreamOrder(DateTime searchDate)
- //{
- // var responseContent = new WebResponseContent();
-
- // try
- // {
- // // 璇锋眰鍦板潃
- // var url = "http://127.0.0.1:9090/GYZ2/95fck/inOrder";
-
- // //// 璇锋眰鍙傛暟
- // var requestData = new
- // {
- // searchDate = searchDate.ToString("yyyy-MM-dd HH:mm:ss")
- // };
-
- // // 鍙戣捣璇锋眰
- // var result = HttpHelper.Post(url, requestData.ToJsonString());
-
- // // 鍙嶅簭鍒楀寲
- // var response = JsonConvert.DeserializeObject<UpstreamResponse<UpstreamOrderInfo>>(result);
-
- // if (response.resultCode != "0")
- // {
- // // 璋冪敤寮傚父鎺ュ彛
- // SendErrorToUpstream(1, "", response.resultMsg ?? "涓婃父鎺ュ彛杩斿洖澶辫触", "");
- // return responseContent.Error(response.resultMsg ?? "涓婃父鎺ュ彛杩斿洖澶辫触");
- // }
-
- // if (response.data == null || !response.data.Any())
- // {
- // return responseContent.OK("鏃犳柊鍏ュ簱鍗曟暟鎹�");
- // }
-
- // Db.Ado.BeginTran();
- // List<Dt_CabinOrder> _CabinOrders = new List<Dt_CabinOrder>();
- // foreach (var order in response.data)
- // {
- // try
- // {
- // // 鎻掑叆鍏ュ簱鍗曡〃
- // var entityOrder = new Dt_CabinOrder
- // {
-
- // Order_no = order.order_no,
- // Order_type = order.order_type,
- // Supplier_no = order.supplier_no,
- // Account_tiem = order.account_time,
- // OdrderStatus = "鏂板缓",
- // };
- // //var orderId = Db.Insertable(entityOrder).ExecuteReturnIdentity(); //灏辨槸杩斿洖涓婚敭ID銆�
-
- // // 鎻掑叆鍏ュ簱鏄庣粏琛�
- // var detailEntities = order.details.Select(d => new Dt_CabinOrderDetail
- // {
- // //OrderId= orderId,
- // Goods_no = d.goods_no,
- // Order_qty = d.order_qty,
- // Batch_num = d.batch_num,
- // Exp_date = d.exp_date,
- // Warehouse_no = d.warehouse_no,
- // Status = 0,
- // }).ToList();
- // entityOrder.Details.AddRange(detailEntities); //寤虹珛涓诲璞′笌瀛愬璞＄殑鍏宠仈鍏崇郴
- // _CabinOrders.Add(entityOrder);
-
- // //鑷繁
- // /// Db.Insertable(detailEntities).ExecuteCommand();
-
- // //杩欓噷瑕佽皟鐢ㄤ竴涓帴鍙ｅ皢涓婇潰鐨勪俊鎭紶缁檞cs锛岀劧鍚庢敼鍙樼姸鎬�
- // }
- // catch (Exception innerEx)
- // {
- // // 閽堝鏌愭潯璁㈠崟鎶ラ敊鏃讹紝鎺ㄩ�佸紓甯哥粰涓婃父
- // SendErrorToUpstream(1, order.order_no, innerEx.Message, "");
- // throw; // 鎶涘嚭寮傚父锛岃澶栧眰鎹曡幏鍥炴粴
- // }
- // }
- // // 鎵归噺鎻掑叆锛圫qlSugar鑷姩澶勭悊涓诲閿叧绯伙級
- // Db.Insertable(_CabinOrders).ExecuteCommand();
- // Db.Ado.CommitTran();
-
- // //濡傛灉EdiIn瀹屾垚閭ｄ箞灏辫皟鐢–ompleteOrder鎺ュ彛
-
- // return responseContent.OK("鍚屾鍏ュ簱鍗曟垚鍔�");
- // }
- // catch (Exception ex)
- // {
- // // 鍏ㄥ眬寮傚父鏃讹紝涔熸帹閫佸紓甯哥粰涓婃父
- // SendErrorToUpstream(1, "", ex.Message, "");
- // Db.Ado.RollbackTran();
- // return responseContent.Error("鍚屾澶辫触: " + ex.Message);
- // }
- //}
+
+
public WebResponseContent GetCabinOrders(SaveModel saveModel)
{
WebResponseContent content = new WebResponseContent();
@@ -333,6 +236,12 @@
return content;
}
+
+ /// <summary>
+ /// 鑾峰彇涓婃父绯荤粺鐨勫叆搴撳崟
+ /// </summary>
+ /// <param name="searchDate"></param>
+ /// <returns></returns>
public WebResponseContent GetUpstreamOrder()
{
var responseContent = new WebResponseContent();
@@ -389,6 +298,7 @@
foreach (var order in newOrders)
{
+ bool skipOrder = false;//鏍囪鏄惁璺宠繃璇ュ叆搴撳崟
var entityOrder = new Dt_CabinOrder
{
Order_no = order.order_no,
@@ -417,8 +327,22 @@
// 灏嗕笂娓稿叆搴撴暟閲忚浆涓烘鏁�
item.order_qty = Math.Abs(item.order_qty);
#region 鏍规嵁鐗╂枡缂栫爜鏌ヨ鐗╂枡淇℃伅
- //Dt_MaterielInfo materielInfo = _basicService.MaterielInfoService.Repository.QueryFirst(x => x.MaterielCode == item.goods_no);
- Dt_MedicineGoods materielInfo = BaseDal.Db.Queryable<Dt_MedicineGoods>().Where(x => x.Goods_no == item.goods_no).First();
+ Dt_MaterielInfo materielInfo = _basicService.MaterielInfoService.Repository.QueryFirst(x => x.MaterielCode == item.goods_no);
+ //濡傛灉鐗╂枡淇℃伅涓嶅瓨鍦紝璺宠繃鏁翠釜鍏ュ簱鍗�
+ if (materielInfo == null)
+ {
+ skipOrder = true;
+ Console.WriteLine($"璺宠繃鍏ュ簱鍗� {order.order_no}锛屽師鍥狅細鏈壘鍒板晢鍝� [{item.goods_no}] 鐨勭墿鏂欎俊鎭��");
+ break;
+ }
+
+ // 鑻ョ墿鏂欎笉瀛樺湪鎴� MaterielSourceType 涓虹┖锛屽垯璺宠繃鏁翠釜鍏ュ簱鍗�
+ if (materielInfo == null || !Enum.IsDefined(typeof(MaterielSourceTypeEnum), materielInfo.MaterielSourceType))
+ {
+ skipOrder = true;
+ break;
+ }
+ //Dt_MedicineGoods materielInfo = BaseDal.Db.Queryable<Dt_MedicineGoods>().Where(x => x.Goods_no == item.goods_no).First();
///鏍规嵁鐗╂枡淇℃伅澶у皬浠跺睘鎬у尯鍒嗘槸鍚﹀叆绔嬪簱 //澶т欢鍏ュ钩搴�
if (materielInfo.MaterielSourceType == MaterielSourceTypeEnum.PurchasePart)
{
@@ -504,9 +428,15 @@
}
#endregion
}
- //_basicService.MaterielInfoService.Repository.UpdateData(materielInfo);
- _medicineGoodsServices.Db.Updateable(materielInfo).ExecuteCommand();
+ _basicService.MaterielInfoService.Repository.UpdateData(materielInfo);
+ //_medicineGoodsServices.Db.Updateable(materielInfo).ExecuteCommand();
#endregion
+ }
+ // 鉂楀鏋滆烦杩囪鍗曪紝鍒欑洿鎺ontinue锛屼笉淇濆瓨
+ if (skipOrder)
+ {
+ Console.WriteLine($"璺宠繃鍏ュ簱鍗� {order.order_no}锛屽洜涓哄瓨鍦ㄦ湭瀹氫箟鐗╂枡灞炴�х殑鍟嗗搧銆�");
+ continue;
}
_CabinOrders.Add(entityOrder);
orderNos.Add(order.order_no);
@@ -529,6 +459,214 @@
catch (Exception ex)
{
// 鍏ㄥ眬寮傚父鏃讹紝涔熸帹閫佸紓甯哥粰涓婃父
+ SendErrorToUpstream(1, "", ex.Message, "");
+ return responseContent.Error("鍚屾澶辫触: " + ex.Message);
+ }
+ }
+
+ /// <summary>
+ /// 瀵规病鏈夎繘琛岀淮鎶ゅ晢鍝佷俊鎭〃鐨勫叆搴撳崟杩涜杩囨护澶勭悊
+ /// </summary>
+ /// <returns></returns>
+ public WebResponseContent GetUpstreamOrder2()
+ {
+ var responseContent = new WebResponseContent();
+ try
+ {
+ // 璇锋眰鍦板潃
+ var url = "http://121.37.118.63:80/GYZ2/95fck/inOrder";
+ //if (string.IsNullOrEmpty(SearchDate)) SearchDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+ //// 璇锋眰鍙傛暟
+ var requestData = new
+ {
+ //searchDate = SearchDate
+ searchDate = "2020-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<UpstreamOrderInfo>>(result);
+
+ if (response.resultCode != "0")
+ {
+ SendErrorToUpstream(1, "", response.resultMsg ?? "涓婃父鎺ュ彛杩斿洖澶辫触", "");
+ return responseContent.Error(response.resultMsg ?? "涓婃父鎺ュ彛杩斿洖澶辫触");
+ }
+
+ if (response.data == null || !response.data.Any())
+ return responseContent.OK("鏃犳柊鍏ュ簱鍗曟暟鎹�");
+
+ var existingOrderNos = BaseDal.Db.Queryable<Dt_CabinOrder>()
+ .Select(x => x.Order_no)
+ .ToList();
+
+ var newOrders = response.data
+ .Where(order => !existingOrderNos.Contains(order.order_no))
+ .ToList();
+
+ if (!newOrders.Any())
+ return responseContent.OK("鎵�鏈夊叆搴撳崟宸插瓨鍦紝鏃犻渶鏂板");
+
+ Db.Ado.BeginTran();
+ try
+ {
+ List<Dt_CabinOrder> _CabinOrders = new();
+ List<string> orderNos = new();
+
+ foreach (var order in newOrders)
+ {
+ bool skipOrder = false; // 鏍囪鏄惁璺宠繃璇ュ叆搴撳崟
+ var entityOrder = new Dt_CabinOrder
+ {
+ Order_no = order.order_no,
+ Order_type = order.order_type,
+ Supplier_no = order.supplier_no,
+ Account_tiem = order.account_time,
+ OdrderStatus = "鏂板缓",
+ Supplier_name = order.supplier_name,
+ Warehouse_no = order.warehouse_no,
+ Details = new List<Dt_CabinOrderDetail>()
+ };
+
+ foreach (var item in order.details)
+ {
+ item.order_qty = Math.Abs(item.order_qty);
+
+ // 鏌ヨ鐗╂枡淇℃伅
+ var materielInfo = BaseDal.Db.Queryable<Dt_MedicineGoods>()
+ .Where(x => x.Goods_no == item.goods_no)
+ .First();
+
+
+ //濡傛灉鐗╂枡淇℃伅涓嶅瓨鍦紝璺宠繃鏁翠釜鍏ュ簱鍗�
+ if (materielInfo == null)
+ {
+ skipOrder = true;
+ Console.WriteLine($"璺宠繃鍏ュ簱鍗� {order.order_no}锛屽師鍥狅細鏈壘鍒板晢鍝� [{item.goods_no}] 鐨勭墿鏂欎俊鎭��");
+ break;
+ }
+
+ // 鑻ョ墿鏂欎笉瀛樺湪鎴� MaterielSourceType 涓虹┖锛屽垯璺宠繃鏁翠釜鍏ュ簱鍗�
+ if (materielInfo == null || !Enum.IsDefined(typeof(MaterielSourceTypeEnum), materielInfo.MaterielSourceType))
+ {
+ skipOrder = true;
+ break;
+ }
+
+ // 鍖哄垎澶т欢/灏忎欢
+ if (materielInfo.MaterielSourceType == MaterielSourceTypeEnum.PurchasePart)
+ {
+ var detail = new Dt_CabinOrderDetail
+ {
+ Reservoirarea = order.warehouse_no,
+ Goods_no = item.goods_no,
+ Order_qty = item.order_qty,
+ Batch_num = item.batch_num,
+ Exp_date = item.exp_date,
+ OrderDetailStatus = "鏂板缓",
+ Status = 2
+ };
+ entityOrder.Details.Add(detail);
+ }
+ else
+ {
+ Dt_CabinOrderDetail orderDetail = null;
+ var ys = item.order_qty % materielInfo.BoxQty; // 涓嶈兘鏁撮櫎鐨勬暎浠�
+ var xs = item.order_qty / materielInfo.BoxQty; // 鏁寸鏁伴噺
+
+ // 鏈夋暎浠�
+ if (ys > 0)
+ {
+ orderDetail = new Dt_CabinOrderDetail
+ {
+ Reservoirarea = order.warehouse_no,
+ Goods_no = item.goods_no,
+ Order_qty = ys,
+ Batch_num = item.batch_num,
+ Exp_date = item.exp_date,
+ OrderDetailStatus = "鏂板缓",
+ Status = 0
+ };
+ materielInfo.Business_qty += ys;
+ }
+
+ // 涓嶈冻鏈�浣庡簱瀛樻椂琛ュ叆绔嬪簱
+ while (materielInfo.Business_qty < materielInfo.MinQty && xs > 0)
+ {
+ xs--;
+ if (orderDetail == null)
+ {
+ orderDetail = new Dt_CabinOrderDetail
+ {
+ Reservoirarea = order.warehouse_no,
+ Goods_no = item.goods_no,
+ Order_qty = materielInfo.BoxQty,
+ Batch_num = item.batch_num,
+ Exp_date = item.exp_date,
+ OrderDetailStatus = "鏂板缓",
+ Status = 0
+ };
+ }
+ else
+ {
+ orderDetail.Order_qty += materielInfo.BoxQty;
+ }
+ materielInfo.Business_qty += materielInfo.BoxQty;
+ }
+
+ if (orderDetail != null) entityOrder.Details.Add(orderDetail);
+
+ // 鍓╀綑鏁寸鍏ュ钩搴�
+ if (xs > 0)
+ {
+ entityOrder.Details.Add(new Dt_CabinOrderDetail
+ {
+ Reservoirarea = order.warehouse_no,
+ Goods_no = item.goods_no,
+ Order_qty = materielInfo.BoxQty * xs,
+ Batch_num = item.batch_num,
+ Exp_date = item.exp_date,
+ OrderDetailStatus = "鏂板缓",
+ Status = 2
+ });
+ }
+ }
+
+ _medicineGoodsServices.Db.Updateable(materielInfo).ExecuteCommand();
+ }
+
+ // 鉂楀鏋滆烦杩囪鍗曪紝鍒欑洿鎺ontinue锛屼笉淇濆瓨
+ if (skipOrder)
+ {
+ Console.WriteLine($"璺宠繃鍏ュ簱鍗� {order.order_no}锛屽洜涓哄瓨鍦ㄦ湭瀹氫箟鐗╂枡灞炴�х殑鍟嗗搧銆�");
+ continue;
+ }
+
+ _CabinOrders.Add(entityOrder);
+ orderNos.Add(order.order_no);
+ }
+
+ if (_CabinOrders.Any())
+ {
+ BaseDal.Db.InsertNav(_CabinOrders).Include(x => x.Details).ExecuteCommand();
+ Db.Ado.CommitTran();
+ return responseContent.OK($"鎴愬姛鍚屾 {_CabinOrders.Count} 鏉″叆搴撳崟");
+ }
+ else
+ {
+ Db.Ado.RollbackTran();
+ return responseContent.OK("鏃犲彲澶勭悊鐨勫叆搴撳崟锛堝晢鍝佸睘鎬ф湭瀹氫箟鎴栨湭鎵惧埌锛�");
+ }
+ }
+ catch (Exception ex)
+ {
+ Db.Ado.RollbackTran();
+ SendErrorToUpstream(1, "", ex.Message, "");
+ return responseContent.Error("鍚屾澶辫触: " + ex.Message);
+ }
+ }
+ catch (Exception ex)
+ {
SendErrorToUpstream(1, "", ex.Message, "");
return responseContent.Error("鍚屾澶辫触: " + ex.Message);
}
@@ -571,10 +709,10 @@
string materialCode = "YY";//榛樿鍊�
//鑾峰彇褰撳墠璁㈠崟鐨勭涓�涓槑缁嗛」
var firstDetail = order.Details.FirstOrDefault();
- if (firstDetail?.MedicineGoods != null && !string.IsNullOrEmpty(firstDetail.MedicineGoods.MaterialCode))
+ if (firstDetail?.MedicineGoods != null && !string.IsNullOrEmpty(firstDetail.MedicineGoods.MaterielErpType))
{
//濡傛灉鏉′欢婊¤冻锛屽皢鐗╂枡浠ｇ爜璁剧疆涓虹涓�涓槑缁嗛」瀵瑰簲鐨勮嵂鍝佺墿鏂欎唬鐮�
- materialCode = firstDetail.MedicineGoods.MaterialCode;
+ materialCode = firstDetail.MedicineGoods.MaterielErpType;
}
var ediDto = new ToediInInfo
@@ -599,9 +737,9 @@
//浜у搧
productCode = d.Goods_no,
//sku鍚嶇О
- productName = d.MedicineGoods?.Goods_spm,
+ productName = d.MedicineGoods?.MaterielName,
//sku瑙勬牸
- productSpecifications = d.MedicineGoods?.Model,
+ productSpecifications = d.MedicineGoods?.MaterielSpec,
//鏁伴噺
quantity = (int)d.Order_qty,
//鏁堟湡
--
Gitblit v1.9.3