minghui/mh_goadmin_server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1、优化零售退货单反审核失败问题；

Browse Source 
2、新建零售退货订单拆分非串码商品时，同步拆分退货数量和退货金额字段；零售列表合并非串码商品时，同步合并退货数量和退货金额字段；修复后解决商品零售毛利汇总退货单多个相同非串码商品退货金额统计不准确的问题；
This commit is contained in:
chenlin 2024-09-20 14:24:33 +08:00
parent a9ab3b4d72
commit ca63f38c48
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/admin/apis/erpordermanage/erp_order.go
View File

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

6
app/admin/models/erp_order.go
View File

@ -1402,6 +1402,8 @@ 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}, ",")
@ -5403,10 +5405,12 @@ 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].Count); j++ {
for j := 0; j < int(req.ErpOrderCommodities[i].RejectedCount); 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])
}