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/CabinOrderServices.cs | 52 +++++++++++++++++++---------------------------------
1 files changed, 19 insertions(+), 33 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 70c5937..e8caa77 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"
@@ -297,17 +297,17 @@
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";
+ 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(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 = "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");
+ SearchDate = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd HH:mm:ss");
// 鍙戣捣璇锋眰
var result = HttpHelper.Post(url, requestData.ToJsonString());
@@ -360,7 +360,7 @@
#region 鍒涘缓涓�涓叆搴撳崟鏂规硶
//鎺掗櫎鐗规畩鑽搧
bool skipOrder = false;//鏍囪鏄惁璺宠繃璇ュ叆搴撳崟
- if (order.warehouse_no != "001" && order.warehouse_no != "澶т欢骞冲簱") //鐗规畩鑽搧搴撴埧鍙疯繘琛屼笅闈㈡搷浣�
+ if (order.warehouse_no != "001" && (order.warehouse_no == "010" || order.warehouse_no == "003" || order.warehouse_no == "017"))//鐗规畩鑽搧搴撴埧鍙疯繘琛屼笅闈㈡搷浣�
{
//鍒涘缓鍏ュ簱鍗曚富琛ㄤ粠琛�
var entityOrder = new Dt_CabinOrder
@@ -529,7 +529,7 @@
BaseDal.Db.InsertNav(_CabinOrders).Include(x => x.Details).ExecuteCommand();
//鍦ㄤ笅鍙戠粰wcs
- //var reslut= EdiIn(); //鍙戠粰涓嬫父
+ //EdiIn(); //鍙戠粰涓嬫父
//濡傛灉杩欎釜鏂规硶鎴愬姛浜嗭紝閭ｄ箞灏辫皟鐢–ompleteOrder鎺ュ彛锛岀劧鍚庢敼鍙�
Db.Ado.CommitTran();
return responseContent.OK("鍚屾鍏ュ簱鍗曟垚鍔�");
@@ -778,8 +778,11 @@
// 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 == null || !orders.Any())
{
@@ -787,18 +790,13 @@
return WebResponseContent.Instance.Error("娌℃湁绗﹀悎鏉′欢鐨勮鍗曢渶瑕佹帹閫�");
}
-
// 4. 閬嶅巻璁㈠崟锛岀粍瑁� DTO 骞舵帹閫�
foreach (var order in orders)
{
- string materialCode = "YY";//榛樿鍊�
- //鑾峰彇褰撳墠璁㈠崟鐨勭涓�涓槑缁嗛」
- var firstDetail = order.Details.FirstOrDefault();
- if (firstDetail?.MedicineGoods != null && !string.IsNullOrEmpty(firstDetail.MedicineGoods.MaterielErpType))
- {
- //濡傛灉鏉′欢婊¤冻锛屽皢鐗╂枡浠ｇ爜璁剧疆涓虹涓�涓槑缁嗛」瀵瑰簲鐨勮嵂鍝佺墿鏂欎唬鐮�
- materialCode = firstDetail.MedicineGoods.MaterielErpType;
- }
+ // 浠庣涓�涓湁 MedicineGoods 鐨勬槑缁嗕腑鍙栧嚭 MaterielErpType
+ string materialCode = order.Details
+ .Select(d => d.MedicineGoods?.MaterielErpType)
+ .FirstOrDefault(x => !string.IsNullOrEmpty(x)) ?? "YY"; // 榛樿鍊糦Y
var ediDto = new ToediInInfo
{
@@ -833,23 +831,11 @@
manufacturer = d.MedicineGoods?.Factory,
//鎴垮彿
libraryNo = order.Warehouse_no,
- //鐩樼泩鍏ュ簱
- //stocktakingDetails = new List<ToediInStock>()
- //stocktakingDetails = new List<ToediInStock>()
- //{
- // new ToediInStock
- // {
- // //鏂欑鍙�
- // palletCode = "PDA001",
- // //鏁伴噺
- // quantity = d.Order_qty.ToString()
- // }
- // }
}).ToList()
};
- //var url = "http://172.16.1.2:9357/file-admin/api/in/ediIn";
- var url = "http://127.0.0.1:4523/m2/5660322-5340849-default/363019549";
+ var url = "http://172.16.1.2:9357/file-admin/api/in/ediIn";
+ //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);
@@ -861,9 +847,9 @@
.Where(o => o.Id == order.Id)
.ExecuteCommand();
- // 鏇存柊鏄庣粏鐘舵�佷负宸插悓姝�
+ // 鏇存柊鏄庣粏鐘舵�佷负宸插悓姝� //杩欓噷瑕佹槸灏嗘柊寤�--銆嬪紑濮嬬姸鎬�,鍦ㄥ悗绔帴鍙ｈ繑鍥炴垜浠殑鏃跺�欏湪杩斿洖宸插畬鎴�
BaseDal.Db.Updateable<Dt_CabinOrderDetail>()
- .SetColumns(d => new Dt_CabinOrderDetail { Status = 1, OrderDetailStatus = "宸插畬鎴�" })
+ .SetColumns(d => new Dt_CabinOrderDetail { Status = 1, OrderDetailStatus = "寮�濮�" })
.Where(d => d.OrderId == order.Id && d.Status == 0)
.ExecuteCommand();
--
Gitblit v1.9.3