wms / wms_ningxiangwanrong · Commits

Commit 28a1088c3d2c7b7259de968c7930c1eaeee5c677

Authored by mahuandong
2 parents e41aab4f 965a7d08

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

Inline Side-by-side
Showing 11 changed files with 661 additions and 18 deletions
src/main/java/com/huaheng/pc/config/shipmentAnalyzeTemplate/controller/ShipmentAnalyzeTemplateController.java renamed to src/main/java/com/huaheng/pc/shipment/shipmentAnalyzeTemplate/controller/ShipmentAnalyzeTemplateController.java
  View file @28a1088
1   -package com.huaheng.pc.config.shipmentAnalyzeTemplate.controller;
  1 +package com.huaheng.pc.shipment.shipmentAnalyzeTemplate.controller;
2 2  
3 3  
4 4 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
... ... @@ -13,9 +13,8 @@ import com.huaheng.framework.web.controller.BaseController;
13 13 import com.huaheng.framework.web.page.PageDomain;
14 14 import com.huaheng.framework.web.page.TableDataInfo;
15 15 import com.huaheng.framework.web.page.TableSupport;
16   -import com.huaheng.pc.config.shipmentAnalyzeTemplate.domain.ShipmentAnalyzeTemplate;
17   -import com.huaheng.pc.config.shipmentAnalyzeTemplate.service.ShipmentAnalyzeTemplateService;
18   -import com.huaheng.pc.shipment.shipmentHeader.domain.ShipmentHeader;
  16 +import com.huaheng.pc.shipment.shipmentAnalyzeTemplate.domain.ShipmentAnalyzeTemplate;
  17 +import com.huaheng.pc.shipment.shipmentAnalyzeTemplate.service.ShipmentAnalyzeTemplateService;
19 18 import io.swagger.annotations.Api;
20 19 import org.apache.shiro.authz.annotation.RequiresPermissions;
21 20 import org.springframework.beans.factory.annotation.Autowired;
... ... @@ -65,11 +64,11 @@ public class ShipmentAnalyzeTemplateController extends BaseController {
65 64 Integer pageNum = pageDomain.getPageNum();
66 65 Integer pageSize = pageDomain.getPageSize();
67 66  
68   - lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin),ShipmentAnalyzeTemplate::getCreated, createdBegin)
  67 + lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin), ShipmentAnalyzeTemplate::getCreated, createdBegin)
69 68 .le(StringUtils.isNotEmpty(createdEnd), ShipmentAnalyzeTemplate::getCreated, createdEnd)
70 69 .eq(ShipmentAnalyzeTemplate::getWarehouseCode, ShiroUtils.getWarehouseCode())
71 70 .eq(StringUtils.isNotEmpty(shipmentAnalyzeTemplate.getCriteriaCode()
72   - ),ShipmentAnalyzeTemplate::getCriteriaCode,shipmentAnalyzeTemplate.getCriteriaCode());
  71 + ), ShipmentAnalyzeTemplate::getCriteriaCode,shipmentAnalyzeTemplate.getCriteriaCode());
73 72  
74 73 if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
75 74 /**
... ...
src/main/java/com/huaheng/pc/config/shipmentAnalyzeTemplate/domain/ShipmentAnalyzeTemplate.java renamed to src/main/java/com/huaheng/pc/shipment/shipmentAnalyzeTemplate/domain/ShipmentAnalyzeTemplate.java
  View file @28a1088
1   -package com.huaheng.pc.config.shipmentAnalyzeTemplate.domain;
  1 +package com.huaheng.pc.shipment.shipmentAnalyzeTemplate.domain;
2 2  
3 3 import com.baomidou.mybatisplus.annotation.IdType;
4 4 import com.baomidou.mybatisplus.annotation.TableField;
... ...
src/main/java/com/huaheng/pc/config/shipmentAnalyzeTemplate/mapper/ShipmentAnalyzeTemplateMapper.java renamed to src/main/java/com/huaheng/pc/shipment/shipmentAnalyzeTemplate/mapper/ShipmentAnalyzeTemplateMapper.java
  View file @28a1088
1   -package com.huaheng.pc.config.shipmentAnalyzeTemplate.mapper;
  1 +package com.huaheng.pc.shipment.shipmentAnalyzeTemplate.mapper;
2 2  
3 3 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4   -import com.huaheng.pc.config.shipmentAnalyzeTemplate.domain.ShipmentAnalyzeTemplate;
  4 +import com.huaheng.pc.shipment.shipmentAnalyzeTemplate.domain.ShipmentAnalyzeTemplate;
5 5  
6 6 public interface ShipmentAnalyzeTemplateMapper extends BaseMapper<ShipmentAnalyzeTemplate> {
7 7 }
8 8 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/config/shipmentAnalyzeTemplate/service/ShipmentAnalyzeTemplateService.java renamed to src/main/java/com/huaheng/pc/shipment/shipmentAnalyzeTemplate/service/ShipmentAnalyzeTemplateService.java
  View file @28a1088
1   -package com.huaheng.pc.config.shipmentAnalyzeTemplate.service;
  1 +package com.huaheng.pc.shipment.shipmentAnalyzeTemplate.service;
2 2  
3 3 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
4   -import com.huaheng.pc.config.shipmentAnalyzeTemplate.domain.ShipmentAnalyzeTemplate;
5   -import com.huaheng.pc.config.shipmentAnalyzeTemplate.mapper.ShipmentAnalyzeTemplateMapper;
  4 +import com.huaheng.pc.shipment.shipmentAnalyzeTemplate.domain.ShipmentAnalyzeTemplate;
  5 +import com.huaheng.pc.shipment.shipmentAnalyzeTemplate.mapper.ShipmentAnalyzeTemplateMapper;
6 6 import org.springframework.stereotype.Service;
7 7  
8 8 @Service
... ...
src/main/java/com/huaheng/pc/shipment/shipmentHeader/controller/ShipmentHeaderController.java
  View file @28a1088
... ... @@ -207,4 +207,22 @@ public class ShipmentHeaderController extends BaseController
207 207 }
208 208  
209 209  
  210 + /**
  211 + * 订单分析
  212 + */
  213 +// @RequiresPermissions("shipment:bill:edit")
  214 +// @Log(title = "出库-出库单", operating="订单分析", action = BusinessType.OTHER)
  215 +// @PostMapping( "/analysis")
  216 +// @ResponseBody
  217 +// @Transactional
  218 +// public void analysis(String ids){
  219 +// if (StringUtils.isEmpty(ids))
  220 +// throw new ServiceException("id不能为空");
  221 +// for (Integer id : Convert.toIntArray(ids))
  222 +// {
  223 +//
  224 +// }
  225 +//
  226 +// }
  227 +
210 228 }
... ...
src/main/resources/mybatis/config/ShipmentAnalyzeTemplateMapper.xml renamed to src/main/resources/mybatis/shipment/ShipmentAnalyzeTemplateMapper.xml
  View file @28a1088
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3 3 <mapper namespace="com.huaheng.pc.shipment.shipmentAnalyzeTemplate.mapper.ShipmentAnalyzeTemplateMapper">
4   - <resultMap id="BaseResultMap" type="com.huaheng.pc.config.shipmentAnalyzeTemplate.domain.ShipmentAnalyzeTemplate">
  4 + <resultMap id="BaseResultMap" type="com.huaheng.pc.shipment.shipmentAnalyzeTemplate.domain.ShipmentAnalyzeTemplate">
5 5 <!--@mbg.generated-->
6 6 <id column="id" jdbcType="INTEGER" property="id" />
7 7 <result column="code" jdbcType="VARCHAR" property="code" />
... ...
src/main/resources/templates/config/waveMaster/edit.html
  View file @28a1088
... ... @@ -5,7 +5,7 @@
5 5 <body class="white-bg">
6 6 <div class="wrapper wrapper-content animated fadeInRight ibox-content" th:object="${waveMaster}">
7 7 <form class="form-horizontal m" id="form-waveMaster-edit">
8   - <input name="id" th:field="*{id}">
  8 + <input name="id" type="hidden" th:field="*{id}">
9 9 <div class="form-group">
10 10 <label class="col-sm-3 control-label">主表名称：</label>
11 11 <div class="col-sm-8">
... ...
src/main/resources/templates/config/waveMaster/waveMaster.html
  View file @28a1088
... ... @@ -97,10 +97,6 @@
97 97 title : '缺货模式',
98 98 },
99 99 {
100   - field : 'maxShipments',
101   - title : '缺货模式'
102   - },
103   - {
104 100 field : 'needReplenishment',
105 101 title : '是否补货',
106 102 formatter: function (value, item, index) {
... ...
src/main/resources/templates/shipment/shipmentAnalyzeTemplate/add.html 0 → 100644
  View file @28a1088
  1 +<!DOCTYPE HTML>
  2 +<html lang="zh" xmlns:th="http://www.thymeleaf.org">
  3 +<meta charset="utf-8">
  4 +<head th:include="include :: header"></head>
  5 +<body class="white-bg">
  6 + <div class="wrapper wrapper-content animated fadeInRight ibox-content">
  7 + <form class="form-horizontal m" id="form-containerType-add">
  8 + <div class="form-group">
  9 + <label class="col-sm-3 control-label">编码：</label>
  10 + <div class="col-sm-8">
  11 + <input id="code" name="code" class="form-control" type="text">
  12 + </div>
  13 + </div>
  14 + <div class="form-group">
  15 + <label class="col-sm-3 control-label">名称：</label>
  16 + <div class="col-sm-8">
  17 + <input id="name" name="name" class="form-control" type="text">
  18 + </div>
  19 + </div>
  20 + <div class="form-group">
  21 + <label class="col-sm-3 control-label">序号：</label>
  22 + <div class="col-sm-8">
  23 + <input id="sequence" name="sequence" class="form-control" type="text">
  24 + </div>
  25 + </div>
  26 + <!--<div class="form-group"> -->
  27 + <!--<label class="col-sm-3 control-label">仓库Id：</label>-->
  28 + <!--<div class="col-sm-8">-->
  29 + <!--<input id="warehouseId" name="warehouseId" class="form-control" type="text">-->
  30 + <!--</div>-->
  31 + <!--</div>-->
  32 + <!--<div class="form-group"> -->
  33 + <!--<label class="col-sm-3 control-label">仓库编码：</label>-->
  34 + <!--<div class="col-sm-8">-->
  35 + <!--<input id="warehouseCode" name="warehouseCode" class="form-control" type="text">-->
  36 + <!--</div>-->
  37 + <!--</div>-->
  38 + <div class="form-group">
  39 + <label class="col-sm-3 control-label">空箱重量kg：</label>
  40 + <div class="col-sm-8">
  41 + <input id="emptyWeight" name="emptyWeight" class="form-control" type="text">
  42 + </div>
  43 + </div>
  44 + <div class="form-group">
  45 + <label class="col-sm-3 control-label">长m：</label>
  46 + <div class="col-sm-8">
  47 + <input id="length" name="length" class="form-control" type="text">
  48 + </div>
  49 + </div>
  50 + <div class="form-group">
  51 + <label class="col-sm-3 control-label">宽m：</label>
  52 + <div class="col-sm-8">
  53 + <input id="width" name="width" class="form-control" type="text">
  54 + </div>
  55 + </div>
  56 + <div class="form-group">
  57 + <label class="col-sm-3 control-label">高m：</label>
  58 + <div class="col-sm-8">
  59 + <input id="height" name="height" class="form-control" type="text">
  60 + </div>
  61 + </div>
  62 + <div class="form-group">
  63 + <label class="col-sm-3 control-label">最大重量kg：</label>
  64 + <div class="col-sm-8">
  65 + <input id="maxWeight" name="maxWeight" class="form-control" type="text">
  66 + </div>
  67 + </div>
  68 + <div class="form-group">
  69 + <label class="col-sm-3 control-label">装满度：</label>
  70 + <div class="col-sm-8">
  71 + <input id="fillPercent" name="fillPercent" class="form-control" type="text">
  72 + </div>
  73 + </div>
  74 + <div class="form-group">
  75 + <label class="col-sm-3 control-label">状态：</label>
  76 + <div class="col-sm-8">
  77 + <input id="status" name="status" class="form-control" type="text">
  78 + </div>
  79 + </div>
  80 + <!--<div class="form-group"> -->
  81 + <!--<label class="col-sm-3 control-label">作为默认货箱：</label>-->
  82 + <!--<div class="col-sm-8">-->
  83 + <!--<input id="useAsDefault" name="useAsDefault" class="form-control" type="text">-->
  84 + <!--</div>-->
  85 + <!--</div>-->
  86 + <div class="form-group">
  87 + <label class="col-sm-3 control-label">是否默认容器：</label>
  88 + <div class="col-sm-8">
  89 + <div class="onoffswitch">
  90 + <input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="useAsDefault" name="useAsDefault">
  91 + <label class="onoffswitch-label" for="useAsDefault">
  92 + <span class="onoffswitch-inner"></span>
  93 + <span class="onoffswitch-switch"></span>
  94 + </label>
  95 + </div>
  96 + </div>
  97 + </div>
  98 + <div class="form-group">
  99 + <label class="col-sm-3 control-label">是否有效：</label>
  100 + <div class="col-sm-8">
  101 + <!--<input id="enable" name="enable" class="form-control" type="text">-->
  102 + <div class="onoffswitch">
  103 + <input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="enable" name="enable">
  104 + <label class="onoffswitch-label" for="enable">
  105 + <span class="onoffswitch-inner"></span>
  106 + <span class="onoffswitch-switch"></span>
  107 + </label>
  108 + </div>
  109 + </div>
  110 + </div>
  111 + <!--<div class="form-group"> -->
  112 + <!--<label class="col-sm-3 control-label">是否删除：</label>-->
  113 + <!--<div class="col-sm-8">-->
  114 + <!--<input id="deleted" name="deleted" class="form-control" type="text">-->
  115 + <!--</div>-->
  116 + <!--</div>-->
  117 + <!--<div class="form-group"> -->
  118 + <!--<label class="col-sm-3 control-label">自定义字段1：</label>-->
  119 + <!--<div class="col-sm-8">-->
  120 + <!--<input id="userDef1" name="userDef1" class="form-control" type="text">-->
  121 + <!--</div>-->
  122 + <!--</div>-->
  123 + <!--<div class="form-group"> -->
  124 + <!--<label class="col-sm-3 control-label">自定义字段2：</label>-->
  125 + <!--<div class="col-sm-8">-->
  126 + <!--<input id="userDef2" name="userDef2" class="form-control" type="text">-->
  127 + <!--</div>-->
  128 + <!--</div>-->
  129 + <!--<div class="form-group"> -->
  130 + <!--<label class="col-sm-3 control-label">自定义字段3：</label>-->
  131 + <!--<div class="col-sm-8">-->
  132 + <!--<input id="userDef3" name="userDef3" class="form-control" type="text">-->
  133 + <!--</div>-->
  134 + <!--</div>-->
  135 + <!--<div class="form-group"> -->
  136 + <!--<label class="col-sm-3 control-label">自定义字段4：</label>-->
  137 + <!--<div class="col-sm-8">-->
  138 + <!--<input id="userDef4" name="userDef4" class="form-control" type="text">-->
  139 + <!--</div>-->
  140 + <!--</div>-->
  141 + <!--<div class="form-group"> -->
  142 + <!--<label class="col-sm-3 control-label">自定义字段5：</label>-->
  143 + <!--<div class="col-sm-8">-->
  144 + <!--<input id="userDef5" name="userDef5" class="form-control" type="text">-->
  145 + <!--</div>-->
  146 + <!--</div>-->
  147 + <div class="form-group">
  148 + <div class="form-control-static col-sm-offset-9">
  149 + <button type="submit" class="btn btn-primary">提交</button>
  150 + <button onclick="$.modal.close()" class="btn btn-danger" type="button">关闭</button>
  151 + </div>
  152 + </div>
  153 + </form>
  154 + </div>
  155 + <div th:include="include::footer"></div>
  156 + <script type="text/javascript">
  157 + var prefix = ctx + "config/containerType";
  158 + /*$("#form-containerType-add").validate({
  159 + rules:{
  160 + code:{
  161 + required:true
  162 + },
  163 + fillPercent:{
  164 + range:[0,100]
  165 + }
  166 + },
  167 + submitHandler: function(form) {
  168 + // $.operate.save(prefix + "/add", $('#form-containerType-add').serialize());
  169 + var tableValue = $.common.getTableValue("#form-containerType-add");
  170 + $.operate.save(prefix + "/add", tableValue);
  171 + }*/
  172 + $("#form-containerType-add").validate({
  173 + submitHandler: function(form) {
  174 + $.ajax({
  175 + cache : true,
  176 + type : "POST",
  177 + url : prefix + "/add",
  178 + data : {
  179 + "id": $("input[name='id']").val(),
  180 + "enable" : $("input[name='enable']").is(':checked'),
  181 + "useAsDefault" : $("input[name='useAsDefault']").is(':checked'),
  182 + "code" :$("input[name='code']").val(),
  183 + "name" :$("input[name='name']").val(),
  184 + "sequence" :$("input[name='sequence']").val(),
  185 + "emptyWeight" :$("input[name='emptyWeight']").val(),
  186 + "length" :$("input[name='length']").val(),
  187 + "width" :$("input[name='width']").val(),
  188 + "height" :$("input[name='height']").val(),
  189 + "maxWeight" :$("input[name='maxWeight']").val(),
  190 + "fillPercent" :$("input[name='fillPercent']").val(),
  191 + "status" :$("input[name='status']").val(),
  192 + },
  193 + async : false,
  194 + error : function(request) {
  195 + $.modal.alertError("添加失败！");
  196 + },
  197 + success : function(data) {
  198 + $.operate.saveSuccess(data);
  199 + }
  200 + });
  201 + }
  202 + });
  203 + </script>
  204 +</body>
  205 +</html>
... ...
src/main/resources/templates/shipment/shipmentAnalyzeTemplate/edit.html 0 → 100644
  View file @28a1088
  1 +<!DOCTYPE HTML>
  2 +<html lang="zh" xmlns:th="http://www.thymeleaf.org">
  3 +<meta charset="utf-8">
  4 +<head th:include="include :: header"></head>
  5 +<body class="white-bg">
  6 + <div class="wrapper wrapper-content animated fadeInRight ibox-content">
  7 + <form class="form-horizontal m" id="form-containerType-edit" th:object="${containerType}">
  8 + <input id="id" name="id" th:field="*{id}" type="hidden">
  9 + <div class="form-group">
  10 + <label class="col-sm-3 control-label">编码：</label>
  11 + <div class="col-sm-8">
  12 + <input id="code" name="code" th:field="*{code}" class="form-control" type="text">
  13 + </div>
  14 + </div>
  15 + <div class="form-group">
  16 + <label class="col-sm-3 control-label">名称：</label>
  17 + <div class="col-sm-8">
  18 + <input id="name" name="name" th:field="*{name}" class="form-control" type="text">
  19 + </div>
  20 + </div>
  21 + <!--<div class="form-group"> -->
  22 + <!--<label class="col-sm-3 control-label">仓库Id：</label>-->
  23 + <!--<div class="col-sm-8">-->
  24 + <!--<input id="warehouseId" name="warehouseId" th:field="*{warehouseId}" class="form-control" type="text">-->
  25 + <!--</div>-->
  26 + <!--</div>-->
  27 + <!--<div class="form-group"> -->
  28 + <!--<label class="col-sm-3 control-label">仓库编码：</label>-->
  29 + <!--<div class="col-sm-8">-->
  30 + <!--<input id="warehouseCode" name="warehouseCode" th:field="*{warehouseCode}" class="form-control" type="text">-->
  31 + <!--</div>-->
  32 + <!--</div>-->
  33 +
  34 + <div class="form-group">
  35 + <label class="col-sm-3 control-label">空箱重量kg：</label>
  36 + <div class="col-sm-8">
  37 + <input id="emptyWeight" name="emptyWeight" th:field="*{emptyWeight}" class="form-control" type="text">
  38 + </div>
  39 + </div>
  40 + <div class="form-group">
  41 + <label class="col-sm-3 control-label">长m：</label>
  42 + <div class="col-sm-8">
  43 + <input id="length" name="length" th:field="*{length}" class="form-control" type="text">
  44 + </div>
  45 + </div>
  46 + <div class="form-group">
  47 + <label class="col-sm-3 control-label">宽m：</label>
  48 + <div class="col-sm-8">
  49 + <input id="width" name="width" th:field="*{width}" class="form-control" type="text">
  50 + </div>
  51 + </div>
  52 + <div class="form-group">
  53 + <label class="col-sm-3 control-label">高m：</label>
  54 + <div class="col-sm-8">
  55 + <input id="height" name="height" th:field="*{height}" class="form-control" type="text">
  56 + </div>
  57 + </div>
  58 + <div class="form-group">
  59 + <label class="col-sm-3 control-label">最大重量kg：</label>
  60 + <div class="col-sm-8">
  61 + <input id="maxWeight" name="maxWeight" th:field="*{maxWeight}" class="form-control" type="text">
  62 + </div>
  63 + </div>
  64 + <div class="form-group">
  65 + <label class="col-sm-3 control-label">装满度：</label>
  66 + <div class="col-sm-8">
  67 + <input id="fillPercent" name="fillPercent" th:field="*{fillPercent}" class="form-control" type="text">
  68 + </div>
  69 + </div>
  70 + <!--<div class="form-group">
  71 + <label class="col-sm-3 control-label">作为默认货箱：</label>
  72 + <div class="col-sm-8">
  73 + <input id="useAsDefault" name="useAsDefault" th:field="*{ }" class="form-control" type="text">
  74 + </div>
  75 + </div>-->
  76 + <!--<div class="form-group">-->
  77 + <!--<label class="col-sm-3 control-label">是否默认容器：</label>-->
  78 + <!--<div class="col-sm-8">-->
  79 + <!--<div class="onoffswitch">-->
  80 + <!--<input type="checkbox" th:checked="${containerType.useAsDefault}" class="onoffswitch-checkbox" id="useAsDefault" name="useAsDefault">-->
  81 + <!--<label class="onoffswitch-label" for="useAsDefault">-->
  82 + <!--<span class="onoffswitch-inner"></span>-->
  83 + <!--<span class="onoffswitch-switch"></span>-->
  84 + <!--</label>-->
  85 + <!--</div>-->
  86 + <!--</div>-->
  87 + <!--</div>-->
  88 + <!--<div class="form-group"> -->
  89 + <!--<label class="col-sm-3 control-label">类型描述：</label>-->
  90 + <!--<div class="col-sm-8">-->
  91 + <!--<input id="remark" name="remark" th:field="*{remark}" class="form-control" type="text">-->
  92 + <!--</div>-->
  93 + <!--</div>-->
  94 + <!--<div class="form-group"> -->
  95 + <!--<label class="col-sm-3 control-label">创建时间：</label>-->
  96 + <!--<div class="col-sm-8">-->
  97 + <!--<input id="created" name="created" th:field="*{created}" class="form-control" type="text">-->
  98 + <!--</div>-->
  99 + <!--</div>-->
  100 + <!--<div class="form-group"> -->
  101 + <!--<label class="col-sm-3 control-label">创建用户：</label>-->
  102 + <!--<div class="col-sm-8">-->
  103 + <!--<input id="createdBy" name="createdBy" th:field="*{createdBy}" class="form-control" type="text">-->
  104 + <!--</div>-->
  105 + <!--</div>-->
  106 + <!--<div class="form-group"> -->
  107 + <!--<label class="col-sm-3 control-label">创建时间：</label>-->
  108 + <!--<div class="col-sm-8">-->
  109 + <!--<input id="lastUpdated" name="lastUpdated" th:field="*{lastUpdated}" class="form-control" type="text">-->
  110 + <!--</div>-->
  111 + <!--</div>-->
  112 + <!--<div class="form-group"> -->
  113 + <!--<label class="col-sm-3 control-label">更新用户：</label>-->
  114 + <!--<div class="col-sm-8">-->
  115 + <!--<input id="lastUpdatedBy" name="lastUpdatedBy" th:field="*{lastUpdatedBy}" class="form-control" type="text">-->
  116 + <!--</div>-->
  117 + <!--</div>-->
  118 + <div class="form-group">
  119 + <label class="col-sm-3 control-label">是否有效：</label>
  120 + <div class="col-sm-8">
  121 + <!--<input id="enable" name="enable" th:field="*{enable}" class="form-control" type="text">-->
  122 + <div class="onoffswitch">
  123 + <input type="checkbox" th:checked="${containerType.enable}" class="onoffswitch-checkbox" id="enable" name="enable">
  124 + <label class="onoffswitch-label" for="enable">
  125 + <span class="onoffswitch-inner"></span>
  126 + <span class="onoffswitch-switch"></span>
  127 + </label>
  128 + </div>
  129 + </div>
  130 + </div>
  131 + <!--<div class="form-group"> -->
  132 + <!--<label class="col-sm-3 control-label">是否删除：</label>-->
  133 + <!--<div class="col-sm-8">-->
  134 + <!--<input id="deleted" name="deleted" th:field="*{deleted}" class="form-control" type="text">-->
  135 + <!--</div>-->
  136 + <!--</div>-->
  137 + <!--<div class="form-group"> -->
  138 + <!--<label class="col-sm-3 control-label">自定义字段1：</label>-->
  139 + <!--<div class="col-sm-8">-->
  140 + <!--<input id="userDef1" name="userDef1" th:field="*{userDef1}" class="form-control" type="text">-->
  141 + <!--</div>-->
  142 + <!--</div>-->
  143 + <!--<div class="form-group"> -->
  144 + <!--<label class="col-sm-3 control-label">自定义字段2：</label>-->
  145 + <!--<div class="col-sm-8">-->
  146 + <!--<input id="userDef2" name="userDef2" th:field="*{userDef2}" class="form-control" type="text">-->
  147 + <!--</div>-->
  148 + <!--</div>-->
  149 + <!--<div class="form-group"> -->
  150 + <!--<label class="col-sm-3 control-label">自定义字段3：</label>-->
  151 + <!--<div class="col-sm-8">-->
  152 + <!--<input id="userDef3" name="userDef3" th:field="*{userDef3}" class="form-control" type="text">-->
  153 + <!--</div>-->
  154 + <!--</div>-->
  155 + <!--<div class="form-group"> -->
  156 + <!--<label class="col-sm-3 control-label">自定义字段4：</label>-->
  157 + <!--<div class="col-sm-8">-->
  158 + <!--<input id="userDef4" name="userDef4" th:field="*{userDef4}" class="form-control" type="text">-->
  159 + <!--</div>-->
  160 + <!--</div>-->
  161 + <!--<div class="form-group"> -->
  162 + <!--<label class="col-sm-3 control-label">自定义字段5：</label>-->
  163 + <!--<div class="col-sm-8">-->
  164 + <!--<input id="userDef5" name="userDef5" th:field="*{userDef5}" class="form-control" type="text">-->
  165 + <!--</div>-->
  166 + <!--</div>-->
  167 + <div class="form-group">
  168 + <div class="form-control-static col-sm-offset-9">
  169 + <button type="submit" class="btn btn-primary">提交</button>
  170 + <button onclick="$.modal.close()" class="btn btn-danger" type="button">关闭</button>
  171 + </div>
  172 + </div>
  173 + </form>
  174 + </div>
  175 + <div th:include="include::footer"></div>
  176 + <script type="text/javascript">
  177 + var prefix = ctx + "config/containerType";
  178 + /*$("#form-containerType-edit").validate({
  179 + rules:{
  180 + code:{
  181 + required:true
  182 + },
  183 + fillPercent:{
  184 + range:[0,100]
  185 + }
  186 + },
  187 + submitHandler: function(form) {
  188 + // $.operate.save(prefix + "/edit", $('#form-containerType-edit').serialize());
  189 + var tableValue = $.common.getTableValue("#form-containerType-edit");
  190 + $.operate.save(prefix + "/edit", tableValue);
  191 + }
  192 + });*/
  193 + $("#form-containerType-edit").validate({
  194 + submitHandler: function(form) {
  195 + $.ajax({
  196 + cache : true,
  197 + type : "POST",
  198 + url : prefix + "/edit",
  199 + data : {
  200 + "id": $("input[name='id']").val(),
  201 + "enable" : $("input[name='enable']").is(':checked'),
  202 + "useAsDefault" : $("input[name='useAsDefault']").is(':checked'),
  203 + "code" :$("input[name='code']").val(),
  204 + "name" :$("input[name='name']").val(),
  205 + "prefix" :$("input[name='prefix']").val(),
  206 + "emptyWeight" :$("input[name='emptyWeight']").val(),
  207 + "length" :$("input[name='length']").val(),
  208 + "width" :$("input[name='width']").val(),
  209 + "height" :$("input[name='height']").val(),
  210 + "maxWeight" :$("input[name='maxWeight']").val(),
  211 + "fillPercent" :$("input[name='fillPercent']").val(),
  212 + "remark" :$("input[name='remark']").val()
  213 + },
  214 + async : false,
  215 + error : function(request) {
  216 + $.modal.alertError("请求失败！");
  217 + },
  218 + success : function(data) {
  219 + $.operate.saveSuccess(data);
  220 + }
  221 + });
  222 + }
  223 + });
  224 + </script>
  225 +</body>
  226 +</html>
... ...
src/main/resources/templates/shipment/shipmentAnalyzeTemplate/shipmentAnalyzeTemplate.html 0 → 100644
  View file @28a1088
  1 +<!DOCTYPE HTML>
  2 +<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
  3 +<meta charset="utf-8">
  4 +<head th:include="include :: header"></head>
  5 +<body class="gray-bg">
  6 + <div class="container-div">
  7 + <div class="row">
  8 + <div class="col-sm-12 select-info">
  9 + <form id="containerType-form">
  10 + <div class="select-list">
  11 + <ul>
  12 + <li>
  13 + 箱型：<input type="text" name="code"/>
  14 + </li>
  15 + <li>
  16 + 名称：<input type="text" name="name"/>
  17 + </li>
  18 + <!--<li>-->
  19 + <!--角色状态：<select name="enable" th:with="type=${@dict.getType('sys_normal_disable')}">-->
  20 + <!--<option value="">所有</option>-->
  21 + <!--<option th:each="e : ${type}" th:text="${e['dictLabel']}" th:value="${e['dictValue']}"></option>-->
  22 + <!--</select>-->
  23 + <!--</li>-->
  24 + <li class="time">
  25 + <label>创建时间： </label>
  26 + <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="createdBegin"/>
  27 + <span>-</span>
  28 + <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="createdEnd"/>
  29 + </li>
  30 + <li>
  31 + <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
  32 + <!--<a class="btn btn-success btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="system:role:export"><i class="fa fa-download"></i>&nbsp;导出</a>-->
  33 + </li>
  34 + </ul>
  35 + </div>
  36 + </form>
  37 + </div>
  38 +
  39 + <div class="btn-group hidden-xs" id="toolbar" role="group">
  40 + <a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()" shiro:hasPermission="config:containerType:add">
  41 + <i class="fa fa-plus"></i> 新增
  42 + </a>
  43 + <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()" shiro:hasPermission="config:containerType:remove">
  44 + <i class="fa fa-trash-o"></i> 删除
  45 + </a>
  46 + </div>
  47 +
  48 + <div class="col-sm-12 select-info">
  49 + <table id="bootstrap-table" data-mobile-responsive="true" class="table table-bordered table-hover"></table>
  50 + </div>
  51 + </div>
  52 + </div>
  53 + <div th:include="include :: footer"></div>
  54 + <script th:inline="javascript">
  55 + var editFlag = [[${@permission.hasPermi('config:containerType:edit')}]];
  56 + var removeFlag = [[${@permission.hasPermi('config:containerType:remove')}]];
  57 + var prefix = ctx + "config/containerType"
  58 + var datas = [[${@dict.getType('sys_normal_disable')}]];
  59 + $(function() {
  60 + var options = {
  61 + url: prefix + "/list",
  62 + createUrl: prefix + "/add",
  63 + updateUrl: prefix + "/edit/{id}",
  64 + removeUrl: prefix + "/remove",
  65 + modalName: "容器类型",
  66 + search: false,
  67 + columns: [{
  68 + checkbox: true
  69 + },
  70 + {
  71 + field : 'id',
  72 + title : '标识'
  73 + },
  74 + {
  75 + field : 'code',
  76 + title : '箱型'
  77 + },
  78 + {
  79 + field : 'name',
  80 + title : '名称'
  81 + },
  82 + {
  83 + field : 'warehouseCode',
  84 + title : '仓库编码'
  85 + },
  86 + {
  87 + field : 'companyCode',
  88 + title : '货主编码'
  89 + },
  90 + {
  91 + field : 'sequence',
  92 + title : '序号'
  93 + },
  94 + {
  95 + field : 'emptyWeight',
  96 + title : '空箱重量kg'
  97 + },
  98 + {
  99 + field : 'length',
  100 + title : '长m'
  101 + },
  102 + {
  103 + field : 'width',
  104 + title : '宽m'
  105 + },
  106 + {
  107 + field : 'height',
  108 + title : '高m'
  109 + },
  110 + {
  111 + field : 'maxWeight',
  112 + title : '最大重量kg'
  113 + },
  114 + {
  115 + field : 'fillPercent',
  116 + title : '装满度%'
  117 + },
  118 + {
  119 + field : 'useAsDefault',
  120 + title : '默认容器',
  121 + formatter: function (value, item, index) {
  122 + if (value==true) {
  123 + return '<span class="badge" style="background-color: #00B83F;color: white;width: 36px;">' + ' 是 ' + '</span>';
  124 + }
  125 + else if (value==false) {
  126 + return '<span class="badge" style="background-color: #ff0000;color: white;width: 36px;">' + ' 否 ' + '</span>';
  127 + }
  128 + }
  129 + },
  130 + {
  131 + field : 'created',
  132 + title : '创建时间'
  133 + },
  134 + {
  135 + field : 'createdBy',
  136 + title : '创建用户'
  137 + },
  138 + {
  139 + field : 'lastUpdated',
  140 + title : '更新时间'
  141 + },
  142 + {
  143 + field : 'lastUpdatedBy',
  144 + title : '更新用户'
  145 + },
  146 + {
  147 + field : 'enable',
  148 + title : '是否有效',
  149 + formatter: function(value, row, index) {
  150 + return $.table.selectDictLabel(datas, value);
  151 + },
  152 + align: 'center',
  153 +
  154 + },
  155 + // {
  156 + // field : 'deleted',
  157 + // title : '是否删除'
  158 + // },
  159 + {
  160 + field : 'userDef1',
  161 + title : '自定义字段1' ,
  162 + visible:false
  163 + },
  164 + {
  165 + field : 'userDef2',
  166 + title : '自定义字段2' ,
  167 + visible:false
  168 + },
  169 + {
  170 + field : 'userDef3',
  171 + title : '自定义字段3' ,
  172 + visible:false
  173 + },
  174 + {
  175 + field : 'userDef4',
  176 + title : '自定义字段4' ,
  177 + visible:false
  178 + },
  179 + {
  180 + field : 'userDef5',
  181 + title : '自定义字段5' ,
  182 + visible:false
  183 + },
  184 + {
  185 + title: '操作',
  186 + align: 'center',
  187 + formatter: function(value, row, index) {
  188 + var actions = [];
  189 + actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
  190 + actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-trash-o"></i>删除</a>');
  191 + return actions.join('');
  192 + }
  193 + }]
  194 + };
  195 + $.table.init(options);
  196 + });
  197 + </script>
  198 +</body>
  199 +</html>
0 200 \ No newline at end of file
... ...