From 7ec2a6554b15bd82f9620906d8661f5f01c2654c Mon Sep 17 00:00:00 2001 From: lgh0010 <1746689524@qq.com> Date: Mon, 13 Dec 2021 16:42:10 +0800 Subject: [PATCH] =?UTF-8?q?code=E7=94=9F=E6=88=90=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mt/wms/basic/controller/AlarmBaseController.java | 4 ++-- .../mt/wms/basic/controller/KilnInfoController.java | 4 ++-- .../wms/basic/controller/LocationInfoController.java | 4 ++-- .../com/mt/wms/basic/controller/VehicleController.java | 4 ++-- .../mt/wms/basic/controller/WarehouseController.java | 4 ++-- .../java/com/mt/wms/basic/params/KilnInfoParam.java | 2 +- .../java/com/mt/wms/basic/params/WarehouseParam.java | 6 ++++++ .../src/main/java/com/mt/wms/basic/vo/KilnInfoVo.java | 2 +- .../src/main/java/com/mt/wms/basic/vo/WarehouseVo.java | 10 ++++++++-- 9 files changed, 26 insertions(+), 14 deletions(-) diff --git a/6.program/wms-basic/src/main/java/com/mt/wms/basic/controller/AlarmBaseController.java b/6.program/wms-basic/src/main/java/com/mt/wms/basic/controller/AlarmBaseController.java index 9a03a77..de80326 100644 --- a/6.program/wms-basic/src/main/java/com/mt/wms/basic/controller/AlarmBaseController.java +++ b/6.program/wms-basic/src/main/java/com/mt/wms/basic/controller/AlarmBaseController.java @@ -79,7 +79,7 @@ public class AlarmBaseController extends BaseController { @PostMapping(value = "codeGenerator") @ApiOperation(value = "编码生成") - private String CodeGenerator(){ - return IDGenerator.gen("BJ", "yyyyMMddHHmm", 2, "ALARMBASE_CODE"); + private R codeGenerator() { + return successful(IDGenerator.gen("BJ", "yyyyMMddHHmm", 2, "ALARMBASE_CODE")); } } diff --git a/6.program/wms-basic/src/main/java/com/mt/wms/basic/controller/KilnInfoController.java b/6.program/wms-basic/src/main/java/com/mt/wms/basic/controller/KilnInfoController.java index 5099a2c..2482aa9 100644 --- a/6.program/wms-basic/src/main/java/com/mt/wms/basic/controller/KilnInfoController.java +++ b/6.program/wms-basic/src/main/java/com/mt/wms/basic/controller/KilnInfoController.java @@ -80,7 +80,7 @@ public class KilnInfoController extends BaseController { @PostMapping(value = "codeGenerator") @ApiOperation(value = "编码生成") - private String CodeGenerator(){ - return IDGenerator.gen("YL", "yyyyMMddHHmm", 2, "KILN_CODE"); + private R codeGenerator(){ + return successful(IDGenerator.gen("YL", "yyyyMMddHHmm", 2, "KILN_CODE")); } } diff --git a/6.program/wms-basic/src/main/java/com/mt/wms/basic/controller/LocationInfoController.java b/6.program/wms-basic/src/main/java/com/mt/wms/basic/controller/LocationInfoController.java index 1abb3c3..a8e1189 100644 --- a/6.program/wms-basic/src/main/java/com/mt/wms/basic/controller/LocationInfoController.java +++ b/6.program/wms-basic/src/main/java/com/mt/wms/basic/controller/LocationInfoController.java @@ -78,8 +78,8 @@ public class LocationInfoController extends BaseController { @PostMapping(value = "codeGenerator") @ApiOperation(value = "编码生成") - private String CodeGenerator(){ - return IDGenerator.gen("KW", "yyyyMMddHHmm", 2, "LOCATION_CODE"); + private R codeGenerator(){ + return successful(IDGenerator.gen("KW", "yyyyMMddHHmm", 2, "LOCATION_CODE")); } } diff --git a/6.program/wms-basic/src/main/java/com/mt/wms/basic/controller/VehicleController.java b/6.program/wms-basic/src/main/java/com/mt/wms/basic/controller/VehicleController.java index e248651..45b4f93 100644 --- a/6.program/wms-basic/src/main/java/com/mt/wms/basic/controller/VehicleController.java +++ b/6.program/wms-basic/src/main/java/com/mt/wms/basic/controller/VehicleController.java @@ -78,8 +78,8 @@ public class VehicleController extends BaseController { @PostMapping(value = "codeGenerator") @ApiOperation(value = "编码生成") - private String CodeGenerator(){ - return IDGenerator.gen("CL", "yyyyMMddHHmm", 2, "VEHICLE_CODE"); + private R codeGenerator(){ + return successful(IDGenerator.gen("CL", "yyyyMMddHHmm", 2, "VEHICLE_CODE")); } } diff --git a/6.program/wms-basic/src/main/java/com/mt/wms/basic/controller/WarehouseController.java b/6.program/wms-basic/src/main/java/com/mt/wms/basic/controller/WarehouseController.java index af977a0..aecd09c 100644 --- a/6.program/wms-basic/src/main/java/com/mt/wms/basic/controller/WarehouseController.java +++ b/6.program/wms-basic/src/main/java/com/mt/wms/basic/controller/WarehouseController.java @@ -80,7 +80,7 @@ public class WarehouseController extends BaseController { @PostMapping(value = "codeGenerator") @ApiOperation(value = "编码生成") - private String CodeGenerator(){ - return IDGenerator.gen("HC", "yyyyMMddHHmm", 2, "WAREHOUSE_CODE"); + private R codeGenerator(){ + return successful(IDGenerator.gen("HC", "yyyyMMddHHmm", 2, "WAREHOUSE_CODE")); } } diff --git a/6.program/wms-basic/src/main/java/com/mt/wms/basic/params/KilnInfoParam.java b/6.program/wms-basic/src/main/java/com/mt/wms/basic/params/KilnInfoParam.java index d7207f0..335af70 100644 --- a/6.program/wms-basic/src/main/java/com/mt/wms/basic/params/KilnInfoParam.java +++ b/6.program/wms-basic/src/main/java/com/mt/wms/basic/params/KilnInfoParam.java @@ -67,7 +67,7 @@ public class KilnInfoParam extends BaseParam { * 端口号 */ @ApiModelProperty(value = "端口号", example = "8888") - private String partNumber; + private String portNumber; /** * 备注 diff --git a/6.program/wms-basic/src/main/java/com/mt/wms/basic/params/WarehouseParam.java b/6.program/wms-basic/src/main/java/com/mt/wms/basic/params/WarehouseParam.java index a59d549..de2a408 100644 --- a/6.program/wms-basic/src/main/java/com/mt/wms/basic/params/WarehouseParam.java +++ b/6.program/wms-basic/src/main/java/com/mt/wms/basic/params/WarehouseParam.java @@ -79,4 +79,10 @@ public class WarehouseParam extends BaseParam { */ @ApiModelProperty(value = "英文名称",required = true, example = "1") private Integer number; + + /** + * 状态 0初始化，1已占用 + */ + @ApiModelProperty(value = "状态",required = true, example = "1") + private Integer status; } diff --git a/6.program/wms-basic/src/main/java/com/mt/wms/basic/vo/KilnInfoVo.java b/6.program/wms-basic/src/main/java/com/mt/wms/basic/vo/KilnInfoVo.java index 70e95b7..6ef0593 100644 --- a/6.program/wms-basic/src/main/java/com/mt/wms/basic/vo/KilnInfoVo.java +++ b/6.program/wms-basic/src/main/java/com/mt/wms/basic/vo/KilnInfoVo.java @@ -61,7 +61,7 @@ public class KilnInfoVo extends BaseVo implements PageVo.ConvertVo { * 端口号 */ @ApiModelProperty(value = "端口号", example = "8888") - private String partNumber; + private String portNumber; /** * 状态 0初始化，1损坏 diff --git a/6.program/wms-basic/src/main/java/com/mt/wms/basic/vo/WarehouseVo.java b/6.program/wms-basic/src/main/java/com/mt/wms/basic/vo/WarehouseVo.java index 6a1a5ff..13744e1 100644 --- a/6.program/wms-basic/src/main/java/com/mt/wms/basic/vo/WarehouseVo.java +++ b/6.program/wms-basic/src/main/java/com/mt/wms/basic/vo/WarehouseVo.java @@ -66,12 +66,18 @@ public class WarehouseVo extends BaseVo implements PageVo.ConvertVo{ /** * 别名 */ - @ApiModelProperty(value = "英文名称",example = "1") + @ApiModelProperty(value = "别名",example = "1") private String aliasName; /** * 库位数量 */ - @ApiModelProperty(value = "英文名称",example = "1") + @ApiModelProperty(value = "库位数量",example = "1") private Integer number; + + /** + * 状态 0初始化，1已占用 + */ + @ApiModelProperty(value = "状态", example = "1") + private Integer status; }