pfz_smile
/
depositroy
2
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity
Browse Source

添加托盘创建功能

lwx_dev
erdanergou 3 years ago
parent
74eb4b36a7
commit
950c0143f7
5 changed files with 149 additions and 63 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      src/main/java/com/dreamchaser/depository_manage/controller/PageController.java
  2. 5
      src/main/java/com/dreamchaser/depository_manage/entity/Place.java
  3. 3
      src/main/java/com/dreamchaser/depository_manage/mapper/PlaceMapper.xml
  4. 3
      target/classes/com/dreamchaser/depository_manage/mapper/PlaceMapper.xml
  5. 193
      target/classes/templates/pages/place/place_add.html

8
src/main/java/com/dreamchaser/depository_manage/controller/PageController.java
View File

@ -1959,7 +1959,7 @@ public class PageController {
if (!(Integer.compare(placeId, 0) == 0)) { if (!(Integer.compare(placeId, 0) == 0)) {
// 如果不是默认库位 // 如果不是默认库位
Place placeById = placeService.findPlaceById(placeId); Place placeById = placeService.findPlaceById(placeId);
location.append("-" + placeById.getCode()); location.append("-").append(placeById.getCode());
} }
// 设置盘点位置 // 设置盘点位置
stp.setDepositoryName(location.toString()); stp.setDepositoryName(location.toString());
@ -1976,12 +1976,12 @@ public class PageController {
List<RoleAndDepository> depositoryAndRole = roleService.findDepositoryAndRole(userToken.getId()); List<RoleAndDepository> depositoryAndRole = roleService.findDepositoryAndRole(userToken.getId());
StringBuilder RoleName = new StringBuilder(); StringBuilder RoleName = new StringBuilder();
StringBuilder DepositoryName = new StringBuilder(); StringBuilder DepositoryName = new StringBuilder();
for (int i = 0; i < depositoryAndRole.size(); i++) { for (RoleAndDepository roleAndDepository : depositoryAndRole) {
String depositoryName = depositoryAndRole.get(i).getDepositoryName(); String depositoryName = roleAndDepository.getDepositoryName();
if (depositoryName == null) { if (depositoryName == null) {
depositoryName = ""; depositoryName = "";
} }
DepositoryName.append(depositoryName + " "); DepositoryName.append(depositoryName).append(" ");
} }
mv.addObject("roleAndDepository", depositoryAndRole); mv.addObject("roleAndDepository", depositoryAndRole);
mv.addObject("RoleName", RoleName.toString()); mv.addObject("RoleName", RoleName.toString());

5
src/main/java/com/dreamchaser/depository_manage/entity/Place.java
View File

@ -59,4 +59,9 @@ public class Place {
* 当前库位数目 * 当前库位数目
*/ */
private Integer quantity; private Integer quantity;
/**
* 当前库位类型（1库位2托盘）
*/
private Integer flagForType;
} }

3
src/main/java/com/dreamchaser/depository_manage/mapper/PlaceMapper.xml
View File

@ -17,6 +17,7 @@
<result column="max" property="max" jdbcType="INTEGER" /> <result column="max" property="max" jdbcType="INTEGER" />
<result column="state" property="state" jdbcType="INTEGER" /> <result column="state" property="state" jdbcType="INTEGER" />
<result column="quantity" property="quantity" jdbcType="INTEGER" /> <result column="quantity" property="quantity" jdbcType="INTEGER" />
<result column="flagForType" property="flagForType" jdbcType="INTEGER" />
</resultMap> </resultMap>
<resultMap id="materialAndPlaceMap" type="com.dreamchaser.depository_manage.entity.MaterialAndPlace"> <resultMap id="materialAndPlaceMap" type="com.dreamchaser.depository_manage.entity.MaterialAndPlace">
@ -53,7 +54,7 @@
<!-- 表查询字段 --> <!-- 表查询字段 -->
<sql id="allColumns"> <sql id="allColumns">
p.id,p.x,p.y,p.z,p.code,p.mid,p.did,p.min,p.max,p.state,p.quantity p.id,p.x,p.y,p.z,p.code,p.mid,p.did,p.min,p.max,p.state,p.quantity,p.flagForType
</sql> </sql>
<sql id="allColumnsByMaterialAndPlace"> <sql id="allColumnsByMaterialAndPlace">

3
target/classes/com/dreamchaser/depository_manage/mapper/PlaceMapper.xml
View File

@ -17,6 +17,7 @@
<result column="max" property="max" jdbcType="INTEGER" /> <result column="max" property="max" jdbcType="INTEGER" />
<result column="state" property="state" jdbcType="INTEGER" /> <result column="state" property="state" jdbcType="INTEGER" />
<result column="quantity" property="quantity" jdbcType="INTEGER" /> <result column="quantity" property="quantity" jdbcType="INTEGER" />
<result column="flagForType" property="flagForType" jdbcType="INTEGER" />
</resultMap> </resultMap>
<resultMap id="materialAndPlaceMap" type="com.dreamchaser.depository_manage.entity.MaterialAndPlace"> <resultMap id="materialAndPlaceMap" type="com.dreamchaser.depository_manage.entity.MaterialAndPlace">
@ -53,7 +54,7 @@
<!-- 表查询字段 --> <!-- 表查询字段 -->
<sql id="allColumns"> <sql id="allColumns">
p.id,p.x,p.y,p.z,p.code,p.mid,p.did,p.min,p.max,p.state,p.quantity p.id,p.x,p.y,p.z,p.code,p.mid,p.did,p.min,p.max,p.state,p.quantity,p.flagForType
</sql> </sql>
<sql id="allColumnsByMaterialAndPlace"> <sql id="allColumnsByMaterialAndPlace">

193
target/classes/templates/pages/place/place_add.html
View File

@ -15,58 +15,105 @@
<fieldset class="table-search-fieldset"> <fieldset class="table-search-fieldset">
<legend>库位创建</legend> <legend>库位创建</legend>
<div class="layui-fluid"> <div class="layui-fluid">
<div class="layui-card"> <div class="layui-tab">
<div class="layui-card-body" style="padding-top: 40px;"> <ul class="layui-tab-title" style="text-align: center">
<div> <li class="layui-this">库位创建</li>
<form class="layui-form" <li class="layui-this">托盘创建</li>
style="margin: 0 auto;max-width: 700px;padding-top: 100px; padding-bottom: 200px" lay-filter="form1"> </ul>
<input style="display: none" th:value="${depositoryId}" name="depositoryId" id="depositoryID"> <div class="layui-tab-content">
<div class="layui-form-item"> <div class="layui-tab-item layui-show">
<label class="layui-form-label">库位行:</label> <div class="layui-card">
<div class="layui-input-block"> <div class="layui-card-body" style="padding-top: 40px;">
<input type="text" placeholder="请填写行数" class="layui-input" <div>
name="place_x" lay-verify="required"/> <form class="layui-form"
style="margin: 0 auto;max-width: 700px;padding-top: 100px; padding-bottom: 200px"
lay-filter="form1">
<input style="display: none" th:value="${depositoryId}" name="depositoryId"
id="depositoryID">
<div class="layui-form-item">
<label class="layui-form-label">库位行:</label>
<div class="layui-input-block">
<input type="text" placeholder="请填写行数" class="layui-input"
name="place_x" lay-verify="required"/>
</div>
</div>
<!-- <div class="layui-form-item">
<label class="layui-form-label">库位列:</label>
<div class="layui-input-block">
<input type="text" placeholder="请填写列数" class="layui-input"
name="place_y" lay-verify="required"/>
</div>
</div>-->
<div class="layui-form-item">
<label class="layui-form-label">库位层:</label>
<div class="layui-input-block">
<input type="text" placeholder="请填写层数" class="layui-input"
name="place_z" lay-verify="required"/>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">最大存放量:</label>
<div class="layui-input-block">
<input type="text" placeholder="请填写最大存放量" class="layui-input"
name="max" lay-verify="required"/>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">最小存放量:</label>
<div class="layui-input-block">
<input type="text" placeholder="请填写最小存放量" class="layui-input"
name="min" lay-verify="required"/>
</div>
</div>
<div class="layui-form-item">
<div class="layui-input-block">
<button class="layui-btn" lay-submit lay-filter="formStep">
&emsp;创建库位&emsp;
</button>
</div>
</div>
</form>
</div> </div>
</div> </div>
<!-- <div class="layui-form-item"> <hr>
<label class="layui-form-label">库位列:</label> </div>
<div class="layui-input-block"> </div>
<input type="text" placeholder="请填写列数" class="layui-input" <div class="layui-tab-item">
name="place_y" lay-verify="required"/> <div class="layui-card">
</div> <div class="layui-card-body" style="padding-top: 40px;">
</div>--> <div>
<div class="layui-form-item"> <form class="layui-form"
<label class="layui-form-label">库位层:</label> style="margin: 0 auto;max-width: 700px;padding-top: 100px; padding-bottom: 200px"
<div class="layui-input-block"> lay-filter="form2">
<input type="text" placeholder="请填写层数" class="layui-input" <input style="display: none" th:value="${depositoryId}" name="depositoryId">
name="place_z" lay-verify="required"/> <div class="layui-form-item">
</div> <label class="layui-form-label">最大存放量:</label>
</div> <div class="layui-input-block">
<div class="layui-form-item"> <input type="text" placeholder="请填写最大存放量" class="layui-input"
<label class="layui-form-label">最大存放量:</label> name="max" lay-verify="required"/>
<div class="layui-input-block"> </div>
<input type="text" placeholder="请填写最大存放量" class="layui-input" </div>
name="max" lay-verify="required"/> <div class="layui-form-item">
</div> <label class="layui-form-label">最小存放量:</label>
</div> <div class="layui-input-block">
<div class="layui-form-item"> <input type="text" placeholder="请填写最大存放量" class="layui-input"
<label class="layui-form-label">最小存放量:</label> name="min" lay-verify="required"/>
<div class="layui-input-block"> </div>
<input type="text" placeholder="请填写最小存放量" class="layui-input" </div>
name="min" lay-verify="required"/>
</div> <div class="layui-form-item">
</div> <div class="layui-input-block">
<div class="layui-form-item"> <button class="layui-btn" type="button" lay-submit lay-filter="formStep1">
<div class="layui-input-block"> &emsp;创建库位&emsp;
<button class="layui-btn" lay-submit lay-filter="formStep"> </button>
&emsp;创建库位&emsp; </div>
</button> </div>
</form>
</div> </div>
</div> </div>
</form> </div>
</div> </div>
</div> </div>
<hr>
</div> </div>
</div> </div>
</fieldset> </fieldset>
@ -79,7 +126,7 @@
<script> <script>
var data; var data;
layui.use(['form', 'layer','dropdown','tree'], function () { layui.use(['form', 'layer', 'dropdown', 'tree'], function () {
var $ = layui.jquery, var $ = layui.jquery,
form = layui.form, form = layui.form,
layer = layui.layer; layer = layui.layer;
@ -107,28 +154,60 @@
icon: 6,//成功的表情 icon: 6,//成功的表情
time: 1000 time: 1000
}, //1秒关闭（如果不配置，默认是3秒） }, //1秒关闭（如果不配置，默认是3秒）
function(){ function () {
//do something //do something
window.location="/insertPlace?depositoryId="+depositoryId window.location = "/insertPlace?depositoryId=" + depositoryId
}); });
} }
}, },
complete: function () { complete: function () {
form.val("form1", { form.val("form1", {})
}) }
});
return false;
});
form.on('submit(formStep1)', function (data) {
var req = data.field;
req.type = "one";
$.ajax({
url: "/place/addTray",
type: 'post',
dataType: 'json',
contentType: "application/json;charset=utf-8",
data: JSON.stringify(req),
beforeSend: function () {
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
},
success: function (data) {
layer.close(this.layerIndex);
if (data.status >= 300) {
layer.msg(data.statusInfo.message);//失败的表情
return;
} else {
layer.msg("添加成功！", {
icon: 6,//成功的表情
time: 1000
}, //1秒关闭（如果不配置，默认是3秒）
function () {
//do something
window.location = "/insertPlace?depositoryId=" + depositoryId
});
}
},
complete: function () {
form.val("form1", {})
} }
}); });
return false; return false;
}); });
form.on('select(depositoryId)', function (data) {
form.on('select(depositoryId)',function (data){
$.ajax({ $.ajax({
url:"/repository/findDepositoryByParent?parentId="+data.value, url: "/repository/findDepositoryByParent?parentId=" + data.value,
type:'get', type: 'get',
dataType:'json', dataType: 'json',
contentType: "application/json;charset=utf-8", contentType: "application/json;charset=utf-8",
success:function(d){ success: function (d) {
console.log(d.data) console.log(d.data)
} }
}) })

Write Preview
Loading…
Cancel
Save