Browse Source

修改托盘修改功能

lwx_dev
erdanergou 3 years ago
parent
commit
839d3bc47a
  1. 4
      src/main/java/com/dreamchaser/depository_manage/controller/PageController.java
  2. 32
      src/main/java/com/dreamchaser/depository_manage/controller/PlaceController.java
  3. 120
      src/main/java/com/dreamchaser/depository_manage/service/impl/PlaceServiceImpl.java
  4. 2
      src/main/resources/templates/pages/place/place_edit.html
  5. 176
      src/main/resources/templates/pages/place/place_editForTray.html
  6. 2
      target/classes/templates/pages/place/place_edit.html

4
src/main/java/com/dreamchaser/depository_manage/controller/PageController.java

@ -1188,6 +1188,10 @@ public class PageController {
mv.addObject("id", id);
Place placeById = placeService.findPlaceById(id);
mv.addObject("place", placeById);
if(Integer.compare(placeById.getFlagForType(),2)==0){
// 如果是托盘
mv.setViewName("pages/place/place_editForTray");
}
} else {
throw new MyException("缺少必要参数!");
}

32
src/main/java/com/dreamchaser/depository_manage/controller/PlaceController.java

@ -269,7 +269,7 @@ public class PlaceController {
update.put("z", place_z);
update.put("code", newCode);
update.put("oldCode", oldCode);
update.put("did", map.get("depositoryId"));
update.put("did", map.get("did"));
if (!"".equals(min)) {
update.put("min", map.get("min"));
} else {
@ -284,6 +284,36 @@ public class PlaceController {
return CrudUtil.postHandle(placeService.UpdatePlace(update),1);
}
@PostMapping("/tray_edit")
public RestResponse trayEdit(@RequestBody Map<String,Object> map){
if(map.containsKey("state")){
map.put("state",1);
}else{
map.put("state",2);
}
String code = (String) map.get("code");
Integer depositoryId = ObjectFormatUtil.toInteger(map.get("did"));
Place placeByDidAndCode = placeService.findPlaceByDidAndCode(depositoryId, code);
if(placeByDidAndCode != null){
return new RestResponse("",12345,new StatusInfo("修改失败","该编码已经存在"));
}
Map<String, Object> update = new HashMap<>();
String min = (String) map.get("min");
String max = (String) map.get("max");
if (!"".equals(min)) {
update.put("min", map.get("min"));
} else {
update.put("min", 0);
}
if (!"".equals(max)) {
update.put("max", map.get("max"));
} else {
update.put("max", 500);
}
update.put("code",code);
update.put("id", map.get("id"));
return CrudUtil.postHandle(placeService.UpdatePlace(update),1); }
@PostMapping("/editPlaceState")
public RestResponse editPlaceState(@RequestBody Map<String,Object> map) {

120
src/main/java/com/dreamchaser/depository_manage/service/impl/PlaceServiceImpl.java

@ -34,29 +34,32 @@ public class PlaceServiceImpl implements PlaceService {
/**
* 查找所有库位
*
* @return
*/
@Override
public List<Place> findPlaceAll() {
return placeMapper.findPlaceAll();
}
/**
* 根据条件查找库位
*
* @param map
* @return
*/
@Override
public List<Place> findPlaceByCondition(Map<String, Object> map) {
if(map.containsKey("place_x")){
map.put("x",map.get("place_x"));
if (map.containsKey("place_x")) {
map.put("x", map.get("place_x"));
map.remove("place_x");
}
if(map.containsKey("place_y")){
map.put("y",map.get("place_y"));
if (map.containsKey("place_y")) {
map.put("y", map.get("place_y"));
map.remove("place_y");
}
if(map.containsKey("place_z")){
map.put("z",map.get("place_z"));
if (map.containsKey("place_z")) {
map.put("z", map.get("place_z"));
map.remove("place_z");
}
Integer size = 10, page = 1;
@ -68,19 +71,21 @@ public class PlaceServiceImpl implements PlaceService {
page = ObjectFormatUtil.toInteger(map.get("page"));
map.put("begin", (page - 1) * size);
}
if(map.containsKey("depositoryId")){
map.put("did",map.get("depositoryId"));
if (map.containsKey("depositoryId")) {
map.put("did", map.get("depositoryId"));
map.remove("depositoryId");
}
Object state = 1;
if(map.containsKey("state")){
if (map.containsKey("state")) {
state = map.get("state");
}
map.put("state",state);
map.put("state", state);
return placeMapper.findPlaceByCondition(map);
}
/**
* 查找符合条件的库位数
*
* @param map
* @return
*/
@ -100,22 +105,26 @@ public class PlaceServiceImpl implements PlaceService {
/**
* 根据条件修改库位
*
* @param map
* @return
*/
@Override
public Integer UpdatePlace(Map<String, Object> map) {
Integer id = ObjectFormatUtil.toInteger(map.get("id"));
Place placeById = placeMapper.findPlaceById(id);
String oldCode = (String) map.get("oldCode");
if(!oldCode.equals(placeById.getCode())){
map.put("code",oldCode);
if (map.containsKey("oldCode")) {
Place placeById = placeMapper.findPlaceById(id);
String oldCode = (String) map.get("oldCode");
if (!oldCode.equals(placeById.getCode())) {
map.put("code", oldCode);
}
}
return placeMapper.UpdatePlace(map);
}
/**
* 修改库位状态
*
* @param map
* @return
*/
@ -130,6 +139,7 @@ public class PlaceServiceImpl implements PlaceService {
/**
* 根据条件修改库位
*
* @param place
* @return
*/
@ -137,8 +147,10 @@ public class PlaceServiceImpl implements PlaceService {
public Integer UpdatePlace(Place place) {
return placeMapper.UpdatePlace(place);
}
/**
* 根据主键删除库位
*
* @param pid
* @return
*/
@ -146,24 +158,28 @@ public class PlaceServiceImpl implements PlaceService {
public Integer DelPlace(Integer pid) {
return placeMapper.DelPlace(pid);
}
/**
* 插入一条库位信息
*
* @param map
* @return
*/
@Override
public Integer InsertPlace(Map<String, Object> map) {
Map<String,Object> param = new HashMap<>();
param.put("did",map.get("did"));
param.put("code",map.get("code"));
Map<String, Object> param = new HashMap<>();
param.put("did", map.get("did"));
param.put("code", map.get("code"));
List<Place> placeByCondition = placeMapper.findPlaceByCondition(param);
if(placeByCondition.size() > 0){
if (placeByCondition.size() > 0) {
return 1;
}
return placeMapper.InsertPlace(map);
}
/**
* 根据仓库编号查找库位
*
* @param did
* @return
*/
@ -174,6 +190,7 @@ public class PlaceServiceImpl implements PlaceService {
/**
* 根据id查询库位
*
* @return
*/
@Override
@ -183,20 +200,22 @@ public class PlaceServiceImpl implements PlaceService {
/**
* 根据仓库id及库位编码获取对应库位
* @param did 仓库id
*
* @param did 仓库id
* @param code 库位编码
* @return
*/
@Override
public Place findPlaceByDidAndCode(Integer did, String code) {
Map<String,Object> paramForPlace = new HashMap<>();
paramForPlace.put("code",code);
paramForPlace.put("did",did);
return placeMapper.findPlaceByDidAndCode(paramForPlace);
Map<String, Object> paramForPlace = new HashMap<>();
paramForPlace.put("code", code);
paramForPlace.put("did", did);
return placeMapper.findPlaceByDidAndCode(paramForPlace);
}
/**
* 根据id将库位状态改为删除
*
* @param id
* @return
*/
@ -207,6 +226,7 @@ public class PlaceServiceImpl implements PlaceService {
/**
* 根据批量id将库位状态改为删除
*
* @param ids
* @return
*/
@ -217,14 +237,15 @@ public class PlaceServiceImpl implements PlaceService {
/**
* 根据物料与所处仓库获取库位
*
* @param mid
* @return
*/
@Override
public List<PlaceP> findPlaceByMidAndDid(Integer mid,Integer depositoryId) {
Map<String,Object> map = new HashMap<>();
map.put("mid",mid);
map.put("did",depositoryId);
public List<PlaceP> findPlaceByMidAndDid(Integer mid, Integer depositoryId) {
Map<String, Object> map = new HashMap<>();
map.put("mid", mid);
map.put("did", depositoryId);
Inventory inventoryById = materialMapper.findInventoryById(mid);
List<Place> placeByCondition = placeMapper.findPlaceByMidAndDid(map);
List<PlaceP> placePList = new ArrayList<>();
@ -253,15 +274,16 @@ public class PlaceServiceImpl implements PlaceService {
/**
* 根据仓库id及物料id获取对应库位存储的物料
*
* @param did 待查询仓库id
* @param mid 物料id
* @return
*/
@Override
public List<MaterialAndPlaceForView> findPlaceAndMaterialByDidAndMid(Integer did, Integer mid) {
Map<String,Object> map = new HashMap<>();
map.put("depositoryId",did);
map.put("mid",mid);
Map<String, Object> map = new HashMap<>();
map.put("depositoryId", did);
map.put("mid", mid);
return placeMapper.findPlaceAndMaterialByDidAndMid(map);
}
@ -270,9 +292,9 @@ public class PlaceServiceImpl implements PlaceService {
*/
@Override
public MaterialAndPlace findPlaceAndMaterialByMidAndPid(Integer pid, Integer mid) {
Map<String,Object> map = new HashMap<>();
map.put("mid",mid);
map.put("pid",pid);
Map<String, Object> map = new HashMap<>();
map.put("mid", mid);
map.put("pid", pid);
return placeMapper.findPlaceAndMaterialByMidAndPid(map);
}
@ -297,20 +319,22 @@ public class PlaceServiceImpl implements PlaceService {
/**
* 获取当前物料在当前库位的数量
*
* @param mid
* @param pid
* @return
*/
@Override
public Integer findQuantityByMidAndPid(Integer mid, Integer pid) {
Map<String,Object> map = new HashMap<>();
map.put("pid",pid);
map.put("mid",mid);
Map<String, Object> map = new HashMap<>();
map.put("pid", pid);
map.put("mid", mid);
return placeMapper.findQuantityByMidAndPid(map);
}
/**
* 修改当前库位存放物料
*
* @param mp
* @return
*/
@ -321,6 +345,7 @@ public class PlaceServiceImpl implements PlaceService {
/**
* 删除当前库位与物料的对应关系
*
* @param id 主键id
* @return
*/
@ -331,27 +356,29 @@ public class PlaceServiceImpl implements PlaceService {
/**
* 获取库位对应的二维码
*
* @param pid
* @return
*/
@Override
public String findQrCodeByPlace(Integer pid) {
Map<String,Object> map = new HashMap<>();
Map<String, Object> map = new HashMap<>();
// 1为库位2为仓库
map.put("flag",1);
map.put("pid",pid);
map.put("flag", 1);
map.put("pid", pid);
return qrCodeMapper.selectQrCodeByDepositoryOrPlace(map);
}
/**
* 用于添加库位与二维码的对应关系
*
* @param map
* @return
*/
@Override
public Integer addQrCodeByPlace(Map<String, Object> map) {
// 1为库位2为仓库
map.put("flag",1);
map.put("flag", 1);
return qrCodeMapper.addQrCodeByPidOrDid(map);
}
@ -360,10 +387,10 @@ public class PlaceServiceImpl implements PlaceService {
*/
@Override
public PidOrDidAndCode findLocationByQrCode(String qrCode) {
Map<String,Object> map = new HashMap<>();
map.put("qrCode",qrCode);
Map<String, Object> map = new HashMap<>();
map.put("qrCode", qrCode);
List<PidOrDidAndCode> locationByCondition = qrCodeMapper.findLocationByCondition(map);
if(locationByCondition.size()>0){
if (locationByCondition.size() > 0) {
return locationByCondition.get(0);
}
return null;
@ -371,14 +398,15 @@ public class PlaceServiceImpl implements PlaceService {
/**
* 查询当前类型的库位数量
*
* @param flag 类型
* @return
*/
@Override
public Integer findPlaceCoutnByTypeForFlag(Integer flag, Integer did) {
Map<String,Object> map = new HashMap<>();
map.put("flag",flag);
map.put("did",did);
Map<String, Object> map = new HashMap<>();
map.put("flag", flag);
map.put("did", did);
return placeMapper.findPlaceCoutnByTypeForFlag(map);
}

2
src/main/resources/templates/pages/place/place_edit.html

@ -46,7 +46,7 @@
<div class="layui-form-item">
<label class="layui-form-label">库位码:</label>
<div class="layui-input-block">
<input type="text" placeholder="请填写最大库位码" class="layui-input" th:value="${place.getCode()}"
<input type="text" placeholder="请填写库位码" class="layui-input" th:value="${place.getCode()}"
name="code" lay-verify="required"/>
</div>
</div>

176
src/main/resources/templates/pages/place/place_editForTray.html

@ -0,0 +1,176 @@
<!DOCTYPE html>
<html lang="en" xmlns:th="http://www.thymeleaf.org">
<head>
<meta charset="utf-8">
<title>layui</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<link rel="stylesheet" href="/static/lib/layui-v2.6.3/css/layui.css" media="all">
<link rel="stylesheet" href="/static/css/public.css" media="all">
</head>
<body>
<div class="layuimini-container">
<div class="layuimini-main">
<fieldset class="table-search-fieldset">
<legend>库位详情</legend>
<div class="layui-fluid">
<div class="layui-card">
<div class="layui-card-body" style="padding-top: 40px;">
<div>
<form class="layui-form"
style="margin: 0 auto;max-width: 700px;padding-top: 100px; padding-bottom: 200px" lay-filter="form1">
<input th:value="${place.getId()}" id="placeId" name = "id" type="text" style="display: none">
<input th:value="${place.getDid()}" id="depositoryId" name = "did" type="text" style="display: none">
<div class="layui-form-item">
<label class="layui-form-label">托盘码:</label>
<div class="layui-input-block">
<input type="text" placeholder="请填写托盘码" class="layui-input" th:value="${place.getCode()}"
name="code" 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" th:value="${place.getMax()}"
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" th:value="${place.getMin()}"
name="min" lay-verify="required"/>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">打印码</label>
<div class="layui-input-block">
<input id="createCode" type="button" class="layui-btn layui-btn-radius layui-btn-normal" onclick="createQrCode()" value="生成"/>
<div id="codeItem" style="display:none;">
<img id="barCode" >
<button id="printer" type="button" onclick="print_code()" class="layui-btn">打印</button>
</div>
</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>
<hr>
</div>
</div>
</fieldset>
</div>
</div>
<script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script>
<script>
var data;
function createQrCode() {
}
function print_code() {
}
layui.use(['form', 'layer','dropdown','tree'], function () {
var $ = layui.jquery,
form = layui.form,
layer = layui.layer;
var depositoryId = $("#depositoryId").val();
form.on('submit(formStep)', function (data) {
var req = data.field;
req.type = "one";
$.ajax({
url: "/place/tray_edit",
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.detail,{
icon:0,
time:1000
},function () {
location.reload();
});//失败的表情
} else {
layer.msg("修改成功!", {
icon: 6,//成功的表情
time: 1000
}, //1秒关闭(如果不配置,默认是3秒)
function(){
//do something
var index = parent.layer.getFrameIndex(window.name);
parent.layer.close(index);//关闭当前页
window.location='/warehouseByParentId?parentId='+depositoryId;
});
}
},
complete: function () {
form.val("form1", {
})
}
});
return false;
});
createQrCode = function () {
var placeId = $("#placeId").val();
var req = {};
req.pid = placeId;
$.ajax({
url: "/place/createQrCode",
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 (d) {
var data = d.data;
layer.close(this.layerIndex);
$("#barCode").attr("src", data.qrCode);
$("#codeItem").show();
$("#createCode").hide();
}
})
};
print_code = function(){
layer.open({
type: 2,
title: '打印',
skin: 'layui-layer-rim',
maxmin: true,
shadeClose: true, //点击遮罩关闭层
area: ['80%', '80%'],
move: '.layui-layer-title',
fixed: false,
content: '/printCode?mid='+$("#placeId").val()+'&flag=3',
})
};
});
</script>
</body>
</html>

2
target/classes/templates/pages/place/place_edit.html

@ -46,7 +46,7 @@
<div class="layui-form-item">
<label class="layui-form-label">库位码:</label>
<div class="layui-input-block">
<input type="text" placeholder="请填写最大库位码" class="layui-input" th:value="${place.getCode()}"
<input type="text" placeholder="请填写库位码" class="layui-input" th:value="${place.getCode()}"
name="code" lay-verify="required"/>
</div>
</div>

Loading…
Cancel
Save