页面格式和排版更改

pengcheng
1 parent 78382ae4
Showing 11 changed files with 67 additions and 60 deletions
src/main/java/com/huaheng/pc/config/FilterConfigDetail/controller/FilterConfigDetailController.java
src/main/java/com/huaheng/pc/config/FilterConfigDetail/domain/FilterConfigDetail.java
src/main/java/com/huaheng/pc/config/waveFlowDetail/controller/WaveFlowDetailController.java
src/main/java/com/huaheng/pc/shipment/shipmentHeader/service/ShipmentHeaderServiceImpl.java
src/main/java/com/huaheng/pc/shipment/shippingCombination/service/ShippingCombinationService.java
src/main/resources/templates/config/filterConfigDetail/add.html
src/main/resources/templates/config/filterConfigDetail/edit.html
src/main/resources/templates/config/filterConfigDetail/filterConfigDetail.html
src/main/resources/templates/config/waveMaster/add.html
src/main/resources/templates/config/waveMaster/edit.html
src/main/resources/templates/config/waveMaster/waveMaster.html
@@ -123,6 +123,7 @@ public class FilterConfigDetailController extends BaseController {
         }
         filterConfigDetail.setModuleType(configHeader.getModuleType());
         filterConfigDetail.setRecordType(configHeader.getRecordType());
+        filterConfigDetail.setFilterCode(configHeader.getFilterCode());
         filterConfigDetail.setWarehouseCode(ShiroUtils.getWarehouseCode());
         filterConfigDetail.setCreatedBy(ShiroUtils.getLoginName());
         filterConfigDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
@@ -78,9 +78,9 @@ public class FilterConfigDetail implements Serializable {
     @ApiModelProperty(value="全SQL")
     private String statement;
  
-    @TableField(value = "sqll")
+    @TableField(value = "statements")
     @ApiModelProperty(value="后续分组排序")
-    private String sqll;
+    private String statements;
  
     /**
      * 是否系统创建
@@ -50,9 +50,9 @@ public class WaveFlowDetailController extends BaseController {
  
  
     @RequiresPermissions("config:waveFlowDetail:view")
-    @GetMapping("/list/{id}")
-    public String waveFlowDetail(@PathVariable("id")Integer id, ModelMap mmap) {
-        mmap.put("headerId",id);
+    @GetMapping("/list/{headerId}")
+    public String waveFlowDetail(@PathVariable("id")Integer headerId, ModelMap mmap) {
+        mmap.put("headerId",headerId);
         return prefix + "/waveFlowDetail";
     }
  
@@ -108,6 +108,7 @@ public class ShipmentHeaderServiceImpl extends ServiceImpl&lt;ShipmentHeaderMapper,
             //说明没有货箱，则直接首位均为新建
             shipmentHeader.setFirstStatus(100);
             shipmentHeader.setLastStatus(100);
+
             this.saveOrUpdate(shipmentHeader);
         }else {
             int firstStatus = map.get("maxStatus");
@@ -78,7 +78,7 @@ public class ShippingCombinationService {
  
             //根据sql查库存
             try {
-                list = inventoryDetailService.selectBysql(filterConfigDetail.getStatement(),shipmentDetail,filterConfigDetail.getSqll(),shipmentPreference);
+                list = inventoryDetailService.selectBysql(filterConfigDetail.getStatement(),shipmentDetail,filterConfigDetail.getStatements(),shipmentPreference);
             }catch (Exception e){
                 throw new ServiceException("sql错误");
             }
@@ -98,7 +98,7 @@ public class ShippingCombinationService {
             }
  
             //根据sql查库存
-            list=inventoryDetailService.selectBysql(filterConfigDetail.getStatement(),shipmentDetail,filterConfigDetail.getSqll(),shipmentPreference);
+            list=inventoryDetailService.selectBysql(filterConfigDetail.getStatement(),shipmentDetail,filterConfigDetail.getStatements(),shipmentPreference);
             return list;
         }
  
@@ -112,7 +112,7 @@ public class ShippingCombinationService {
         }
  
         //根据sql查库存
-        list=inventoryDetailService.selectBysql(filterConfigDetail.getStatement(),shipmentDetail,filterConfigDetail.getSqll(),shipmentPreference);
+        list=inventoryDetailService.selectBysql(filterConfigDetail.getStatement(),shipmentDetail,filterConfigDetail.getStatements(),shipmentPreference);
         return list;
     }
  
@@ -24,12 +24,12 @@
                 <!--<input id="recordType" name="recordType" class="form-control" type="text">-->
             <!--</div>-->
         <!--</div>-->
-        <div class="form-group">
-            <label class="col-sm-3 control-label">条件名：</label>
-            <div class="col-sm-8">
-                <input id="filterCode" name="filterCode" class="form-control" type="text">
-            </div>
-        </div>
+        <!--<div class="form-group">-->
+            <!--<label class="col-sm-3 control-label">条件名：</label>-->
+            <!--<div class="col-sm-8">-->
+                <!--<input id="filterCode" name="filterCode" class="form-control" type="text">-->
+            <!--</div>-->
+        <!--</div>-->
         <div class="form-group">
             <label class="col-sm-3 control-label">描述：</label>
             <div class="col-sm-8">
@@ -43,6 +43,12 @@
             </div>
         </div>
         <div class="form-group">
+            <label class="col-sm-3 control-label">后续分组排序：</label>
+            <div class="col-sm-8">
+                <input id="statements" name="statements" class="form-control" type="text">
+            </div>
+        </div>
+        <div class="form-group">
             <label class="col-sm-3 control-label">是否系统创建：</label>
             <div class="col-sm-8">
                 <div class="onoffswitch">
@@ -82,15 +88,6 @@
             code:{
                 required:true,
             },
-            // moduleType:{
-            //     required:true,
-            // },
-            // recordType:{
-            //     required:true,
-            // },
-            filterCode:{
-                required:true,
-            },
         },
         submitHandler: function(form) {
             // $.operate.save(prefix + "/add", $('#form-locationType-add').serialize());
@@ -25,12 +25,7 @@
                 <!--<input id="recordType" name="recordType" class="form-control" type="text" th:field="*{recordType}">-->
             <!--</div>-->
         <!--</div>-->
-        <div class="form-group">
-            <label class="col-sm-3 control-label">条件名：</label>
-            <div class="col-sm-8">
-                <input id="filterCode" name="filterCode" class="form-control" type="text" th:field="*{filterCode}">
-            </div>
-        </div>
+
         <div class="form-group">
             <label class="col-sm-3 control-label">描述：</label>
             <div class="col-sm-8">
@@ -83,15 +78,6 @@
             code:{
                 required:true,
             },
-            // moduleType:{
-            //     required:true,
-            // },
-            // recordType:{
-            //     required:true,
-            // },
-            filterCode:{
-                required:true,
-            },
         },
         submitHandler: function(form) {
             // $.operate.save(prefix + "/add", $('#form-locationType-add').serialize());
@@ -92,6 +92,10 @@
                     title : '全SQL'
                 },
                 {
+                    field : 'statements',
+                    title : '后续分组排序'
+                },
+                {
                     field : 'systemCreated',
                     title : '是否系统创建',
                     formatter: function (value, item, index) {
@@ -68,21 +68,25 @@
         <div class="form-group">
             <label class="col-sm-3 control-label">是否补货：</label>
             <div class="col-sm-8">
-                <div class="radio radio-info radio-inline" style="transform: scale(1.1, 1.1);">
-                    <input type="radio" id="needReplenishment1" name="needReplenishment" value="true" checked="checked"
-                           class="radio_select">
-                    <label for="needReplenishment1">是</label>
-                </div>
-                <div class="radio radio-danger radio-inline " style="transform: scale(1.1, 1.1);">
-                    <input type="radio" id="needReplenishment2" name="needReplenishment" value="false">
-                    <label for="needReplenishment2">否</label>
+                <div class="onoffswitch">
+                    <input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="needReplenishment" name="needReplenishment">
+                    <label class="onoffswitch-label" for="needReplenishment">
+                        <span class="onoffswitch-inner"></span>
+                        <span class="onoffswitch-switch"></span>
+                    </label>
                 </div>
             </div>
         </div>
         <div class="form-group">
             <label class="col-sm-3 control-label">取消波次时保留补货任务：</label>
             <div class="col-sm-8">
-                <input id="holdRplnTask" name="holdRplnTask" class="form-control" type="text">
+                <div class="onoffswitch">
+                    <input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="holdRplnTask" name="holdRplnTask">
+                    <label class="onoffswitch-label" for="holdRplnTask">
+                        <span class="onoffswitch-inner"></span>
+                        <span class="onoffswitch-switch"></span>
+                    </label>
+                </div>
             </div>
         </div>
         <!--<div class="form-group">
@@ -69,23 +69,28 @@
         <div class="form-group">
             <label class="col-sm-3 control-label">是否补货：</label>
             <div class="col-sm-8">
-                <div class="radio radio-info radio-inline" style="transform: scale(1.1, 1.1);">
-                    <input type="radio" id="needReplenishment1" name="needReplenishment" value="true" th:field="*{needReplenishment}"
-                           class="radio_select">
-                    <label for="needReplenishment1">是</label>
-                </div>
-                <div class="radio radio-danger radio-inline " style="transform: scale(1.1, 1.1);">
-                    <input type="radio" id="needReplenishment2" name="needReplenishment" value="false" th:field="*{needReplenishment}">
-                    <label for="needReplenishment2">否</label>
+                <div class="onoffswitch">
+                    <input type="checkbox" th:checked="*{needReplenishment}" class="onoffswitch-checkbox" id="needReplenishment" name="needReplenishment">
+                    <label class="onoffswitch-label" for="needReplenishment">
+                        <span class="onoffswitch-inner"></span>
+                        <span class="onoffswitch-switch"></span>
+                    </label>
                 </div>
             </div>
         </div>
         <div class="form-group">
             <label class="col-sm-3 control-label">取消波次时保留补货任务：</label>
             <div class="col-sm-8">
-                <input id="holdRplnTask" name="holdRplnTask" class="form-control" type="text" th:field="*{holdRplnTask}">
+                <div class="onoffswitch">
+                    <input type="checkbox" th:checked="*{holdRplnTask}" class="onoffswitch-checkbox" id="holdRplnTask" name="holdRplnTask">
+                    <label class="onoffswitch-label" for="holdRplnTask">
+                        <span class="onoffswitch-inner"></span>
+                        <span class="onoffswitch-switch"></span>
+                    </label>
+                </div>
             </div>
         </div>
+
         <!--<div class="form-group">
             <label class="col-sm-3 control-label">数据版本：</label>
             <div class="col-sm-8">
@@ -104,8 +104,8 @@
                     <div class="tab-pane fade" id="tabDetail">
  
                         <div class="btn-group hidden-xs" id="toolbar2" role="group">
-                            <a class="btn btn-outline btn-success btn-rounded" onclick="detailAdd()"
-                               shiro:hasPermission="config:waveFlowHeader:add">
+                            <a class="btn btn-outline btn-success btn-rounded" onclick="detailAdd()" style="display:none;"
+                               id="detailAdd" shiro:hasPermission="config:waveFlowHeader:add">
                                 <i class="fa fa-plus"></i> 新增
                             </a>
                             <a class="btn btn-outline btn-danger btn-rounded" onclick="detailBatRemove()"
@@ -216,7 +216,15 @@
                         },
                         {
                             field : 'holdRplnTask',
-                            title : '取消波次时保留补货任务'
+                            title : '取消波次时保留补货任务',
+                            formatter: function (value, item, index) {
+                                if (value==true) {
+                                    return '<span class="badge" style="background-color: #00B83F;color: white;width: 36px;">' + ' 是 ' + '</span>';
+                                }
+                                else if (value==false) {
+                                    return '<span class="badge" style="background-color: #ff0000;color: white;width: 36px;">' + ' 否 ' + '</span>';
+                                }
+                            }
                         },
                         {
                             field : 'created',
@@ -524,6 +532,7 @@
  
             function detailReg(rowId){
                 headerId = rowId;
+                $("#detailAdd").css("display","block");
                 detail();
             }
  
@@ -598,7 +607,7 @@
             }
  
             function detailAdd() {
-                var url = prefix2+"/add";
+                var url = prefix2+"/add/"+headerId;
                 $.modal.open("添加明细", url);
             }