From e9d27de99fe55757ef4011df72aedc2e0c6f73ce Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期二, 14 十一月 2023 14:53:10 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS

---
 docs/swagger.yaml |  143 ++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 134 insertions(+), 9 deletions(-)

diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 6754d44..37b8823 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -1,4 +1,45 @@
 definitions:
+  code.CodeAuto:
+    properties:
+      AutoLength:
+        type: integer
+      Desc:
+        type: string
+      PrefixMethod:
+        type: integer
+      PrefixValue:
+        type: string
+      SuffixMethod:
+        type: integer
+    type: object
+  code.CodeRule:
+    properties:
+      Desc:
+        type: string
+      Length:
+        type: integer
+      Name:
+        type: string
+    type: object
+  code.CodeStandard:
+    properties:
+      AutoRule:
+        $ref: '#/definitions/code.CodeAuto'
+      ID:
+        type: string
+      List:
+        items:
+          $ref: '#/definitions/code.CodeRule'
+        type: array
+      Method:
+        type: integer
+      Name:
+        type: string
+      Status:
+        type: string
+      Type:
+        type: string
+    type: object
   constvar.BaseOperationType:
     enum:
     - 1
@@ -181,6 +222,20 @@
     - Consumables
     - Server
     - StoredProduct
+  constvar.PurchaseType:
+    enum:
+    - 1
+    - 2
+    - 3
+    type: integer
+    x-enum-comments:
+      PurchaseTypeEntrust: 濮斿
+      PurchaseTypeOutSource: 閲囪喘
+      PurchaseTypeSelf: 鑷埗
+    x-enum-varnames:
+    - PurchaseTypeOutSource
+    - PurchaseTypeSelf
+    - PurchaseTypeEntrust
   constvar.ReservationMethod:
     enum:
     - 1
@@ -359,6 +414,8 @@
         items:
           $ref: '#/definitions/models.Attachment'
         type: array
+      autoIncr:
+        type: integer
       barcode:
         description: 鏉＄爜
         type: string
@@ -373,6 +430,10 @@
         type: integer
       categoryName:
         description: 浜у搧绫诲埆鍚嶇О
+        type: string
+      codeStandardID:
+        description: Explain           string                  `gorm:"type:varchar(512);comment:缂栧彿璇存槑"
+          json:"explain"`
         type: string
       companyId:
         description: 鍏徃id
@@ -418,8 +479,7 @@
         - $ref: '#/definitions/constvar.InvoicingStrategy'
         description: 寮�绁ㄧ瓥鐣�
       isSale:
-        description: PurchaseType      constvar.PurchaseType `gorm:"type:int(11);comment:閲囪喘绫诲瀷"
-          json:"purchaseType"`
+        description: 鏄惁閿�鍞�
         type: boolean
       makeAdvanceTime:
         description: 鍒堕�犲墠缃椂闂�(澶�)
@@ -428,11 +488,7 @@
         description: 鏈�澶у簱瀛�
         type: number
       minInventory:
-        description: |-
-          Explain           string                  `gorm:"type:varchar(512);comment:缂栧彿璇存槑" json:"explain"`
-          CodeStandardID    string                  `gorm:"type:varchar(191);comment:缂栫爜瑙勮寖ID" json:"codeStandardID"`
-          Specs             string                  `gorm:"type:varchar(191);comment:鐗╂枡瑙勬牸" json:"specs"`
-          Type              string                  `gorm:"type:varchar(191);comment:鐗╂枡鍨嬪彿" json:"type"`
+        description: 鏈�灏忓簱瀛�
         type: number
       minPurchaseAmount:
         description: |-
@@ -446,6 +502,8 @@
           json:"materialType"`
       name:
         description: 鐗╂枡鍚嶇О
+        type: string
+      note:
         type: string
       orderAdvanceTime:
         description: 璁㈠崟鍑嗗澶╂暟(澶�)
@@ -473,6 +531,8 @@
       purchasePrice:
         description: 閲囪喘浠锋牸
         type: number
+      purchaseType:
+        $ref: '#/definitions/constvar.PurchaseType'
       salePrice:
         description: 閿�鍞崟浠�
         type: number
@@ -482,14 +542,17 @@
       sellExplain:
         description: 閿�鍞鏄�
         type: string
+      specs:
+        type: string
       supplier:
         description: |-
           FSource           string                  `gorm:"type:varchar(191);comment:鐢熶骇杞﹂棿" json:"-"`
           Status            constvar.MaterialStatus `gorm:"type:int(11);comment:鐘舵��" json:"status"`
         type: string
       templateID:
-        description: Note              string                  `gorm:"type:varchar(1024);comment:澶囨敞"
-          json:"note"`
+        description: 妯℃澘ID
+        type: string
+      type:
         type: string
       unit:
         description: LockAmount        decimal.Decimal         `gorm:"type:decimal(35,18);default:0;comment:閿佸畾鏁伴噺"
@@ -1578,6 +1641,68 @@
       summary: 涓婁紶闄勪欢
       tags:
       - 闄勪欢绠＄悊
+  /api-wms/v1/code/getAutoCode:
+    post:
+      parameters:
+      - description: 鍙傛暟
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/code.CodeStandard'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            allOf:
+            - $ref: '#/definitions/util.ResponseList'
+            - properties:
+                data:
+                  additionalProperties: true
+                  type: object
+              type: object
+      summary: 鑾峰彇鑷姩缂栫爜
+      tags:
+      - 缂栫爜
+  /api-wms/v1/code/getCodeList:
+    get:
+      parameters:
+      - in: query
+        name: codeStandID
+        type: string
+      - in: query
+        name: name
+        type: string
+      - description: 椤电爜
+        in: query
+        name: page
+        type: integer
+      - description: 姣忛〉澶у皬
+        in: query
+        name: pageSize
+        type: integer
+      - in: query
+        name: type
+        type: string
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            allOf:
+            - $ref: '#/definitions/util.ResponseList'
+            - properties:
+                data:
+                  items:
+                    $ref: '#/definitions/code.CodeStandard'
+                  type: array
+              type: object
+      summary: 鑾峰彇缂栫爜鍒楄〃
+      tags:
+      - 缂栫爜
   /api-wms/v1/company/company:
     get:
       parameters:

--
Gitblit v1.8.0