Compare commits

..

No commits in common. "b47ea1135fe6b0e5063905a680dd93e93d33e6cd" and "b528c53e905cab2d4e0e4823c19764a8b62bf9cc" have entirely different histories.

View File

@ -3741,7 +3741,6 @@ func packData(result []RetailDetailByJoin) []ErpOrder {
commodity.ErpSupplierName = item.ErpSupplierName commodity.ErpSupplierName = item.ErpSupplierName
commodity.SalesProfit = item.SalesProfit commodity.SalesProfit = item.SalesProfit
commodity.StaffProfit = item.StaffProfit commodity.StaffProfit = item.StaffProfit
commodity.StaffPrice = item.WholesalePrice + item.StaffCostPrice
order.Commodities = append(order.Commodities, commodity) order.Commodities = append(order.Commodities, commodity)
orderIdMap[item.ErpOrderId] = order orderIdMap[item.ErpOrderId] = order