app/admin/apis/erpordermanage/erp_order.go

@@ -207,7 +207,6 @@ func ErpOrderAudit(c *gin.Context) {
 			}
 
 			var checkReq model.ErpOrderCreateReq
-			checkReq.StoreId = erpOrder.StoreId
 			checkReq.ErpOrderCommodities = commodity
 			err = model.CheckOrderCommodityStock(&checkReq)
 			if err != nil {

app/admin/models/erp_order.go

@@ -1402,8 +1402,6 @@ func mergeOrderCommodities(orderCommodities []ErpOrderCommodity) []ErpOrderCommo
 			existingCommodity.SaleDiscount += commodity.SaleDiscount
 			existingCommodity.MemberDiscount += commodity.MemberDiscount
 			existingCommodity.ReceivedAmount += commodity.ReceivedAmount
-			existingCommodity.RejectedCount += commodity.RejectedCount
-			existingCommodity.RejectedAmount += commodity.RejectedAmount
 			stockCommodityID, _ := tools.StringToInt(commodity.ErpStockCommodityID)
 			if stockCommodityID > 0 {
 				existingCommodity.ErpStockCommodityID = strings.Join([]string{existingCommodity.ErpStockCommodityID, commodity.ErpStockCommodityID}, ",")
@@ -5405,12 +5403,10 @@ func checkOrderData(req *ErpOrderCreateReq, c *gin.Context) (*ErpOrder, error) {
 			//// 单个商品退货金额
 			//req.ErpOrderCommodities[i].RejectedAmount = req.ErpOrderCommodities[i].RejectedAmount / float64(req.ErpOrderCommodities[i].RejectedCount)
 
-			for j := 0; j < int(req.ErpOrderCommodities[i].RejectedCount); j++ {
+			for j := 0; j < int(req.ErpOrderCommodities[i].Count); j++ {
 				stockIdList, _ := stringToIntArray(req.ErpOrderCommodities[i].ErpStockCommodityID)
 				temp := req.ErpOrderCommodities[i]
-				temp.RejectedAmount = req.ErpOrderCommodities[i].RejectedAmount / float64(req.ErpOrderCommodities[i].RejectedCount)
 				temp.Count = 1
-				temp.RejectedCount = 1
 				if len(stockIdList) > j {
 					temp.ErpStockCommodityID = fmt.Sprintf("%d", stockIdList[j])
 				}

app/admin/models/inventory_report.go

@@ -388,7 +388,6 @@ func (m *InventoryReportByProductReq) ReportByProductList(c *gin.Context) (*Inve
 	resp.TotalEffectiveAmount = sumData.TotalEffectiveAmount
 	resp.TotalTransferAmount = sumData.TotalTransferAmount
 	resp.TotalAmount = resp.TotalEffectiveAmount + resp.TotalTransferAmount
-	resp.TotalAmount = math.Round(resp.TotalAmount*100) / 100
 	resp.Total = uint32(len(reportList))
 	resp.List = reportList