diff --git a/src/main/java/com/huaheng/pc/config/shipmentAnalyzeTemplate/controller/ShipmentAnalyzeTemplateController.java b/src/main/java/com/huaheng/pc/shipment/shipmentAnalyzeTemplate/controller/ShipmentAnalyzeTemplateController.java
index 71f6fea..abdc357 100644
--- a/src/main/java/com/huaheng/pc/config/shipmentAnalyzeTemplate/controller/ShipmentAnalyzeTemplateController.java
+++ b/src/main/java/com/huaheng/pc/shipment/shipmentAnalyzeTemplate/controller/ShipmentAnalyzeTemplateController.java
@@ -1,4 +1,4 @@
-package com.huaheng.pc.config.shipmentAnalyzeTemplate.controller;
+package com.huaheng.pc.shipment.shipmentAnalyzeTemplate.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -13,9 +13,8 @@ import com.huaheng.framework.web.controller.BaseController;
import com.huaheng.framework.web.page.PageDomain;
import com.huaheng.framework.web.page.TableDataInfo;
import com.huaheng.framework.web.page.TableSupport;
-import com.huaheng.pc.config.shipmentAnalyzeTemplate.domain.ShipmentAnalyzeTemplate;
-import com.huaheng.pc.config.shipmentAnalyzeTemplate.service.ShipmentAnalyzeTemplateService;
-import com.huaheng.pc.shipment.shipmentHeader.domain.ShipmentHeader;
+import com.huaheng.pc.shipment.shipmentAnalyzeTemplate.domain.ShipmentAnalyzeTemplate;
+import com.huaheng.pc.shipment.shipmentAnalyzeTemplate.service.ShipmentAnalyzeTemplateService;
import io.swagger.annotations.Api;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
@@ -65,11 +64,11 @@ public class ShipmentAnalyzeTemplateController extends BaseController {
Integer pageNum = pageDomain.getPageNum();
Integer pageSize = pageDomain.getPageSize();
- lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin),ShipmentAnalyzeTemplate::getCreated, createdBegin)
+ lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin), ShipmentAnalyzeTemplate::getCreated, createdBegin)
.le(StringUtils.isNotEmpty(createdEnd), ShipmentAnalyzeTemplate::getCreated, createdEnd)
.eq(ShipmentAnalyzeTemplate::getWarehouseCode, ShiroUtils.getWarehouseCode())
.eq(StringUtils.isNotEmpty(shipmentAnalyzeTemplate.getCriteriaCode()
- ),ShipmentAnalyzeTemplate::getCriteriaCode,shipmentAnalyzeTemplate.getCriteriaCode());
+ ), ShipmentAnalyzeTemplate::getCriteriaCode,shipmentAnalyzeTemplate.getCriteriaCode());
if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
/**
diff --git a/src/main/java/com/huaheng/pc/config/shipmentAnalyzeTemplate/domain/ShipmentAnalyzeTemplate.java b/src/main/java/com/huaheng/pc/shipment/shipmentAnalyzeTemplate/domain/ShipmentAnalyzeTemplate.java
index 4414573..c3301f7 100644
--- a/src/main/java/com/huaheng/pc/config/shipmentAnalyzeTemplate/domain/ShipmentAnalyzeTemplate.java
+++ b/src/main/java/com/huaheng/pc/shipment/shipmentAnalyzeTemplate/domain/ShipmentAnalyzeTemplate.java
@@ -1,4 +1,4 @@
-package com.huaheng.pc.config.shipmentAnalyzeTemplate.domain;
+package com.huaheng.pc.shipment.shipmentAnalyzeTemplate.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
diff --git a/src/main/java/com/huaheng/pc/config/shipmentAnalyzeTemplate/mapper/ShipmentAnalyzeTemplateMapper.java b/src/main/java/com/huaheng/pc/shipment/shipmentAnalyzeTemplate/mapper/ShipmentAnalyzeTemplateMapper.java
index 849ef20..514a56a 100644
--- a/src/main/java/com/huaheng/pc/config/shipmentAnalyzeTemplate/mapper/ShipmentAnalyzeTemplateMapper.java
+++ b/src/main/java/com/huaheng/pc/shipment/shipmentAnalyzeTemplate/mapper/ShipmentAnalyzeTemplateMapper.java
@@ -1,7 +1,7 @@
-package com.huaheng.pc.config.shipmentAnalyzeTemplate.mapper;
+package com.huaheng.pc.shipment.shipmentAnalyzeTemplate.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.huaheng.pc.config.shipmentAnalyzeTemplate.domain.ShipmentAnalyzeTemplate;
+import com.huaheng.pc.shipment.shipmentAnalyzeTemplate.domain.ShipmentAnalyzeTemplate;
public interface ShipmentAnalyzeTemplateMapper extends BaseMapper<ShipmentAnalyzeTemplate> {
}
\ No newline at end of file
diff --git a/src/main/java/com/huaheng/pc/config/shipmentAnalyzeTemplate/service/ShipmentAnalyzeTemplateService.java b/src/main/java/com/huaheng/pc/shipment/shipmentAnalyzeTemplate/service/ShipmentAnalyzeTemplateService.java
index d85d784..fab7a8f 100644
--- a/src/main/java/com/huaheng/pc/config/shipmentAnalyzeTemplate/service/ShipmentAnalyzeTemplateService.java
+++ b/src/main/java/com/huaheng/pc/shipment/shipmentAnalyzeTemplate/service/ShipmentAnalyzeTemplateService.java
@@ -1,8 +1,8 @@
-package com.huaheng.pc.config.shipmentAnalyzeTemplate.service;
+package com.huaheng.pc.shipment.shipmentAnalyzeTemplate.service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.huaheng.pc.config.shipmentAnalyzeTemplate.domain.ShipmentAnalyzeTemplate;
-import com.huaheng.pc.config.shipmentAnalyzeTemplate.mapper.ShipmentAnalyzeTemplateMapper;
+import com.huaheng.pc.shipment.shipmentAnalyzeTemplate.domain.ShipmentAnalyzeTemplate;
+import com.huaheng.pc.shipment.shipmentAnalyzeTemplate.mapper.ShipmentAnalyzeTemplateMapper;
import org.springframework.stereotype.Service;
@Service
diff --git a/src/main/java/com/huaheng/pc/shipment/shipmentHeader/controller/ShipmentHeaderController.java b/src/main/java/com/huaheng/pc/shipment/shipmentHeader/controller/ShipmentHeaderController.java
index 6cdaaeb..d460e40 100644
--- a/src/main/java/com/huaheng/pc/shipment/shipmentHeader/controller/ShipmentHeaderController.java
+++ b/src/main/java/com/huaheng/pc/shipment/shipmentHeader/controller/ShipmentHeaderController.java
@@ -207,4 +207,22 @@ public class ShipmentHeaderController extends BaseController
}
+ /**
+ * 订单分析
+ */
+// @RequiresPermissions("shipment:bill:edit")
+// @Log(title = "出库-出库单", operating="订单分析", action = BusinessType.OTHER)
+// @PostMapping( "/analysis")
+// @ResponseBody
+// @Transactional
+// public void analysis(String ids){
+// if (StringUtils.isEmpty(ids))
+// throw new ServiceException("id不能为空");
+// for (Integer id : Convert.toIntArray(ids))
+// {
+//
+// }
+//
+// }
+
}
diff --git a/src/main/resources/mybatis/config/ShipmentAnalyzeTemplateMapper.xml b/src/main/resources/mybatis/shipment/ShipmentAnalyzeTemplateMapper.xml
index 48db35f..5d3ed9e 100644
--- a/src/main/resources/mybatis/config/ShipmentAnalyzeTemplateMapper.xml
+++ b/src/main/resources/mybatis/shipment/ShipmentAnalyzeTemplateMapper.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.huaheng.pc.shipment.shipmentAnalyzeTemplate.mapper.ShipmentAnalyzeTemplateMapper">
- <resultMap id="BaseResultMap" type="com.huaheng.pc.config.shipmentAnalyzeTemplate.domain.ShipmentAnalyzeTemplate">
+ <resultMap id="BaseResultMap" type="com.huaheng.pc.shipment.shipmentAnalyzeTemplate.domain.ShipmentAnalyzeTemplate">
<!--@mbg.generated-->
<id column="id" jdbcType="INTEGER" property="id" />
<result column="code" jdbcType="VARCHAR" property="code" />
diff --git a/src/main/resources/templates/config/waveMaster/edit.html b/src/main/resources/templates/config/waveMaster/edit.html
index 99a49ff..a95770c 100644
--- a/src/main/resources/templates/config/waveMaster/edit.html
+++ b/src/main/resources/templates/config/waveMaster/edit.html
@@ -5,7 +5,7 @@
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content" th:object="${waveMaster}">
<form class="form-horizontal m" id="form-waveMaster-edit">
- <input name="id" th:field="*{id}">
+ <input name="id" type="hidden" th:field="*{id}">
<div class="form-group">
<label class="col-sm-3 control-label">主表名称：</label>
<div class="col-sm-8">
diff --git a/src/main/resources/templates/config/waveMaster/waveMaster.html b/src/main/resources/templates/config/waveMaster/waveMaster.html
index c09afd8..7d22e9d 100644
--- a/src/main/resources/templates/config/waveMaster/waveMaster.html
+++ b/src/main/resources/templates/config/waveMaster/waveMaster.html
@@ -97,10 +97,6 @@
title : '缺货模式',
},
{
- field : 'maxShipments',
- title : '缺货模式'
- },
- {
field : 'needReplenishment',
title : '是否补货',
formatter: function (value, item, index) {
diff --git a/src/main/resources/templates/shipment/shipmentAnalyzeTemplate/add.html b/src/main/resources/templates/shipment/shipmentAnalyzeTemplate/add.html
new file mode 100644
index 0000000..ce81e17
--- /dev/null
+++ b/src/main/resources/templates/shipment/shipmentAnalyzeTemplate/add.html
@@ -0,0 +1,205 @@
+<!DOCTYPE HTML>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org">
+<meta charset="utf-8">
+<head th:include="include :: header"></head>
+<body class="white-bg">
+ <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+ <form class="form-horizontal m" id="form-containerType-add">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">编码：</label>
+ <div class="col-sm-8">
+ <input id="code" name="code" 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="name" name="name" 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="sequence" name="sequence" class="form-control" type="text">
+ </div>
+ </div>
+ <!--<div class="form-group"> -->
+ <!--<label class="col-sm-3 control-label">仓库Id：</label>-->
+ <!--<div class="col-sm-8">-->
+ <!--<input id="warehouseId" name="warehouseId" 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="warehouseCode" name="warehouseCode" class="form-control" type="text">-->
+ <!--</div>-->
+ <!--</div>-->
+ <div class="form-group">
+ <label class="col-sm-3 control-label">空箱重量kg：</label>
+ <div class="col-sm-8">
+ <input id="emptyWeight" name="emptyWeight" class="form-control" type="text">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">长m：</label>
+ <div class="col-sm-8">
+ <input id="length" name="length" class="form-control" type="text">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">宽m：</label>
+ <div class="col-sm-8">
+ <input id="width" name="width" class="form-control" type="text">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">高m：</label>
+ <div class="col-sm-8">
+ <input id="height" name="height" class="form-control" type="text">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">最大重量kg：</label>
+ <div class="col-sm-8">
+ <input id="maxWeight" name="maxWeight" 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="fillPercent" name="fillPercent" 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="status" name="status" 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="useAsDefault" name="useAsDefault" 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">
+ <input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="useAsDefault" name="useAsDefault">
+ <label class="onoffswitch-label" for="useAsDefault">
+ <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="enable" name="enable" class="form-control" type="text">-->
+ <div class="onoffswitch">
+ <input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="enable" name="enable">
+ <label class="onoffswitch-label" for="enable">
+ <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="deleted" name="deleted" class="form-control" type="text">-->
+ <!--</div>-->
+ <!--</div>-->
+ <!--<div class="form-group"> -->
+ <!--<label class="col-sm-3 control-label">自定义字段1：</label>-->
+ <!--<div class="col-sm-8">-->
+ <!--<input id="userDef1" name="userDef1" class="form-control" type="text">-->
+ <!--</div>-->
+ <!--</div>-->
+ <!--<div class="form-group"> -->
+ <!--<label class="col-sm-3 control-label">自定义字段2：</label>-->
+ <!--<div class="col-sm-8">-->
+ <!--<input id="userDef2" name="userDef2" class="form-control" type="text">-->
+ <!--</div>-->
+ <!--</div>-->
+ <!--<div class="form-group"> -->
+ <!--<label class="col-sm-3 control-label">自定义字段3：</label>-->
+ <!--<div class="col-sm-8">-->
+ <!--<input id="userDef3" name="userDef3" class="form-control" type="text">-->
+ <!--</div>-->
+ <!--</div>-->
+ <!--<div class="form-group"> -->
+ <!--<label class="col-sm-3 control-label">自定义字段4：</label>-->
+ <!--<div class="col-sm-8">-->
+ <!--<input id="userDef4" name="userDef4" class="form-control" type="text">-->
+ <!--</div>-->
+ <!--</div>-->
+ <!--<div class="form-group"> -->
+ <!--<label class="col-sm-3 control-label">自定义字段5：</label>-->
+ <!--<div class="col-sm-8">-->
+ <!--<input id="userDef5" name="userDef5" class="form-control" type="text">-->
+ <!--</div>-->
+ <!--</div>-->
+ <div class="form-group">
+ <div class="form-control-static col-sm-offset-9">
+ <button type="submit" class="btn btn-primary">提交</button>
+ <button onclick="$.modal.close()" class="btn btn-danger" type="button">关闭</button>
+ </div>
+ </div>
+ </form>
+ </div>
+ <div th:include="include::footer"></div>
+ <script type="text/javascript">
+ var prefix = ctx + "config/containerType";
+ /*$("#form-containerType-add").validate({
+ rules:{
+ code:{
+ required:true
+ },
+ fillPercent:{
+ range:[0,100]
+ }
+ },
+ submitHandler: function(form) {
+ // $.operate.save(prefix + "/add", $('#form-containerType-add').serialize());
+ var tableValue = $.common.getTableValue("#form-containerType-add");
+ $.operate.save(prefix + "/add", tableValue);
+ }*/
+ $("#form-containerType-add").validate({
+ submitHandler: function(form) {
+ $.ajax({
+ cache : true,
+ type : "POST",
+ url : prefix + "/add",
+ data : {
+ "id": $("input[name='id']").val(),
+ "enable" : $("input[name='enable']").is(':checked'),
+ "useAsDefault" : $("input[name='useAsDefault']").is(':checked'),
+ "code" :$("input[name='code']").val(),
+ "name" :$("input[name='name']").val(),
+ "sequence" :$("input[name='sequence']").val(),
+ "emptyWeight" :$("input[name='emptyWeight']").val(),
+ "length" :$("input[name='length']").val(),
+ "width" :$("input[name='width']").val(),
+ "height" :$("input[name='height']").val(),
+ "maxWeight" :$("input[name='maxWeight']").val(),
+ "fillPercent" :$("input[name='fillPercent']").val(),
+ "status" :$("input[name='status']").val(),
+ },
+ async : false,
+ error : function(request) {
+ $.modal.alertError("添加失败！");
+ },
+ success : function(data) {
+ $.operate.saveSuccess(data);
+ }
+ });
+ }
+ });
+ </script>
+</body>
+</html>
diff --git a/src/main/resources/templates/shipment/shipmentAnalyzeTemplate/edit.html b/src/main/resources/templates/shipment/shipmentAnalyzeTemplate/edit.html
new file mode 100644
index 0000000..0eb7258
--- /dev/null
+++ b/src/main/resources/templates/shipment/shipmentAnalyzeTemplate/edit.html
@@ -0,0 +1,226 @@
+<!DOCTYPE HTML>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org">
+<meta charset="utf-8">
+<head th:include="include :: header"></head>
+<body class="white-bg">
+ <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+ <form class="form-horizontal m" id="form-containerType-edit" th:object="${containerType}">
+ <input id="id" name="id" th:field="*{id}" type="hidden">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">编码：</label>
+ <div class="col-sm-8">
+ <input id="code" name="code" th:field="*{code}" 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="name" name="name" th:field="*{name}" class="form-control" type="text">
+ </div>
+ </div>
+ <!--<div class="form-group"> -->
+ <!--<label class="col-sm-3 control-label">仓库Id：</label>-->
+ <!--<div class="col-sm-8">-->
+ <!--<input id="warehouseId" name="warehouseId" th:field="*{warehouseId}" 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="warehouseCode" name="warehouseCode" th:field="*{warehouseCode}" class="form-control" type="text">-->
+ <!--</div>-->
+ <!--</div>-->
+
+ <div class="form-group">
+ <label class="col-sm-3 control-label">空箱重量kg：</label>
+ <div class="col-sm-8">
+ <input id="emptyWeight" name="emptyWeight" th:field="*{emptyWeight}" class="form-control" type="text">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">长m：</label>
+ <div class="col-sm-8">
+ <input id="length" name="length" th:field="*{length}" class="form-control" type="text">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">宽m：</label>
+ <div class="col-sm-8">
+ <input id="width" name="width" th:field="*{width}" class="form-control" type="text">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">高m：</label>
+ <div class="col-sm-8">
+ <input id="height" name="height" th:field="*{height}" class="form-control" type="text">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">最大重量kg：</label>
+ <div class="col-sm-8">
+ <input id="maxWeight" name="maxWeight" th:field="*{maxWeight}" 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="fillPercent" name="fillPercent" th:field="*{fillPercent}" 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="useAsDefault" name="useAsDefault" th:field="*{ }" 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">-->
+ <!--<input type="checkbox" th:checked="${containerType.useAsDefault}" class="onoffswitch-checkbox" id="useAsDefault" name="useAsDefault">-->
+ <!--<label class="onoffswitch-label" for="useAsDefault">-->
+ <!--<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="remark" name="remark" th:field="*{remark}" 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="created" name="created" th:field="*{created}" 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="createdBy" name="createdBy" th:field="*{createdBy}" 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="lastUpdated" name="lastUpdated" th:field="*{lastUpdated}" 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="lastUpdatedBy" name="lastUpdatedBy" th:field="*{lastUpdatedBy}" 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="enable" name="enable" th:field="*{enable}" class="form-control" type="text">-->
+ <div class="onoffswitch">
+ <input type="checkbox" th:checked="${containerType.enable}" class="onoffswitch-checkbox" id="enable" name="enable">
+ <label class="onoffswitch-label" for="enable">
+ <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="deleted" name="deleted" th:field="*{deleted}" class="form-control" type="text">-->
+ <!--</div>-->
+ <!--</div>-->
+ <!--<div class="form-group"> -->
+ <!--<label class="col-sm-3 control-label">自定义字段1：</label>-->
+ <!--<div class="col-sm-8">-->
+ <!--<input id="userDef1" name="userDef1" th:field="*{userDef1}" class="form-control" type="text">-->
+ <!--</div>-->
+ <!--</div>-->
+ <!--<div class="form-group"> -->
+ <!--<label class="col-sm-3 control-label">自定义字段2：</label>-->
+ <!--<div class="col-sm-8">-->
+ <!--<input id="userDef2" name="userDef2" th:field="*{userDef2}" class="form-control" type="text">-->
+ <!--</div>-->
+ <!--</div>-->
+ <!--<div class="form-group"> -->
+ <!--<label class="col-sm-3 control-label">自定义字段3：</label>-->
+ <!--<div class="col-sm-8">-->
+ <!--<input id="userDef3" name="userDef3" th:field="*{userDef3}" class="form-control" type="text">-->
+ <!--</div>-->
+ <!--</div>-->
+ <!--<div class="form-group"> -->
+ <!--<label class="col-sm-3 control-label">自定义字段4：</label>-->
+ <!--<div class="col-sm-8">-->
+ <!--<input id="userDef4" name="userDef4" th:field="*{userDef4}" class="form-control" type="text">-->
+ <!--</div>-->
+ <!--</div>-->
+ <!--<div class="form-group"> -->
+ <!--<label class="col-sm-3 control-label">自定义字段5：</label>-->
+ <!--<div class="col-sm-8">-->
+ <!--<input id="userDef5" name="userDef5" th:field="*{userDef5}" class="form-control" type="text">-->
+ <!--</div>-->
+ <!--</div>-->
+ <div class="form-group">
+ <div class="form-control-static col-sm-offset-9">
+ <button type="submit" class="btn btn-primary">提交</button>
+ <button onclick="$.modal.close()" class="btn btn-danger" type="button">关闭</button>
+ </div>
+ </div>
+ </form>
+ </div>
+ <div th:include="include::footer"></div>
+ <script type="text/javascript">
+ var prefix = ctx + "config/containerType";
+ /*$("#form-containerType-edit").validate({
+ rules:{
+ code:{
+ required:true
+ },
+ fillPercent:{
+ range:[0,100]
+ }
+ },
+ submitHandler: function(form) {
+ // $.operate.save(prefix + "/edit", $('#form-containerType-edit').serialize());
+ var tableValue = $.common.getTableValue("#form-containerType-edit");
+ $.operate.save(prefix + "/edit", tableValue);
+ }
+ });*/
+ $("#form-containerType-edit").validate({
+ submitHandler: function(form) {
+ $.ajax({
+ cache : true,
+ type : "POST",
+ url : prefix + "/edit",
+ data : {
+ "id": $("input[name='id']").val(),
+ "enable" : $("input[name='enable']").is(':checked'),
+ "useAsDefault" : $("input[name='useAsDefault']").is(':checked'),
+ "code" :$("input[name='code']").val(),
+ "name" :$("input[name='name']").val(),
+ "prefix" :$("input[name='prefix']").val(),
+ "emptyWeight" :$("input[name='emptyWeight']").val(),
+ "length" :$("input[name='length']").val(),
+ "width" :$("input[name='width']").val(),
+ "height" :$("input[name='height']").val(),
+ "maxWeight" :$("input[name='maxWeight']").val(),
+ "fillPercent" :$("input[name='fillPercent']").val(),
+ "remark" :$("input[name='remark']").val()
+ },
+ async : false,
+ error : function(request) {
+ $.modal.alertError("请求失败！");
+ },
+ success : function(data) {
+ $.operate.saveSuccess(data);
+ }
+ });
+ }
+ });
+ </script>
+</body>
+</html>
diff --git a/src/main/resources/templates/shipment/shipmentAnalyzeTemplate/shipmentAnalyzeTemplate.html b/src/main/resources/templates/shipment/shipmentAnalyzeTemplate/shipmentAnalyzeTemplate.html
new file mode 100644
index 0000000..adc2d2a
--- /dev/null
+++ b/src/main/resources/templates/shipment/shipmentAnalyzeTemplate/shipmentAnalyzeTemplate.html
@@ -0,0 +1,199 @@
+<!DOCTYPE HTML>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<meta charset="utf-8">
+<head th:include="include :: header"></head>
+<body class="gray-bg">
+ <div class="container-div">
+ <div class="row">
+ <div class="col-sm-12 select-info">
+ <form id="containerType-form">
+ <div class="select-list">
+ <ul>
+ <li>
+ 箱型：<input type="text" name="code"/>
+ </li>
+ <li>
+ 名称：<input type="text" name="name"/>
+ </li>
+ <!--<li>-->
+ <!--角色状态：<select name="enable" th:with="type=${@dict.getType('sys_normal_disable')}">-->
+ <!--<option value="">所有</option>-->
+ <!--<option th:each="e : ${type}" th:text="${e['dictLabel']}" th:value="${e['dictValue']}"></option>-->
+ <!--</select>-->
+ <!--</li>-->
+ <li class="time">
+ <label>创建时间： </label>
+ <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="createdBegin"/>
+ <span>-</span>
+ <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="createdEnd"/>
+ </li>
+ <li>
+ <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a>
+ <!--<a class="btn btn-success btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="system:role:export"><i class="fa fa-download"></i> 导出</a>-->
+ </li>
+ </ul>
+ </div>
+ </form>
+ </div>
+
+ <div class="btn-group hidden-xs" id="toolbar" role="group">
+ <a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()" shiro:hasPermission="config:containerType:add">
+ <i class="fa fa-plus"></i> 新增
+ </a>
+ <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()" shiro:hasPermission="config:containerType:remove">
+ <i class="fa fa-trash-o"></i> 删除
+ </a>
+ </div>
+
+ <div class="col-sm-12 select-info">
+ <table id="bootstrap-table" data-mobile-responsive="true" class="table table-bordered table-hover"></table>
+ </div>
+ </div>
+ </div>
+ <div th:include="include :: footer"></div>
+ <script th:inline="javascript">
+ var editFlag = [[${@permission.hasPermi('config:containerType:edit')}]];
+ var removeFlag = [[${@permission.hasPermi('config:containerType:remove')}]];
+ var prefix = ctx + "config/containerType"
+ var datas = [[${@dict.getType('sys_normal_disable')}]];
+ $(function() {
+ var options = {
+ url: prefix + "/list",
+ createUrl: prefix + "/add",
+ updateUrl: prefix + "/edit/{id}",
+ removeUrl: prefix + "/remove",
+ modalName: "容器类型",
+ search: false,
+ columns: [{
+ checkbox: true
+ },
+ {
+ field : 'id',
+ title : '标识'
+ },
+ {
+ field : 'code',
+ title : '箱型'
+ },
+ {
+ field : 'name',
+ title : '名称'
+ },
+ {
+ field : 'warehouseCode',
+ title : '仓库编码'
+ },
+ {
+ field : 'companyCode',
+ title : '货主编码'
+ },
+ {
+ field : 'sequence',
+ title : '序号'
+ },
+ {
+ field : 'emptyWeight',
+ title : '空箱重量kg'
+ },
+ {
+ field : 'length',
+ title : '长m'
+ },
+ {
+ field : 'width',
+ title : '宽m'
+ },
+ {
+ field : 'height',
+ title : '高m'
+ },
+ {
+ field : 'maxWeight',
+ title : '最大重量kg'
+ },
+ {
+ field : 'fillPercent',
+ title : '装满度%'
+ },
+ {
+ field : 'useAsDefault',
+ 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',
+ title : '创建时间'
+ },
+ {
+ field : 'createdBy',
+ title : '创建用户'
+ },
+ {
+ field : 'lastUpdated',
+ title : '更新时间'
+ },
+ {
+ field : 'lastUpdatedBy',
+ title : '更新用户'
+ },
+ {
+ field : 'enable',
+ title : '是否有效',
+ formatter: function(value, row, index) {
+ return $.table.selectDictLabel(datas, value);
+ },
+ align: 'center',
+
+ },
+ // {
+ // field : 'deleted',
+ // title : '是否删除'
+ // },
+ {
+ field : 'userDef1',
+ title : '自定义字段1' ,
+ visible:false
+ },
+ {
+ field : 'userDef2',
+ title : '自定义字段2' ,
+ visible:false
+ },
+ {
+ field : 'userDef3',
+ title : '自定义字段3' ,
+ visible:false
+ },
+ {
+ field : 'userDef4',
+ title : '自定义字段4' ,
+ visible:false
+ },
+ {
+ field : 'userDef5',
+ title : '自定义字段5' ,
+ visible:false
+ },
+ {
+ title: '操作',
+ align: 'center',
+ formatter: function(value, row, index) {
+ var actions = [];
+ actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+ actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-trash-o"></i>删除</a>');
+ return actions.join('');
+ }
+ }]
+ };
+ $.table.init(options);
+ });
+ </script>
+</body>
+</html>
\ No newline at end of file