物料订单调度问题,刷新库存更改api

This commit is contained in:
苏尹岚
2020-03-18 14:05:22 +08:00
parent fd4455ea95
commit fbb059b071
2 changed files with 10 additions and 8 deletions

View File

@@ -762,6 +762,8 @@ func jxOrder2GoodsOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, deliveryAd
order.FromStoreID = jxOrder.FromStoreID
order.WaybillVendorID = model.VendorIDJDWL
order.DeliveryFlag = model.OrderDeliveryFlagMaskScheduleDisabled
order.DeliveryType = model.OrderDeliveryTypeSelfTake
order.Flag = 1
}
return order, err
}
@@ -923,11 +925,11 @@ func CancelOrder(ctx *jxcontext.Context, order *model.GoodsOrder, reason string)
errList.AddErr(err)
}
}
if err == nil{
if err == nil {
MarkArrears(db, order, orderPay)
err2 := CancelMatterOrder(db, order, reason)
errList.AddErr(err2)
}
}
} else {
orderPay.Status = model.PayStatusCanceled
_, err2 := dao.UpdateEntity(db, orderPay)