From 0cf29ba50d05efa7d8db3666aa865c45982bf5d8 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期一, 27 十月 2025 16:32:01 +0800
Subject: [PATCH] 优化前端
---
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs | 51 ++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 46 insertions(+), 5 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 6fa2fbf..78352b9 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"
@@ -557,7 +557,7 @@
if (Qty != item.order_qty) throw new Exception($"鐩樼泩鍏ュ簱鍗曘�恵order.order_no}銆戠墿鏂欑紪鍙枫�恵item.goods_no}銆戠墿鏂欐壒娆°�恵item.batch_num}銆戠殑鐩樼泩鏁伴噺鏈夎");
//鎵炬墍鏈夊簱瀛�
List<Dt_InventoryInfo> inventoryInfos = _inventoryInfoService.Repository.QueryData(x => x.MaterielCode == inventory_Batch.MaterielCode && x.BatchNo == inventory_Batch.BatchNo);
- //鑾峰彇绔嬪簱鐩樼偣宸紓鏁�
+ //鑾峰彇绔嬪簱鐩樼偣宸紓鏁�.銆傘�傘�傘�傘�傘�傘�傘�傘�傘�傘�傘��
var inventoryLK = inventoryInfos.Where(x => x.WarehouseCode == WareCodeLK).First();
var LkQty = Math.Abs(inventoryLK.StockQuantity - inventoryLK.SupplyQuantity);
//鑾峰彇澶т欢搴撶洏鐐瑰樊寮傛暟
@@ -626,7 +626,8 @@
Status = 2,
}).ToList()
};
- Repository.AddData(entityOrder);
+ Db.InsertNav(entityOrder).Include(it => it.Details).ExecuteCommand();
+ //Repository.AddData(entityOrder);
#endregion
}
else
@@ -655,7 +656,7 @@
OrderNo = order.order_no,
StockQuantity = Math.Abs(inventoryInfo.StockQuantity - inventoryInfo.SupplyQuantity),
SupplyQuantity = 0,
- Remark = "鐩樼泩鍏ュ簱"
+ Remark = "鐩樹簭鍑哄簱"
};
_supplyTaskHtyService.AddData(supplyTask_Hty);
}
@@ -691,7 +692,8 @@
Status = 2,
}).ToList()
};
- Repository.AddData(cabinOrder);
+ //Repository.AddData(cabinOrder);
+ Db.InsertNav(cabinOrder).Include(it => it.Details).ExecuteCommand();
}
#endregion
@@ -716,9 +718,11 @@
Status = 0,
}).ToList()
};
- Repository.AddData(entityOrder);
+ Db.InsertNav(entityOrder).Include(it => it.Details).ExecuteCommand();
+ //Repository.AddData(entityOrder);
#endregion
}
+ return WebResponseContent.Instance.OK("鎴愬姛");
}
}
}
@@ -966,5 +970,42 @@
}
return content;
}
+
+ public WebResponseContent FinishOutOrder(int key)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ Dt_DeliveryOrder deliveryOrder = BaseDal.QueryFirst(x => x.Id == key);
+ List<Dt_DeliveryOrder> deliveryOrders = Db.Queryable<Dt_DeliveryOrder>().Where(x => x.Out_no == deliveryOrder.Out_no).Includes(x => x.Details).ToList();//鎵惧嚭鎵�鏈夊嚭搴撳崟鍙风浉鍚岀殑鍑哄簱鍗�
+ _unitOfWorkManage.BeginTran();
+ foreach (var item in deliveryOrders)
+ {
+ if (item.Details != null)
+ _deliveryOrderDetailServices.Repository.DeleteAndMoveIntoHty(item.Details, OperateTypeEnum.浜哄伐瀹屾垚);
+ item.Modifier = App.User.UserName;
+ item.ModifyDate = DateTime.Now;
+ item.Details = null;
+ }
+ BaseDal.DeleteAndMoveIntoHty(deliveryOrders, OperateTypeEnum.浜哄伐瀹屾垚);
+ var url = "http://121.37.118.63:80/GYZ2/95fck/outOrderOk";
+ var requestDate = new
+ {
+ order_no = deliveryOrder.Out_no
+ };
+ var result = HttpHelper.Post(url, requestDate.ToJsonString());
+ var response = JsonConvert.DeserializeObject<UpstreamOrderResponse>(result);
+ if (response == null) throw new Exception("涓婃姤ERP鍑哄簱鍗曞畬鎴愬け璐ワ紒");
+ if (response.resultCode != "0") throw new Exception(response.resultMsg);
+ _unitOfWorkManage.CommitTran();
+ content.OK();
+ }
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ content.Error(ex.Message);
+ }
+ return content;
+ }
}
}
--
Gitblit v1.9.3