From d7aead04c0ecbb3cd047c28964b4bf7579552ef9 Mon Sep 17 00:00:00 2001 From: yiming Date: Fri, 22 Apr 2022 14:18:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=98=86=E8=88=B9=E8=8E=B7=E5=8F=96=E7=9B=98?= =?UTF-8?q?=E7=82=B9=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/StockController.java | 17 ++++--- .../java/com/zhehekeji/web/entity/Stock.java | 8 +++- .../web/pojo/stock/StockCheckSearch.java | 31 +++++++++++++ .../com/zhehekeji/web/service/PlcService.java | 29 +++++++++--- .../zhehekeji/web/service/StockService.java | 9 +++- .../zhehekeji/web/service/StreetService.java | 44 +++++++++++++++++++ 6 files changed, 119 insertions(+), 19 deletions(-) create mode 100644 web/src/main/java/com/zhehekeji/web/pojo/stock/StockCheckSearch.java 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 feb95da..a011c8c 100644 --- a/web/src/main/java/com/zhehekeji/web/controller/StockController.java +++ b/web/src/main/java/com/zhehekeji/web/controller/StockController.java @@ -91,7 +91,6 @@ public class StockController { response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx"); List excels = stockService.exportExcels(streetId); EasyExcel.write(os, StockExportExcel.class).sheet().doWrite(excels); - } @ApiOperation(value = "复核页面的核对信息") @@ -101,6 +100,14 @@ public class StockController { return Result.success(stockService.stockInfo(stockCheck)); } + @ApiOperation(value = "获取盘点信息") + @RequestMapping(value = "/checkInfo", method = RequestMethod.POST) + public Result checkInfo(@RequestBody StockCheckSearch stockCheck) { + validatorUtil.validate(stockCheck); + Stock stock = new Stock(); + return Result.success(stock); + } + @ApiOperation(value = "人工复核") @RequestMapping(value = "/checkCorrect", method = RequestMethod.POST) public Result check(@RequestBody StockCheck stockCheck) { @@ -115,12 +122,4 @@ public class StockController { return Result.success(stockService.checkByMan(checkByMan)); } -// @ApiOperation(value = "slow") -// @RequestMapping(value = "/slow", method = RequestMethod.GET) -// public Result slow(Integer cameraId,Integer x) { -// JoywarePtzControlModule.toPtzSlow(cameraId,x); -// return Result.success(); -// -// } - } diff --git a/web/src/main/java/com/zhehekeji/web/entity/Stock.java b/web/src/main/java/com/zhehekeji/web/entity/Stock.java index 2de7bc0..855d8f8 100644 --- a/web/src/main/java/com/zhehekeji/web/entity/Stock.java +++ b/web/src/main/java/com/zhehekeji/web/entity/Stock.java @@ -21,11 +21,13 @@ public class Stock { @TableId(type = IdType.AUTO) private Long id; + @ApiModelProperty("随行任务号") private String orderNum; + @ApiModelProperty("盘点任务号") private String checkNum; - @ApiModelProperty("条码") + @ApiModelProperty("扫描出的条码") private String code; @ApiModelProperty("品规名称") @@ -35,13 +37,14 @@ public class Stock { @ApiModelProperty("数量") private Integer count; + @ApiModelProperty("系统货物条码") private String wmsCode; private String wmsCategory; private Integer wmsCount; - @ApiModelProperty("wms托盘码") + @ApiModelProperty("系统托盘码") private String wmsTrayCode; @ApiModelProperty("扫描出的托盘码") @@ -68,6 +71,7 @@ public class Stock { @ApiModelProperty("操作后的图片") private String overoperationPic; + @ApiModelProperty("盘点图片") private String checkPic; @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss") diff --git a/web/src/main/java/com/zhehekeji/web/pojo/stock/StockCheckSearch.java b/web/src/main/java/com/zhehekeji/web/pojo/stock/StockCheckSearch.java new file mode 100644 index 0000000..57f2431 --- /dev/null +++ b/web/src/main/java/com/zhehekeji/web/pojo/stock/StockCheckSearch.java @@ -0,0 +1,31 @@ +package com.zhehekeji.web.pojo.stock; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; + +@Data +public class StockCheckSearch { + + @NotEmpty(message = "巷道标识符不能为空") + @ApiModelProperty("巷道标识符") + private String SRMNumber; + + @NotNull(message = "行不能为空") + @ApiModelProperty("左右 1：左 2：右") + private Integer direction; + + @ApiModelProperty("为双伸货架，且为外侧货架时传2，其余为1") + private Integer separation; + + @NotNull(message = "行不能为空") + @ApiModelProperty("行号") + private Integer row; + + @NotNull(message = "列不能为空") + @ApiModelProperty("列") + private Integer column; + +} 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 5bfc455..d382893 100644 --- a/web/src/main/java/com/zhehekeji/web/service/PlcService.java +++ b/web/src/main/java/com/zhehekeji/web/service/PlcService.java @@ -441,17 +441,32 @@ public class PlcService { public Integer getCameraByPlcCmd(PlcCmdInfo plcCmdInfo,Integer leftRight){ Street street = streetService.getStreetByPlcId(plcCmdInfo.getPlcId()); - if (street.getCamera1Id() != null && street.getCamera2Id() != null && street.getCamera1Id() != 0 && street.getCamera2Id() != 0) { - if (leftRight == 1) { - return street.getCamera1Id(); + //判断单双伸 type=1 单伸 2为双伸 + Integer type; + if(leftRight == 1){ + type = street.getLeftType(); + }else { + type = street.getRightType(); + } + if(type == 1){ + //单伸 + if (street.getCamera1Id() != null && street.getCamera2Id() != null && street.getCamera1Id() != 0 && street.getCamera2Id() != 0) { + if (leftRight == 1) { + return street.getCamera1Id(); + } else { + return street.getCamera2Id(); + } } else { - return street.getCamera2Id(); + Integer cameraId = street.getCamera1Id() != null && street.getCamera1Id() != 0 ? street.getCamera1Id() : street.getCamera2Id(); + return cameraId; } - } else { - Integer cameraId = street.getCamera1Id() != null && street.getCamera1Id() != 0 ? street.getCamera1Id() : street.getCamera2Id(); - return cameraId; + }else { + //双伸 + //todo + return null; } + } public void kescTest6(PlcCmdInfo plcCmdInfo,String code,String wmsCode){ 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 64d73fc..72307ce 100644 --- a/web/src/main/java/com/zhehekeji/web/service/StockService.java +++ b/web/src/main/java/com/zhehekeji/web/service/StockService.java @@ -224,7 +224,7 @@ public class StockService { * @return */ public Stock stockInfo(StockCheck stockCheck) { - System.out.println(stockCheck.toString()); + Stock stock = stockMapper.getByShelveIdAndRowColumn(stockCheck.getShelveId(), stockCheck.getRow(), stockCheck.getColumn()); if(stock == null){ stock = new Stock(); @@ -236,6 +236,13 @@ public class StockService { return stock; } + public Stock stock(StockCheckSearch stockCheckSearch){ + String shelveId = streetService.getShevelId(stockCheckSearch.getSRMNumber(),stockCheckSearch.getDirection(),stockCheckSearch.getSeparation()); + Assert.notNull(shelveId,"无该货架信息"); + Stock stock = stockMapper.getByShelveIdAndRowColumn(shelveId,stockCheckSearch.getRow(),stockCheckSearch.getColumn()); + return stock; + } + /** * 核对单子 * 核对正确 diff --git a/web/src/main/java/com/zhehekeji/web/service/StreetService.java b/web/src/main/java/com/zhehekeji/web/service/StreetService.java index 3ede638..5654f2b 100644 --- a/web/src/main/java/com/zhehekeji/web/service/StreetService.java +++ b/web/src/main/java/com/zhehekeji/web/service/StreetService.java @@ -286,4 +286,48 @@ public class StreetService { } } + + /** + * 获取货架号 + * @param SRMNumber 巷道标识符 + * @param direction 方向 1：左 2：右 + * @param separation 内外侧货架（双伸时才有用） 1：内侧（靠近巷道的一侧） 2：外侧（远离巷道的一侧） + * @return + */ + public String getShevelId(String SRMNumber,Integer direction,Integer separation){ + Street street = getStreetByPlcId(SRMNumber); + //判断单双伸 type=1 单伸 2为双伸 + Integer type; + if(direction == 1){ + + type = street.getLeftType(); + }else { + type = street.getRightType(); + } + String sheveId = null; + if(type == 1){ + //单伸只需要判断左右 + if(direction == 1){ + return street.getLeftShelveId(); + }else { + return street.getRightShelveId(); + } + }else { + //双伸，还需要判断内外 + if(direction == 1){ + if(separation == 1){ + return street.getLeftInsideShelveId(); + }else { + return street.getRightShelveId(); + } + }else { + if(separation == 1){ + return street.getRightInsideShelveId(); + }else { + return street.getRightOutsideShelveId(); + } + } + } + } + }