diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/controller/OrderLogController.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/controller/OrderLogController.java index bd06d5b8b..f6a318bc0 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/controller/OrderLogController.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/controller/OrderLogController.java @@ -26,6 +26,7 @@ import javax.validation.Valid; import org.springblade.core.secure.BladeUser; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; import org.springframework.web.bind.annotation.*; @@ -56,6 +57,8 @@ public class OrderLogController extends BladeController { @ApiOperationSupport(order = 1) @ApiOperation(value = "详情", notes = "传入orderLog") public R detail(OrderLogEntity orderLog) { + AuthUtil.getUser(); + OrderLogEntity detail = orderLogService.getOne(Condition.getQueryWrapper(orderLog)); return R.data(detail); } diff --git a/doc/dpm/物流租户系统.pdma.json b/doc/dpm/物流租户系统.pdma.json index 174b33b2d..641db5a7c 100644 --- a/doc/dpm/物流租户系统.pdma.json +++ b/doc/dpm/物流租户系统.pdma.json @@ -4,7 +4,7 @@ "avatar": "", "version": "4.5.1", "createdTime": "2023-3-27 13:32:56", - "updatedTime": "2023-5-4 15:56:46", + "updatedTime": "2023-5-4 18:09:49", "dbConns": [], "profile": { "default": { @@ -7880,6 +7880,23 @@ } ], "fields": [ + { + "defKey": "id", + "defName": "主键", + "comment": "", + "type": "INT", + "len": 20, + "scale": "", + "primaryKey": true, + "notNull": true, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "41CE226C-898E-4A6A-B510-8D8313E23C04" + }, { "defKey": "tenant_id", "defName": "租户号", @@ -8016,23 +8033,6 @@ "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", "id": "D13DF376-1571-4FF7-97A0-7F6533DB588F" }, - { - "defKey": "id", - "defName": "主键", - "comment": "", - "type": "INT", - "len": 20, - "scale": "", - "primaryKey": true, - "notNull": true, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": "", - "extProps": {}, - "domain": "", - "id": "41CE226C-898E-4A6A-B510-8D8313E23C04" - }, { "defKey": "reserve1", "defName": "预留1", @@ -8154,8 +8154,8 @@ }, { "defKey": "type", - "defName": "仓库类型", - "comment": "", + "defName": "货区类型", + "comment": "码表:1 普通货区 2 备货区", "type": "", "len": "", "scale": "", @@ -13123,6 +13123,23 @@ } ], "fields": [ + { + "defKey": "id", + "defName": "主键", + "comment": "", + "type": "INT", + "len": 20, + "scale": "", + "primaryKey": true, + "notNull": true, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "204B98CB-2338-4CD3-A686-8E6C281801C8" + }, { "defKey": "tenant_id", "defName": "租户号", @@ -13259,23 +13276,6 @@ "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", "id": "00459251-1C83-473B-A473-52D2E22F1DD6" }, - { - "defKey": "id", - "defName": "主键", - "comment": "", - "type": "INT", - "len": 20, - "scale": "", - "primaryKey": true, - "notNull": true, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": "", - "extProps": {}, - "domain": "", - "id": "204B98CB-2338-4CD3-A686-8E6C281801C8" - }, { "defKey": "template_name", "defName": "打印模板名称", @@ -16053,24 +16053,6 @@ "id": "209697F4-F108-412D-A805-7038BBFB4C44", "uiHint": null }, - { - "defKey": "huitong_shopping_mall", - "defName": "汇通商场", - "comment": "", - "type": "VARCHAR", - "len": 100, - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": null, - "id": "A91EF855-C095-4BAA-ABE6-25BFAFA49B66", - "uiHint": null - }, { "defKey": "mall_name", "defName": "商场名称", @@ -16233,6 +16215,23 @@ "id": "B181ABDF-A02E-493E-9F0D-1842156C495F", "uiHint": null }, + { + "defKey": "customer_address", + "defName": "顾客地址", + "comment": "", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", + "id": "44F59D31-C722-4779-B398-C154C30646F5" + }, { "defKey": "customer_name", "defName": "顾客名称", @@ -16308,7 +16307,7 @@ { "defKey": "order_type", "defName": "订单类型", - "comment": "1线上 2 线下", + "comment": "1工厂 2 零担", "type": "", "len": "", "scale": "", @@ -16326,7 +16325,7 @@ { "defKey": "order_source", "defName": "订单来源", - "comment": "", + "comment": "品牌", "type": "VARCHAR", "len": 50, "scale": "", @@ -16493,6 +16492,24 @@ } ], "fields": [ + { + "defKey": "id", + "defName": "主键", + "comment": "", + "type": "INT", + "len": 20, + "scale": "", + "primaryKey": true, + "notNull": true, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": null, + "extProps": {}, + "domain": null, + "id": "7F85E884-CC45-4E0B-963C-B0DBE11F64F5", + "uiHint": null + }, { "defKey": "tenant_id", "defName": "租户号", @@ -16632,24 +16649,6 @@ "id": "704B7F50-9142-4F54-A53B-4DF139171F72", "uiHint": null }, - { - "defKey": "id", - "defName": "主键", - "comment": "", - "type": "INT", - "len": 20, - "scale": "", - "primaryKey": true, - "notNull": true, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": null, - "id": "7F85E884-CC45-4E0B-963C-B0DBE11F64F5", - "uiHint": null - }, { "defKey": "reserve1", "defName": "预留1", @@ -17030,7 +17029,7 @@ }, { "defKey": "fixed_price", - "defName": "参考一口加", + "defName": "参考一口价", "comment": "", "type": "", "len": "",