Browse Source

修改部分bug

lwx_dev
erdanergou 3 years ago
parent
commit
6a87933c06
  1. 11
      src/main/java/com/dreamchaser/depository_manage/controller/PlaceController.java
  2. 8
      src/main/java/com/dreamchaser/depository_manage/service/PlaceService.java
  3. 20
      src/main/java/com/dreamchaser/depository_manage/service/impl/PlaceServiceImpl.java
  4. 2
      src/main/resources/templates/pages/JcPrinter/PrinterIndex.html
  5. 2
      src/main/resources/templates/pages/material/material-add.html
  6. 4
      src/main/resources/templates/pages/warehouse/warehouseByParentId.html

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

@ -204,6 +204,17 @@ public class PlaceController {
return CrudUtil.postHandle(placeService.UpdatePlace(update),1); return CrudUtil.postHandle(placeService.UpdatePlace(update),1);
} }
@PostMapping("/editPlaceState")
public RestResponse editPlaceState(@RequestBody Map<String,Object> map) {
if (map.containsKey("state")) {
map.put("state", 1);
} else {
map.put("state", 2);
}
return CrudUtil.postHandle(placeService.editPlaceState(map),1);
}
// 根据物料编号获取库位 // 根据物料编号获取库位
@PostMapping("/findPlaceByMid") @PostMapping("/findPlaceByMid")
public RestResponse findPlaceByMid(@RequestBody Map<String,Object> map, HttpServletRequest request){ public RestResponse findPlaceByMid(@RequestBody Map<String,Object> map, HttpServletRequest request){

8
src/main/java/com/dreamchaser/depository_manage/service/PlaceService.java

@ -37,6 +37,14 @@ public interface PlaceService {
*/ */
Integer UpdatePlace(Map<String,Object> map); Integer UpdatePlace(Map<String,Object> map);
/**
* 修改库位状态
* @param map
* @return
*/
Integer editPlaceState(Map<String,Object> map);
/** /**
* 根据条件修改库位 * 根据条件修改库位
* @param place * @param place

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

@ -72,6 +72,11 @@ public class PlaceServiceImpl implements PlaceService {
map.put("did",map.get("depositoryId")); map.put("did",map.get("depositoryId"));
map.remove("depositoryId"); map.remove("depositoryId");
} }
Object state = 1;
if(map.containsKey("state")){
state = map.get("state");
}
map.put("state",state);
return placeMapper.findPlaceByCondition(map); return placeMapper.findPlaceByCondition(map);
} }
/** /**
@ -102,6 +107,21 @@ public class PlaceServiceImpl implements PlaceService {
public Integer UpdatePlace(Map<String, Object> map) { public Integer UpdatePlace(Map<String, Object> map) {
return placeMapper.UpdatePlace(map); return placeMapper.UpdatePlace(map);
} }
/**
* 修改库位状态
* @param map
* @return
*/
@Override
public Integer editPlaceState(Map<String, Object> map) {
Integer id = ObjectFormatUtil.toInteger(map.get("id"));
Integer state = ObjectFormatUtil.toInteger(map.get("state"));
Place placeById = placeMapper.findPlaceById(id);
placeById.setState(state);
return placeMapper.UpdatePlace(placeById);
}
/** /**
* 根据条件修改库位 * 根据条件修改库位
* @param place * @param place

2
src/main/resources/templates/pages/JcPrinter/PrinterIndex.html

@ -13,7 +13,7 @@
<input style="display:none;" id="name" th:value="${name}"> <input style="display:none;" id="name" th:value="${name}">
<input style="display:none;" id="version" th:value="${version}"> <input style="display:none;" id="version" th:value="${version}">
<div class="title"> <div class="title">
<H2>刷新</H2> <H2>下载</H2>
<div> <div>
<el-button @click="downLoadServer()" type="primary">下载打印服务</el-button> <el-button @click="downLoadServer()" type="primary">下载打印服务</el-button>
</div> </div>

2
src/main/resources/templates/pages/material/material-add.html

@ -98,7 +98,7 @@
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">计量单位:</label> <label class="layui-form-label">计量单位:</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" placeholder="请填写计量单位" class="layui-input" <input type="text" placeholder="请填写计量单位" class="layui-input" lay-verify="required"
name="unit" /> name="unit" />
</div> </div>
</div> </div>

4
src/main/resources/templates/pages/warehouse/warehouseByParentId.html

@ -328,13 +328,13 @@
//监听状态操作 //监听状态操作
form.on('switch(changeState)', function (obj) { form.on('switch(changeState)', function (obj) {
var req = new Map; var req = {};
if (obj.elem.checked) { if (obj.elem.checked) {
req["state"] = 1 req["state"] = 1
} }
req["id"] = this.value; req["id"] = this.value;
$.ajax({ $.ajax({
url: "/place/place_edit", url: "/place/editPlaceState",
type: 'post', type: 'post',
dataType: 'json', dataType: 'json',
contentType: "application/json;charset=utf-8", contentType: "application/json;charset=utf-8",

Loading…
Cancel
Save