sun-pc 7 miesięcy temu
rodzic
commit
c2d38d69ea

+ 14 - 223
boxcost/api/aadiffupdatetest.http

@@ -1,4 +1,5 @@
 @host = 192.168.110.131:8888
+# @host = 192.168.110.131:18088
 
 
 ###
@@ -8,229 +9,7 @@ POST http://{{host}}/boxcost/diffUpdatePlanTest HTTP/1.1
 Content-Type: application/json
 Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3MjI4MjU4OTIsImlkIjoiNjQyYTUyNGY1ZjUwYmM5MDNmOTg2Mzk0Iiwia2V5IjoiYm94Y29zdCIsIm5hbWUiOiLlrZnog5wiLCJvcmlnX2lhdCI6MTcyMjIyMTA5MiwicGFyZW50IjoiNjQyYTUyNGY1ZjUwYmM5MDNmOTg2Mzk0IiwicGhvbmUiOiIxMzQwODU0NzgyMyIsInJvbGUiOiIiLCJzdGF0ZSI6MSwidXNlclR5cGUiOjJ9.Cz7qI3-Vah0io5ZLIFDyVOf8qsqdmbT8WHdprrjbdXw
 
-{
-    "_id": "64aa52935cca777202101884",
-    "name": "2023年-稻香锦绣内贴纸fdsds换xxx",
-    "pack": {
-      "_id": "646c37becfd68ee5e94335ef",
-      "name": "2023年-稻香rrrererer锦绣",
-      "thumbnail": "",
-      "compCounts": 6,
-      "designer": "1",
-      "components": [
-        {
-          "id": "1685594042228",
-          "name": "内贴纸(1*4)",
-          "thumbnail": "",
-          "count": 1,
-          "uv": "",
-          "uvSize": "0",
-          "stages": [
-            {
-              "id": "1686109343729640b1add481f42e1f1219741",
-              "typeId": "640b1add481f42e1f1219741",
-              "orderPrice": 0.601,
-              "orderCount": 4700,
-              "isFix": null,
-              "confirmCount": 4700,
-              "deliveryTime": "2023-07-11T06:23:49.091Z",
-              "supplierInfo": {
-                "_id": "635f4afa769300c4a84bfd1b",
-                "name": "016-成都凯纸业sxferexfdfd",
-                "address": "崇州经开区霞光路fdfer51号",
-                "phone": "15982811956",
-                "categorys": [
-                  "纸张erererr",
-                  "cfdfdff"
-                ],
-                "category": "纸张类",
-                "createTime": "2022-10-31T04:11:38.249Z",
-                "updateTime": "2023-04-26T03:52:33.544Z"
-              },
-              "batchCount": 4,
-              "batchSizeWidth": 730,
-              "batchSizeHeight": 889,
-              "remark": "特规分切",
-              "size": "0",
-              "name": "铜版纸",
-              "category": "纸张",
-              "price": 5900,
-              "unit": "吨",
-              "norm": "157g",
-              "createTime": "2023-03-10T11:56:13.495Z",
-              "updateTime": "2023-06-07T03:33:00.164Z",
-              "type": 1,
-              "group": "",
-              "billId": "64aa52b45cca777202101885",
-              "billType": 1
-            },
-            {
-              "id": "1685594164090642bd76a26be7fdfb05898efab",
-              "typeId": "642bd76a26be7db05898efab",
-              "orderPrice": 0.12,
-              "orderCount": 4600,
-              "isFix": null,
-              "confirmCount": 0,
-              "deliveryTime": "2023-07-12T06:23:53.291Z",
-              "supplierInfo": {
-                "_id": "63846b744d585ba68be6cba1",
-                "name": "008-成都宏川印务",
-                "address": "成都崇州经济开发区泗维路dhfjkdhf号",
-                "phone": "13689052627",
-                "categorys": [
-                  "外协加工"
-                ],
-                "category": "普通印刷",
-                "createTime": "2022-11-28T08:04:04.791Z",
-                "updateTime": "2023-04-26T03:52:56.541Z"
-              },
-              "batchCount": 4,
-              "batchSizeWidth": 730,
-              "batchSizeHeight": 830,
-              "remark": "专红PT200C",
-              "size": "0",
-              "name": "普通印刷",
-              "category": "外协加工",
-              "price": 0.072,
-              "unit": "张",
-              "norm": "满版专色",
-              "createTime": "0001-01-01T00:00:00Z",
-              "updateTime": "0001-01-01T00:00:00Z",
-              "type": 2,
-              "group": "",
-              "billId": "64aa52bb5cca777202101886",
-              "billType": 2
-            },
-            {
-              "id": "168559418417563ef066d1031634bc6eeb844",
-              "typeId": "63ef066d1031634bc6eeb844",
-              "orderPrice": 0.297,
-              "orderCount": 4550,
-              "isFix": null,
-              "confirmCount": 0,
-              "deliveryTime": "2023-07-13T06:23:58.424Z",
-              "supplierInfo": {
-                "_id": "6388441551ba5b3307f8ab61",
-                "name": "018-覆膜 熊明军",
-                "address": "金鸡路556号 覆膜熊明军",
-                "phone": "13980871668",
-                "categorys": [
-                  "外协加工"
-                ],
-                "category": "覆膜",
-                "createTime": "2022-12-01T06:05:09.079Z",
-                "updateTime": "2023-04-19T09:35:50.467Z"
-              },
-              "batchCount": 4,
-              "batchSizeWidth": 730,
-              "batchSizeHeight": 830,
-              "remark": " ",
-              "size": "0",
-              "name": "覆膜",
-              "category": "外协加工",
-              "price": 0.49,
-              "unit": "平方米",
-              "norm": "哑膜",
-              "createTime": "0001-01-01T00:00:00Z",
-              "updateTime": "0001-01-01T00:00:00Z",
-              "type": 2,
-              "group": "",
-              "billId": "64aa52be5cca777202101887",
-              "billType": 2
-            },
-            {
-              "id": "168559419589263ef10f91031634bc6eeb849",
-              "typeId": "63ef10f91031634bc6eeb849",
-              "orderPrice": 0.08,
-              "orderCount": 4500,
-              "isFix": null,
-              "confirmCount": 0,
-              "deliveryTime": "2023-07-14T06:24:03.474Z",
-              "supplierInfo": {
-                "_id": "63edbe951bd7c47e69698533",
-                "name": "019-压纹 吴宗祥",
-                "address": "",
-                "phone": "18280165844",
-                "categorys": [
-                  "外协加工"
-                ],
-                "category": "压纹",
-                "createTime": "2023-02-16T05:26:45.004Z",
-                "updateTime": "2023-04-19T09:36:07.663Z"
-              },
-              "batchCount": 884,
-              "batchSizeWidth": 0,
-              "batchSizeHeight": 0,
-              "remark": " ",
-              "size": "0",
-              "name": "压纹",
-              "category": "外协加工",
-              "price": 0.08,
-              "unit": "张",
-              "norm": "按文件要求",
-              "createTime": "0001-01-01T00:00:00Z",
-              "updateTime": "0001-01-01T00:00:00Z",
-              "type": 2,
-              "group": "",
-              "billId": "64aa52c65cca777202101888",
-              "billType": 2
-            },
-            {
-              "id": "168792259076963ef10b51031634bc6eeb848",
-              "typeId": "63ef10b51031634bc6eeb848",
-              "orderPrice": 0.12,
-              "orderCount": 8900,
-              "isFix": null,
-              "confirmCount": 0,
-              "deliveryTime": "2023-07-15T06:24:08.758Z",
-              "supplierInfo": {
-                "_id": "638eecd4f9039e0980fe5650",
-                "name": "020-烫金 温学刚",
-                "address": "崇州金鸡路556号 罗哦哦哦烫金 温学刚",
-                "phone": "13028138020",
-                "categorys": [
-                  "外协加工"
-                ],
-                "category": "烫金",
-                "createTime": "2022-12-06T07:18:44.322Z",
-                "updateTime": "2023-04-19T09:36:26.912Z"
-              },
-              "batchCount": 2,
-              "batchSizeWidth": 0,
-              "batchSizeHeight": 0,
-              "remark": " ",
-              "size": "0",
-              "name": "普通烫金eeeeeeeeeeeeee",
-              "category": "外协加工",
-              "price": 0.12,
-              "unit": "张",
-              "norm": "按文件要求",
-              "createTime": "0001-01-01T00:00:00Z",
-              "updateTime": "0001-01-01T00:00:00Z",
-              "type": 2,
-              "group": "",
-              "billId": "64aa52d65cca777202101889",
-              "billType": 2
-            }
-          ],
-          "remark": "",
-          "totalPrice": 6156.05
-        }
-      ],
-      "createTime": "2023-05-23T03:49:18.506Z",
-      "updateTime": "2023-05-23T13:36:11.432Z"
-    },
-    "thumbnail": "",
-    "createUser": "费用易展红图承担",
-    "total": 20000,
-    "status": "process",
-    "totalPrice": 6156.05,
-    "updateTime": "2024-07-23T04:33:44.858Z",
-    "createTime": "2023-07-09T06:24:19.305Z"
-  }
-
-
-
+ 
 ###
 # 工艺单日志记录测试
 # 测试数据表(collection): bill-produce_copy1
@@ -321,6 +100,18 @@ GET http://{{host}}/boxcost/printDiff?query={"targetId":"64aa52935cca77720210188
 Content-Type: application/json
 
 
+###
+# 打印更改差异
+GET http://{{host}}/boxcost/logs/list?query={"targetId":"64aa52935cca777202101884","collection":"product-plan_copy1"} HTTP/1.1
+Content-Type: application/json
+Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3MjI4MjU4OTIsImlkIjoiNjQyYTUyNGY1ZjUwYmM5MDNmOTg2Mzk0Iiwia2V5IjoiYm94Y29zdCIsIm5hbWUiOiLlrZnog5wiLCJvcmlnX2lhdCI6MTcyMjIyMTA5MiwicGFyZW50IjoiNjQyYTUyNGY1ZjUwYmM5MDNmOTg2Mzk0IiwicGhvbmUiOiIxMzQwODU0NzgyMyIsInJvbGUiOiIiLCJzdGF0ZSI6MSwidXNlclR5cGUiOjJ9.Cz7qI3-Vah0io5ZLIFDyVOf8qsqdmbT8WHdprrjbdXw
+
+
+###
+# 追踪详情
+GET http://{{host}}/boxcost/planTrack/detail/66a773f9e6e5177313cc50c5 HTTP/1.1
+Content-Type: application/json
+Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3MjI4MjU4OTIsImlkIjoiNjQyYTUyNGY1ZjUwYmM5MDNmOTg2Mzk0Iiwia2V5IjoiYm94Y29zdCIsIm5hbWUiOiLlrZnog5wiLCJvcmlnX2lhdCI6MTcyMjIyMTA5MiwicGFyZW50IjoiNjQyYTUyNGY1ZjUwYmM5MDNmOTg2Mzk0IiwicGhvbmUiOiIxMzQwODU0NzgyMyIsInJvbGUiOiIiLCJzdGF0ZSI6MSwidXNlclR5cGUiOjJ9.Cz7qI3-Vah0io5ZLIFDyVOf8qsqdmbT8WHdprrjbdXw
 
 
 ###

+ 1 - 0
boxcost/api/plan-process-track.go

@@ -59,6 +59,7 @@ func CreatePlanTrack(c *gin.Context, apictx *ApiSession) (interface{}, error) {
 
 	PlanTrack.CreateTime = time.Now()
 	PlanTrack.UpdateTime = time.Now()
+	PlanTrack.UserId, _ = primitive.ObjectIDFromHex(apictx.User.ID)
 
 	result, err := repo.RepoAddDoc(ctx, repo.CollectionPlanTrack, &PlanTrack)
 	return result, err

+ 1 - 1
boxcost/db/model/plan-track.go

@@ -7,7 +7,7 @@ import (
 )
 
 type PlanTrack struct {
-	Id     primitive.ObjectID `bson:"id,omitempty" json:"id"`
+	Id     primitive.ObjectID `bson:"_id,omitempty" json:"_id"`
 	UserId primitive.ObjectID `bson:"userId,omitempty" json:"userId"`
 	//名字
 	Name string `bson:"name,omitempty" json:"name"`