diff --git a/app/admin/models/inventory_allot.go b/app/admin/models/inventory_allot.go index 3dd3f49..7c7641d 100644 --- a/app/admin/models/inventory_allot.go +++ b/app/admin/models/inventory_allot.go @@ -142,12 +142,12 @@ func checkAllotInventoryParam(req *InventoryAllotAddReq, editFlag bool) error { } } - // 校验编辑订单时是否有传商品ID - if editFlag { - if item.ID == 0 { - return fmt.Errorf("商品[%s]ID为空", item.CommodityName) - } - } + //// 校验编辑订单时是否有传商品ID + //if editFlag { + // if item.ID == 0 { + // return fmt.Errorf("商品[%s]ID为空", item.CommodityName) + // } + //} // 校验串码类型 switch item.IMEIType { diff --git a/app/admin/models/purchase.go b/app/admin/models/purchase.go index ec966ac..6b3e07f 100644 --- a/app/admin/models/purchase.go +++ b/app/admin/models/purchase.go @@ -1379,7 +1379,7 @@ func combineStocks(waitCreateStockList []ErpStock) []ErpStock { func InventoryErpPurchaseUpdateRejectStock(gdb *gorm.DB, list []ErpPurchaseInventory, purchaseOrder ErpPurchaseOrder) error { usedStockCommodityIdList := make(map[uint32]bool) for i, _ := range list { - if list[i].IMEIType == 2 { // 串码商品 + if list[i].IMEIType == 2 || list[i].IMEIType == 3 { // 串码商品 if list[i].IMEI == "" { return errors.New("串码为空") }