Commit ee4c7099dffcc88db4518e07ba5a2a79f41f1996
Merge remote-tracking branch 'origin/develop' into develop
Showing
4 changed files
with
22 additions
and
14 deletions
src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java
| ... | ... | @@ -52,8 +52,12 @@ public class ReceiptHeaderController extends BaseController { |
| 52 | 52 | private ReceiptDetailService receiptDetailService; |
| 53 | 53 | |
| 54 | 54 | @RequiresPermissions("receipt:receiptHeader:view") |
| 55 | - @GetMapping() | |
| 56 | - public String receiptHeader() { | |
| 55 | + @GetMapping("/{statusFirst}/{statusLast}") | |
| 56 | + public String receiptHeader(ModelMap modelMap, | |
| 57 | + @PathVariable("statusFirst") Integer statusFirst, | |
| 58 | + @PathVariable("statusLast") Integer statusLast) { | |
| 59 | + modelMap.put("statusFirst",statusFirst); | |
| 60 | + modelMap.put("statusLast",statusLast); | |
| 57 | 61 | return prefix + "/receiptHeader"; |
| 58 | 62 | } |
| 59 | 63 | |
| ... | ... | @@ -62,11 +66,13 @@ public class ReceiptHeaderController extends BaseController { |
| 62 | 66 | */ |
| 63 | 67 | @RequiresPermissions("receipt:receiptHeader:list") |
| 64 | 68 | @Log(title = "入库-入库单头表", operating = "查看入库单列表", action = BusinessType.GRANT) |
| 65 | - @PostMapping("/list") | |
| 69 | + @PostMapping("/list/{statusFirst}/{statusLast}") | |
| 66 | 70 | @ResponseBody |
| 67 | 71 | public TableDataInfo list(@ApiParam(name="receiptHeader",value="入库头表")ReceiptHeader receiptHeader, |
| 68 | 72 | @ApiParam(name = "createdBegin", value = "起止时间") String createdBegin, |
| 69 | - @ApiParam(name = "createdEnd", value = "结束时间") String createdEnd) { | |
| 73 | + @ApiParam(name = "createdEnd", value = "结束时间") String createdEnd, | |
| 74 | + @PathVariable Integer statusFirst, | |
| 75 | + @PathVariable Integer statusLast) { | |
| 70 | 76 | LambdaQueryWrapper<ReceiptHeader> lambdaQueryWrapper = Wrappers.lambdaQuery(); |
| 71 | 77 | PageDomain pageDomain = TableSupport.buildPageRequest(); |
| 72 | 78 | Integer pageNum = pageDomain.getPageNum(); |
| ... | ... | @@ -83,10 +89,10 @@ public class ReceiptHeaderController extends BaseController { |
| 83 | 89 | .eq(StringUtils.isNotEmpty(receiptHeader.getReferCode()), ReceiptHeader::getReferCode, receiptHeader.getReferCode()) |
| 84 | 90 | .le(StringUtils.isNotNull(receiptHeader.getFirstStatus()), |
| 85 | 91 | ReceiptHeader::getFirstStatus, receiptHeader.getFirstStatus()) |
| 86 | - .between(StringUtils.isNull(receiptHeader.getFirstStatus()),ReceiptHeader::getFirstStatus,0,179) | |
| 92 | + .between(StringUtils.isNull(receiptHeader.getFirstStatus()),ReceiptHeader::getFirstStatus,statusLast,statusFirst) | |
| 87 | 93 | .ge(StringUtils.isNotNull(receiptHeader.getLastStatus()), |
| 88 | 94 | ReceiptHeader::getLastStatus, receiptHeader.getLastStatus()) |
| 89 | - .between(StringUtils.isNull(receiptHeader.getLastStatus()),ReceiptHeader::getLastStatus,0,179) | |
| 95 | + .between(StringUtils.isNull(receiptHeader.getLastStatus()),ReceiptHeader::getLastStatus,statusLast,statusFirst) | |
| 90 | 96 | .orderByDesc(ReceiptHeader::getCreated); |
| 91 | 97 | |
| 92 | 98 | if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){ |
| ... | ... |
src/main/resources/application-druid.properties
| ... | ... | @@ -2,14 +2,14 @@ |
| 2 | 2 | spring.datasource.type=com.alibaba.druid.pool.DruidDataSource |
| 3 | 3 | spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver |
| 4 | 4 | # Ö÷¿â |
| 5 | -#spring.datasource.druid.master.url=jdbc:mysql://172.16.29.45:3306/wms_v2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2b8 | |
| 5 | +spring.datasource.druid.master.url=jdbc:mysql://172.16.29.45:3306/wms_v2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2b8 | |
| 6 | 6 | #spring.datasource.druid.master.url=jdbc:mysql://172.16.29.45:3306/huahengExample?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false |
| 7 | -spring.datasource.druid.master.url=jdbc:mysql://localhost:3306/wms_v2?characterEncoding=utf8&serverTimezone=GMT%2b8 | |
| 7 | +#spring.datasource.druid.master.url=jdbc:mysql://localhost:3306/wms_v2?characterEncoding=utf8&serverTimezone=GMT%2b8 | |
| 8 | 8 | |
| 9 | -#spring.datasource.druid.master.username=softhuaheng | |
| 10 | -#spring.datasource.druid.master.password=HHrobot123. | |
| 11 | -spring.datasource.druid.master.username=root | |
| 12 | -spring.datasource.druid.master.password=123456 | |
| 9 | +spring.datasource.druid.master.username=softhuaheng | |
| 10 | +spring.datasource.druid.master.password=HHrobot123. | |
| 11 | +#spring.datasource.druid.master.username=root | |
| 12 | +#spring.datasource.druid.master.password=123456 | |
| 13 | 13 | # ´Ó¿â |
| 14 | 14 | spring.datasource.druid.slave.open = false |
| 15 | 15 | spring.datasource.druid.slave.url=jdbc:mysql://199.19.109.117:3306/wms_v2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false |
| ... | ... |
src/main/resources/templates/config/materialWarning/MaterialWarning.html
src/main/resources/templates/receipt/receiptHeader/receiptHeader.html
| ... | ... | @@ -222,10 +222,12 @@ |
| 222 | 222 | var receiptId = ''; |
| 223 | 223 | var receiptCode = ''; |
| 224 | 224 | let status = [[${status}]]; |
| 225 | + var statusFirst = [[${statusFirst}]]; | |
| 226 | + var statusLast = [[${statusLast}]]; | |
| 225 | 227 | |
| 226 | 228 | $(function() { |
| 227 | 229 | var options = { |
| 228 | - url: prefix + "/list", | |
| 230 | + url: prefix + "/list/"+statusFirst+"/"+statusLast, | |
| 229 | 231 | createUrl: prefix + "/add", |
| 230 | 232 | updateUrl: prefix + "/edit/{id}", |
| 231 | 233 | removeUrl: prefix + "/remove", |
| ... | ... |