From 18a8fab394f764e5b30c48c8e0d6887ef7d44cbf Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 29 十月 2024 14:22:49 +0800
Subject: [PATCH] 取消拆单
---
CoreCms.Net.Web.Admin/Controllers/baifenbingfa/PuhuoController.cs | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/CoreCms.Net.Web.Admin/Controllers/baifenbingfa/PuhuoController.cs b/CoreCms.Net.Web.Admin/Controllers/baifenbingfa/PuhuoController.cs
index da67438..452c445 100644
--- a/CoreCms.Net.Web.Admin/Controllers/baifenbingfa/PuhuoController.cs
+++ b/CoreCms.Net.Web.Admin/Controllers/baifenbingfa/PuhuoController.cs
@@ -639,7 +639,7 @@
//鑾峰彇鍟嗗搧鍒嗙被
var categories = await _coreCmsGoodsCategoryServices.QueryListByClauseAsync(p => p.isShow, p => p.sort, OrderByType.Asc, true, true);
- var distributions = await _coreCmsDistributionServices.QueryListByClauseAsync(p => p.isDelete == false && p.verifyStatus == 1, p => p.createTime, OrderByType.Desc, true, true);
+ var distributions = await _coreCmsDistributionServices.QueryListByClauseAsync(p => p.isDelete == false && p.verifyStatus == 1 && p.profession == "鏍″洯浠ｇ悊", p => p.createTime , OrderByType.Desc, true, true);
var categoriesnew = departmentRecursion(0, categories,"--");
@@ -903,6 +903,19 @@
return jm;
}
model.jintui = entity.jintui;
+ if(model.jintui == 1)
+ {
+ model.tiaozhengbiaoti = "閾鸿揣鏁伴噺";
+ }
+ else if (model.jintui == 2)
+ {
+ model.tiaozhengbiaoti = "閫�璐ф暟閲�";
+ }
+ else if (model.jintui == 3)
+ {
+ model.tiaozhengbiaoti = "璋冩暣鏁伴噺";
+ }
+
jm.code = 0;
jm.data = model;
@@ -934,7 +947,8 @@
var puhuo = await _PuhuoServices.QueryByIdAsync(entity.id);
var aaaa = puhuo.shoukuannums ?? 0;
- if ( puhuo.nums < (aaaa + entity.shoukuannums))
+
+ if ( puhuo.nums < entity.shoukuannums)
{
jm.msg = "鏀舵鏁伴噺澶т簬閾鸿揣鏁伴噺锛屼笉鑳芥彁浜�";
return jm;
@@ -965,7 +979,8 @@
puhuoShoukuan.upDataTime = DateTime.Now;
jm = await _puhuoShoukuanServices.InsertAsync(puhuoShoukuan);
-
+ puhuo.nums = puhuo.nums - entity.shoukuannums.Value;
+ puhuo.amount = new decimal(puhuo.nums) * puhuo.price;
puhuo.upDataBy = _user.Name;
puhuo.upDataTime = DateTime.Now;
var sss = puhuo.shoukuannums ?? 0;
--
Gitblit v1.9.1