From 0551df1d2a65876b2427df112e37625f128b67e4 Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期一, 23 十月 2023 11:59:34 +0800
Subject: [PATCH] 1.库存盘点列表增加基础作业类型
---
controllers/operation_type.go | 2
models/location_product_amount.go | 25 ++++----
docs/swagger.yaml | 26 ++++++++
docs/docs.go | 40 +++++++++++++
docs/swagger.json | 40 +++++++++++++
controllers/location_product_amount.go | 2
6 files changed, 119 insertions(+), 16 deletions(-)
diff --git a/controllers/location_product_amount.go b/controllers/location_product_amount.go
index 23c0ff3..f895a6c 100644
--- a/controllers/location_product_amount.go
+++ b/controllers/location_product_amount.go
@@ -71,6 +71,7 @@
if res := models.NewOperationSearch().Orm.Preload("Details", "product_id=?", v.ProductId).Where("wms_operation.base_operation_type=? and wms_operation.status=? and wms_operation.to_location_id=?", constvar.BaseOperationTypeAdjust, constvar.OperationStatus_Ready, v.LocationId).First(&operation); res.Error != nil {
if errors.Is(res.Error, gorm.ErrRecordNotFound) {
records[k].Status = constvar.OperationStatus_Finish
+ records[k].BaseOperationType = constvar.BaseOperationTypeAdjust
continue
} else {
util.ResponseFormat(c, code.RequestError, fmt.Errorf("find operation err: %v", res.Error.Error()))
@@ -84,6 +85,7 @@
records[k].OperationId = operation.Id
records[k].Status = operation.Status
}
+ records[k].BaseOperationType = constvar.BaseOperationTypeAdjust
}
util.ResponseFormatListWithPage(c, code.Success, records, int(total), params.Page, params.PageSize)
}
diff --git a/controllers/operation_type.go b/controllers/operation_type.go
index c0ea4a9..0ce0a9b 100644
--- a/controllers/operation_type.go
+++ b/controllers/operation_type.go
@@ -173,7 +173,7 @@
// @Produce application/json
// @Param object query request.ListTransfer true "鏌ヨ鍙傛暟"
// @Success 200 {object} util.ResponseList "鎴愬姛"
-// @Router /api-wms/v1/operationType/operationType [get]
+// @Router /api-wms/v1/operationType/listTransfer [get]
func (slf OperationTypeController) ListTransfer(c *gin.Context) {
var params request.GetOperationTypeList
if err := c.ShouldBindQuery(¶ms); err != nil {
diff --git a/docs/docs.go b/docs/docs.go
index e233c6b..364970e 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -1061,7 +1061,7 @@
}
}
},
- "/api-wms/v1/operationType/operationType": {
+ "/api-wms/v1/operationType/listTransfer": {
"get": {
"produces": [
"application/json"
@@ -1085,6 +1085,44 @@
}
}
}
+ }
+ },
+ "/api-wms/v1/operationType/operationType": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "涓氬姟绫诲瀷"
+ ],
+ "summary": "鏌ヨ浣滀笟绫诲瀷鍒楄〃",
+ "parameters": [
+ {
+ "type": "string",
+ "name": "keyword",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "椤电爜",
+ "name": "page",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "姣忛〉澶у皬",
+ "name": "pageSize",
+ "in": "query"
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.ResponseList"
+ }
+ }
+ }
},
"post": {
"produces": [
diff --git a/docs/swagger.json b/docs/swagger.json
index 2201051..aa533b1 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -1049,7 +1049,7 @@
}
}
},
- "/api-wms/v1/operationType/operationType": {
+ "/api-wms/v1/operationType/listTransfer": {
"get": {
"produces": [
"application/json"
@@ -1073,6 +1073,44 @@
}
}
}
+ }
+ },
+ "/api-wms/v1/operationType/operationType": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "涓氬姟绫诲瀷"
+ ],
+ "summary": "鏌ヨ浣滀笟绫诲瀷鍒楄〃",
+ "parameters": [
+ {
+ "type": "string",
+ "name": "keyword",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "椤电爜",
+ "name": "page",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "姣忛〉澶у皬",
+ "name": "pageSize",
+ "in": "query"
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.ResponseList"
+ }
+ }
+ }
},
"post": {
"produces": [
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 7e559df..4f54f49 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -1921,7 +1921,7 @@
summary: 淇敼鍏ュ簱/鍑哄簱淇℃伅
tags:
- 鍏ュ簱/鍑哄簱
- /api-wms/v1/operationType/operationType:
+ /api-wms/v1/operationType/listTransfer:
get:
parameters:
- in: query
@@ -1937,6 +1937,30 @@
summary: 璋冩嫧绫诲瀷鍒楄〃
tags:
- 涓氬姟绫诲瀷
+ /api-wms/v1/operationType/operationType:
+ get:
+ parameters:
+ - in: query
+ name: keyword
+ type: string
+ - description: 椤电爜
+ in: query
+ name: page
+ type: integer
+ - description: 姣忛〉澶у皬
+ in: query
+ name: pageSize
+ type: integer
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ $ref: '#/definitions/util.ResponseList'
+ summary: 鏌ヨ浣滀笟绫诲瀷鍒楄〃
+ tags:
+ - 涓氬姟绫诲瀷
post:
parameters:
- description: 浣滀笟绫诲瀷淇℃伅
diff --git a/models/location_product_amount.go b/models/location_product_amount.go
index b51e00c..0700984 100644
--- a/models/location_product_amount.go
+++ b/models/location_product_amount.go
@@ -31,18 +31,19 @@
LocationProductAmountWithOperation struct {
//LocationProductAmount LocationProductAmount `json:"locationProductAmount"`
- LocationProductAmountId int `json:"locationProductAmountId" gorm:"location_product_amount_id"`
- LocationId int `json:"locationId" gorm:"column:location_id"`
- LocationName string `json:"locationName" gorm:"column:location_name"`
- ProductId string `json:"productId" gorm:"column:product_id"`
- ProductName string `json:"productName" gorm:"column:product_name"`
- Amount decimal.Decimal `json:"amount" gorm:"column:amount"`
- Unit string `json:"unit" gorm:"column:unit"`
- CreateDate string `json:"createDate" gorm:"column:create_date"`
- AdjustAmount decimal.Decimal `json:"adjustAmount" gorm:"column:adjust_amount"`
- DifferenceAmount decimal.Decimal `json:"differenceAmount" gorm:"-"`
- OperationId int `json:"operationId" gorm:"column:operation_id"`
- Status constvar.OperationStatus `json:"status" gorm:"status"`
+ LocationProductAmountId int `json:"locationProductAmountId" gorm:"location_product_amount_id"`
+ LocationId int `json:"locationId" gorm:"column:location_id"`
+ LocationName string `json:"locationName" gorm:"column:location_name"`
+ ProductId string `json:"productId" gorm:"column:product_id"`
+ ProductName string `json:"productName" gorm:"column:product_name"`
+ Amount decimal.Decimal `json:"amount" gorm:"column:amount"`
+ Unit string `json:"unit" gorm:"column:unit"`
+ CreateDate string `json:"createDate" gorm:"column:create_date"`
+ AdjustAmount decimal.Decimal `json:"adjustAmount" gorm:"column:adjust_amount"`
+ DifferenceAmount decimal.Decimal `json:"differenceAmount" gorm:"-"`
+ OperationId int `json:"operationId" gorm:"column:operation_id"`
+ Status constvar.OperationStatus `json:"status" gorm:"status"`
+ BaseOperationType constvar.BaseOperationType `json:"baseOperationType" gorm:"base_operation_type"`
}
)
--
Gitblit v1.8.0