From a9ab3b4d72ac79874fd9e293a9d1fe1d11b8b24a Mon Sep 17 00:00:00 2001 From: chenlin Date: Fri, 20 Sep 2024 11:14:16 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96=E5=AF=B9=E4=B8=B2?= =?UTF-8?q?=E7=A0=81=E5=95=86=E5=93=81=E7=9A=84=E5=88=A4=E6=96=AD=EF=BC=8C?= =?UTF-8?q?imei=5Ftype=E4=B8=BA2/3=E9=83=BD=E6=98=AF=E4=B8=B2=E7=A0=81?= =?UTF-8?q?=E5=95=86=E5=93=81=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/models/inventory_change.go | 6 +++--- app/admin/models/inventory_product.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/admin/models/inventory_change.go b/app/admin/models/inventory_change.go index 5672173..8383e9e 100644 --- a/app/admin/models/inventory_change.go +++ b/app/admin/models/inventory_change.go @@ -760,7 +760,7 @@ func handleInventoryReduce(gdb *gorm.DB, changeOrder ErpInventoryChangeOrder) er usedStockCommodityIdList := make(map[uint32][]uint32) // 记录非串码商品已使用的商品库存表主键id // 更新库存数量 for i, _ := range trimCommodities { - if trimCommodities[i].IMEIType == 2 { // 串码商品 + if trimCommodities[i].IMEIType == 2 || trimCommodities[i].IMEIType == 3 { // 串码商品 if trimCommodities[i].IMEI == "" { return errors.New("串码为空") } @@ -885,7 +885,7 @@ func handleCancelInventoryAdd(gdb *gorm.DB, changeOrder ErpInventoryChangeOrder) // 更新库存数量 for i, _ := range trimCommodities { - if trimCommodities[i].IMEIType == 2 { // 串码商品 + if trimCommodities[i].IMEIType == 2 || trimCommodities[i].IMEIType == 3 { // 串码商品 if trimCommodities[i].IMEI == "" { return errors.New("串码为空") } @@ -970,7 +970,7 @@ func handleCancelInventoryReduce(gdb *gorm.DB, changeOrder ErpInventoryChangeOrd usedStockCommodityIdList := make(map[uint32][]uint32) // 记录非串码商品已使用的商品库存表主键id // 更新库存数量 for i, _ := range trimCommodities { - if trimCommodities[i].IMEIType == 2 { // 串码商品 + if trimCommodities[i].IMEIType == 2 || trimCommodities[i].IMEIType == 3 { // 串码商品 if trimCommodities[i].IMEI == "" { return errors.New("串码为空") } diff --git a/app/admin/models/inventory_product.go b/app/admin/models/inventory_product.go index 039720e..a802649 100644 --- a/app/admin/models/inventory_product.go +++ b/app/admin/models/inventory_product.go @@ -536,7 +536,7 @@ func cancelProductAuditAndUpdateStock(gdb *gorm.DB, productOrder ErpInventoryPro // 更新库存数量 for i, _ := range commodities { - if commodities[i].IMEIType == 2 { // 串码商品 + if commodities[i].IMEIType == 2 || commodities[i].IMEIType == 3 { // 串码商品 if commodities[i].IMEI == "" { return errors.New("串码为空") }