From dd5dbeacdc143ef51202638d8c5b52f563451596 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 12 四月 2024 15:11:48 +0800
Subject: [PATCH] 总差计算 & bug fix

---
 docs/swagger.yaml |  532 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 528 insertions(+), 4 deletions(-)

diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 299d5d9..d933c43 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -142,6 +142,9 @@
       deviation:
         description: 鍋忓樊
         type: number
+      finenessCheckID:
+        description: 绾ゅ害妫�楠岃〃ID
+        type: integer
       finenessGrade:
         description: 绾ゅ害绛夌骇
         type: string
@@ -156,8 +159,7 @@
       id:
         type: integer
       position:
-        description: FinenessCheckID       uint                    `gorm:"not null;comment:绾ゅ害妫�楠岃〃ID"
-          json:"finenessCheckID"`    //绾ゅ害妫�楠岃〃ID
+        description: 杞﹀彿
         type: integer
       purity:
         description: 娲佸噣搴�
@@ -208,6 +210,9 @@
         type: string
       deletedAt:
         $ref: '#/definitions/gorm.DeletedAt'
+      finenessCheckID:
+        description: 绾ゅ害妫�楠岃〃ID
+        type: integer
       finenessList:
         items:
           $ref: '#/definitions/models.FinenessItem'
@@ -262,13 +267,15 @@
         $ref: '#/definitions/gorm.DeletedAt'
       id:
         type: integer
-      marketNumber:
+      marketId:
+        type: integer
+      marketName:
         type: string
       notes:
         type: string
       payStandard:
         type: number
-      rawSilkGradeNumber:
+      rawSilkGrade:
         type: string
       unit:
         type: string
@@ -295,8 +302,135 @@
         type: integer
       updatedAt:
         type: string
+      workshopName:
+        type: string
       workshopNumber:
         type: string
+    type: object
+  models.YieldRegister:
+    properties:
+      bucketCocoonNumber:
+        type: number
+      circle:
+        type: integer
+      circles:
+        items:
+          $ref: '#/definitions/models.YieldRegisterCircle'
+        type: array
+      createTime:
+        type: string
+      createdAt:
+        type: string
+      deletedAt:
+        $ref: '#/definitions/gorm.DeletedAt'
+      fallingSilkBucketOne:
+        type: number
+      fallingSilkBucketThree:
+        type: number
+      fallingSilkBucketTwo:
+        type: number
+      fallingSilkCocoonNumber:
+        type: number
+      groupNumber:
+        type: integer
+      groupReelingdiscount:
+        type: string
+      hourYield:
+        type: number
+      id:
+        type: integer
+      items:
+        items:
+          $ref: '#/definitions/models.YieldRegisterItem'
+        type: array
+      jieZhuang:
+        type: string
+      level:
+        type: string
+      marketId:
+        type: integer
+      marketName:
+        description: 搴勫彛鍚�
+        type: string
+      number:
+        type: string
+      oneBack:
+        type: string
+      record:
+        type: number
+      spec:
+        type: string
+      theorySilkAmount:
+        type: number
+      threeBack:
+        type: string
+      timeJia:
+        type: string
+      timeYi:
+        type: string
+      total:
+        type: number
+      twoBack:
+        type: string
+      updatedAt:
+        type: string
+      vehicleSpeed:
+        type: number
+      workshopId:
+        type: integer
+      workshopName:
+        description: 杞﹂棿鍚�
+        type: string
+    type: object
+  models.YieldRegisterCircle:
+    properties:
+      allYield:
+        type: number
+      carNumber:
+        type: integer
+      circle:
+        type: integer
+      createdAt:
+        type: string
+      deletedAt:
+        $ref: '#/definitions/gorm.DeletedAt'
+      id:
+        type: integer
+      oneYield:
+        type: number
+      pieceNumber:
+        type: integer
+      reelingdiscount:
+        type: string
+      updatedAt:
+        type: string
+      value:
+        type: number
+      yieldRegisterId:
+        type: integer
+    type: object
+  models.YieldRegisterItem:
+    properties:
+      carNumber:
+        type: integer
+      createdAt:
+        type: string
+      deletedAt:
+        $ref: '#/definitions/gorm.DeletedAt'
+      hourYield:
+        type: number
+      id:
+        type: integer
+      oneYield:
+        type: number
+      peopleYield:
+        type: number
+      personReelingdiscount:
+        type: string
+      updatedAt:
+        type: string
+      yieldRegisterId:
+        type: integer
     type: object
   request.AddDict:
     properties:
@@ -358,6 +492,24 @@
         description: 杞︾粍
         type: integer
     type: object
+  request.ChangeYieldRegister:
+    properties:
+      createTime:
+        description: 鍒涘缓鏃堕棿
+        type: string
+      groupNumber:
+        description: 缁勫埆
+        type: integer
+      marketId:
+        description: 搴勫彛id
+        type: integer
+      spec:
+        description: 瑙勬牸
+        type: string
+      workshopId:
+        description: 杞﹂棿id
+        type: integer
+    type: object
   request.DynamicsRank:
     properties:
       rankName:
@@ -383,6 +535,39 @@
         type: number
       sum:
         description: 鍚堣
+        type: number
+    type: object
+  request.GetWorkshopManageCar:
+    properties:
+      groupNumber:
+        description: 缁勫埆
+        type: integer
+      marketName:
+        description: /搴勫彛鍚�
+        type: string
+      workshopName:
+        description: 杞﹂棿鍚嶇О
+        type: string
+    type: object
+  request.GetYieldRegisterList:
+    properties:
+      keyWord:
+        type: string
+      number:
+        description: 浜ч噺鐧昏琛ㄧ紪鍙�
+        type: string
+      page:
+        description: 椤电爜
+        type: integer
+      pageSize:
+        description: 姣忛〉澶у皬
+        type: integer
+    type: object
+  request.PieceInfo:
+    properties:
+      pieceNumber:
+        type: integer
+      value:
         type: number
     type: object
   request.RankStandard:
@@ -437,6 +622,152 @@
         type: string
       remark:
         description: 澶囨敞
+        type: string
+    type: object
+  request.YieldRegisterCircleInfo:
+    properties:
+      allYield:
+        description: 浜ч噺
+        type: number
+      carNumber:
+        description: 杞﹀彿
+        type: integer
+      circle:
+        description: 鍥炴暟
+        type: integer
+      oneYield:
+        description: 鍙颁骇
+        type: number
+      pieceNumbers:
+        description: 鐗囨暟淇℃伅
+        items:
+          $ref: '#/definitions/request.PieceInfo'
+        type: array
+      reelingdiscount:
+        description: 缂姌
+        type: string
+      yieldRegisterId:
+        description: 浜ч噺鐧昏琛╥d
+        type: integer
+    type: object
+  request.YieldRegisterInfo:
+    properties:
+      bucketCocoonNumber:
+        description: 姣忔《鑼ф暟
+        type: number
+      circle:
+        description: 鍥炴暟
+        type: integer
+      circles:
+        items:
+          $ref: '#/definitions/request.YieldRegisterCircleInfo'
+        type: array
+      createTime:
+        description: 鍒涘缓鏃堕棿
+        type: string
+      fallingSilkBucketOne:
+        description: 钀戒笣妗舵暟1
+        type: number
+      fallingSilkBucketThree:
+        description: 钀戒笣妗舵暟3
+        type: number
+      fallingSilkBucketTwo:
+        description: 钀戒笣妗舵暟2
+        type: number
+      fallingSilkCocoonNumber:
+        description: 钀戒笣鑼ф暟
+        type: number
+      groupNumber:
+        description: 缁勫埆
+        type: integer
+      groupReelingdiscount:
+        description: 杞︾粍缂姌
+        type: string
+      hourYield:
+        description: 鍙版椂浜ч噺
+        type: number
+      id:
+        type: integer
+      items:
+        items:
+          $ref: '#/definitions/request.YieldRegisterItemInfo'
+        type: array
+      jieZhuang:
+        description: 鏄惁缁撳簞
+        type: string
+      level:
+        description: 绛夌骇
+        type: string
+      marketId:
+        description: 搴勫彛id
+        type: integer
+      number:
+        description: 缂栧彿
+        type: string
+      oneBack:
+        description: 绗竴鍥�
+        type: string
+      record:
+        description: 鐢熶骇鐢ㄦ椂
+        type: number
+      spec:
+        description: 瑙勬牸
+        type: string
+      theorySilkAmount:
+        description: 鐞嗚涓濋噺
+        type: number
+      threeBack:
+        description: 绗笁鍥�
+        type: string
+      timeJia:
+        description: 鐢茬彮鏃堕棿
+        type: string
+      timeYi:
+        description: 涔欑彮鏃堕棿
+        type: string
+      total:
+        description: 鎬讳骇閲�
+        type: number
+      twoBack:
+        description: 绗簩鍥�
+        type: string
+      vehicleSpeed:
+        description: 瀹炴椂杞﹂��
+        type: number
+      workshopId:
+        description: 杞﹂棿id
+        type: integer
+    type: object
+  request.YieldRegisterItemInfo:
+    properties:
+      carNumber:
+        description: 杞﹀彿
+        type: integer
+      hourYield:
+        description: 鍙版椂浜ч噺
+        type: number
+      oneYield:
+        description: 鍙颁骇閲�
+        type: number
+      peopleYield:
+        description: 涓汉浜ч噺
+        type: number
+      personReelingdiscount:
+        description: 涓汉缂姌
+        type: string
+      yieldRegisterId:
+        description: 浜ч噺鐧昏琛╥d
+        type: integer
+    type: object
+  response.CarAndLevel:
+    properties:
+      car:
+        items:
+          items:
+            type: integer
+          type: array
+        type: array
+      level:
         type: string
     type: object
   response.DynamicsRank:
@@ -513,6 +844,30 @@
 info:
   contact: {}
 paths:
+  /api-jl/v1/fineness/changeYieldRegister:
+    post:
+      parameters:
+      - description: 鍙傛暟
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/request.ChangeYieldRegister'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 鎴愬姛
+          schema:
+            allOf:
+            - $ref: '#/definitions/util.Response'
+            - properties:
+                data:
+                  $ref: '#/definitions/models.YieldRegister'
+              type: object
+      summary: 鍒囨崲浜ч噺鐧昏琛�
+      tags:
+      - 鐢熶骇绠＄悊/浜ч噺鐧昏琛�
   /api-jl/v1/fineness/check:
     get:
       parameters:
@@ -602,6 +957,74 @@
       summary: 绾ゅ害妫�楠岃鎯�
       tags:
       - 绾ゅ害妫�楠�
+  /api-jl/v1/fineness/deleteYieldRegister/{number}:
+    delete:
+      parameters:
+      - description: number
+        in: path
+        name: number
+        required: true
+        type: string
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 鎴愬姛
+          schema:
+            $ref: '#/definitions/util.Response'
+      summary: 鍒犻櫎浜ч噺鐧昏琛ㄨ褰�
+      tags:
+      - 鐢熶骇绠＄悊/浜ч噺鐧昏琛�
+  /api-jl/v1/fineness/getYieldRegisterInfo:
+    post:
+      parameters:
+      - description: 鍙傛暟
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/request.GetYieldRegisterList'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 鎴愬姛
+          schema:
+            allOf:
+            - $ref: '#/definitions/util.Response'
+            - properties:
+                data:
+                  $ref: '#/definitions/models.YieldRegister'
+              type: object
+      summary: 鑾峰彇浜ч噺鐧昏琛ㄨ鎯�
+      tags:
+      - 鐢熶骇绠＄悊/浜ч噺鐧昏琛�
+  /api-jl/v1/fineness/getYieldRegisterList:
+    post:
+      parameters:
+      - description: 鍙傛暟
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/request.GetYieldRegisterList'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 鎴愬姛
+          schema:
+            allOf:
+            - $ref: '#/definitions/util.ResponseList'
+            - properties:
+                data:
+                  items:
+                    $ref: '#/definitions/models.YieldRegister'
+                  type: array
+              type: object
+      summary: 鑾峰彇浜ч噺鐧昏琛�
+      tags:
+      - 鐢熶骇绠＄悊/浜ч噺鐧昏琛�
   /api-jl/v1/fineness/register:
     get:
       parameters:
@@ -696,6 +1119,25 @@
       summary: 绾ゅ害鐧昏璇︽儏
       tags:
       - 绾ゅ害鐧昏
+  /api-jl/v1/fineness/saveYieldRegister:
+    post:
+      parameters:
+      - description: 鍙傛暟
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/request.YieldRegisterInfo'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 鎴愬姛
+          schema:
+            $ref: '#/definitions/util.Response'
+      summary: 淇濆瓨浜ч噺鐧昏琛�
+      tags:
+      - 鐢熶骇绠＄悊/浜ч噺鐧昏琛�
   /api-jl/v1/system/deletePriceStandard/{id}:
     delete:
       parameters:
@@ -754,6 +1196,10 @@
         - DictTypeWorkshop
         - DictTypeColor
         - DictTypeSpec
+      - description: 鎼滅储鍏抽敭瀛�
+        in: query
+        name: keyword
+        type: string
       - description: 椤电爜
         in: query
         name: page
@@ -833,6 +1279,35 @@
       summary: 鍒犻櫎瀛楀吀
       tags:
       - 绯荤粺璁剧疆/瀛楀吀
+  /api-jl/v1/system/getCarAndLevel:
+    post:
+      parameters:
+      - description: token
+        in: header
+        name: Authorization
+        required: true
+        type: string
+      - description: 鍙傛暟
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/request.GetWorkshopManageCar'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 鎴愬姛
+          schema:
+            allOf:
+            - $ref: '#/definitions/util.Response'
+            - properties:
+                data:
+                  $ref: '#/definitions/response.CarAndLevel'
+              type: object
+      summary: 鑾峰彇杞﹁締缂栧彿鍜岀瓑绾�
+      tags:
+      - 绯荤粺璁剧疆/杞﹂棿绠＄悊
   /api-jl/v1/system/getPriceStandardList:
     get:
       parameters:
@@ -883,6 +1358,55 @@
       summary: 鑾峰彇鐢熶笣瀹氱骇鏍囧噯
       tags:
       - 绯荤粺璁剧疆/鐢熶笣瀹氱骇鏍囧噯
+  /api-jl/v1/system/getRankStandardGrade:
+    get:
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 鎴愬姛
+          schema:
+            allOf:
+            - $ref: '#/definitions/util.Response'
+            - properties:
+                data:
+                  additionalProperties:
+                    type: string
+                  type: object
+              type: object
+      summary: 鑾峰彇鐢熶笣绛夌骇
+      tags:
+      - 绯荤粺璁剧疆/鐢熶笣瀹氱骇鏍囧噯
+  /api-jl/v1/system/getWorkshopManageGroup/{number}:
+    get:
+      parameters:
+      - description: token
+        in: header
+        name: Authorization
+        required: true
+        type: string
+      - description: number
+        in: path
+        name: number
+        required: true
+        type: string
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 鎴愬姛
+          schema:
+            allOf:
+            - $ref: '#/definitions/util.Response'
+            - properties:
+                data:
+                  additionalProperties:
+                    type: integer
+                  type: object
+              type: object
+      summary: 鑾峰彇杞﹂棿缁勫埆
+      tags:
+      - 绯荤粺璁剧疆/杞﹂棿绠＄悊
   /api-jl/v1/system/getWorkshopManageList:
     get:
       parameters:

--
Gitblit v1.8.0