From 13c5d48ce19e5047c2bf8f18b1a6105bfb039c7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LAPTOP-S9HJSOEB=5C=E6=98=8A=E5=A4=A9?= Date: Mon, 22 Jan 2024 14:10:50 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E5=93=81=E8=A7=84=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E8=AF=BB=E5=8F=96=202.=E7=9B=98=E7=82=B9=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4=E5=A2=9E=E5=8A=A0=E5=93=81=E8=A7=84=E5=92=8C=E4=B8=AA?= =?UTF-8?q?=E6=95=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/config/ConfigProperties.java | 1 + .../web/controller/StockController.java | 7 ++++ .../zhehekeji/web/pojo/stock/StockCheck.java | 3 ++ .../com/zhehekeji/web/service/PlcService.java | 4 +- .../zhehekeji/web/service/StockService.java | 38 +++++++++---------- .../java/com/zhehekeji/web/util/FileUtil.java | 27 +++++++++++++ web/src/main/resources/application-prod.yml | 4 +- web/src/main/resources/mapper/OrderMapper.xml | 2 +- 8 files changed, 62 insertions(+), 24 deletions(-) create mode 100644 web/src/main/java/com/zhehekeji/web/util/FileUtil.java diff --git a/web/src/main/java/com/zhehekeji/web/config/ConfigProperties.java b/web/src/main/java/com/zhehekeji/web/config/ConfigProperties.java index 3d1af6c..eedadd4 100644 --- a/web/src/main/java/com/zhehekeji/web/config/ConfigProperties.java +++ b/web/src/main/java/com/zhehekeji/web/config/ConfigProperties.java @@ -43,6 +43,7 @@ public class ConfigProperties { private VisualSense visualSense; private Integer orderTest = 0; + private String productDoc; @Data public static class VisualSense{ diff --git a/web/src/main/java/com/zhehekeji/web/controller/StockController.java b/web/src/main/java/com/zhehekeji/web/controller/StockController.java index 37e7584..acf2120 100644 --- a/web/src/main/java/com/zhehekeji/web/controller/StockController.java +++ b/web/src/main/java/com/zhehekeji/web/controller/StockController.java @@ -147,6 +147,13 @@ public class StockController { validatorUtil.validate(stockCheck); return Result.success(stockService.checkCorrect(stockCheck)); } + @ApiOperation(value = "获取品规列表") + @RequestMapping(value = "/getCategoryList", method = RequestMethod.POST) + public Result> getCategoryList() { + List list = stockService.getCategoryList(); + return Result.success(list); + } + @ApiOperation(value = "人工复核") @RequestMapping(value = "/checkByMan", method = RequestMethod.POST) diff --git a/web/src/main/java/com/zhehekeji/web/pojo/stock/StockCheck.java b/web/src/main/java/com/zhehekeji/web/pojo/stock/StockCheck.java index 3f6787c..8f6806a 100644 --- a/web/src/main/java/com/zhehekeji/web/pojo/stock/StockCheck.java +++ b/web/src/main/java/com/zhehekeji/web/pojo/stock/StockCheck.java @@ -27,4 +27,7 @@ public class StockCheck { @ApiModelProperty("列") private Integer column; + private String category; + private Integer count; + } diff --git a/web/src/main/java/com/zhehekeji/web/service/PlcService.java b/web/src/main/java/com/zhehekeji/web/service/PlcService.java index 6c6d76e..378928c 100644 --- a/web/src/main/java/com/zhehekeji/web/service/PlcService.java +++ b/web/src/main/java/com/zhehekeji/web/service/PlcService.java @@ -847,14 +847,14 @@ public class PlcService { String code = dataInfo.getCmdName(); log.info("盘点指令：{}", ksecInfo); - { AlgorithmPojo algorithmPojo = check(plcCmdInfo, ksecInfo.getType(), dataInfo); ksecInfo.getData().setAckStatus(1); dataInfo.setResult(algorithmPojo.getResult()); dataInfo.setGoodsTypeResult(algorithmPojo.getGoodsTypeResult()); dataInfo.setGoodsNumberResult(algorithmPojo.getGoodsNumberResult()); log.info("盘点完成"); - } if (configProperties.getOrderTest() == 1) { + + if (configProperties.getOrderTest() == 1) { checkTest(plcCmdInfo); 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 617a899..ae3bddb 100644 --- a/web/src/main/java/com/zhehekeji/web/service/StockService.java +++ b/web/src/main/java/com/zhehekeji/web/service/StockService.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.zhehekeji.core.util.Assert; +import com.zhehekeji.web.config.ConfigProperties; import com.zhehekeji.web.entity.Stock; import com.zhehekeji.web.entity.CheckLog; import com.zhehekeji.web.entity.StockLog; @@ -16,6 +17,7 @@ import com.zhehekeji.web.mapper.StockMapper; import com.zhehekeji.web.mapper.StreetMapper; import com.zhehekeji.web.pojo.category.PageSearch; import com.zhehekeji.web.pojo.stock.*; +import com.zhehekeji.web.util.FileUtil; import com.zhehekeji.web.util.ToolUtil; import io.swagger.models.auth.In; import lombok.extern.slf4j.Slf4j; @@ -37,6 +39,8 @@ public class StockService { @Resource private StockMapper stockMapper; @Resource + ConfigProperties configProperties; + @Resource private StreetService streetService; @Resource private CheckLogMapper logMapper; @@ -380,7 +384,10 @@ public class StockService { log.info("check stock correct, street_id:{},direction:{},side:{},row:{},column:{}", stockCheck.getStreetId(),stockCheck.getDirection(),stockCheck.getSide(), stockCheck.getRow(), stockCheck.getColumn()); stock.setStatus(StockStatus.MANUAL.getStatus()); + stock.setCount(stockCheck.getCount()); + stock.setCategory(stockCheck.getCategory()); stockMapper.updateById(stock); + stock = stockMapper.selectById(stock.getId()); checkLog(stock); return stock; } @@ -389,7 +396,9 @@ public class StockService { private CheckLogMapper checkLogMapper; private void checkLog(Stock stock){ - CheckLog checkLog = new CheckLog(); + CheckLog checkLog = checkLogMapper.selectOne(new QueryWrapper() + .eq("check_num",stock.getCheckNum()) + .last("limit 1")); checkLog.setRow(stock.getRow()); checkLog.setColumn(stock.getColumn()); checkLog.setCheckNum(stock.getCheckNum()); @@ -398,7 +407,7 @@ public class StockService { checkLog.setStatus(stock.getStatus()); checkLog.setCode(stock.getCode()); checkLog.setCreateTime(LocalDateTime.now()); - checkLogMapper.insert(checkLog); + checkLogMapper.updateById(checkLog); } /** @@ -455,24 +464,13 @@ public class StockService { stockMapper.truncate(); } -// public void init(String shelveId, Integer row, Integer column){ -// Map map = new HashMap<>(); -// map.put("shelve_id",shelveId); -// stockMapper.deleteByMap(map); -// for(int i = 1;i<=row;i++){ -// List stocks = new ArrayList<>(column); -// for(int j = 1;j<=column;j++){ -// Stock stock = new Stock(); -// stock.setShelveId(shelveId); -// stock.setRow(i); -// stock.setColumn(j); -// stock.setStatus(0); -// stocks.add(stock); -// } -// stockMapper.batchInsert(stocks); -// } -// } - + public List getCategoryList() { + List list = new ArrayList<>(); + if(configProperties.getProductDoc() != null){ + list = FileUtil.readLinesToList(configProperties.getProductDoc()); + } + return list; + } } diff --git a/web/src/main/java/com/zhehekeji/web/util/FileUtil.java b/web/src/main/java/com/zhehekeji/web/util/FileUtil.java new file mode 100644 index 0000000..abc8bf5 --- /dev/null +++ b/web/src/main/java/com/zhehekeji/web/util/FileUtil.java @@ -0,0 +1,27 @@ +package com.zhehekeji.web.util; + +import lombok.extern.slf4j.Slf4j; + +import java.io.BufferedReader; +import java.io.FileReader; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + +@Slf4j +public class FileUtil { + public static List readLinesToList(String path) { + List lines = new ArrayList<>(); + + try (BufferedReader reader = new BufferedReader(new FileReader(path))) { + String line; + while ((line = reader.readLine()) != null) { + lines.add(line); + } + }catch (IOException e){ + log.info("读取数据失败"); + } + + return lines; + } +} diff --git a/web/src/main/resources/application-prod.yml b/web/src/main/resources/application-prod.yml index ae8cc84..a4be205 100644 --- a/web/src/main/resources/application-prod.yml +++ b/web/src/main/resources/application-prod.yml @@ -106,4 +106,6 @@ asyncExecutorThread: #订单测试 -orderTest: 1 \ No newline at end of file +orderTest: 1 +#品规文档 +productDoc: "C:/Users/昊天/Desktop/新建 文本文档 (3).txt" \ No newline at end of file diff --git a/web/src/main/resources/mapper/OrderMapper.xml b/web/src/main/resources/mapper/OrderMapper.xml index bd556c7..e1e103b 100644 --- a/web/src/main/resources/mapper/OrderMapper.xml +++ b/web/src/main/resources/mapper/OrderMapper.xml @@ -7,7 +7,7 @@ from `order` t - and t.order_num = #{req.orderNum} + and t.order_num like concat('%',#{req.orderNum},'%') and t.start_time >= #{req.startTimestamp} and t.start_time <= #{req.endTimestamp}