animeic 2 سال پیش
والد
کامیت
a999153834
3فایلهای تغییر یافته به همراه460 افزوده شده و 94 حذف شده
  1. 1 1
      boxcost/api/bill-purchase-excel.go
  2. 456 93
      boxcost/api/tmp.json
  3. 3 0
      boxcost/db/model/bill.go

+ 1 - 1
boxcost/api/bill-purchase-excel.go

@@ -189,7 +189,7 @@ func (b *PurchaseBillExcel) drawTableContent() error {
 	if len(papers) > 0 {
 		for _, paper := range papers {
 			deliveryTime := paper.DeliveryTime.Format("2006-01-02")
-			DrawRow(row, paper.Name, paper.Norm, paper.Height, paper.Width, fmt.Sprintf("%d", paper.Count), paper.Price, paper.Price2, deliveryTime, "")
+			DrawRow(row, paper.Name, paper.Norm, paper.Height, paper.Width, fmt.Sprintf("%d", paper.Count), paper.Price, paper.Price2, deliveryTime, paper.Remark)
 			row++
 		}
 	}

+ 456 - 93
boxcost/api/tmp.json

@@ -1,96 +1,459 @@
 {
-  "_id": "638f108e0027470dd3a42f64",
-  "compCounts": 1,
-  "components": {
-    "count": 1,
-    "id": "638f108e0027470dd3a42f60",
-    "mats": [
-      {
-        "crafts": [
-          {
-            "count": 1,
-            "craftInfo": {
-              "_id": "638ef06b0027470dd3a42f51",
-              "category": "普通印刷",
-              "createTime": "2022-12-06T15:34:03.326+08:00",
-              "name": "单色印刷",
-              "norm": "按文件要求",
-              "price": 0.018,
-              "unit": "张",
-              "updateTime": "2022-12-06T16:02:30.869+08:00"
-            },
-            "id": "638f108e0027470dd3a42f62",
-            "size": "0"
-          }
-        ],
-        "id": "638f108e0027470dd3a42f61",
-        "matInfo": {
-          "_id": "638eee5bf9039e0980fe5654",
-          "category": "纸张类",
-          "createTime": "2022-12-06T15:25:15.32+08:00",
-          "name": "太阳白卡",
-          "norm": "350g",
-          "price": 5400,
-          "unit": "吨",
-          "updateTime": "2022-12-06T15:25:15.32+08:00"
-        }
-      },
-      {
-        "crafts": [
-          {
-            "count": 1,
-            "craftInfo": {
-              "_id": "638470d24d585ba68be6cbaf",
-              "category": "粘盒",
-              "createTime": "2022-11-28T16:26:58.869+08:00",
-              "name": "粘盒",
-              "norm": "按文件要求",
-              "price": 0.08,
-              "unit": "张",
-              "updateTime": "2022-11-28T16:27:24.914+08:00"
-            },
-            "id": "1670402002385638470d24d585ba68be6cbaf1",
-            "size": "0"
-          }
-        ],
-        "id": "1670402002385638465894d585ba68be6cb9e",
-        "matInfo": {
-          "_id": "638465894d585ba68be6cb9e",
-          "category": "纸张类",
-          "createTime": "2022-11-28T15:38:49.329+08:00",
-          "name": "地龙灰底白",
-          "norm": "250g",
-          "price": 4450,
-          "unit": "吨",
-          "updateTime": "2022-11-28T15:38:49.329+08:00"
-        }
-      },
-      {
-        "crafts": [
-          {
-            "count": 1,
-            "craftInfo": {},
-            "size": "0"
-          }
-        ],
-        "id": "1670409094178635f6a9a7709d49772267fca",
-        "matInfo": {
-          "_id": "635f6a9a7709d49772267fca",
-          "category": "小物件",
-          "createTime": "2022-10-31T14:26:34.142+08:00",
-          "name": "金属手提扣",
-          "norm": "小物件规格11",
-          "price": 1,
-          "unit": "个",
-          "updateTime": "2022-10-31T14:26:34.142+08:00"
-        }
-      }
-    ],
-    "name": "333",
-    "uvSize": "0"
+  "billStates": {
+    "638ef5310027470dd3a42f5c": "complete",
+    "638ef5340027470dd3a42f5e": "complete",
+    "63a93b7f1e2834349334461c": "created",
+    "63a9447dfad9189c785c7c18": "created"
   },
-  "createTime": "2022-12-06T17:51:10.885+08:00",
-  "designer": "1232",
-  "name": "测试包装",
-  "updateTime": "2022-12-08T09:56:53.766+08:00"
+  "plan": {
+    "_id": "638ef3960027470dd3a42f55",
+    "name": "鲜花饼360g",
+    "pack": {
+      "_id": "638eed77f9039e0980fe5652",
+      "name": "鲜花饼 360g",
+      "thumbnail": "https://sku3d-test.obs.cn-east-3.myhuaweicloud.com/image/jpg/1670311322997M7wUKS_微信图片_20221206152147.jpg",
+      "compCounts": 1,
+      "designer": "",
+      "components": [
+        {
+          "id": "638eed77f9039e0980fe5651",
+          "name": "外盒",
+          "thumbnail": "https://sku3d-test.obs.cn-east-3.myhuaweicloud.com/image/png/1670311856420e8wylj_微信图片_20221206153035.png",
+          "count": 1,
+          "uv": "",
+          "uvSize": "0",
+          "mats": [
+            {
+              "id": "",
+              "crafts": [
+                {
+                  "id": "",
+                  "size": "0",
+                  "count": 4,
+                  "craftInfo": {
+                    "_id": "635f8bb4971df70343123325",
+                    "name": "4c印刷",
+                    "unit": "版/色",
+                    "price": 0.018,
+                    "norm": "按文件要求",
+                    "remark": "",
+                    "createTime": "2022-10-31T08:47:48.663Z",
+                    "updateTime": "2022-12-01T08:38:57.851Z",
+                    "category": "普通印刷"
+                  },
+                  "supplier": {
+                    "calc": {
+                      "_id": "000000000000000000000000",
+                      "category": "普通印刷",
+                      "name": "普通印刷计价方案1",
+                      "remark": "版费(50)\n起价(普通550,普通+专色800)\n超过10000份减版费",
+                      "param1": "50",
+                      "param2": "550",
+                      "param3": "800",
+                      "param4": "10000",
+                      "param5": "",
+                      "createTime": "0001-01-01T00:00:00Z",
+                      "updateTime": "0001-01-01T00:00:00Z",
+                      "isDefault": null
+                    },
+                    "deliveryTime": "2022-12-09T07:44:51Z",
+                    "orderPrice": 0.072,
+                    "orderCount": 5300,
+                    "orderRealPrice": 581.6,
+                    "supplierInfo": {
+                      "_id": "63846b744d585ba68be6cba1",
+                      "name": "宏川",
+                      "address": "崇州泗潍路333号",
+                      "phone": "13882239198",
+                      "category": "普通印刷",
+                      "createTime": "2022-11-28T08:04:04.791Z",
+                      "updateTime": "2022-12-06T06:55:33.649Z"
+                    }
+                  },
+                  "batchCount": 1,
+                  "batchSizeWidth": 1030,
+                  "batchSizeHeight": 520,
+                  "billId": "638ef5340027470dd3a42f5e",
+                  "remark": "备注1"
+                },
+                {
+                  "id": "",
+                  "size": "0",
+                  "count": 1,
+                  "craftInfo": {
+                    "_id": "63846db34d585ba68be6cba3",
+                    "name": "哑膜",
+                    "unit": "平方米",
+                    "price": 0.49,
+                    "norm": "按文件要求",
+                    "remark": "",
+                    "createTime": "2022-11-28T08:13:39.864Z",
+                    "updateTime": "2022-11-28T08:13:39.864Z",
+                    "category": "覆膜"
+                  },
+                  "supplier": {
+                    "calc": null,
+                    "deliveryTime": "2022-12-10T07:44:51Z",
+                    "orderPrice": 0.262,
+                    "orderCount": 5250,
+                    "orderRealPrice": 1375.5,
+                    "supplierInfo": {
+                      "_id": "6388441551ba5b3307f8ab61",
+                      "name": "熊明军",
+                      "address": "金鸡路556",
+                      "phone": "13980871668",
+                      "category": "覆膜",
+                      "createTime": "2022-12-01T06:05:09.079Z",
+                      "updateTime": "2022-12-01T06:05:09.079Z"
+                    }
+                  },
+                  "batchCount": 1,
+                  "batchSizeWidth": 1030,
+                  "batchSizeHeight": 520,
+                  "billId": "63a93b7f1e2834349334461c",
+                  "remark": ""
+                },
+                {
+                  "id": "",
+                  "size": "0",
+                  "count": 1,
+                  "craftInfo": {
+                    "_id": "638eecaef9039e0980fe564f",
+                    "name": "烫浅金",
+                    "unit": "张",
+                    "price": 0.15,
+                    "norm": "按文件要求",
+                    "remark": "",
+                    "createTime": "2022-12-06T07:18:06.188Z",
+                    "updateTime": "2022-12-06T07:18:06.188Z",
+                    "category": "烫金"
+                  },
+                  "supplier": {
+                    "calc": null,
+                    "deliveryTime": "2022-12-11T07:44:51Z",
+                    "orderPrice": 0.15,
+                    "orderCount": 5250,
+                    "orderRealPrice": 787.5,
+                    "supplierInfo": {
+                      "_id": "638eecd4f9039e0980fe5650",
+                      "name": "温学刚",
+                      "address": "崇州金鸡路556",
+                      "phone": "13028138020",
+                      "category": "烫金",
+                      "createTime": "2022-12-06T07:18:44.322Z",
+                      "updateTime": "2022-12-06T07:18:44.322Z"
+                    }
+                  },
+                  "batchCount": 1,
+                  "batchSizeWidth": 0,
+                  "batchSizeHeight": 0,
+                  "billId": "",
+                  "remark": ""
+                },
+                {
+                  "id": "",
+                  "size": "0",
+                  "count": 1,
+                  "craftInfo": {
+                    "_id": "638470a94d585ba68be6cbae",
+                    "name": "模切",
+                    "unit": "张",
+                    "price": 0.04,
+                    "norm": "按文件要求",
+                    "remark": "",
+                    "createTime": "2022-11-28T08:26:17.151Z",
+                    "updateTime": "2022-11-28T08:29:11.086Z",
+                    "category": "模切"
+                  },
+                  "supplier": {
+                    "calc": null,
+                    "deliveryTime": "2022-12-12T07:44:51Z",
+                    "orderPrice": 0.04,
+                    "orderCount": 5200,
+                    "orderRealPrice": 208,
+                    "supplierInfo": {
+                      "_id": "638ee7d9f9039e0980fe564b",
+                      "name": "德顺源",
+                      "address": "崇州市宏业大道北段345号",
+                      "phone": "18180776616",
+                      "category": "模切",
+                      "createTime": "2022-12-06T06:57:29.637Z",
+                      "updateTime": "2022-12-06T06:57:29.637Z"
+                    }
+                  },
+                  "batchCount": 1,
+                  "batchSizeWidth": 0,
+                  "batchSizeHeight": 0,
+                  "billId": "",
+                  "remark": ""
+                },
+                {
+                  "id": "",
+                  "size": "0",
+                  "count": 1,
+                  "craftInfo": {
+                    "_id": "638471684d585ba68be6cbb0",
+                    "name": "打包",
+                    "unit": "张",
+                    "price": 0.01,
+                    "norm": "按文件要求",
+                    "remark": "",
+                    "createTime": "2022-11-28T08:29:28.343Z",
+                    "updateTime": "2022-11-28T08:29:28.343Z",
+                    "category": "打包"
+                  },
+                  "supplier": {
+                    "calc": null,
+                    "deliveryTime": "2022-12-12T07:44:51Z",
+                    "orderPrice": 0.01,
+                    "orderCount": 5100,
+                    "orderRealPrice": 51,
+                    "supplierInfo": {
+                      "_id": "638ee827f9039e0980fe564d",
+                      "name": "德顺源",
+                      "address": "崇州市宏业大道北段345号",
+                      "phone": "18180776616",
+                      "category": "打包",
+                      "createTime": "2022-12-06T06:58:47.583Z",
+                      "updateTime": "2022-12-06T06:58:47.583Z"
+                    }
+                  },
+                  "batchCount": 1,
+                  "batchSizeWidth": 0,
+                  "batchSizeHeight": 0,
+                  "billId": "",
+                  "remark": ""
+                }
+              ],
+              "matInfo": {
+                "_id": "638eedb2f9039e0980fe5653",
+                "name": "太阳白卡",
+                "category": "纸张类",
+                "price": 5400,
+                "unit": "吨",
+                "norm": "250g",
+                "height": 0,
+                "width": 0,
+                "remark": "",
+                "createTime": "2022-12-06T07:22:26.375Z",
+                "updateTime": "2022-12-06T07:24:48.591Z"
+              },
+              "supplier": {
+                "calc": null,
+                "deliveryTime": "2022-12-08T07:44:51Z",
+                "orderPrice": 0.737,
+                "orderCount": 5400,
+                "orderRealPrice": 3979.8,
+                "supplierInfo": {
+                  "_id": "6384668e4d585ba68be6cb9f",
+                  "name": "正大文博",
+                  "address": "四川省成都市温江区分水村清波工业园A3号",
+                  "phone": "13853360367",
+                  "category": "纸张类",
+                  "createTime": "2022-11-28T07:43:10.638Z",
+                  "updateTime": "2022-12-06T07:19:45.089Z"
+                }
+              },
+              "batchCount": 1,
+              "batchSizeWidth": 1050,
+              "batchSizeHeight": 520,
+              "billId": "638ef5310027470dd3a42f5c",
+              "remark": ""
+            }
+          ],
+          "remark": "",
+          "totalPrice": 6983.4
+        },
+        {
+          "id": "1670311794063",
+          "name": "内卡",
+          "thumbnail": "https://sku3d-test.obs.cn-east-3.myhuaweicloud.com/image/png/1670311942234A5P3ic_微信图片_20221206153145.png",
+          "count": 1,
+          "uv": "",
+          "uvSize": "0",
+          "mats": [
+            {
+              "id": "",
+              "crafts": [
+                {
+                  "id": "",
+                  "size": "0",
+                  "count": 1,
+                  "craftInfo": {
+                    "_id": "638ef06b0027470dd3a42f51",
+                    "name": "单色印刷",
+                    "unit": "套",
+                    "price": 400,
+                    "norm": "按文件要求",
+                    "remark": "",
+                    "createTime": "2022-12-06T07:34:03.326Z",
+                    "updateTime": "2022-12-06T07:34:03.326Z",
+                    "category": "普通印刷"
+                  },
+                  "supplier": {
+                    "calc": {
+                      "_id": "63736d159094a81dd2cc45f2",
+                      "category": "普通印刷",
+                      "name": "普通印刷计价方案1",
+                      "remark": "版费(50)\n起价(普通550,普通+专色800)\n超过10000份减版费",
+                      "param1": "50",
+                      "param2": "550",
+                      "param3": "800",
+                      "param4": "10000",
+                      "param5": "",
+                      "createTime": "0001-01-01T00:00:00Z",
+                      "updateTime": "2022-12-01T05:54:29.052Z",
+                      "isDefault": true
+                    },
+                    "deliveryTime": "2022-12-06T07:44:51Z",
+                    "orderPrice": 0.018,
+                    "orderCount": 10000,
+                    "orderRealPrice": 550,
+                    "supplierInfo": null
+                  },
+                  "batchCount": 1,
+                  "batchSizeWidth": 0,
+                  "batchSizeHeight": 0,
+                  "billId": "",
+                  "remark": ""
+                },
+                {
+                  "id": "",
+                  "size": "0",
+                  "count": 1,
+                  "craftInfo": {
+                    "_id": "63846db34d585ba68be6cba3",
+                    "name": "哑膜",
+                    "unit": "平方米",
+                    "price": 0.49,
+                    "norm": "按文件要求",
+                    "remark": "",
+                    "createTime": "2022-11-28T08:13:39.864Z",
+                    "updateTime": "2022-11-28T08:13:39.864Z",
+                    "category": "覆膜"
+                  },
+                  "supplier": {
+                    "calc": null,
+                    "deliveryTime": "2022-12-06T07:44:51Z",
+                    "orderPrice": 0,
+                    "orderCount": 10000,
+                    "orderRealPrice": 0,
+                    "supplierInfo": null
+                  },
+                  "batchCount": 1,
+                  "batchSizeWidth": 0,
+                  "batchSizeHeight": 0,
+                  "billId": "",
+                  "remark": ""
+                },
+                {
+                  "id": "",
+                  "size": "0",
+                  "count": 1,
+                  "craftInfo": {
+                    "_id": "638470a94d585ba68be6cbae",
+                    "name": "模切",
+                    "unit": "张",
+                    "price": 0.04,
+                    "norm": "按文件要求",
+                    "remark": "",
+                    "createTime": "2022-11-28T08:26:17.151Z",
+                    "updateTime": "2022-11-28T08:29:11.086Z",
+                    "category": "模切"
+                  },
+                  "supplier": {
+                    "calc": null,
+                    "deliveryTime": "2022-12-06T07:44:51Z",
+                    "orderPrice": 0.04,
+                    "orderCount": 10000,
+                    "orderRealPrice": 400,
+                    "supplierInfo": null
+                  },
+                  "batchCount": 1,
+                  "batchSizeWidth": 0,
+                  "batchSizeHeight": 0,
+                  "billId": "",
+                  "remark": ""
+                },
+                {
+                  "id": "",
+                  "size": "0",
+                  "count": 1,
+                  "craftInfo": {
+                    "_id": "638471684d585ba68be6cbb0",
+                    "name": "打包",
+                    "unit": "张",
+                    "price": 0.01,
+                    "norm": "按文件要求",
+                    "remark": "",
+                    "createTime": "2022-11-28T08:29:28.343Z",
+                    "updateTime": "2022-11-28T08:29:28.343Z",
+                    "category": "打包"
+                  },
+                  "supplier": {
+                    "calc": null,
+                    "deliveryTime": "2022-12-06T07:44:51Z",
+                    "orderPrice": 0.01,
+                    "orderCount": 10000,
+                    "orderRealPrice": 100,
+                    "supplierInfo": null
+                  },
+                  "batchCount": 1,
+                  "batchSizeWidth": 0,
+                  "batchSizeHeight": 0,
+                  "billId": "",
+                  "remark": ""
+                }
+              ],
+              "matInfo": {
+                "_id": "638eedb2f9039e0980fe5653",
+                "name": "太阳白卡",
+                "category": "纸张类",
+                "price": 5400,
+                "unit": "吨",
+                "norm": "250g",
+                "height": 0,
+                "width": 0,
+                "remark": "",
+                "createTime": "2022-12-06T07:22:26.375Z",
+                "updateTime": "2022-12-06T07:24:48.591Z"
+              },
+              "supplier": {
+                "calc": null,
+                "deliveryTime": "2022-12-06T07:44:51Z",
+                "orderPrice": 0,
+                "orderCount": 10000,
+                "orderRealPrice": 0,
+                "supplierInfo": {
+                  "_id": "6384668e4d585ba68be6cb9f",
+                  "name": "正大文博",
+                  "address": "四川省成都市温江区分水村清波工业园A3号",
+                  "phone": "13853360367",
+                  "category": "纸张类",
+                  "createTime": "2022-11-28T07:43:10.638Z",
+                  "updateTime": "2022-12-06T07:19:45.089Z"
+                }
+              },
+              "batchCount": 1,
+              "batchSizeWidth": 0,
+              "batchSizeHeight": 0,
+              "billId": "63a9447dfad9189c785c7c18",
+              "remark": "保质保量"
+            }
+          ],
+          "remark": "",
+          "totalPrice": 1050
+        }
+      ],
+      "createTime": "2022-12-06T07:21:27.169Z",
+      "updateTime": "2022-12-06T07:38:56.936Z"
+    },
+    "thumbnail": "https://sku3d-test.obs.cn-east-3.myhuaweicloud.com/image/jpg/1670311322997M7wUKS_微信图片_20221206152147.jpg",
+    "createUser": "1",
+    "total": 10000,
+    "status": "process",
+    "totalPrice": 8033.4,
+    "updateTime": "2022-12-26T07:00:18.895Z",
+    "createTime": "2022-12-06T07:47:34.82Z"
+  }
 }

+ 3 - 0
boxcost/db/model/bill.go

@@ -25,6 +25,9 @@ type PaperBill struct {
 	//数量
 	Count int `bson:"count,omitempty" json:"count"`
 
+	//备注
+	Remark string `bson:"remark,omitempty" json:"remark"`
+
 	//交货时间
 	DeliveryTime time.Time `bson:"deliveryTime,omitempty" json:"deliveryTime"`
 }