From a2ac226eba37410a5f668c866fd45ce43c756394 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期三, 15 十月 2025 14:28:29 +0800
Subject: [PATCH] 前端和后端的更新
---
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs | 354 +++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 282 insertions(+), 72 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 820ca9a..999e7c8 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"
@@ -37,15 +37,16 @@
// try
// {
// // 璇锋眰鍦板潃
- // var url = "http://127.0.0.1:9000/GYZ2/95fck/outOrder";
+ // var url = "http://121.37.118.63:80/GYZ2/95fck/outOrder";
- // if (string.IsNullOrEmpty(SearchDate)) SearchDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+ // //if (string.IsNullOrEmpty(SearchDate)) SearchDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
// //// 璇锋眰鍙傛暟
// var requestData = new
// {
- // searchDate = SearchDate
+ // //searchDate = SearchDate
+ // searchDate = "2022-10-10 20:45:16" // 姝ｇ‘鐨勬牸寮�
// };
- // SearchDate = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd HH:mm:ss");
+ // //SearchDate = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd HH:mm:ss");
// // 鍙戣捣璇锋眰
// var result = HttpHelper.Post(url, requestData.ToJsonString());
@@ -62,75 +63,111 @@
// {
// return responseContent.OK("鏃犳柊鍑哄簱鍗曟暟鎹�");
// }
+ // // 鑾峰彇鎵�鏈夊凡瀛樺湪鐨勫嚭搴撳崟鍙�
+ // var existingOutOrderNos = BaseDal.Db.Queryable<Dt_DeliveryOrder>()
+ // .Select(x => x.Out_no)
+ // .ToList();
- // Db.Ado.BeginTran();
+ // // 杩囨护鎺夊凡瀛樺湪鐨勫嚭搴撳崟
+ // var newOutOrders = response.data
+ // .Where(outorder => !existingOutOrderNos.Contains(outorder.order_no))//order_no鍑哄簱鍗曞彿
+ // .ToList();
- // foreach (var outorder in response.data)
+ // if (!newOutOrders.Any())
// {
- // try
+ // 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)
// {
- // // 鎻掑叆鍑哄簱鍗�
// var entityOrder = new Dt_DeliveryOrder
// {
- // Out_no = outorder.out_no,
- // Out_type = outorder.out_type,
+ // Out_no = outorder.order_no,
+ // Out_type = outorder.order_type,
// Client_no = outorder.client_no,
- // Client_name=outorder.client_name,
+ // Client_name = outorder.client_name,
// Account_time = outorder.account_time,
- // OutStatus= "鏈畬鎴�",
+ // Warehouse_no=outorder.warehouse_no,
+ // OutStatus = "鏈畬鎴�",
+ // //Details = outorder.details.Select(d => new Dt_DeliveryOrderDetail
+ // //{
+ // // // InsertNav 浼氳嚜鍔ㄨ缃叧鑱斿瓧娈� DeliveryOrderId
+ // // Goods_no = d.goods_no,
+ // // Order_qty = d.order_qty,
+ // // Batch_num = d.batch_num,
+ // // Exp_date = d.exp_date,
+ // // OotDetailStatus = "鏂板缓",
+ // // Status = outorder.warehouse_no == "001" ? 0 : 2, //濡傛灉鏄�001鎴块偅涔堝皢鐘舵�佽缃负0锛�2涓轰汉宸ュ鐞�
+ // //}).ToList()
// };
- // var outorderId = BaseDal.Db.Insertable(entityOrder).ExecuteReturnIdentity();
-
- // // 鎻掑叆鍑哄簱鍗曟槑缁�
- // var detailEntities = outorder.details.Select(d => new Dt_DeliveryOrderDetail
+ // #region 鏍规嵁鍑哄簱鍗曡鎯呮煡鎵剧墿鏂欏悕绉般�佹壒娆＄殑搴撳瓨淇℃伅(Dt_InventoryInfo)锛涙牴鎹厛鍏ュ厛鍑�,CreateDate
+ // //鏍规嵁鐗╂枡鍚嶇О鏌ユ壘鐗╂枡淇℃伅
+ // foreach (var item in outorder.details)
// {
- // DeliveryOrderId = outorderId,
- // Goods_no = d.goods_no,
- // Order_qty = d.out_qty,
- // Batch_num = d.batch_num,
- // Exp_date = d.exp_date,
- // OotDetailStatus="鏂板缓"
- // }).ToList();
- // BaseDal.Db.Insertable(detailEntities).ExecuteCommand();
- // }
- // catch (Exception ex)
- // {
- // SendErrorToUpstream(3, outorder.out_no, ex.Message, "");
- // throw; // 璁╁灞傛崟鑾峰苟鍥炴粴
- // }
- // }
+ // // 灏嗕笂娓稿嚭搴撴暟閲忚浆涓烘鏁�
+ // item.order_qty = Math.Abs(item.order_qty);
+ // var medication = BaseDal.Db.Queryable<Dt_MedicineGoods>()
+ // .Where(m => m.Goods_no == item.goods_no)
+ // .First();
- // Db.Ado.CommitTran();
- // return responseContent.OK("鍚屾鍑哄簱鍗曟垚鍔�");
+
+ // }
+
+ // //鏍规嵁绠辫鍒ゆ柇鏄惁鏈夋暎浠讹紝璁＄畻鍑烘暎浠舵暟閲忓拰鏁翠欢鏁�
+
+ // //鏍规嵁鍏ュ簱鏃堕棿鍒嗙粍锛屾湁鏁ｄ欢灏变紭鍏堝垎閰嶇珛搴撴暟閲忥紝鏁翠欢浼樺厛鍒嗛厤骞冲簱鏁伴噺
+
+
+ // #endregion
+ // _DeliveryOrders.Add(entityOrder);
+
+ // };
+
+ // // 浣跨敤 InsertNav 涓�娆℃�ф彃鍏ヤ富琛ㄥ拰瀛愯〃鏁版嵁
+ // BaseDal.Db.InsertNav(_DeliveryOrders).Include(x => x.Details).ExecuteCommand();
+
+ // // 杩欓噷鍙互娣诲姞涓嬪彂鍒� WCS 鐨勯�昏緫
+ // // var result = EdiOut(); // 鍙戠粰涓嬫父
+
+ // Db.Ado.CommitTran();
+ // return responseContent.OK("鍚屾鍑哄簱鍗曟垚鍔�");
+ // }
+ // catch (Exception ex)
+ // {
+ // Db.Ado.RollbackTran();
+ // SendErrorToUpstream(3, "", ex.Message, "");
+ // return responseContent.Error("鍚屾澶辫触: " + ex.Message);
+ // }
// }
// catch (Exception ex)
// {
+ // // 鍏ㄥ眬寮傚父鏃讹紝涔熸帹閫佸紓甯哥粰涓婃父
// SendErrorToUpstream(3, "", ex.Message, "");
- // Db.Ado.RollbackTran();
// return responseContent.Error("鍚屾澶辫触: " + ex.Message);
// }
//}
+
+
public WebResponseContent GetUpstreamOutOrder()
{
var responseContent = new WebResponseContent();
try
{
- // 璇锋眰鍦板潃
var url = "http://121.37.118.63:80/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 = "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 result = HttpHelper.Post(url, requestData.ToJsonString());
var response = JsonConvert.DeserializeObject<UpstreamResponse<UpstramOutOrderInfo>>(result);
if (response.resultCode != "0")
@@ -143,26 +180,26 @@
{
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))//order_no鍑哄簱鍗曞彿
+ .Where(outorder => !existingOutOrderNos.Contains(outorder.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)
{
@@ -173,37 +210,209 @@
Client_no = outorder.client_no,
Client_name = outorder.client_name,
Account_time = outorder.account_time,
- Warehouse_no=outorder.warehouse_no,
+ Warehouse_no = outorder.warehouse_no,
OutStatus = "鏈畬鎴�",
- Details = outorder.details.Select(d => new Dt_DeliveryOrderDetail
- {
- // InsertNav 浼氳嚜鍔ㄨ缃叧鑱斿瓧娈� DeliveryOrderId
- Goods_no = d.goods_no,
- Order_qty = d.out_qty,
- Batch_num = d.batch_num,
- Exp_date = d.exp_date,
- OotDetailStatus = "鏂板缓",
- Status = outorder.warehouse_no == "001" ? 0 : 2, //濡傛灉鏄�001鎴块偅涔堝皢鐘舵�佽缃负0锛�2涓轰汉宸ュ鐞�
- }).ToList()
+ Details = new List<Dt_DeliveryOrderDetail>()
};
- #region 鏍规嵁鍑哄簱鍗曡鎯呮煡鎵剧墿鏂欏悕绉般�佹壒娆＄殑搴撳瓨淇℃伅(Dt_InventoryInfo)锛涙牴鎹厛鍏ュ厛鍑�,CreateDate
- //鏍规嵁鐗╂枡鍚嶇О鏌ユ壘鐗╂枡淇℃伅
- //鏍规嵁绠辫鍒ゆ柇鏄惁鏈夋暎浠讹紝璁＄畻鍑烘暎浠舵暟閲忓拰鏁翠欢鏁�
+ // 閬嶅巻鍑哄簱鏄庣粏
+ foreach (var item in outorder.details)
+ {
+ // 1锔忊儯 杞负姝ｆ暟锛堜笂娓稿彲鑳戒紶璐熸暟锛�
+ item.order_qty = Math.Abs(item.order_qty);
+ decimal orderQty = (decimal)item.order_qty;
- //鏍规嵁鍏ュ簱鏃堕棿鍒嗙粍锛屾湁鏁ｄ欢灏变紭鍏堝垎閰嶇珛搴撴暟閲忥紝鏁翠欢浼樺厛鍒嗛厤骞冲簱鏁伴噺
+ // 2锔忊儯 鏌ョ墿鏂欏熀纭�淇℃伅锛堣幏鍙栫瑙勶級
+ var medication = BaseDal.Db.Queryable<Dt_MedicineGoods>()
+ .Where(m => m.Goods_no == item.goods_no)
+ .First();
+ if (medication == null)
+ {
+ SendErrorToUpstream(3, "", $"鎵句笉鍒扮墿鏂欎俊鎭細{item.goods_no}", "");
+ continue;
+ }
- #endregion
+ decimal boxQty = medication.BoxQty <= 0 ? 1 : medication.BoxQty;
+
+ // 3锔忊儯 璁＄畻鏁翠欢涓庢暎浠舵暟閲�
+ var fullBoxes = (int)(orderQty / boxQty); // 鏁翠欢绠辨暟
+ var partialQty = orderQty % boxQty; // 鏁ｄ欢鏁伴噺
+
+ // 鑻ヤ笂娓哥粰浜嗘壒娆″彿锛屽垯浼樺厛鍖归厤
+ string requestedBatch = string.IsNullOrEmpty(item.batch_num) ? null : item.batch_num;
+
+ // helper: 鏌ヨ搴撳瓨鍑芥暟锛堟寜鍏ュ簱鏃堕棿鍗囧簭锛�
+ Func<int, List<Dt_InventoryInfo>> queryInventoryByStockStatus = (stockStatus) =>
+ {
+ var q = BaseDal.Db.Queryable<Dt_InventoryInfo>()
+ .Where(i => i.MaterielCode == item.goods_no &&
+ (i.StockQuantity - i.OutboundQuantity) > 0 &&
+ i.StockStatus == stockStatus);
+
+ if (!string.IsNullOrEmpty(requestedBatch))
+ q = q.Where(i => i.BatchNo == requestedBatch);
+
+ return q.OrderBy(i => i.InDate).ToList();
+ };
+
+ // 4锔忊儯鍒嗛厤鏁ｄ欢锛堜紭鍏堢珛搴� Status=1锛�
+ decimal remainingPartial = partialQty;
+ if (remainingPartial > 0)
+ {
+ var invList_ly = queryInventoryByStockStatus(1);
+ foreach (var inv in invList_ly)
+ {
+ if (remainingPartial <= 0) break;
+
+ decimal available = (decimal)(inv.StockQuantity - inv.OutboundQuantity);
+ if (available <= 0) continue;
+
+ decimal use = Math.Min(available, remainingPartial);
+
+ var detail = new Dt_DeliveryOrderDetail
+ {
+ Goods_no = item.goods_no,
+ Order_qty = use,
+ Batch_num = inv.BatchNo,
+ Exp_date = inv.ValidityPeriod,
+ OotDetailStatus = "鏂板缓",
+ Status = 1, // 鉁� 绔嬪簱
+ Reservoirarea = inv.LocationCode
+ };
+ entityOrder.Details.Add(detail);
+
+ inv.OutboundQuantity += (float)use;
+ BaseDal.Db.Updateable(inv).ExecuteCommand();
+
+ remainingPartial -= use;
+ }
+
+ // 绔嬪簱涓嶅 鈫� 骞冲簱琛� (Status=2)
+ if (remainingPartial > 0)
+ {
+ var invList_pk = queryInventoryByStockStatus(2);
+ foreach (var inv in invList_pk)
+ {
+ if (remainingPartial <= 0) break;
+
+ decimal available = (decimal)(inv.StockQuantity - inv.OutboundQuantity);
+ if (available <= 0) continue;
+
+ decimal use = Math.Min(available, remainingPartial);
+
+ var detail = new Dt_DeliveryOrderDetail
+ {
+ Goods_no = item.goods_no,
+ Order_qty = use,
+ Batch_num = inv.BatchNo,
+ Exp_date = inv.ValidityPeriod,
+ OotDetailStatus = "鏂板缓",
+ Status = 2, //骞冲簱
+ Reservoirarea = inv.LocationCode
+ };
+ entityOrder.Details.Add(detail);
+
+ inv.OutboundQuantity += (float)use;
+ BaseDal.Db.Updateable(inv).ExecuteCommand();
+
+ remainingPartial -= use;
+ }
+ }
+
+ if (remainingPartial > 0)
+ {
+ SendErrorToUpstream(3, "", $"鍑哄簱鍗昜{outorder.order_no}]鐗╂枡[{item.goods_no}]鏁ｄ欢搴撳瓨涓嶈冻锛屾湭鍒嗛厤锛歿remainingPartial}", "");
+ }
+ }
+
+ //鍒嗛厤鏁翠欢锛堜紭鍏堝钩搴� Status=2锛�
+ int remainingFullBoxes = fullBoxes;
+ if (remainingFullBoxes > 0)
+ {
+ var invList_pk = queryInventoryByStockStatus(2);
+ foreach (var inv in invList_pk)
+ {
+ if (remainingFullBoxes <= 0) break;
+
+ decimal available = (decimal)(inv.StockQuantity - inv.OutboundQuantity);
+ if (available < boxQty) continue;
+
+ int canProvideBoxes = (int)(available / boxQty);
+ if (canProvideBoxes <= 0) continue;
+
+ int useBoxes = Math.Min(canProvideBoxes, remainingFullBoxes);
+ decimal useQty = useBoxes * boxQty;
+
+ var detail = new Dt_DeliveryOrderDetail
+ {
+ Goods_no = item.goods_no,
+ Order_qty = useQty,
+ Batch_num = inv.BatchNo,
+ Exp_date = inv.ValidityPeriod,
+ OotDetailStatus = "鏂板缓",
+ Status = 2, //骞冲簱
+ Reservoirarea = inv.LocationCode
+ };
+ entityOrder.Details.Add(detail);
+
+ inv.OutboundQuantity += (float)useQty;
+ BaseDal.Db.Updateable(inv).ExecuteCommand();
+
+ remainingFullBoxes -= useBoxes;
+ }
+
+ // 骞冲簱涓嶅 鈫� 绔嬪簱琛� (Status=1)
+ if (remainingFullBoxes > 0)
+ {
+ var invList_ly = queryInventoryByStockStatus(1);
+ foreach (var inv in invList_ly)
+ {
+ if (remainingFullBoxes <= 0) break;
+
+ decimal available = (decimal)(inv.StockQuantity - inv.OutboundQuantity);
+ if (available < boxQty) continue;
+
+ int canProvideBoxes = (int)(available / boxQty);
+ if (canProvideBoxes <= 0) continue;
+
+ int useBoxes = Math.Min(canProvideBoxes, remainingFullBoxes);
+ decimal useQty = useBoxes * boxQty;
+
+ var detail = new Dt_DeliveryOrderDetail
+ {
+ Goods_no = item.goods_no,
+ Order_qty = useQty,
+ Batch_num = inv.BatchNo,
+ Exp_date = inv.ValidityPeriod,
+ OotDetailStatus = "鏂板缓",
+ Status = 0, // 鉁� 绔嬪簱锛堣ˉ鏁寸锛�
+ Reservoirarea = inv.LocationCode
+ };
+ entityOrder.Details.Add(detail);
+
+ inv.OutboundQuantity += (float)useQty;
+ BaseDal.Db.Updateable(inv).ExecuteCommand();
+
+ remainingFullBoxes -= useBoxes;
+ }
+ }
+
+ if (remainingFullBoxes > 0)
+ {
+ decimal unfilledQty = remainingFullBoxes * boxQty;
+ SendErrorToUpstream(3, "", $"鍑哄簱鍗昜{outorder.order_no}]鐗╂枡[{item.goods_no}]鏁寸搴撳瓨涓嶈冻锛屾湭鍒嗛厤鏁伴噺锛歿unfilledQty}", "");
+ }
+ }
+ }
+
_DeliveryOrders.Add(entityOrder);
- //orderNos.Add(outorder.out_no);
- };
+ }
- // 浣跨敤 InsertNav 涓�娆℃�ф彃鍏ヤ富琛ㄥ拰瀛愯〃鏁版嵁
- BaseDal.Db.InsertNav(_DeliveryOrders).Include(x => x.Details).ExecuteCommand();
-
- // 杩欓噷鍙互娣诲姞涓嬪彂鍒� WCS 鐨勯�昏緫
- // var result = EdiOut(); // 鍙戠粰涓嬫父
+ // 鎻掑叆涓昏〃+鏄庣粏
+ BaseDal.Db.InsertNav(_DeliveryOrders)
+ .Include(x => x.Details)
+ .ExecuteCommand();
Db.Ado.CommitTran();
return responseContent.OK("鍚屾鍑哄簱鍗曟垚鍔�");
@@ -217,7 +426,6 @@
}
catch (Exception ex)
{
- // 鍏ㄥ眬寮傚父鏃讹紝涔熸帹閫佸紓甯哥粰涓婃父
SendErrorToUpstream(3, "", ex.Message, "");
return responseContent.Error("鍚屾澶辫触: " + ex.Message);
}
@@ -467,6 +675,8 @@
// return new WebResponseContent { Status = false, Message = ex.Message };
// }
//}
+
+
public WebResponseContent InventoryGood(string externalOrderNo)
{
try
--
Gitblit v1.9.3