From 4e890f4a0129f14953268f98f47ecd9ffd8755c4 Mon Sep 17 00:00:00 2001 From: starrysky <838252223@qq.com> Date: Thu, 15 Aug 2019 00:11:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E4=BE=9B=E5=BA=94?= =?UTF-8?q?=E5=95=86=E7=BC=96=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/bd/rest/SupplierInfoController.java | 31 +++++++++++++++---- 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/rest/SupplierInfoController.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/rest/SupplierInfoController.java index 5e431e3d..5512b1f6 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/rest/SupplierInfoController.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/rest/SupplierInfoController.java @@ -13,6 +13,8 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import io.swagger.annotations.*; +import java.util.Calendar; + /** * @author jie * @date 2019-08-03 @@ -27,17 +29,34 @@ public class SupplierInfoController { @Log("分页查询供应商资料列表") @ApiOperation(value = "分页查询供应商资料列表") - @GetMapping(value = "/supplierInfos") + @GetMapping(value = "/querySupplierInfoPage") @PreAuthorize("hasAnyRole('ADMIN','BDSUPPLIERINFO_ALL','BDSUPPLIERINFO_SELECT')") - public ResponseEntity getBdSupplierInfos(SupplierInfoQueryCriteria criteria, Pageable pageable){ + public ResponseEntity querySupplierInfoPage(SupplierInfoQueryCriteria criteria, Pageable pageable){ return new ResponseEntity(supplierInfoService.queryAll(criteria,pageable),HttpStatus.OK); } - @Log("查询供应商资料列表") - @ApiOperation(value = "分页查询供应商资料列表") - @GetMapping(value = "/getSupplierInfoList") + @Log("初始化供应商编号") + @ApiOperation(value = "初始化供应商编号") + @GetMapping(value = "/initSupplierCode") @PreAuthorize("hasAnyRole('ADMIN','BDSUPPLIERINFO_ALL','BDSUPPLIERINFO_SELECT')") - public ResponseEntity getBdSupplierInfoList(SupplierInfoQueryCriteria criteria){ + public ResponseEntity initSupplierCode(){ + Calendar calendar = Calendar.getInstance(); + int year = calendar.get(Calendar.YEAR); + int month = calendar.get(Calendar.MONTH); + int day = calendar.get(Calendar.DAY_OF_MONTH); + int hour = calendar.get(Calendar.HOUR_OF_DAY); + int minute = calendar.get(Calendar.MINUTE); + int second = calendar.get(Calendar.SECOND); + String supplierCode = "GYS" + year + month + day + hour + minute + second; + return new ResponseEntity(supplierCode,HttpStatus.OK); + } + + + @Log("查询供应商资料列表") + @ApiOperation(value = "查询供应商资料列表") + @GetMapping(value = "/querySupplierInfoList") + @PreAuthorize("hasAnyRole('ADMIN','BDSUPPLIERINFO_ALL','BDSUPPLIERINFO_SELECT')") + public ResponseEntity querySupplierInfoList(SupplierInfoQueryCriteria criteria){ return new ResponseEntity(supplierInfoService.queryAll(criteria),HttpStatus.OK); }