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/CabinOrderServices.cs | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 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 8a1872f..44e7072 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"
@@ -28,10 +28,12 @@
static string SearchDate = "";
private readonly IBasicService _basicService;
+ private readonly IMedicineGoodsServices _medicineGoodsServices;
- public CabinOrderServices(IRepository<Dt_CabinOrder> BaseDal, IBasicService basicService) : base(BaseDal)
+ public CabinOrderServices(IRepository<Dt_CabinOrder> BaseDal, IBasicService basicService, IMedicineGoodsServices medicineGoodsServices) : base(BaseDal)
{
_basicService = basicService;
+ _medicineGoodsServices = medicineGoodsServices;
}
/// <summary>
@@ -215,9 +217,12 @@
};
foreach (var item in order.details)
{
+ // 灏嗕笂娓稿叆搴撴暟閲忚浆涓烘鏁�
+ item.order_qty = Math.Abs(item.order_qty);
#region 鏍规嵁鐗╂枡缂栫爜鏌ヨ鐗╂枡淇℃伅
- Dt_MaterielInfo materielInfo = _basicService.MaterielInfoService.Repository.QueryFirst(x => x.MaterielCode == item.goods_no);
- ///鏍规嵁鐗╂枡淇℃伅澶у皬浠跺睘鎬у尯鍒嗘槸鍚﹀叆绔嬪簱
+ //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();
+ ///鏍规嵁鐗╂枡淇℃伅澶у皬浠跺睘鎬у尯鍒嗘槸鍚﹀叆绔嬪簱 //澶т欢鍏ュ钩搴�
if (materielInfo.MaterielSourceType == MaterielSourceTypeEnum.PurchasePart)
{
Dt_CabinOrderDetail orderDetail = new Dt_CabinOrderDetail()
@@ -235,8 +240,8 @@
else
{
Dt_CabinOrderDetail orderDetail = null;
- var ys = item.order_qty % materielInfo.BoxQty;
- var xs = item.order_qty / materielInfo.BoxQty;
+ var ys = item.order_qty % materielInfo.BoxQty; //涓嶈兘鏁撮櫎绠辫鐨勬暎浠舵暟
+ var xs = item.order_qty / materielInfo.BoxQty;//鏁寸鏁伴噺
#region 鐢熸垚绔嬪簱鍏ュ簱鍗�
#region 鍒ゆ柇鏄惁鏈夋暎浠�
@@ -244,6 +249,7 @@
{
orderDetail = new Dt_CabinOrderDetail()
{
+ Reservoirarea = order.warehouse_no,
Goods_no = item.goods_no,
Order_qty = ys,
Batch_num = item.batch_num,
@@ -263,6 +269,7 @@
{
orderDetail = new Dt_CabinOrderDetail()
{
+ Reservoirarea = order.warehouse_no,
Goods_no = item.goods_no,
Order_qty = materielInfo.BoxQty,
Batch_num = item.batch_num,
@@ -288,6 +295,7 @@
{
orderDetail = new Dt_CabinOrderDetail()
{
+ Reservoirarea = order.warehouse_no,
Goods_no = item.goods_no,
Order_qty = materielInfo.BoxQty * xs,
Batch_num = item.batch_num,
@@ -299,7 +307,8 @@
}
#endregion
}
- _basicService.MaterielInfoService.Repository.UpdateData(materielInfo);
+ //_basicService.MaterielInfoService.Repository.UpdateData(materielInfo);
+ _medicineGoodsServices.Db.Updateable(materielInfo).ExecuteCommand();
#endregion
}
_CabinOrders.Add(entityOrder);
--
Gitblit v1.9.3