Compare commits
No commits in common. "5308b4f06986c11ce98d89fb6accc8fbcfdf0f2b" and "934ef9334c0ef923dbca6c7c41df4c37d7b10d6a" have entirely different histories.
5308b4f069
...
934ef9334c
@ -115,9 +115,9 @@ func (r *ProcessApi) BindWave(c *gin.Context) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
systemRes.OkWithDetailed(map[string]interface{}{
|
systemRes.OkWithDetailed(map[string]interface{}{
|
||||||
"receiving_order_id": receivingOrderID, // 入库单ID
|
"receiving_order_id": receivingOrderID,
|
||||||
"wave_task_id": waveTaskID, // 波次任务ID
|
"wave_task_id": waveTaskID,
|
||||||
"wave_task_batch_no": waveTaskBatchNo, // 波次任务批次号
|
"wave_task_batch_no": waveTaskBatchNo,
|
||||||
}, "绑定波次成功，入库单已创建", c)
|
}, "绑定波次成功，入库单已创建", c)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -174,247 +174,6 @@ func (r *ProcessApi) SubmitReceiving(c *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: 添加入库单信息同步到主库的逻辑
|
|
||||||
// 同步入库单信息到主库 product_book_xx 分表
|
|
||||||
r.syncProductBookToMainDB(req, userInfo, c)
|
|
||||||
|
|
||||||
//itemProductIDs := make([]int64, len(req.Items))
|
|
||||||
//for i, item := range req.Items {
|
|
||||||
// itemProductIDs[i] = item.ProductID
|
|
||||||
//}
|
|
||||||
//fmt.Printf("[DEBUG] itemProductIDs: %v\n", itemProductIDs)
|
|
||||||
//
|
|
||||||
//fmt.Printf("[DEBUG] 获取租户数据库, about_id: %d\n", userInfo.AboutID)
|
|
||||||
//tenantDB, err := database.GetTenantDB(userInfo.AboutID)
|
|
||||||
//if err != nil {
|
|
||||||
// fmt.Printf("[DEBUG] 获取租户数据库失败: %v\n", err)
|
|
||||||
// utils.FailWithRequestLog(constant.LoggerChannelWork, "获取租户数据库连接失败", err, c, gin.H{"about_id": userInfo.AboutID})
|
|
||||||
// return
|
|
||||||
//}
|
|
||||||
//fmt.Println("[DEBUG] 租户数据库连接成功")
|
|
||||||
//
|
|
||||||
//fmt.Printf("[DEBUG] 查询入库单(租户库), receiving_order_id: %d\n", req.ReceivingOrderID)
|
|
||||||
//var receivingOrder models.ReceivingOrder
|
|
||||||
//if err := tenantDB.Where("id = ? AND is_del = 0", req.ReceivingOrderID).First(&receivingOrder).Error; err != nil {
|
|
||||||
// fmt.Printf("[DEBUG] 查询入库单失败: %v\n", err)
|
|
||||||
// utils.FailWithRequestLog(constant.LoggerChannelWork, "查询入库单失败", err, c, gin.H{"receiving_order_id": req.ReceivingOrderID})
|
|
||||||
// return
|
|
||||||
//}
|
|
||||||
//fmt.Printf("[DEBUG] 入库单查询成功, warehouse_id: %d\n", receivingOrder.WarehouseID)
|
|
||||||
//
|
|
||||||
//fmt.Printf("[DEBUG] 查询仓库(租户库), warehouse_id: %d\n", receivingOrder.WarehouseID)
|
|
||||||
//var warehouse models.Warehouse
|
|
||||||
//if err := tenantDB.Where("id = ? AND is_del = 0", receivingOrder.WarehouseID).First(&warehouse).Error; err != nil {
|
|
||||||
// fmt.Printf("[DEBUG] 查询仓库失败: %v\n", err)
|
|
||||||
// utils.FailWithRequestLog(constant.LoggerChannelWork, "查询仓库失败", err, c, gin.H{"warehouse_id": receivingOrder.WarehouseID})
|
|
||||||
// return
|
|
||||||
//}
|
|
||||||
//fmt.Printf("[DEBUG] 仓库查询成功, warehouse_name: %s\n", warehouse.Name)
|
|
||||||
//
|
|
||||||
//fmt.Printf("[DEBUG] 获取租户数据库, about_id: %d\n", userInfo.AboutID)
|
|
||||||
//tenantDB, err = database.GetTenantDB(userInfo.AboutID)
|
|
||||||
//if err != nil {
|
|
||||||
// fmt.Printf("[DEBUG] 获取租户数据库失败: %v\n", err)
|
|
||||||
// utils.FailWithRequestLog(constant.LoggerChannelWork, "获取租户数据库连接失败", err, c, gin.H{"about_id": userInfo.AboutID})
|
|
||||||
// return
|
|
||||||
//}
|
|
||||||
//fmt.Println("[DEBUG] 租户数据库连接成功")
|
|
||||||
//
|
|
||||||
//var products []models.Product
|
|
||||||
//fmt.Printf("[DEBUG] 查询商品列表, product_ids: %v\n", itemProductIDs)
|
|
||||||
//if err := tenantDB.Where("id IN ? AND is_del = 0", itemProductIDs).Find(&products).Error; err != nil {
|
|
||||||
// fmt.Printf("[DEBUG] 查询商品列表失败: %v\n", err)
|
|
||||||
// utils.FailWithRequestLog(constant.LoggerChannelWork, "查询商品列表失败", err, c, gin.H{"product_ids": itemProductIDs})
|
|
||||||
// return
|
|
||||||
//}
|
|
||||||
//fmt.Printf("[DEBUG] 商品查询成功, 共 %d 条\n", len(products))
|
|
||||||
//
|
|
||||||
//type locationInfo struct {
|
|
||||||
// LocationID int64
|
|
||||||
// Code string
|
|
||||||
//}
|
|
||||||
//locationMap := make(map[int64]locationInfo)
|
|
||||||
//fmt.Println("[DEBUG] 开始查询库位信息")
|
|
||||||
//for _, product := range products {
|
|
||||||
// var inventoryDetail models.InventoryDetail
|
|
||||||
// if err := tenantDB.Where("product_id = ? AND warehouse_id = ? AND is_del = 0", product.ID, receivingOrder.WarehouseID).First(&inventoryDetail).Error; err == nil {
|
|
||||||
// var location models.Location
|
|
||||||
// if err := tenantDB.Where("id = ? AND is_del = 0", inventoryDetail.LocationID).First(&location).Error; err == nil {
|
|
||||||
// locationMap[product.ID] = locationInfo{
|
|
||||||
// LocationID: location.ID,
|
|
||||||
// Code: location.Code,
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
//}
|
|
||||||
//fmt.Printf("[DEBUG] 库位查询完成, locationMap: %v\n", locationMap)
|
|
||||||
//
|
|
||||||
//bookInfoMap := make(map[int64]models.BookInfo)
|
|
||||||
//fmt.Println("[DEBUG] 开始查询BookInfo")
|
|
||||||
//for _, product := range products {
|
|
||||||
// if product.StandardProductID > 0 {
|
|
||||||
// if _, exists := bookInfoMap[product.StandardProductID]; !exists {
|
|
||||||
// var bookInfo models.BookInfo
|
|
||||||
// if err := database.DB.Where("id = ?", product.StandardProductID).First(&bookInfo).Error; err == nil {
|
|
||||||
// bookInfoMap[product.StandardProductID] = bookInfo
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
//}
|
|
||||||
//fmt.Printf("[DEBUG] BookInfo查询完成, bookInfoMap数量: %d\n", len(bookInfoMap))
|
|
||||||
//
|
|
||||||
//fmt.Println("[DEBUG] 开始写入product_book分表")
|
|
||||||
//for _, product := range products {
|
|
||||||
// isbn := product.Barcode
|
|
||||||
// if isbn == "" {
|
|
||||||
// fmt.Printf("[DEBUG] 跳过无条码商品, product_id: %d\n", product.ID)
|
|
||||||
// continue
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// tableName := models.ProductBookTableName(isbn)
|
|
||||||
// fmt.Printf("[DEBUG] 处理商品, product_id: %d, isbn: %s, table: %s\n", product.ID, isbn, tableName)
|
|
||||||
//
|
|
||||||
// var locInfo locationInfo
|
|
||||||
// if li, exists := locationMap[product.ID]; exists {
|
|
||||||
// locInfo = li
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// var bookInfo models.BookInfo
|
|
||||||
// if bi, exists := bookInfoMap[product.StandardProductID]; exists {
|
|
||||||
// bookInfo = bi
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// catID := bookInfo.CatID
|
|
||||||
// if catID == nil {
|
|
||||||
// catID = datatypes.JSON("[]")
|
|
||||||
// }
|
|
||||||
// liveImage := product.LiveImage
|
|
||||||
// if liveImage == nil {
|
|
||||||
// liveImage = datatypes.JSON("{}")
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// now := time.Now().Unix()
|
|
||||||
//
|
|
||||||
// fmt.Printf("[DEBUG] 查重, self_id: %d, about_id: %d\n", product.ID, userInfo.AboutID)
|
|
||||||
// var existingBook models.ProductBook
|
|
||||||
// err := database.DB.Table(tableName).Where("self_id = ? AND about_id = ? AND is_del = 0", product.ID, userInfo.AboutID).First(&existingBook).Error
|
|
||||||
//
|
|
||||||
// if err != nil && errors.Is(err, gorm.ErrRecordNotFound) {
|
|
||||||
// fmt.Println("[DEBUG] 记录不存在，执行新增")
|
|
||||||
// bookRecord := models.ProductBook{
|
|
||||||
// SelfID: product.ID,
|
|
||||||
// AboutId: userInfo.AboutID,
|
|
||||||
// WarehouseID: warehouse.ID,
|
|
||||||
// WarehouseName: warehouse.Name,
|
|
||||||
// LocationID: locInfo.LocationID,
|
|
||||||
// LocationName: locInfo.Code,
|
|
||||||
// CategoryID: product.CategoryID,
|
|
||||||
// StandardProductID: product.StandardProductID,
|
|
||||||
// Fid: bookInfo.Fid,
|
|
||||||
// Type: bookInfo.Type,
|
|
||||||
// ISBN: isbn,
|
|
||||||
// FISBN: bookInfo.FISBN,
|
|
||||||
// BookName: bookInfo.BookName,
|
|
||||||
// FBookName: bookInfo.FBookName,
|
|
||||||
// Author: bookInfo.Author,
|
|
||||||
// Publishing: bookInfo.Publishing,
|
|
||||||
// PublicationTime: bookInfo.PublicationTime,
|
|
||||||
// Binding: bookInfo.Binding,
|
|
||||||
// PagesCount: bookInfo.PagesCount,
|
|
||||||
// WordsCount: bookInfo.WordsCount,
|
|
||||||
// Format: bookInfo.Format,
|
|
||||||
// CatID: catID,
|
|
||||||
// Name: product.Name,
|
|
||||||
// Appearance: product.Appearance,
|
|
||||||
// Barcode: product.Barcode,
|
|
||||||
// Price: product.Price,
|
|
||||||
// SalePrice: product.SalePrice,
|
|
||||||
// Cost: product.Cost,
|
|
||||||
// LiveImage: liveImage,
|
|
||||||
// IsBatchManaged: product.IsBatchManaged,
|
|
||||||
// IsShelfLifeManaged: product.IsShelfLifeManaged,
|
|
||||||
// Status: product.Status,
|
|
||||||
// CreatedAt: now,
|
|
||||||
// UpdatedAt: now,
|
|
||||||
// IsDel: 0,
|
|
||||||
// }
|
|
||||||
// if createErr := database.DB.Table(tableName).Create(&bookRecord).Error; createErr != nil {
|
|
||||||
// fmt.Printf("[DEBUG] 新增失败: %v\n", createErr)
|
|
||||||
// stmt := database.DB.Session(&gorm.Session{DryRun: true}).Table(tableName).Create(&bookRecord)
|
|
||||||
// utils.ErrorLog(constant.LoggerChannelWork, logrus.Fields{
|
|
||||||
// "source": "写入product_book分表失败",
|
|
||||||
// "user_id": userInfo.AboutID,
|
|
||||||
// "self_id": product.ID,
|
|
||||||
// "isbn": isbn,
|
|
||||||
// "table_name": tableName,
|
|
||||||
// "warehouse_id": warehouse.ID,
|
|
||||||
// "sql": stmt.Statement.SQL.String(),
|
|
||||||
// "vars": fmt.Sprintf("%v", stmt.Statement.Vars),
|
|
||||||
// "err_msg": createErr.Error(),
|
|
||||||
// })
|
|
||||||
// utils.FailWithRequestLog(constant.LoggerChannelWork, "写入product_book分表失败", createErr, c, gin.H{
|
|
||||||
// "product_id": product.ID,
|
|
||||||
// "isbn": isbn,
|
|
||||||
// "table_name": tableName,
|
|
||||||
// })
|
|
||||||
// return
|
|
||||||
// }
|
|
||||||
// fmt.Println("[DEBUG] 新增成功")
|
|
||||||
// } else if err == nil {
|
|
||||||
// fmt.Println("[DEBUG] 记录已存在，执行更新")
|
|
||||||
// updateData := map[string]interface{}{
|
|
||||||
// "warehouse_id": warehouse.ID,
|
|
||||||
// "warehouse_name": warehouse.Name,
|
|
||||||
// "location_id": locInfo.LocationID,
|
|
||||||
// "location_name": locInfo.Code,
|
|
||||||
// "category_id": product.CategoryID,
|
|
||||||
// "standard_product_id": product.StandardProductID,
|
|
||||||
// "name": product.Name,
|
|
||||||
// "book_name": bookInfo.BookName,
|
|
||||||
// "f_isbn": bookInfo.FISBN,
|
|
||||||
// "f_book_name": bookInfo.FBookName,
|
|
||||||
// "author": bookInfo.Author,
|
|
||||||
// "publishing": bookInfo.Publishing,
|
|
||||||
// "publication_time": bookInfo.PublicationTime,
|
|
||||||
// "binding": bookInfo.Binding,
|
|
||||||
// "pages_count": bookInfo.PagesCount,
|
|
||||||
// "words_count": bookInfo.WordsCount,
|
|
||||||
// "format": bookInfo.Format,
|
|
||||||
// "cat_id": catID,
|
|
||||||
// "appearance": product.Appearance,
|
|
||||||
// "barcode": product.Barcode,
|
|
||||||
// "price": product.Price,
|
|
||||||
// "sale_price": product.SalePrice,
|
|
||||||
// "cost": product.Cost,
|
|
||||||
// "live_image": liveImage,
|
|
||||||
// "is_batch_managed": product.IsBatchManaged,
|
|
||||||
// "is_shelf_life_managed": product.IsShelfLifeManaged,
|
|
||||||
// "status": product.Status,
|
|
||||||
// "updated_at": now,
|
|
||||||
// }
|
|
||||||
// if updateErr := database.DB.Table(tableName).Model(&existingBook).Updates(updateData).Error; updateErr != nil {
|
|
||||||
// fmt.Printf("[DEBUG] 更新失败: %v\n", updateErr)
|
|
||||||
// utils.FailWithRequestLog(constant.LoggerChannelWork, "更新product_book分表失败", updateErr, c, gin.H{
|
|
||||||
// "product_id": product.ID,
|
|
||||||
// "isbn": isbn,
|
|
||||||
// "table_name": tableName,
|
|
||||||
// })
|
|
||||||
// return
|
|
||||||
// }
|
|
||||||
// fmt.Println("[DEBUG] 更新成功")
|
|
||||||
// } else {
|
|
||||||
// fmt.Printf("[DEBUG] 查询分表异常: %v\n", err)
|
|
||||||
// utils.FailWithRequestLog(constant.LoggerChannelWork, "查询product_book分表失败", err, c, gin.H{
|
|
||||||
// "product_id": product.ID,
|
|
||||||
// "isbn": isbn,
|
|
||||||
// "table_name": tableName,
|
|
||||||
// })
|
|
||||||
// return
|
|
||||||
// }
|
|
||||||
//}
|
|
||||||
//fmt.Println("[DEBUG] product_book分表写入全部完成")
|
|
||||||
|
|
||||||
fmt.Printf("提交入库成功，入库单ID: %d, 波次任务ID: %d, 波次任务批次号: %s\n", req.ReceivingOrderID, req.WaveTaskID)
|
|
||||||
go func(receivingOrderID, aboutID, waveTaskID int64, itemProductIDs []int64) {
|
go func(receivingOrderID, aboutID, waveTaskID int64, itemProductIDs []int64) {
|
||||||
databaseConn := database.DB
|
databaseConn := database.DB
|
||||||
|
|
||||||
@ -438,6 +197,7 @@ func (r *ProcessApi) SubmitReceiving(c *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 同步给主库对应的product_book_xx中
|
||||||
// 同步给主库对应的product_book_xx中
|
// 同步给主库对应的product_book_xx中
|
||||||
// 获取租户数据库连接
|
// 获取租户数据库连接
|
||||||
tenantDB, err := database.GetTenantDB(aboutID)
|
tenantDB, err := database.GetTenantDB(aboutID)
|
||||||
@ -645,7 +405,6 @@ func (r *ProcessApi) SubmitReceiving(c *gin.Context) {
|
|||||||
warehouseId := warehouse.ID
|
warehouseId := warehouse.ID
|
||||||
|
|
||||||
productIds := make([]string, len(itemProductIDs))
|
productIds := make([]string, len(itemProductIDs))
|
||||||
|
|
||||||
for i, pid := range itemProductIDs {
|
for i, pid := range itemProductIDs {
|
||||||
productIds[i] = fmt.Sprintf("%d", pid)
|
productIds[i] = fmt.Sprintf("%d", pid)
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,281 +0,0 @@
|
|||||||
package controllers
|
|
||||||
|
|
||||||
import (
|
|
||||||
"encoding/json"
|
|
||||||
"fmt"
|
|
||||||
"strconv"
|
|
||||||
|
|
||||||
"github.com/gin-gonic/gin"
|
|
||||||
"github.com/sirupsen/logrus"
|
|
||||||
"gorm.io/datatypes"
|
|
||||||
"gorm.io/gorm"
|
|
||||||
"psi/constant"
|
|
||||||
"psi/database"
|
|
||||||
"psi/es"
|
|
||||||
"psi/models"
|
|
||||||
systemReq "psi/models/request"
|
|
||||||
systemRes "psi/models/response"
|
|
||||||
"psi/service"
|
|
||||||
"psi/utils"
|
|
||||||
"time"
|
|
||||||
)
|
|
||||||
|
|
||||||
type bookFieldData struct {
|
|
||||||
Fid int64
|
|
||||||
BookType int8
|
|
||||||
ISBN string
|
|
||||||
FISBN string
|
|
||||||
BookName string
|
|
||||||
FBookName string
|
|
||||||
Author string
|
|
||||||
Publishing string
|
|
||||||
PublicationTime int64
|
|
||||||
Binding string
|
|
||||||
PagesCount int64
|
|
||||||
WordsCount int64
|
|
||||||
Format int64
|
|
||||||
CatID datatypes.JSON
|
|
||||||
}
|
|
||||||
|
|
||||||
// defaultCatID 默认分类ID
|
|
||||||
func defaultCatID() datatypes.JSON {
|
|
||||||
return datatypes.JSON(`{"xian_yu_cat_id": "", "kong_fu_zi_cat_id": "", "pin_duo_duo_cat_id": ""}`)
|
|
||||||
}
|
|
||||||
|
|
||||||
// bookFieldsFromDB 从数据库中获取书籍信息
|
|
||||||
func bookFieldsFromDB(bi models.BookInfo) bookFieldData {
|
|
||||||
catID := bi.CatID
|
|
||||||
if catID == nil {
|
|
||||||
catID = defaultCatID()
|
|
||||||
}
|
|
||||||
return bookFieldData{
|
|
||||||
Fid: bi.Fid, BookType: bi.Type, ISBN: bi.ISBN, FISBN: bi.FISBN,
|
|
||||||
BookName: bi.BookName, FBookName: bi.FBookName, Author: bi.Author,
|
|
||||||
Publishing: bi.Publishing, PublicationTime: bi.PublicationTime,
|
|
||||||
Binding: bi.Binding, PagesCount: bi.PagesCount, WordsCount: bi.WordsCount,
|
|
||||||
Format: bi.Format, CatID: catID,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// bookFieldsFromES 从ES中获取书籍信息
|
|
||||||
func bookFieldsFromES(eb *systemRes.ESBook, isbn string) bookFieldData {
|
|
||||||
var bookType int8
|
|
||||||
if eb.IsSuit > 0 {
|
|
||||||
bookType = 2
|
|
||||||
}
|
|
||||||
var publicationTime int64
|
|
||||||
if eb.PublicationTime != "" {
|
|
||||||
if v, err := strconv.ParseInt(eb.PublicationTime, 10, 64); err == nil {
|
|
||||||
publicationTime = v
|
|
||||||
}
|
|
||||||
}
|
|
||||||
var pagesCount int64
|
|
||||||
if v, err := strconv.ParseInt(string(eb.PageCount), 10, 64); err == nil {
|
|
||||||
pagesCount = v
|
|
||||||
}
|
|
||||||
var wordsCount int64
|
|
||||||
if v, err := strconv.ParseInt(string(eb.WordCount), 10, 64); err == nil {
|
|
||||||
wordsCount = v
|
|
||||||
}
|
|
||||||
var formatVal int64
|
|
||||||
if v, err := strconv.ParseInt(string(eb.BookFormat), 10, 64); err == nil {
|
|
||||||
formatVal = v
|
|
||||||
}
|
|
||||||
catID := defaultCatID()
|
|
||||||
if catBytes, err := json.Marshal(eb.CatId); err == nil {
|
|
||||||
emptyCat := es.CatIdObject{}
|
|
||||||
if eb.CatId != emptyCat {
|
|
||||||
catID = catBytes
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return bookFieldData{
|
|
||||||
Fid: eb.Fid, BookType: bookType, ISBN: isbn, FISBN: eb.FISBN,
|
|
||||||
BookName: eb.BookName.Value, FBookName: eb.FBookName.Value, Author: eb.Author,
|
|
||||||
Publishing: eb.Publisher, PublicationTime: publicationTime,
|
|
||||||
Binding: eb.BindingLayout, PagesCount: pagesCount, WordsCount: wordsCount,
|
|
||||||
Format: formatVal, CatID: catID,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// syncProductBookToMainDB 入库后同步商品信息到主库 product_book_xx 分表
|
|
||||||
func (r *ProcessApi) syncProductBookToMainDB(req systemReq.ReceivingSubmitRequest, userInfo utils.UserInfo, c *gin.Context) {
|
|
||||||
itemProductIDs := make([]int64, len(req.Items))
|
|
||||||
for i, item := range req.Items {
|
|
||||||
itemProductIDs[i] = item.ProductID
|
|
||||||
}
|
|
||||||
|
|
||||||
tenantDB, err := database.GetTenantDB(userInfo.AboutID)
|
|
||||||
if err != nil {
|
|
||||||
utils.FailWithRequestLog(constant.LoggerChannelWork, "获取租户数据库连接失败", err, c, gin.H{"about_id": userInfo.AboutID})
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
var receivingOrder models.ReceivingOrder
|
|
||||||
if err := tenantDB.Where("id = ? AND is_del = 0", req.ReceivingOrderID).First(&receivingOrder).Error; err != nil {
|
|
||||||
utils.FailWithRequestLog(constant.LoggerChannelWork, "查询入库单失败", err, c, gin.H{"receiving_order_id": req.ReceivingOrderID})
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
var warehouse models.Warehouse
|
|
||||||
if err := tenantDB.Where("id = ? AND is_del = 0", receivingOrder.WarehouseID).First(&warehouse).Error; err != nil {
|
|
||||||
utils.FailWithRequestLog(constant.LoggerChannelWork, "查询仓库失败", err, c, gin.H{"warehouse_id": receivingOrder.WarehouseID})
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
var products []models.Product
|
|
||||||
if err := tenantDB.Where("id IN ? AND is_del = 0", itemProductIDs).Find(&products).Error; err != nil {
|
|
||||||
utils.FailWithRequestLog(constant.LoggerChannelWork, "查询商品列表失败", err, c, gin.H{"product_ids": itemProductIDs})
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
type locationInfo struct {
|
|
||||||
LocationID int64
|
|
||||||
Code string
|
|
||||||
}
|
|
||||||
locationMap := make(map[int64]locationInfo)
|
|
||||||
for _, product := range products {
|
|
||||||
var invDetail models.InventoryDetail
|
|
||||||
if err := tenantDB.Where("product_id = ? AND warehouse_id = ? AND is_del = 0", product.ID, receivingOrder.WarehouseID).First(&invDetail).Error; err == nil {
|
|
||||||
var loc models.Location
|
|
||||||
if err := tenantDB.Where("id = ? AND is_del = 0", invDetail.LocationID).First(&loc).Error; err == nil {
|
|
||||||
locationMap[product.ID] = locationInfo{LocationID: loc.ID, Code: loc.Code}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// 构建书籍信息：有StandardProductID查book_info表，否则查ES
|
|
||||||
bookSvc := service.BookService{}
|
|
||||||
dbBookMap := make(map[int64]models.BookInfo)
|
|
||||||
esBookMap := make(map[string]*systemRes.ESBook)
|
|
||||||
|
|
||||||
for _, product := range products {
|
|
||||||
if product.Barcode == "" {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if product.StandardProductID > 0 {
|
|
||||||
if _, exists := dbBookMap[product.StandardProductID]; !exists {
|
|
||||||
var bookInfo models.BookInfo
|
|
||||||
if err := database.DB.Where("id = ?", product.StandardProductID).First(&bookInfo).Error; err == nil {
|
|
||||||
dbBookMap[product.StandardProductID] = bookInfo
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
}
|
|
||||||
isbn := product.Barcode
|
|
||||||
if _, exists := esBookMap[isbn]; !exists {
|
|
||||||
esBook, esErr := bookSvc.GetBookInfo(systemReq.BookRequest{Isbn: isbn})
|
|
||||||
if esErr != nil {
|
|
||||||
utils.ErrorLog(constant.LoggerChannelWork, logrus.Fields{
|
|
||||||
"source": "ES查询BookInfo失败", "isbn": isbn, "err_msg": esErr.Error(),
|
|
||||||
})
|
|
||||||
}
|
|
||||||
if esBook != nil {
|
|
||||||
esBookMap[isbn] = esBook
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// 逐个写入分表
|
|
||||||
now := time.Now().Unix()
|
|
||||||
for _, product := range products {
|
|
||||||
isbn := product.Barcode
|
|
||||||
if isbn == "" {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
var fields bookFieldData
|
|
||||||
var hasBookInfo bool
|
|
||||||
|
|
||||||
if bi, exists := dbBookMap[product.StandardProductID]; product.StandardProductID > 0 && exists {
|
|
||||||
fields = bookFieldsFromDB(bi)
|
|
||||||
hasBookInfo = true
|
|
||||||
} else if eb, exists := esBookMap[isbn]; exists {
|
|
||||||
fields = bookFieldsFromES(eb, isbn)
|
|
||||||
hasBookInfo = true
|
|
||||||
}
|
|
||||||
|
|
||||||
if !hasBookInfo {
|
|
||||||
utils.ErrorLog(constant.LoggerChannelWork, logrus.Fields{
|
|
||||||
"source": "书籍信息未找到，跳过同步",
|
|
||||||
"product_id": product.ID,
|
|
||||||
"isbn": isbn,
|
|
||||||
"about_id": userInfo.AboutID,
|
|
||||||
})
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
tableName := models.ProductBookTableName(isbn)
|
|
||||||
var locInfo locationInfo
|
|
||||||
if li, exists := locationMap[product.ID]; exists {
|
|
||||||
locInfo = li
|
|
||||||
}
|
|
||||||
|
|
||||||
liveImage := product.LiveImage
|
|
||||||
if liveImage == nil {
|
|
||||||
liveImage = datatypes.JSON("[]")
|
|
||||||
}
|
|
||||||
|
|
||||||
var existingBook models.ProductBook
|
|
||||||
err := database.DB.Table(tableName).Where("self_id = ? AND about_id = ? AND is_del = 0", product.ID, userInfo.AboutID).First(&existingBook).Error
|
|
||||||
|
|
||||||
if err != nil && err == gorm.ErrRecordNotFound {
|
|
||||||
bookRecord := models.ProductBook{
|
|
||||||
SelfID: product.ID, AboutId: userInfo.AboutID,
|
|
||||||
WarehouseID: warehouse.ID, WarehouseName: warehouse.Name,
|
|
||||||
LocationID: locInfo.LocationID, LocationName: locInfo.Code,
|
|
||||||
CategoryID: product.CategoryID, StandardProductID: product.StandardProductID,
|
|
||||||
Fid: fields.Fid, Type: fields.BookType, ISBN: isbn, FISBN: fields.FISBN,
|
|
||||||
BookName: fields.BookName, FBookName: fields.FBookName,
|
|
||||||
Author: fields.Author, Publishing: fields.Publishing,
|
|
||||||
PublicationTime: fields.PublicationTime, Binding: fields.Binding,
|
|
||||||
PagesCount: fields.PagesCount, WordsCount: fields.WordsCount,
|
|
||||||
Format: fields.Format, CatID: fields.CatID,
|
|
||||||
Name: product.Name, Appearance: product.Appearance,
|
|
||||||
Barcode: product.Barcode, Price: product.Price,
|
|
||||||
SalePrice: product.SalePrice, Cost: product.Cost,
|
|
||||||
LiveImage: liveImage, IsBatchManaged: product.IsBatchManaged,
|
|
||||||
IsShelfLifeManaged: product.IsShelfLifeManaged, Status: product.Status,
|
|
||||||
CreatedAt: now, UpdatedAt: now, IsDel: 0,
|
|
||||||
}
|
|
||||||
if createErr := database.DB.Table(tableName).Create(&bookRecord).Error; createErr != nil {
|
|
||||||
utils.FailWithRequestLog(constant.LoggerChannelWork, "写入product_book分表失败", createErr, c, gin.H{
|
|
||||||
"product_id": product.ID, "isbn": isbn, "table_name": tableName,
|
|
||||||
})
|
|
||||||
return
|
|
||||||
}
|
|
||||||
} else if err == nil {
|
|
||||||
updateData := map[string]interface{}{
|
|
||||||
"warehouse_id": warehouse.ID, "warehouse_name": warehouse.Name,
|
|
||||||
"location_id": locInfo.LocationID, "location_name": locInfo.Code,
|
|
||||||
"category_id": product.CategoryID, "standard_product_id": product.StandardProductID,
|
|
||||||
"fid": fields.Fid, "type": fields.BookType,
|
|
||||||
"f_isbn": fields.FISBN, "book_name": fields.BookName,
|
|
||||||
"f_book_name": fields.FBookName, "author": fields.Author,
|
|
||||||
"publishing": fields.Publishing, "publication_time": fields.PublicationTime,
|
|
||||||
"binding": fields.Binding, "pages_count": fields.PagesCount,
|
|
||||||
"words_count": fields.WordsCount, "format": fields.Format, "cat_id": fields.CatID,
|
|
||||||
"name": product.Name, "appearance": product.Appearance,
|
|
||||||
"barcode": product.Barcode, "price": product.Price,
|
|
||||||
"sale_price": product.SalePrice, "cost": product.Cost,
|
|
||||||
"live_image": liveImage, "is_batch_managed": product.IsBatchManaged,
|
|
||||||
"is_shelf_life_managed": product.IsShelfLifeManaged, "status": product.Status,
|
|
||||||
"updated_at": now,
|
|
||||||
}
|
|
||||||
if updateErr := database.DB.Table(tableName).Model(&existingBook).Updates(updateData).Error; updateErr != nil {
|
|
||||||
utils.FailWithRequestLog(constant.LoggerChannelWork, "更新product_book分表失败", updateErr, c, gin.H{
|
|
||||||
"product_id": product.ID, "isbn": isbn, "table_name": tableName,
|
|
||||||
})
|
|
||||||
return
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
utils.FailWithRequestLog(constant.LoggerChannelWork, "查询product_book分表失败", err, c, gin.H{
|
|
||||||
"product_id": product.ID, "isbn": isbn, "table_name": tableName,
|
|
||||||
})
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fmt.Printf("同步product_book完成, 入库单ID: %d, 商品数: %d\n", req.ReceivingOrderID, len(products))
|
|
||||||
}
|
|
||||||
@ -34,10 +34,10 @@ type WaveItemRequest struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type BindWaveRequest struct {
|
type BindWaveRequest struct {
|
||||||
WaveNo string `form:"wave_no" binding:"required"` // 波次号
|
WaveNo string `form:"wave_no" binding:"required"`
|
||||||
Operator string `form:"operator" binding:"required"` // 操作人
|
Operator string `form:"operator" binding:"required"`
|
||||||
OperatorID int64 `form:"operator_id" binding:"required"` // 操作人ID
|
OperatorID int64 `form:"operator_id" binding:"required"`
|
||||||
Remark string `form:"remark"` // 备注
|
Remark string `form:"remark"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type GetIdRequest struct {
|
type GetIdRequest struct {
|
||||||
@ -45,10 +45,10 @@ type GetIdRequest struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type ReceivingSubmitRequest struct {
|
type ReceivingSubmitRequest struct {
|
||||||
ReceivingOrderID int64 `form:"receiving_order_id" binding:"required"` // 入库单ID
|
ReceivingOrderID int64 `form:"receiving_order_id" binding:"required"`
|
||||||
WaveTaskID int64 `form:"wave_task_id" binding:"required"` // 波次ID
|
WaveTaskID int64 `form:"wave_task_id" binding:"required"`
|
||||||
Force int8 `form:"force"` // 强制
|
Force int8 `form:"force"`
|
||||||
Items []ReceivingItemRequest `form:"items[]"` // 入库单项
|
Items []ReceivingItemRequest `form:"items[]"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type ReceivingItemRequest struct {
|
type ReceivingItemRequest struct {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user