Merge remote-tracking branch 'origin/develop' into develop

DESKTOP-AO0VKC8\mahua
2 parents 53c1d1e9 58ca5703
Showing 4 changed files with 22 additions and 14 deletions
src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java
src/main/resources/application-druid.properties
src/main/resources/templates/config/materialWarning/MaterialWarning.html
src/main/resources/templates/receipt/receiptHeader/receiptHeader.html
@@ -52,8 +52,12 @@ public class ReceiptHeaderController extends BaseController {
     private ReceiptDetailService receiptDetailService;
     @RequiresPermissions("receipt:receiptHeader:view")
-    @GetMapping()
-    public String receiptHeader() {
+    @GetMapping("/{statusFirst}/{statusLast}")
+    public String receiptHeader(ModelMap modelMap,
+                                @PathVariable("statusFirst") Integer statusFirst,
+                                @PathVariable("statusLast") Integer statusLast) {
+        modelMap.put("statusFirst",statusFirst);
+        modelMap.put("statusLast",statusLast);
         return prefix + "/receiptHeader";
     }
@@ -62,11 +66,13 @@ public class ReceiptHeaderController extends BaseController {
      */
     @RequiresPermissions("receipt:receiptHeader:list")
     @Log(title = "入库-入库单头表", operating = "查看入库单列表", action = BusinessType.GRANT)
-    @PostMapping("/list")
+    @PostMapping("/list/{statusFirst}/{statusLast}")
     @ResponseBody
     public TableDataInfo list(@ApiParam(name="receiptHeader",value="入库头表")ReceiptHeader receiptHeader,
                               @ApiParam(name = "createdBegin", value = "起止时间") String createdBegin,
-                              @ApiParam(name = "createdEnd", value = "结束时间") String createdEnd) {
+                              @ApiParam(name = "createdEnd", value = "结束时间") String createdEnd,
+                              @PathVariable Integer statusFirst,
+                              @PathVariable Integer statusLast) {
         LambdaQueryWrapper<ReceiptHeader> lambdaQueryWrapper = Wrappers.lambdaQuery();
         PageDomain pageDomain = TableSupport.buildPageRequest();
         Integer pageNum = pageDomain.getPageNum();
@@ -83,10 +89,10 @@ public class ReceiptHeaderController extends BaseController {
                 .eq(StringUtils.isNotEmpty(receiptHeader.getReferCode()), ReceiptHeader::getReferCode, receiptHeader.getReferCode())
                 .le(StringUtils.isNotNull(receiptHeader.getFirstStatus()),
                 ReceiptHeader::getFirstStatus, receiptHeader.getFirstStatus())
-                .between(StringUtils.isNull(receiptHeader.getFirstStatus()),ReceiptHeader::getFirstStatus,0,179)
+                .between(StringUtils.isNull(receiptHeader.getFirstStatus()),ReceiptHeader::getFirstStatus,statusLast,statusFirst)
                 .ge(StringUtils.isNotNull(receiptHeader.getLastStatus()),
                         ReceiptHeader::getLastStatus, receiptHeader.getLastStatus())
-                .between(StringUtils.isNull(receiptHeader.getLastStatus()),ReceiptHeader::getLastStatus,0,179)
+                .between(StringUtils.isNull(receiptHeader.getLastStatus()),ReceiptHeader::getLastStatus,statusLast,statusFirst)
                 .orderByDesc(ReceiptHeader::getCreated);
         if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
@@ -2,14 +2,14 @@
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
 # Ö÷¿â
-#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
+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
 #spring.datasource.druid.master.url=jdbc:mysql://172.16.29.45:3306/huahengExample?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
-spring.datasource.druid.master.url=jdbc:mysql://localhost:3306/wms_v2?characterEncoding=utf8&serverTimezone=GMT%2b8
+#spring.datasource.druid.master.url=jdbc:mysql://localhost:3306/wms_v2?characterEncoding=utf8&serverTimezone=GMT%2b8
-#spring.datasource.druid.master.username=softhuaheng
-#spring.datasource.druid.master.password=HHrobot123.
-spring.datasource.druid.master.username=root
-spring.datasource.druid.master.password=123456
+spring.datasource.druid.master.username=softhuaheng
+spring.datasource.druid.master.password=HHrobot123.
+#spring.datasource.druid.master.username=root
+#spring.datasource.druid.master.password=123456
 # ´Ó¿â
 spring.datasource.druid.slave.open = false
 spring.datasource.druid.slave.url=jdbc:mysql://199.19.109.117:3306/wms_v2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
@@ -163,7 +163,7 @@
 							field: 'email',
 							title: '-'
 						},
-											        {
+					{
 		            title: '操作',
 		            align: 'center',
 		            formatter: function(value, row, index) {
@@ -222,10 +222,12 @@
     var receiptId = '';
     var receiptCode = '';
     let status = [[${status}]];
+    var statusFirst = [[${statusFirst}]];
+    var statusLast = [[${statusLast}]];
     $(function() {
         var options = {
-            url: prefix + "/list",
+            url: prefix + "/list/"+statusFirst+"/"+statusLast,
             createUrl: prefix + "/add",
             updateUrl: prefix + "/edit/{id}",
             removeUrl: prefix + "/remove",