Merge remote-tracking branch 'origin/dev_1.4.1'

1.修复零售明细中没有员工成本价的缺陷；
2024-07-05 11:46:06 +08:00 · 2024-07-05 11:45:22 +08:00
1 changed files with 1 additions and 0 deletions
--- a/app/admin/models/erp_order.go
+++ b/app/admin/models/erp_order.go
@ -3741,6 +3741,7 @@ func packData(result []RetailDetailByJoin) []ErpOrder {
 		commodity.ErpSupplierName = item.ErpSupplierName
 		commodity.SalesProfit = item.SalesProfit
 		commodity.StaffProfit = item.StaffProfit
+		commodity.StaffPrice = item.WholesalePrice + item.StaffCostPrice

 		order.Commodities = append(order.Commodities, commodity)
 		orderIdMap[item.ErpOrderId] = order
Author	SHA1	Message	Date
chenlin	b47ea1135f	Merge remote-tracking branch 'origin/dev_1.4.1'	2024-07-05 11:46:06 +08:00
chenlin	14aff507b8	1.修复零售明细中没有员工成本价的缺陷；	2024-07-05 11:45:22 +08:00