2.从系统导出的excel数据,在外部对excel某一列进行更改时,新增的要回传到原来的地方;并对改动的地方进行覆盖。
3.销售单管理、出库管理、发货单三个接口里面展示第三方订单编号和快递单号
4.选择多个仓库时,只要选择发货单子就会报错
5.在这个/api/split-account-deduction-log/create接口里,当传参时,如果参数 total_amount 是0,则会报错 {"code":204,"data":{},"msg":"TotalAmount不能为空"} 0是金额数字,不能当空值进行判断(T)
传递参数created_by,没有往数据表里写入
6.商品销毁的同时写入日志,也能通过读取这个日志,还原销毁的商品。传出这个新增的接口
7.新增一个不需要签名认证的分帐扣钱日志列表接口,新增一个返回字段buniness_no,并对这个字段进行模糊查询。
测试接口:/open/split-account-deduction-log/list
8.增加个新接口:首先 调用 /api/sales-order/create 创建销售订单的时候会锁定库存,
现在我需要一个解锁库存的接口,传递参数是订单编号
POST /api/sales-order/unlock-inventory // 解锁销售订单库存
/api/split-account-deduction-log/update /api/sales-order/unlock-inventory 在这两个接口里不需要签名认证
/api/sales-order/unlock-inventory 在这个接口里面返回解锁的所有商品信息
/api/split-account-deduction-log/update 在这个接口里面的status也需要更改,status没有变化
208 lines
8.0 KiB
Go
208 lines
8.0 KiB
Go
package service
|
|
|
|
import (
|
|
"fmt"
|
|
"psi/database"
|
|
"psi/models"
|
|
systemReq "psi/models/request"
|
|
systemRes "psi/models/response"
|
|
"psi/utils"
|
|
|
|
"gorm.io/gorm"
|
|
)
|
|
|
|
type OutboundService struct{}
|
|
|
|
// GetOutboundOrderList 获取出库单列表
|
|
func (s *OutboundService) GetOutboundOrderList(req systemReq.GetOutboundOrderListRequest, creatorID int64, role int64, db ...*gorm.DB) (*systemRes.OutboundOrderListResponse, error) {
|
|
databaseConn := database.OptionalDB(db...)
|
|
|
|
if req.Page < 1 {
|
|
req.Page = 1
|
|
}
|
|
if req.PageSize < 1 || req.PageSize > 100 {
|
|
req.PageSize = 20
|
|
}
|
|
|
|
query := databaseConn.Model(&models.OutboundOrder{}).Where("outbound_order.is_del = ?", 0)
|
|
|
|
if req.Status > 0 {
|
|
query = query.Where("outbound_order.status = ?", req.Status)
|
|
}
|
|
if req.CustomerID > 0 {
|
|
query = query.Where("outbound_order.customer_id = ?", req.CustomerID)
|
|
}
|
|
if req.WarehouseID > 0 {
|
|
query = query.Where("outbound_order.warehouse_id = ?", req.WarehouseID)
|
|
}
|
|
if req.OutNo != "" {
|
|
query = query.Where("outbound_order.out_no LIKE ?", "%"+req.OutNo+"%")
|
|
}
|
|
if req.StartDate > 0 {
|
|
query = query.Where("outbound_order.created_at >= ?", req.StartDate)
|
|
}
|
|
if req.EndDate > 0 {
|
|
query = query.Where("outbound_order.created_at <= ?", req.EndDate)
|
|
}
|
|
|
|
if req.AssociationOrderNo != "" {
|
|
subQuery := databaseConn.Table("outbound_order_item").
|
|
Select("outbound_order_item.out_order_id").
|
|
Joins("INNER JOIN sales_order ON outbound_order_item.sales_order_id = sales_order.id AND sales_order.is_del = 0").
|
|
Where("outbound_order_item.is_del = 0 AND sales_order.association_order_no LIKE ?", "%"+req.AssociationOrderNo+"%")
|
|
query = query.Where("outbound_order.id IN (?)", subQuery)
|
|
}
|
|
if req.LogisticsNo != "" {
|
|
subQuery := databaseConn.Table("outbound_order_item").
|
|
Select("outbound_order_item.out_order_id").
|
|
Joins("INNER JOIN sales_order_item ON outbound_order_item.sales_order_id = sales_order_item.sales_order_id AND sales_order_item.is_del = 0").
|
|
Where("outbound_order_item.is_del = 0 AND sales_order_item.logistics_no LIKE ?", "%"+req.LogisticsNo+"%")
|
|
query = query.Where("outbound_order.id IN (?)", subQuery)
|
|
}
|
|
|
|
var total int64
|
|
if err := query.Count(&total).Error; err != nil {
|
|
return nil, utils.NewError("查询总数失败")
|
|
}
|
|
|
|
if total == 0 {
|
|
return &systemRes.OutboundOrderListResponse{
|
|
List: []systemRes.OutboundOrderItem{},
|
|
Total: 0,
|
|
Page: req.Page,
|
|
PageSize: req.PageSize,
|
|
}, nil
|
|
}
|
|
|
|
var orders []systemRes.OutboundOrderWithInfo
|
|
offset := (req.Page - 1) * req.PageSize
|
|
if err := query.Select("outbound_order.*, c.name as customer_name, w.name as warehouse_name").
|
|
Joins("LEFT JOIN customer c ON outbound_order.customer_id = c.id AND c.is_del = 0").
|
|
Joins("LEFT JOIN warehouse w ON outbound_order.warehouse_id = w.id AND w.is_del = 0").
|
|
Order("outbound_order.created_at DESC").
|
|
Offset(offset).
|
|
Limit(req.PageSize).
|
|
Find(&orders).Error; err != nil {
|
|
return nil, utils.NewError("查询出库单列表失败")
|
|
}
|
|
|
|
orderItems := make([]systemRes.OutboundOrderItem, 0, len(orders))
|
|
for _, order := range orders {
|
|
var shopList []systemRes.OutboundShopInfo
|
|
|
|
var shops []struct {
|
|
ShopName string `gorm:"column:shop_name"`
|
|
ShopType int8 `gorm:"column:shop_type"`
|
|
}
|
|
|
|
databaseConn.Table("outbound_order_item").
|
|
Select("DISTINCT so.sales_person as shop_name, so.shop_type as shop_type").
|
|
Joins("INNER JOIN sales_order so ON outbound_order_item.sales_order_id = so.id AND so.is_del = 0").
|
|
Where("outbound_order_item.out_order_id = ? AND outbound_order_item.is_del = ?", order.ID, 0).
|
|
Scan(&shops)
|
|
|
|
for _, shop := range shops {
|
|
shopList = append(shopList, systemRes.OutboundShopInfo{
|
|
ShopName: shop.ShopName,
|
|
ShopType: shop.ShopType,
|
|
ShopTypeText: systemRes.GetShopTypeText(shop.ShopType),
|
|
})
|
|
}
|
|
|
|
var associationOrderNos string
|
|
databaseConn.Table("outbound_order_item").
|
|
Select("GROUP_CONCAT(DISTINCT so.association_order_no SEPARATOR ', ')").
|
|
Joins("INNER JOIN sales_order so ON outbound_order_item.sales_order_id = so.id AND so.is_del = 0").
|
|
Where("outbound_order_item.out_order_id = ? AND outbound_order_item.is_del = ? AND so.association_order_no != ''", order.ID, 0).
|
|
Scan(&associationOrderNos)
|
|
|
|
var logisticsNos string
|
|
databaseConn.Table("outbound_order_item").
|
|
Select("GROUP_CONCAT(DISTINCT soi.logistics_no SEPARATOR ', ')").
|
|
Joins("INNER JOIN sales_order_item soi ON outbound_order_item.sales_order_id = soi.sales_order_id AND outbound_order_item.product_id = soi.product_id AND soi.is_del = 0").
|
|
Where("outbound_order_item.out_order_id = ? AND outbound_order_item.is_del = ? AND soi.logistics_no != ''", order.ID, 0).
|
|
Scan(&logisticsNos)
|
|
|
|
orderItems = append(orderItems, systemRes.ConvertOutboundOrderToItem(
|
|
order.OutboundOrder,
|
|
order.CustomerName,
|
|
order.WarehouseName,
|
|
shopList,
|
|
associationOrderNos,
|
|
logisticsNos,
|
|
))
|
|
}
|
|
|
|
return &systemRes.OutboundOrderListResponse{
|
|
List: orderItems,
|
|
Total: total,
|
|
Page: req.Page,
|
|
PageSize: req.PageSize,
|
|
}, nil
|
|
}
|
|
|
|
// GetOutboundOrderDetail 获取出库单详情
|
|
func (s *OutboundService) GetOutboundOrderDetail(id int64, creatorID int64, role int64, db ...*gorm.DB) (*systemRes.OutboundOrderDetailResponse, error) {
|
|
databaseConn := database.OptionalDB(db...)
|
|
|
|
query := databaseConn.Model(&models.OutboundOrder{}).
|
|
Select("outbound_order.*, c.name as customer_name, w.name as warehouse_name").
|
|
Joins("LEFT JOIN customer c ON outbound_order.customer_id = c.id AND c.is_del = 0").
|
|
Joins("LEFT JOIN warehouse w ON outbound_order.warehouse_id = w.id AND w.is_del = 0").
|
|
Where("outbound_order.id = ? AND outbound_order.is_del = ?", id, 0)
|
|
|
|
// 打印SQL调试
|
|
sqlStmt := query.Session(&gorm.Session{DryRun: true}).First(&systemRes.OutboundOrderWithInfo{}).Statement
|
|
fmt.Println("Generated SQL:", sqlStmt.SQL.String(), "Vars:", sqlStmt.Vars)
|
|
|
|
var order systemRes.OutboundOrderWithInfo
|
|
result := query.First(&order)
|
|
|
|
if result.Error != nil {
|
|
return nil, utils.NewError("出库单不存在")
|
|
}
|
|
|
|
var items []systemRes.OutboundOrderItemWithProduct
|
|
itemQuery := databaseConn.Model(&models.OutboundOrderItem{}).
|
|
Select("outbound_order_item.*, p.name as product_name, p.barcode as product_code, p.category_id, c.name as category_name, l.code as location_name, w.name as warehouse_name, w.code as warehouse_code, so.so_no as sales_order_no").
|
|
Joins("LEFT JOIN product p ON outbound_order_item.product_id = p.id AND p.is_del = 0").
|
|
Joins("LEFT JOIN product_category c ON p.category_id = c.id AND c.is_del = 0").
|
|
Joins("LEFT JOIN location l ON outbound_order_item.location_id = l.id AND l.is_del = 0").
|
|
Joins("LEFT JOIN warehouse w ON l.warehouse_id = w.id AND w.is_del = 0").
|
|
Joins("LEFT JOIN sales_order so ON outbound_order_item.sales_order_id = so.id AND so.is_del = 0").
|
|
Where("outbound_order_item.out_order_id = ? AND outbound_order_item.is_del = ?", order.ID, 0)
|
|
|
|
// 打印SQL调试
|
|
itemSqlStmt := itemQuery.Session(&gorm.Session{DryRun: true}).Find(&[]systemRes.OutboundOrderItemWithProduct{}).Statement
|
|
fmt.Println("Generated SQL:", itemSqlStmt.SQL.String(), "Vars:", itemSqlStmt.Vars)
|
|
|
|
itemQuery.Find(&items)
|
|
|
|
detailItems := make([]systemRes.OutboundOrderDetailItem, 0, len(items))
|
|
for _, item := range items {
|
|
detailItems = append(detailItems, systemRes.OutboundOrderDetailItem{
|
|
ID: item.ID,
|
|
OutboundOrderID: item.OutOrderID,
|
|
SalesOrderNo: item.SalesOrderNo,
|
|
ProductID: item.ProductID,
|
|
ProductName: item.ProductName,
|
|
ProductCode: item.ProductCode,
|
|
CategoryID: item.CategoryID,
|
|
CategoryName: item.CategoryName,
|
|
LocationID: item.LocationID,
|
|
LocationName: item.LocationName,
|
|
WarehouseName: item.WarehouseName,
|
|
WarehouseCode: item.WarehouseCode,
|
|
BatchNo: item.BatchNo,
|
|
ProductionDate: item.ProductionDate,
|
|
ExpiryDate: item.ExpiryDate,
|
|
Quantity: item.Quantity,
|
|
CreatedAt: item.CreatedAt,
|
|
UpdatedAt: item.UpdatedAt,
|
|
})
|
|
}
|
|
|
|
detail := systemRes.ConvertOutboundOrderToDetail(order.OutboundOrder, order.CustomerName, order.WarehouseName, detailItems)
|
|
return &detail, nil
|
|
}
|