From e3713637442690189d03be682b72914b8285432a Mon Sep 17 00:00:00 2001 From: yiming Date: Sat, 28 Jan 2023 17:21:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/service/EmptyCheckService.java | 49 +------------------ .../zhehekeji/web/service/StockService.java | 1 - .../service/putian/PTEmptyCheckContent.java | 2 - .../web/service/putian/PTOrderContent.java | 2 - 4 files changed, 1 insertion(+), 53 deletions(-) diff --git a/web/src/main/java/com/zhehekeji/web/service/EmptyCheckService.java b/web/src/main/java/com/zhehekeji/web/service/EmptyCheckService.java index 0b431ce..c4bc11f 100644 --- a/web/src/main/java/com/zhehekeji/web/service/EmptyCheckService.java +++ b/web/src/main/java/com/zhehekeji/web/service/EmptyCheckService.java @@ -175,20 +175,12 @@ public class EmptyCheckService { //托盤組 11111111 int c = checkStreetSummary.getGoodsCount() + 1; checkStreetSummaryMapper.updateGoodsCount(street.getId(),taskId,c); -// if(goodsCode.equals("11111111")){ -// int c = checkStreetSummary.getEmptyGoodsCount() + 1; -// checkStreetSummaryMapper.updateEmptyGoodsCount(street.getId(),taskId,c); -// }else { -// -// } - } } public String getEmptyStatus(Integer streetId,Integer side,Integer leftRight,Integer row,Integer startColumn,Integer endColumn){ List emptyChecks = emptyCheckMapper.selectList(new QueryWrapper().eq("`row`",row).eq("street_id",streetId).eq("direction",leftRight).eq("side",side).ge("`column`",startColumn).le("`column`",endColumn)); - //List stockList = stockMapper.selectList(new QueryWrapper().eq("`row`",row).eq("street_id",street.getId()).eq("direction",leftRight).eq("side",side)); Map stockMap = new HashMap<>(emptyChecks.size()*2); emptyChecks.forEach(stock -> { stockMap.put(stock.getColumn(),stock); @@ -270,8 +262,6 @@ public class EmptyCheckService { checkStatus.setColumnEnd(rowColumnStatus.getColumnEnd()); checkStatus.setRowStart(rowColumnStatus.getRowStart()); checkStatus.setRowEnd(rowColumnStatus.getRowEnd()); - //checkStatus.setShelveId(rowColumnStatus.getShelveId()); - ListstockList = new ArrayList<>(); //默认全部盘点正确 @@ -287,8 +277,7 @@ public class EmptyCheckService { columns = getMax(column,columns); columnTabStatus.put(column,0); } - Map columnTabCorrectCount = new LinkedHashMap<>(); - Map rowTabCorrectCount = new LinkedHashMap<>(); + List stocks = emptyCheckMapper.selectList(new QueryWrapper().select("empty_status","`row`","`column`").eq("`street_id`",rowColumnStatus.getStreetId()).eq("direction",rowColumnStatus.getDirection()).eq("side",rowColumnStatus.getSide())); if(CollectionUtils.isEmpty(stocks)){ stockInit(rowColumnStatus.getRowStart(), rowColumnStatus.getRowEnd(), rowColumnStatus.getColumnStart(), rowColumnStatus.getColumnEnd(), null,stocks); @@ -308,15 +297,6 @@ public class EmptyCheckService { for(String rowTab: rowColumnStatus.getRowTabs()){ if(isRowColumnInTab(emptyCheck,rowTab,true)){ tabStatus(emptyCheck,rowTabStatus,rowTab); - -// if(emptyCheck.getEmptyStatus() != 0 && emptyCheck.getEmptyStatus() != 1){ -// if(rowTabCorrectCount.get(rowTab) == null){ -// rowTabCorrectCount.put(rowTab,1); -// }else { -// int c = rowTabCorrectCount.get(rowTab); -// rowTabCorrectCount.put(rowTab,c+1); -// } -// } } } } @@ -324,38 +304,11 @@ public class EmptyCheckService { for(String columnTab: rowColumnStatus.getColumnTabs()){ if(isRowColumnInTab(emptyCheck,columnTab,false)){ tabStatus(emptyCheck,columnTabStatus,columnTab); -// if(emptyCheck.getEmptyStatus() != 0 && emptyCheck.getEmptyStatus() != 1){ -// if(columnTabCorrectCount.get(columnTab) == null){ -// columnTabCorrectCount.put(columnTab,1); -// }else { -// int c = columnTabCorrectCount.get(columnTab); -// columnTabCorrectCount.put(columnTab,c+1); -// } -// } } } } } -// for(Map.Entry entry: rowTabCorrectCount.entrySet()){ -// String [] strings = entry.getKey().split(" - "); -// Integer tabStart = Integer.valueOf(strings[0]); -// Integer tabEnd = Integer.valueOf(strings[1]); -// int counts = (tabEnd- tabStart + 1) * rows; -// if(counts == entry.getValue()){ -// rowTabStatus.put(entry.getKey(),2); -// } -// } -// for(Map.Entry entry: columnTabCorrectCount.entrySet()){ -// String [] strings = entry.getKey().split(" - "); -// Integer tabStart = Integer.valueOf(strings[0]); -// Integer tabEnd = Integer.valueOf(strings[1]); -// int counts = (tabEnd- tabStart + 1) * rows; -// if(counts == entry.getValue()){ -// columnTabStatus.put(entry.getKey(),2); -// } -// } - checkStatus.setColumnTabStatus(columnTabStatus); checkStatus.setRowTabStatus(rowTabStatus); checkStatus.setEmptyStatus(stockInit(rowColumnStatus.getRowStart(), rowColumnStatus.getRowEnd(), rowColumnStatus.getColumnStart(), rowColumnStatus.getColumnEnd(), null,stockList)); diff --git a/web/src/main/java/com/zhehekeji/web/service/StockService.java b/web/src/main/java/com/zhehekeji/web/service/StockService.java index 2518365..cd098aa 100644 --- a/web/src/main/java/com/zhehekeji/web/service/StockService.java +++ b/web/src/main/java/com/zhehekeji/web/service/StockService.java @@ -80,7 +80,6 @@ public class StockService { PageHelper.startPage(pageSearch.getPageNum(), pageSearch.getPageSize()); List stocks = stockMapper.selectList(new QueryWrapper().orderByAsc("shelve_id", "`row`", "`column`")); return new PageInfo<>(stocks); - } public CheckStatus statusByRowColumn(RowColumnStatus rowColumnStatus){ diff --git a/web/src/main/java/com/zhehekeji/web/service/putian/PTEmptyCheckContent.java b/web/src/main/java/com/zhehekeji/web/service/putian/PTEmptyCheckContent.java index 246a59a..ea1e17a 100644 --- a/web/src/main/java/com/zhehekeji/web/service/putian/PTEmptyCheckContent.java +++ b/web/src/main/java/com/zhehekeji/web/service/putian/PTEmptyCheckContent.java @@ -24,8 +24,6 @@ public class PTEmptyCheckContent { private String taskNo; - private Integer num; - private Integer row; private Integer startColumn; diff --git a/web/src/main/java/com/zhehekeji/web/service/putian/PTOrderContent.java b/web/src/main/java/com/zhehekeji/web/service/putian/PTOrderContent.java index 9624f56..cea9cec 100644 --- a/web/src/main/java/com/zhehekeji/web/service/putian/PTOrderContent.java +++ b/web/src/main/java/com/zhehekeji/web/service/putian/PTOrderContent.java @@ -13,8 +13,6 @@ public class PTOrderContent { private String pics; - private String scanRowAndColumn; - /** * 货位入库顶部拍照（IS01） * 货位入库完成 拍照、扫码触发指令（IS03）