更新密码找回uniapp
This commit is contained in:
1 parent
7f9a66da0f
commit
3fdda89833
1304 files changed
+3503
-26132
No files matched your search
@@ -10,14 +10,6 @@ import (
|
||||
"github.com/beego/beego/v2/client/orm"
|
||||
)
|
||||
|
||||
// ApplyDocEffect 单据「审核生效」的统一效果引擎。调用方必须传入开启的事务 Ormer,
|
||||
// 并保证单据当前状态为 草稿/驳回/审批中。生效后:
|
||||
//
|
||||
// purchase_in → 入库流水 + 累计采购订单执行量 + 生成应付
|
||||
// sales_out → 出库流水(加权成本) + 累计销售订单执行量 + 信用校验 + 生成应收
|
||||
// *_return → 反向流水 + 红字往来账冲减
|
||||
// other_in/out / transfer / stock_take → 仅库存变动
|
||||
// *_order → 仅状态推进,不动库存
|
||||
func ApplyDocEffect(o orm.QueryExecutor, doc *models.ErpDocument, items []models.ErpDocumentItem,
|
||||
operatorID, operatorName string) error {
|
||||
|
||||
@@ -39,7 +31,6 @@ func ApplyDocEffect(o orm.QueryExecutor, doc *models.ErpDocument, items []models
|
||||
|
||||
switch doc.DocType {
|
||||
case models.ErpDocPurchaseOrder, models.ErpDocSalesOrder:
|
||||
// 订单不动库存、不产生往来账
|
||||
|
||||
case models.ErpDocPurchaseIn:
|
||||
for i := range items {
|
||||
@@ -87,7 +78,6 @@ func ApplyDocEffect(o orm.QueryExecutor, doc *models.ErpDocument, items []models
|
||||
for i := range items {
|
||||
it := &items[i]
|
||||
wh := pickWh(doc, it)
|
||||
// 退货出库成本:优先取原入库流水成本,取不到则按当前加权成本
|
||||
cost := 0.0
|
||||
if c, ok := refLedgerCost(o, doc.TenantID, it.RefItemID, models.ErpStockIn); ok {
|
||||
cost = c
|
||||
@@ -109,7 +99,7 @@ func ApplyDocEffect(o orm.QueryExecutor, doc *models.ErpDocument, items []models
|
||||
wh := pickWh(doc, it)
|
||||
cost := 0.0
|
||||
if c, ok := refLedgerCost(o, doc.TenantID, it.RefItemID, models.ErpStockOut); ok {
|
||||
cost = c // 按原出库成本回冲入库
|
||||
cost = c
|
||||
}
|
||||
if err := mv(it, models.ErpStockIn, cost, wh); err != nil {
|
||||
return err
|
||||
@@ -203,7 +193,6 @@ func pickWh(doc *models.ErpDocument, it *models.ErpDocumentItem) uint64 {
|
||||
return doc.WarehouseID
|
||||
}
|
||||
|
||||
// checkOrderExec 入库/出库数量不得超过来源订单的未执行数量。
|
||||
func checkOrderExec(o orm.QueryExecutor, tenantID string, it *models.ErpDocumentItem, orderType string) error {
|
||||
if it.RefItemID == 0 {
|
||||
return nil
|
||||
@@ -240,7 +229,6 @@ func bumpExecutedQty(o orm.QueryExecutor, it *models.ErpDocumentItem) error {
|
||||
return err
|
||||
}
|
||||
|
||||
// checkReturnLimit 退货数量不得超过原单行数量 - 已退数量。
|
||||
func checkReturnLimit(o orm.QueryExecutor, doc *models.ErpDocument, items []models.ErpDocumentItem) error {
|
||||
ids := make([]uint64, 0, len(items))
|
||||
for _, it := range items {
|
||||
@@ -257,7 +245,6 @@ func checkReturnLimit(o orm.QueryExecutor, doc *models.ErpDocument, items []mode
|
||||
for i := range refItems {
|
||||
refMap[refItems[i].ID] = &refItems[i]
|
||||
}
|
||||
// 已退数量 = 其他已生效退货单中引用同一原行的数量
|
||||
already := map[uint64]float64{}
|
||||
var sibs []models.ErpDocumentItem
|
||||
_, _ = o.QueryTable(new(models.ErpDocumentItem)).
|
||||
@@ -300,7 +287,6 @@ func checkReturnLimit(o orm.QueryExecutor, doc *models.ErpDocument, items []mode
|
||||
return nil
|
||||
}
|
||||
|
||||
// refLedgerCost 取原单明细对应流水的单位成本(退货回冲口径)。
|
||||
func refLedgerCost(o orm.QueryExecutor, tenantID string, refItemID uint64, direction int8) (float64, bool) {
|
||||
if refItemID == 0 {
|
||||
return 0, false
|
||||
@@ -317,7 +303,6 @@ func refLedgerCost(o orm.QueryExecutor, tenantID string, refItemID uint64, direc
|
||||
return led.UnitCost, true
|
||||
}
|
||||
|
||||
// checkCustomerCredit 销售出库信用额度校验:客户未收往来余额 + 本单金额 ≤ 信用额度。
|
||||
func checkCustomerCredit(o orm.QueryExecutor, doc *models.ErpDocument) error {
|
||||
if doc.PartnerType != "customer" || doc.PartnerID == 0 {
|
||||
return nil
|
||||
@@ -359,7 +344,6 @@ func (e *CreditError) Error() string {
|
||||
e.PartnerName, e.Limit, e.Open, e.This)
|
||||
}
|
||||
|
||||
// createPartnerBill 出库/入库/退货生效时生成往来账;退货生成红字(负数)账。
|
||||
func createPartnerBill(o orm.QueryExecutor, doc *models.ErpDocument, billType int8) error {
|
||||
if doc.PartnerID == 0 || doc.ActualAmount == 0 {
|
||||
return nil
|
||||
@@ -382,7 +366,6 @@ func createPartnerBill(o orm.QueryExecutor, doc *models.ErpDocument, billType in
|
||||
Amount: amount, SettledAmount: 0, Status: 0,
|
||||
CreateTime: time.Now(), UpdateTime: time.Now(),
|
||||
}
|
||||
// 红字互抵:正数账先吸收同单位红字余额;红字账入账后抵扣未结正数账
|
||||
if amount > 0 {
|
||||
consumed, err := autoOffsetBill(o, &bill)
|
||||
if err != nil {
|
||||
@@ -407,8 +390,6 @@ func createPartnerBill(o orm.QueryExecutor, doc *models.ErpDocument, billType in
|
||||
return nil
|
||||
}
|
||||
|
||||
// SyncErpDocResult 审批引擎回调:审批终态回写业务单据。
|
||||
// bizType 形如 erp_sales_out;status 为实例终态。幂等:仅推进处于「审批中」的单据。
|
||||
func SyncErpDocResult(bizType string, bizID uint64, tid uint64, status int8) {
|
||||
if !strings.HasPrefix(bizType, "erp_") || bizID == 0 || tid == 0 {
|
||||
return
|
||||
@@ -422,7 +403,7 @@ func SyncErpDocResult(bizType string, bizID uint64, tid uint64, status int8) {
|
||||
return
|
||||
}
|
||||
if doc.Status != models.ErpDocStatusPending {
|
||||
return // 已被处理,幂等跳过
|
||||
return
|
||||
}
|
||||
|
||||
switch status {
|
||||
@@ -437,7 +418,6 @@ func SyncErpDocResult(bizType string, bizID uint64, tid uint64, status int8) {
|
||||
}
|
||||
}
|
||||
|
||||
// approveWithTx 独立开启事务并生效单据(审批回调 / 直接审核共用)。
|
||||
func approveWithTx(docID uint64, tenantID, auditorID, auditorName string) error {
|
||||
o := models.Orm
|
||||
tx, err := o.Begin()
|
||||
@@ -451,7 +431,6 @@ func approveWithTx(docID uint64, tenantID, auditorID, auditorName string) error
|
||||
return tx.Commit()
|
||||
}
|
||||
|
||||
// ApproveDocumentTx 事务内:状态锁 + 效果执行 + 状态推进,供控制器与审批回调复用。
|
||||
func ApproveDocumentTx(tx orm.QueryExecutor, docID uint64, tenantID, auditorID, auditorName string) error {
|
||||
var doc models.ErpDocument
|
||||
if err := tx.QueryTable(new(models.ErpDocument)).
|
||||
@@ -460,7 +439,7 @@ func ApproveDocumentTx(tx orm.QueryExecutor, docID uint64, tenantID, auditorID,
|
||||
return fmt.Errorf("单据不存在")
|
||||
}
|
||||
if doc.Status == models.ErpDocStatusApproved {
|
||||
return nil // 幂等
|
||||
return nil
|
||||
}
|
||||
if doc.Status != models.ErpDocStatusDraft &&
|
||||
doc.Status != models.ErpDocStatusRejected &&
|
||||
@@ -490,7 +469,6 @@ func ApproveDocumentTx(tx orm.QueryExecutor, docID uint64, tenantID, auditorID,
|
||||
return err
|
||||
}
|
||||
|
||||
// ApproveDocument 非审批流路径的直接审核入口。
|
||||
func ApproveDocument(docID uint64, tenantID, auditorID, auditorName string) error {
|
||||
return approveWithTx(docID, tenantID, auditorID, auditorName)
|
||||
}
|
||||
Reference in new issue
Block a user