From 230ce554d9a42e5c1e322bf13d186f87651edd96 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 12 一月 2024 10:49:03 +0800
Subject: [PATCH] 物料只查有库存的
---
controllers/operation.go | 190 +++++++++++++++++++++++++++++++++-------------
1 files changed, 135 insertions(+), 55 deletions(-)
diff --git a/controllers/operation.go b/controllers/operation.go
index e75abc4..1dda2db 100644
--- a/controllers/operation.go
+++ b/controllers/operation.go
@@ -6,29 +6,31 @@
"errors"
"fmt"
"github.com/gin-gonic/gin"
+ uuid "github.com/satori/go.uuid"
"github.com/shopspring/decimal"
"github.com/xuri/excelize/v2"
- "google.golang.org/grpc"
- "google.golang.org/grpc/credentials/insecure"
"gorm.io/gorm"
"os"
"sort"
"strconv"
"strings"
"time"
- "wms/conf"
"wms/constvar"
"wms/extend/code"
"wms/extend/util"
"wms/models"
"wms/opa"
"wms/pkg/logx"
+ "wms/pkg/mysqlx"
"wms/pkg/structx"
"wms/proto/client"
+ "wms/proto/init_client"
+ "wms/proto/inventory_order"
"wms/proto/product_inventory"
"wms/proto/purchase_wms"
"wms/proto/supplier"
"wms/request"
+ "wms/response"
"wms/service"
"wms/utils/http"
"wms/utils/upload"
@@ -76,8 +78,19 @@
}
params.Status = constvar.OperationStatus_Ready
- params.Number = strconv.FormatInt(time.Now().Unix(), 10)
+ //params.Number = strconv.FormatInt(time.Now().Unix(), 10)
params.BaseOperationType = operationType.BaseOperationType
+
+ var numberNum int64
+ if err := mysqlx.GetDB().Model(&models.Operation{}).Where("number=?", params.Number).Count(&numberNum).Error; err != nil {
+ util.ResponseFormat(c, code.RequestParamError, err.Error())
+ return
+ }
+ if numberNum > 0 {
+ util.ResponseFormat(c, code.RequestParamError, "鍗曞彿宸插瓨鍦�")
+ return
+ }
+
if err := models.NewOperationSearch().Create(¶ms); err != nil {
logx.Errorf("Operation create err: %v", err)
util.ResponseFormat(c, code.SaveFail, "娣诲姞澶辫触锛�"+err.Error())
@@ -142,6 +155,10 @@
func (slf OperationController) CheckParams(params models.Operation) error {
if params.SourceNumber == "" {
return errors.New("璇峰～鍏ユ簮鍗曞彿")
+ }
+
+ if params.Number == "" {
+ return errors.New("璇峰～鍏ュ崟鍙�")
}
if params.OperationTypeId == 0 && int(params.BaseOperationType) == 0 {
@@ -363,7 +380,7 @@
util.ResponseFormat(c, code.RequestError, "璇ュ嚭鍏ュ簱淇℃伅鏃犳硶瀹屾垚")
return
}
- if err := models.WithTransaction(func(tx *gorm.DB) error {
+ err = models.WithTransaction(func(tx *gorm.DB) error {
if err := models.NewOperationSearch().SetOrm(tx).SetID(id).Update(&models.Operation{Status: constvar.OperationStatus_Finish, AuditDate: time.Now().Format("2006-01-02 15:04:05")}); err != nil {
return err
@@ -523,8 +540,8 @@
return err
}
}
- if operation.SourceNumber != "" {
- go UpdatePurchaseStatus(operation.SourceNumber)
+ if operation.Source != "" {
+ go UpdatePurchaseStatus(operation.Source, operation.SourceNumber)
}
}
@@ -556,10 +573,13 @@
}
locAmount, res := models.NewLocationProductAmountSearch().
SetProductId(v.ID).
- SetLocationId(operation.ToLocationID).
+ SetLocationId(operation.FromLocationID).
FirstRes()
if res.Error != nil {
- return err
+ if res.Error == gorm.ErrRecordNotFound {
+ return errors.New("褰撳墠浠撳簱娌℃湁璇ヤ骇鍝�,璇峰厛鍏ュ簱")
+ }
+ return res.Error
}
if locAmount.Amount.LessThan(value) {
return errors.New(fmt.Sprintf("浜у搧锛�%v,搴撳瓨锛�%v,鍑哄簱锛�%v,鏁伴噺涓嶅锛屾棤娉曞畬鎴愬嚭搴撴搷浣�", v.Name, v.Amount.String(), value.String()))
@@ -569,8 +589,8 @@
return err
}
}
- if operation.SourceNumber != "" {
- go UpdateSalesDetailStatus(operation.SourceNumber)
+ if operation.Source != "" {
+ go UpdateOutStatus(operation.Source, operation.SourceNumber, 4)
}
}
@@ -723,7 +743,8 @@
}
}
return nil
- }); err != nil {
+ })
+ if err != nil {
util.ResponseFormat(c, code.RequestError, err.Error())
return
}
@@ -765,50 +786,64 @@
return nil
}
-var (
- ProductInventoryServiceConn *grpc.ClientConn
- PurchaseServiceConn *grpc.ClientConn
-)
+//var (
+// ProductInventoryServiceConn *grpc.ClientConn
+// PurchaseServiceConn *grpc.ClientConn
+//)
+//
+//func InitProductInventoryServiceConn() {
+// var err error
+// ProductInventoryServiceConn, err = grpc.Dial(conf.GrpcServerConf.CrmAddr, grpc.WithTransportCredentials(insecure.NewCredentials()))
+// if err != nil {
+// logx.Errorf("grpc dial product service error: %v", err.Error())
+// return
+// }
+// PurchaseServiceConn, err = grpc.Dial(conf.GrpcServerConf.SrmAddr, grpc.WithTransportCredentials(insecure.NewCredentials()))
+// if err != nil {
+// logx.Errorf("grpc dial product service error: %v", err.Error())
+// return
+// }
+//}
+//
+//func CloseProductInventoryServiceConn() {
+// if ProductInventoryServiceConn != nil {
+// ProductInventoryServiceConn.Close()
+// }
+// if PurchaseServiceConn != nil {
+// PurchaseServiceConn.Close()
+// }
+//}
-func InitProductInventoryServiceConn() {
- var err error
- ProductInventoryServiceConn, err = grpc.Dial(conf.GrpcServerConf.CrmAddr, grpc.WithTransportCredentials(insecure.NewCredentials()))
- if err != nil {
- logx.Errorf("grpc dial product service error: %v", err.Error())
- return
+func UpdateOutStatus(source, number string, status int64) {
+ if source == "CRM" {
+ cl := product_inventory.NewProductInventoryServiceClient(init_client.CrmConn)
+ _, err := cl.UpdateSalesDetailStatus(context.Background(), &product_inventory.UpdateSalesDetailStatusRequest{
+ Number: number,
+ SalesDetailStatus: "宸插嚭搴�",
+ })
+ if err != nil {
+ logx.Errorf("grpc dial UpdateSalesDetailStatus service error: %v", err)
+ }
}
- PurchaseServiceConn, err = grpc.Dial(conf.GrpcServerConf.SrmAddr, grpc.WithTransportCredentials(insecure.NewCredentials()))
- if err != nil {
- logx.Errorf("grpc dial product service error: %v", err.Error())
- return
+ if source == "APS_APPLY_MATERIAL" {
+ cl := inventory_order.NewInventoryOrderServiceClient(init_client.ApsConn)
+ _, err := cl.UpdateMaterialApplyStatus(context.Background(), &inventory_order.UpdateMaterialApplyStatusRequest{
+ Number: number,
+ Status: status,
+ })
+ if err != nil {
+ logx.Errorf("grpc dial UpdateSalesDetailStatus service error: %v", err)
+ }
}
}
-func CloseProductInventoryServiceConn() {
- if ProductInventoryServiceConn != nil {
- ProductInventoryServiceConn.Close()
- }
- if PurchaseServiceConn != nil {
- PurchaseServiceConn.Close()
- }
-}
-
-func UpdateSalesDetailStatus(number string) {
- client := product_inventory.NewProductInventoryServiceClient(ProductInventoryServiceConn)
- _, err := client.UpdateSalesDetailStatus(context.Background(), &product_inventory.UpdateSalesDetailStatusRequest{
- Number: number,
- SalesDetailStatus: "宸插嚭搴�",
- })
- if err != nil {
- logx.Errorf("grpc dial UpdateSalesDetailStatus service error: %v", err)
- }
-}
-
-func UpdatePurchaseStatus(number string) {
- client := purchase_wms.NewPurchaseServiceClient(PurchaseServiceConn)
- _, err := client.UpdatePurchaseStatus(context.Background(), &purchase_wms.UpdatePurchaseStatusRequest{Number: number})
- if err != nil {
- logx.Errorf("grpc dial UpdatePurchaseStatus service error: %v", err)
+func UpdatePurchaseStatus(source, number string) {
+ if source == "SRM_PURCHASE" {
+ cl := purchase_wms.NewPurchaseServiceClient(init_client.SrmConn)
+ _, err := cl.UpdatePurchaseStatus(context.Background(), &purchase_wms.UpdatePurchaseStatusRequest{Number: number})
+ if err != nil {
+ logx.Errorf("grpc dial UpdatePurchaseStatus service error: %v", err)
+ }
}
}
@@ -891,6 +926,10 @@
util.ResponseFormat(c, code.SaveFail, err.Error())
return
}
+ //鏇存柊aps鐗╂枡鐢宠鐘舵��
+ if operation.Source == "APS_APPLY_MATERIAL" {
+ go UpdateOutStatus(operation.Source, operation.SourceNumber, 3)
+ }
util.ResponseFormat(c, code.Success, "鎿嶄綔鎴愬姛")
}
@@ -958,6 +997,7 @@
return "", errors.New("璇诲彇excel妯＄増澶辫触锛�" + err.Error())
}
readerCloser.Close()
+ defer f.Close()
style, _ := f.NewStyle(&excelize.Style{
Border: []excelize.Border{
@@ -1013,7 +1053,7 @@
return "", err
}
- fileUrl, err := upload.UploadFileToSeaWeed(string(constvar.FileType_File), "xlsx", buf.Bytes())
+ fileUrl, err := upload.UploadFileToSeaWeed(string(constvar.FileType_File), uuid.NewV4().String()+".xlsx", buf.Bytes())
if err != nil {
logx.Errorf("file upload err: %v", err)
return "", err
@@ -1038,6 +1078,7 @@
return "", errors.New("璇诲彇excel妯＄増澶辫触锛�" + err.Error())
}
readerCloser.Close()
+ defer f.Close()
style, _ := f.NewStyle(&excelize.Style{
Border: []excelize.Border{
@@ -1089,7 +1130,7 @@
return "", err
}
- fileUrl, err := upload.UploadFileToSeaWeed(string(constvar.FileType_File), "xlsx", buf.Bytes())
+ fileUrl, err := upload.UploadFileToSeaWeed(string(constvar.FileType_File), uuid.NewV4().String()+".xlsx", buf.Bytes())
if err != nil {
logx.Errorf("file upload err: %v", err)
return "", err
@@ -1108,7 +1149,7 @@
//
// @Router /api-wms/v1/operation/getSupplierList [get]
func (slf OperationController) GetSupplierList(c *gin.Context) {
- cli := supplier.NewSupplierServiceClient(supplier.SupplierConn)
+ cli := supplier.NewSupplierServiceClient(init_client.SrmConn)
resp, err := cli.GetSupplierList(c, &supplier.SupplierListRequest{Status: 1})
if err != nil {
util.ResponseFormat(c, code.RequestParamError, "grpc璋冪敤澶辫触:"+err.Error())
@@ -1126,7 +1167,7 @@
//
// @Router /api-wms/v1/operation/getClientList [get]
func (slf OperationController) GetClientList(c *gin.Context) {
- cli := client.NewClientServiceClient(client.ClientConn)
+ cli := client.NewClientServiceClient(init_client.CrmConn)
resp, err := cli.GetClientList(c, &client.ClientListRequest{})
if err != nil {
util.ResponseFormat(c, code.RequestParamError, "grpc璋冪敤澶辫触:"+err.Error())
@@ -1134,3 +1175,42 @@
}
util.ResponseFormat(c, code.Success, resp.List)
}
+
+// ListByCondition
+// @Tags 鍏ュ簱/鍑哄簱
+// @Summary 鍑哄叆搴撴槑缁�
+// @Produce application/json
+// @Param object body request.OperationCondition true "鍙傛暟"
+// @Success 200 {object} util.Response "鎴愬姛"
+// @Router /api-wms/v1/operation/listByCondition [post]
+func (slf OperationController) ListByCondition(c *gin.Context) {
+ var params request.OperationCondition
+ if err := c.BindJSON(¶ms); err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�:"+err.Error())
+ return
+ }
+ if !params.PageInfo.Check() {
+ util.ResponseFormat(c, code.RequestParamError, "鏁版嵁鍒嗛〉淇℃伅閿欒")
+ return
+ }
+
+ db := mysqlx.GetDB().Table("wms_operation").Select("wms_operation.id as operation_id,wms_operation.number,wms_operation.base_operation_type,material.id AS product_id,material.`name` AS product_name,wms_operation_details.amount,material.unit,wms_operation.from_location_id,from_location.`name` AS from_location,wms_operation.to_location_id,to_location.`name` AS to_location,wms_operation.operation_date as date,wms_operation.`status`").InnerJoins("inner join wms_operation_details ON wms_operation_details.operation_id = wms_operation.id").InnerJoins("INNER JOIN material ON material.id = wms_operation_details.product_id").InnerJoins("INNER JOIN wms_location AS from_location ON from_location.id = wms_operation.from_location_id").InnerJoins("INNER JOIN wms_location AS to_location ON to_location.id = wms_operation.to_location_id")
+ if params.Condition != "" {
+ db = db.Where("wms_operation.number like ? or wms_operation.source_number like ? or from_location.`name` like ? or to_location.`name` like ?", "%"+params.Condition+"%", "%"+params.Condition+"%", "%"+params.Condition+"%", "%"+params.Condition+"%")
+ }
+ var (
+ records = make([]*response.InventoryHistory, 0)
+ total int64
+ )
+
+ if err := db.Count(&total).Error; err != nil {
+ util.ResponseFormat(c, code.RequestError, "鏌ユ壘澶辫触:"+err.Error())
+ return
+ }
+
+ if err := db.Offset((params.Page - 1) * params.PageSize).Limit(params.PageSize).Find(&records).Error; err != nil {
+ util.ResponseFormat(c, code.RequestError, "鏌ユ壘澶辫触:"+err.Error())
+ return
+ }
+ util.ResponseFormatListWithPage(c, code.Success, records, int(total), params.Page, params.PageSize)
+}
--
Gitblit v1.8.0