zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/TagServiceImpl.java
@@ -10,6 +10,7 @@ import org.springframework.stereotype.Service; import java.util.Date; import java.util.List; @Service("manTagService") public class TagServiceImpl extends ServiceImpl<TagMapper, Tag> implements TagService { @@ -51,9 +52,15 @@ if (!Cools.isEmpty(firstTagName)) { //存在一级分类，查询一级分类 Tag firstTag = this.getOne(new LambdaQueryWrapper<Tag>() List<Tag> firstList = this.list(new LambdaQueryWrapper<Tag>() .eq(Tag::getName, firstTagName) .eq(Tag::getHostId, hostId)); .eq(Tag::getHostId, hostId) .orderByAsc(Tag::getCreateTime)); Tag firstTag = null; if (!firstList.isEmpty()) { firstTag = firstList.get(0); } if (firstTag == null) { //一级分类为空，创建一级分类 firstTag = new Tag(); @@ -68,9 +75,14 @@ if (!Cools.isEmpty(secondTagName)) { //存在二级分类，查询二级分类 Tag secondTag = this.getOne(new LambdaQueryWrapper<Tag>() List<Tag> secondList = this.list(new LambdaQueryWrapper<Tag>() .eq(Tag::getName, secondTagName) .eq(Tag::getHostId, hostId)); .eq(Tag::getHostId, hostId) .orderByAsc(Tag::getCreateTime)); Tag secondTag = null; if (!secondList.isEmpty()) { secondTag = secondList.get(0); } if (secondTag == null) { //二级分类为空，创建二级分类 secondTag = new Tag(); zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java
@@ -362,8 +362,8 @@ wrkMast.setWrkSts(101L); // 工作状态：101.生成出库 wrkMast.setIoType(ioType); // 入出库状态 wrkMast.setIoPri(13D); // 优先级：13 wrkMast.setSourceStaNo(staDesc.getDeviceStn()); // 源站 wrkMast.setStaNo(staDesc.getStnNo()); // 目标站 wrkMast.setSourceStaNo(Cools.isEmpty(staDesc.getDeviceStn())? 0 : staDesc.getDeviceStn()); // 源站 wrkMast.setStaNo(Cools.isEmpty(staDesc.getStnNo()) ? 0:staDesc.getStnNo()); // 目标站 wrkMast.setSourceLocNo(dto.getLocNo()); // 源库位 wrkMast.setFullPlt("Y"); // 满板：Y wrkMast.setPicking("N"); // 拣料 zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WaitPakinLogController.java
@@ -3,7 +3,9 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zy.asrs.common.wms.entity.LocDetl; import com.zy.asrs.common.wms.entity.WaitPakin; import com.zy.asrs.common.wms.entity.WaitPakinLog; import com.zy.asrs.common.wms.service.WaitPakinLogService; @@ -30,6 +32,63 @@ return R.ok(waitPakinLogService.getById(String.valueOf(id))); } @RequestMapping(value = "/waitPakinLog/export/auth1") @ManagerAuth(memo = "库位明细导出") public synchronized R export(@RequestBody JSONObject param){ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class); QueryWrapper<WaitPakinLog> wrapper = new QueryWrapper<>(); Map<String, Object> map = excludeTrash(param.getJSONObject("waitPakinLog")); String row = ""; if (map.get("row") != null) { String chooseRow = (String) map.get("row"); if (chooseRow.length() == 1) { row = "0" + chooseRow; map.remove("row"); }else { row = chooseRow; map.remove("row"); } } convert(map, wrapper); // if (!row.equals("")){ // wrapper.and() // .where("loc_no like '" +row +"%'"); // } List<WaitPakinLog> list = waitPakinLogService.list(wrapper); return R.ok(exportSupport(list, fields)); } private <T> void convert(Map<String, Object> map, QueryWrapper<T> wrapper){ for (Map.Entry<String, Object> entry : map.entrySet()){ if(Cools.eq(entry.getKey(),"curr") || Cools.eq(entry.getKey(),"limit") || Cools.eq(entry.getKey(),"unreason") || Cools.eq(entry.getKey(),"orderByField") || Cools.eq(entry.getKey(),"orderByType") || Cools.eq(entry.getKey(),"row") || Cools.eq(entry.getKey(),"condition")){ continue; } if(Cools.isEmpty(entry.getValue())){ continue; } String val = String.valueOf(entry.getValue()); if (val.contains(RANGE_TIME_LINK)){ String[] dates = val.split(RANGE_TIME_LINK); wrapper.ge(entry.getKey(), DateUtils.convert(dates[0])); wrapper.le(entry.getKey(), DateUtils.convert(dates[1])); } else { if (entry.getKey().equals("locNo")) { wrapper.eq("loc_no", String.valueOf(entry.getValue())); } else { wrapper.like(entry.getKey(), String.valueOf(entry.getValue())); } } } } @RequestMapping(value = "/waitPakinLog/page/auth") @ManagerAuth public R page(@RequestParam(defaultValue = "1") Integer curr, zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/PostMesDataUtils.java
@@ -20,9 +20,9 @@ public class PostMesDataUtils extends AbstractHandler<String> { public ReturnT<String> getMesData(String name,String URL,String mesPath, LinkedHashMap<String, Object> combParam){ boolean success = false; if(combParam != null){ String response = ""; boolean success = false; try { response = new HttpHandler.Builder() .setUri(URL) @@ -41,6 +41,7 @@ //上报失败 log.error("请求接口失败！！！url：{}；request：{}；response：{}", URL+"/"+mesPath, JSON.toJSONString(combParam), response); // throw new CoolException("上报"+name); success = false; } // if (jsonObject.getInteger("code").equals(200) || jsonObject.getInteger("Code").equals(200)) { // @@ -78,6 +79,9 @@ log.error("", e); } } } if (!success){ return FAIL.setMsg("上報失敗"); } return SUCCESS; } } zy-asrs-wms/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js
@@ -158,7 +158,7 @@ 'fields': fields }; $.ajax({ url: baseUrl+"/waitPakinLog/export/auth", url: baseUrl+"/waitPakinLog/export/auth1", headers: {'token': localStorage.getItem('token')}, data: JSON.stringify(param), dataType:'json',
