diff --git a/web/src/main/java/com/zhehekeji/web/entity/EmptyCheck.java b/web/src/main/java/com/zhehekeji/web/entity/EmptyCheck.java index 9634f5b..f33c4b1 100644 --- a/web/src/main/java/com/zhehekeji/web/entity/EmptyCheck.java +++ b/web/src/main/java/com/zhehekeji/web/entity/EmptyCheck.java @@ -25,6 +25,4 @@ public class EmptyCheck { private Integer emptyStatus; private LocalDateTime createTime; - - } 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 01abc5c..5da8df6 100644 --- a/web/src/main/java/com/zhehekeji/web/service/EmptyCheckService.java +++ b/web/src/main/java/com/zhehekeji/web/service/EmptyCheckService.java @@ -236,20 +236,22 @@ public class EmptyCheckService { emptyCheck.setOrderNum(ecTransmission.getTaskId()); emptyCheck.setSide(ecTransmission.getSide()); emptyCheck.setDirection(ecTransmission.getDirection()); - //0:未知 1：空 2：非空 - if(ecTransmission.getIsEmpty().equals("N")){ - emptyCheck.setEmptyStatus(1); - }else { + //0:未盘点 1：有货 2：无货 + if(ecTransmission.getIsEmpty().equals("0")){ emptyCheck.setEmptyStatus(2); + }else { + emptyCheck.setEmptyStatus(1); } emptyCheck.setRow(ecTransmission.getRow()); emptyCheck.setColumn(ecTransmission.getColumn()); }else { emptyCheck.setOrderNum(ecTransmission.getTaskId()); - if(ecTransmission.getIsEmpty().equals("N")){ - emptyCheck.setEmptyStatus(1); - }else { + if(ecTransmission.getIsEmpty().equals("0")){ + log.info("goodsLocation:{}, status: {}", ecTransmission.getGoodsLocation(), ecTransmission.getIsEmpty()); emptyCheck.setEmptyStatus(2); + }else { + log.info("goodsLocation:{}, status: {}", ecTransmission.getGoodsLocation(), ecTransmission.getIsEmpty()); + emptyCheck.setEmptyStatus(1); } } emptyCheckMapper.insertOrUpdate(emptyCheck); 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 b91c6e9..5d64eca 100644 --- a/web/src/main/java/com/zhehekeji/web/service/PlcService.java +++ b/web/src/main/java/com/zhehekeji/web/service/PlcService.java @@ -429,10 +429,7 @@ public class PlcService { * @return */ public Boolean check(PlcCmdInfo plcCmdInfo,String cmdCode,String wmsCode,String wmsTrayCode){ - long startTime = System.currentTimeMillis(); - - long end = System.currentTimeMillis(); long s = end - startTime; log.info("time:{}millisecond",s); @@ -447,10 +444,10 @@ public class PlcService { public Stock checkStart(TMTransmission tmTransmission){ log.info("【开始盘点货位】save stock info ,taskId:{},SRMNumber:{}，goodsLocation:{}",tmTransmission.getTaskNo(),tmTransmission.getSRMNumber(),tmTransmission.getGoodsLocation()); Street street = streetService.getStreetByPlcId(tmTransmission.getSRMNumber()); - Integer row = Integer.valueOf(tmTransmission.getGoodsLocation().substring(5,8)); - Integer column = Integer.valueOf(tmTransmission.getGoodsLocation().substring(8,10)); + Integer row = Integer.valueOf(tmTransmission.getGoodsLocation().substring(8,10)); + Integer column = Integer.valueOf(tmTransmission.getGoodsLocation().substring(5,8)); Integer leftRight = Integer.valueOf(tmTransmission.getGoodsLocation().substring(4,5)); - Integer inout = Integer.valueOf(tmTransmission.getGoodsLocation().substring(10,12)); + Integer inout = Integer.valueOf(tmTransmission.getGoodsLocation().substring(11,12)); Stock old = stockMapper.getByStreetAndDirectionAndSideAndRowColumn(street.getId(),leftRight,inout,row,column); if(old == null){ old = new Stock(); @@ -463,7 +460,8 @@ public class PlcService { old.setColumn(column); old.setDirection(leftRight); old.setSide(inout); - old.setWmsCode(tmTransmission.getCode()); + old.setWmsCode(tmTransmission.getGoodsLocation()); + old.setWmsCategory(tmTransmission.getCategory()); old.setWmsCount(tmTransmission.getCount()); old.setStreetId(street.getId()); old.setExportTime(LocalDateTime.now()); @@ -472,7 +470,7 @@ public class PlcService { }else { old.setLotnum(tmTransmission.getTaskNo()); old.setExportTime(LocalDateTime.now()); - old.setWmsCode(tmTransmission.getCode()); + old.setWmsCode(tmTransmission.getGoodsLocation()); old.setWmsCount(tmTransmission.getCount()); old.setCheckNum(tmTransmission.getTaskNo()); old.setWmsTrayCode(""); @@ -489,21 +487,23 @@ public class PlcService { public Stock checkEnd(TMTransmission tmTransmission){ log.info("【盘点货位结果返回】update stock info ,taskId:{},SRMNumber:{},goodsLocation:{}",tmTransmission.getTaskNo(),tmTransmission.getSRMNumber(),tmTransmission.getGoodsLocation()); Street street = streetService.getStreetByPlcId(tmTransmission.getSRMNumber()); - Integer row = Integer.valueOf(tmTransmission.getGoodsLocation().substring(5,8)); - Integer column = Integer.valueOf(tmTransmission.getGoodsLocation().substring(8,10)); + Integer row = Integer.valueOf(tmTransmission.getGoodsLocation().substring(8,10)); + Integer column = Integer.valueOf(tmTransmission.getGoodsLocation().substring(5,8)); Integer leftRight = Integer.valueOf(tmTransmission.getGoodsLocation().substring(4,5)); - Integer inout = Integer.valueOf(tmTransmission.getGoodsLocation().substring(10,12)); + Integer inout = Integer.valueOf(tmTransmission.getGoodsLocation().substring(11,12)); Stock stock = stockMapper.getByStreetAndDirectionAndSideAndRowColumn(street.getId(),leftRight,inout,row,column); if(stock != null){ - stock.setCount(tmTransmission.getCount()); - stock.setCode(tmTransmission.getCode()); + stock.setCount(tmTransmission.getRstCount()); + stock.setCategory(tmTransmission.getRstCategory()); + stock.setCode(tmTransmission.getGoodsLocation()); + stock.setWmsCategory(tmTransmission.getCategory()); //盘点正确 ：2 //盘点异常 ：1 - Integer status = tmTransmission.getCount().equals(stock.getWmsCount()) && tmTransmission.getCode().equals(stock.getWmsCode()) ? 2: 1; + Integer status = tmTransmission.getRstCount().equals(stock.getWmsCount()) && tmTransmission.getRstCategory().equals(stock.getWmsCategory()) ? 2: 1; stock.setStatus(status); stock.setTrayCode(tmTransmission.getTrayNo()); stockMapper.updateById(stock); - log.info("update check info,taskId:{},SRMNumber:{},count:{},code:{}",stock.getCheckNum(),tmTransmission.getSRMNumber(),tmTransmission.getCount(),tmTransmission.getCode()); + log.info("update check info,taskId:{},SRMNumber:{},goodsLocation:{}",stock.getCheckNum(),tmTransmission.getSRMNumber(),tmTransmission.getGoodsLocation()); }else { log.info("check end,but no stock info ,taskId:{},SRMNumber:{},goodsLocation:{}",tmTransmission.getTaskNo(),tmTransmission.getSRMNumber(),tmTransmission.getGoodsLocation()); stock = new Stock(); @@ -511,11 +511,10 @@ public class PlcService { stock.setCode(tmTransmission.getCode()); stock.setStatus(1); } - checkLog(stock); +// checkLog(stock); return stock; } - public void checkLog(Stock stock){ CheckLog checkLog = new CheckLog(); checkLog.setCheckNum(stock.getCheckNum()); @@ -528,11 +527,12 @@ public class PlcService { checkLog.setStatus(stock.getStatus()); checkLog.setRow(stock.getRow()); checkLog.setColumn(stock.getColumn()); - checkLog.setCreateTime(LocalDateTime.now()); checkLog.setTrayCode(stock.getTrayCode()); checkLog.setWmsTrayCode(stock.getWmsTrayCode()); checkLog.setLotnum(stock.getLotnum()); + checkLog.setCreateTime(LocalDateTime.now()); checkLogMapper.insert(checkLog); + log.info("checkLogMapper insert"); } public void truncateStock(){ stockMapper.truncate(); @@ -567,12 +567,10 @@ public class PlcService { } return tags; } - public ConfigProperties getConfigProperties(){ return configProperties; } - /** * 相机转动，拍照，并返回图片地址 * 顶部拍照 C1 @@ -582,7 +580,7 @@ public class PlcService { public String IntoStock(String SRMNumber,String taskId,String goodsLocation){ Street street = streetService.getStreetByPlcId(SRMNumber); if (street == null){ - log.error("SRMNum: {} 对应的巷道不存在"); + log.error("SRMNum: {} 对应的巷道不存在", SRMNumber); } //南京烟草物流只有一个相机 Integer cameraId = street.getCamera1Id() == null ? street.getCamera2Id():street.getCamera1Id(); 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 cd098aa..e6c29d9 100644 --- a/web/src/main/java/com/zhehekeji/web/service/StockService.java +++ b/web/src/main/java/com/zhehekeji/web/service/StockService.java @@ -335,7 +335,7 @@ public class StockService { stock.setOveroperationPic(stockLogs.get(0).getPic()); stock.setPreoperationPic(stockLogs.get(1).getPic()); } - String ip ="http://"+ street.getPlcIp()+":9009/pic/"+stock.getCode()+"/"+stock.getLotnum()+"/"+stock.getLotnum()+"/"; + String ip ="http://"+ street.getPlcIp()+":9009/pic/"+stock.getCode()+"/"+stock.getCheckNum()+"/"; stock.setSidePic1(String.format("%s1.png",ip)); stock.setSidePic2(String.format("%s2.png",ip)); stock.setSidePic3(String.format("%s3.png",ip)); diff --git a/web/src/main/java/com/zhehekeji/web/service/client/ClientChanel.java b/web/src/main/java/com/zhehekeji/web/service/client/ClientChanel.java index 7b82b40..240d896 100644 --- a/web/src/main/java/com/zhehekeji/web/service/client/ClientChanel.java +++ b/web/src/main/java/com/zhehekeji/web/service/client/ClientChanel.java @@ -64,7 +64,7 @@ public class ClientChanel { InetSocketAddress socketAddress = (InetSocketAddress) channel.remoteAddress(); String clientIp = socketAddress.getAddress().getHostAddress(); putSRMNUmber_Ip(SRMNumber, clientIp); - log.info("connect 巷道 "); + log.info("connect:{}巷道 ", SRMNumber); } public static void disConnect(String key){ diff --git a/web/src/main/java/com/zhehekeji/web/service/client/Decoder.java b/web/src/main/java/com/zhehekeji/web/service/client/Decoder.java index c1e3611..57b4ed1 100644 --- a/web/src/main/java/com/zhehekeji/web/service/client/Decoder.java +++ b/web/src/main/java/com/zhehekeji/web/service/client/Decoder.java @@ -14,6 +14,7 @@ import org.slf4j.LoggerFactory; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; +import java.util.List; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; @@ -119,7 +120,7 @@ public class Decoder extends DelimiterBasedFrameDecoder { //发送给客户端 PTCheckContent ptCheckContent = PTCheckContent.CheckContentSC01(ptData.getContent()); TMTransmission tmTransmission = new TMTransmission(ptCheckContent.getSRMNUmber(),ptCheckContent.getTaskNo(),ptCheckContent.getGoodsLocation(),ptCheckContent.getCode(), ptCheckContent.getCount(), "N"); -// plcService.checkStart(tmTransmission); + plcService.checkStart(tmTransmission); String tmTransmissionStr = tmTransmission.toString(); ClientChanel.write(tmTransmissionStr,ptCheckContent.getSRMNUmber()); in.release(); @@ -140,10 +141,10 @@ public class Decoder extends DelimiterBasedFrameDecoder { //保存order标表 PTOrderContent ptOrderContent = PTOrderContent.OrderContentIS01And03(ptData.getContent()); String srmNumber = ptOrderContent.getSRMNUmber(); - if (srmNumber.length() < 3){ - Integer number = Integer.valueOf(srmNumber); - srmNumber = String.format("%03d", number); - } +// if (srmNumber.length() < 3){ +// Integer number = Integer.valueOf(srmNumber); +// srmNumber = String.format("%03d", number); +// } String picPath = plcService.IntoStock(srmNumber, ptOrderContent.getTaskNo(), ptOrderContent.getGoodsLocation()); //返回普天 PTData resData = PTData.IntoStock02(ptOrderContent.getSRMNUmber(), ptOrderContent.getTaskNo(), ptOrderContent.getGoodsLocation(),picPath); @@ -155,10 +156,10 @@ public class Decoder extends DelimiterBasedFrameDecoder { PuTianNettyClient.write(ptDataSend); PTOrderContent ptOrderContent = PTOrderContent.OrderContentIS01And03(ptData.getContent()); String srmNumber = ptOrderContent.getSRMNUmber(); - if (srmNumber.length() < 3){ - Integer number = Integer.valueOf(srmNumber); - srmNumber = String.format("%03d", number); - } +// if (srmNumber.length() < 3){ +// Integer number = Integer.valueOf(srmNumber); +// srmNumber = String.format("%03d", number); +// } String picPath = plcService.IntoStockOver(srmNumber, ptOrderContent.getTaskNo(), ptOrderContent.getGoodsLocation()); PTData resData = PTData.IntoStock04(ptOrderContent.getSRMNUmber(), ptOrderContent.getTaskNo(), ptOrderContent.getGoodsLocation(), picPath, ptOrderContent.getGoodsLocation()); PuTianNettyClient.write(resData); @@ -182,12 +183,12 @@ public class Decoder extends DelimiterBasedFrameDecoder { PuTianNettyClient.write(ptData); }else { //收到盘点结果 -// Stock stock = plcService.checkEnd(tmTransmission); + Stock stock = plcService.checkEnd(tmTransmission); //将盘点结果发给普天 PTData ptData = PTData.StockCheck04(tmTransmission); PuTianNettyClient.write(ptData); //添加到实时信息里 -// RealtimeCheckMap.put(tmTransmission.getSRMNumber(),tmTransmission.checkInfo()); + RealtimeCheckMap.put(tmTransmission.getSRMNumber(),tmTransmission.checkInfo()); //更新盤點統計 // emptyCheckService.updateCheckLastTime(tmTransmission.getTaskNo(),tmTransmission.getSRMNumber(),stock.getCode()); } @@ -204,19 +205,23 @@ public class Decoder extends DelimiterBasedFrameDecoder { } else if(body.startsWith(ECTransmission.getHEADER())){ //空货位盘点 - ECTransmission ecTransmission = new ECTransmission(body); + ECResultMessage ecResultMessage = new ECResultMessage(body); log.info("empty result: {}", body); //将库位的盘点结果发给普天 - StringBuffer strBff = new StringBuffer(ecTransmission.getSRMNumber()); - strBff.append("*").append(ecTransmission.getTaskId()).append("*").append(ecTransmission.getEmptyMsg()); + StringBuffer strBff = new StringBuffer(ecResultMessage.getSRMNumber()); + strBff.append("*").append(ecResultMessage.getTaskId()).append("*").append(ecResultMessage.getEmptyCheckMsg()); // strBff.append(",").append(ecTransmission.getIsEmpty()); String content = strBff.toString(); PTData ptData = new PTData(content, PTData.FLOW_R, PTData.EMPTY_CHECK_03); + log.info("ptData:{}", ptData); PuTianNettyClient.write(ptData); //保存空货位条码 - EmptyCheckCodeInfo.addCode(ecTransmission.getSRMNumber(),ecTransmission.getRow(),ecTransmission.getStartColumn(), ecTransmission.getEndColumn(), ecTransmission.getOriginCode()); +// EmptyCheckCodeInfo.addCode(ecTransmission.getSRMNumber(),ecTransmission.getRow(),ecTransmission.getStartColumn(), ecTransmission.getEndColumn(), ecTransmission.getOriginCode()); //保存空货位信息 - emptyCheckService.emptyCheckLog(ecTransmission); + List ecTransmissionList = ecResultMessage.getEcTransMissionList(); + for (ECTransmission ecTransmission : ecTransmissionList) { + emptyCheckService.emptyCheckLog(ecTransmission); + } in.release(); } else if(body.startsWith("DC")){ diff --git a/web/src/main/java/com/zhehekeji/web/service/client/ECResultMessage.java b/web/src/main/java/com/zhehekeji/web/service/client/ECResultMessage.java new file mode 100644 index 0000000..54a0f12 --- /dev/null +++ b/web/src/main/java/com/zhehekeji/web/service/client/ECResultMessage.java @@ -0,0 +1,50 @@ +package com.zhehekeji.web.service.client; + +import java.util.ArrayList; +import java.util.List; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; + +@Slf4j + +@Data +/** + * 空货位盘点 + * + * EC&6&17455&UL061001050111,1;UL061002050111,0;UL061003050111,1;>（算法客户端发送） + * UL061001050111,1 货位号,是否有货（0：无货，1：有货） + */ + +public class ECResultMessage { + private static String HEADER = "EC"; + private static String SPLIT = "&"; + private static String SPLIT_EMP = ";"; + private String SRMNumber; + private String taskId; + private String emptyCheckMsg; + private List ecTransMissionList; + + public ECResultMessage(String body){ + ecTransMissionList = new ArrayList<>(); + log.info("body: {}", body); + String [] strings = body.split(SPLIT); + if(strings != null && strings.length == 4 && HEADER.equals(strings[0])){ + SRMNumber = strings[1]; + taskId = strings[2]; + emptyCheckMsg = strings[3]; + log.info("srmNumber:{}, taskId:{},emptyCheckMsg:{}", SRMNumber, taskId, emptyCheckMsg); + String[] checkMsgStrs = emptyCheckMsg.split(SPLIT_EMP); + for (String checkMsgStr : checkMsgStrs) { + if (!checkMsgStr.isEmpty() && checkMsgStr.contains(",")){ + log.info("checkMsgStr: {}", checkMsgStr); + String[] msgStrs = checkMsgStr.split(","); + String goodsLocation = msgStrs[0]; + String empty = msgStrs[1]; + ECTransmission ecTransmission = new ECTransmission(SRMNumber, taskId, goodsLocation, empty); + ecTransMissionList.add(ecTransmission); + } + } + } + } + +} diff --git a/web/src/main/java/com/zhehekeji/web/service/client/ECTransmission.java b/web/src/main/java/com/zhehekeji/web/service/client/ECTransmission.java index fd14a54..7b0b07d 100644 --- a/web/src/main/java/com/zhehekeji/web/service/client/ECTransmission.java +++ b/web/src/main/java/com/zhehekeji/web/service/client/ECTransmission.java @@ -90,6 +90,19 @@ public class ECTransmission { } } + public ECTransmission(String srmNumber, String id, String location, String empty){ + SRMNumber = srmNumber; + taskId = id; + goodsLocation = location; + isEmpty = empty; + + // UL061001050111 + row = Integer.valueOf(goodsLocation.substring(8,10)); + column = Integer.valueOf(goodsLocation.substring(5,8)); + direction = Integer.valueOf(goodsLocation.substring(4,5)); + side = Integer.valueOf(goodsLocation.substring(11,12)); + } + /** * 空托盘检测开始信息 * @return diff --git a/web/src/main/java/com/zhehekeji/web/service/client/LCTransmission.java b/web/src/main/java/com/zhehekeji/web/service/client/LCTransmission.java index 29f5907..d2329c9 100644 --- a/web/src/main/java/com/zhehekeji/web/service/client/LCTransmission.java +++ b/web/src/main/java/com/zhehekeji/web/service/client/LCTransmission.java @@ -19,7 +19,7 @@ public class LCTransmission { private Integer status; public String toString(){ - return HEADER + "," + SRMNumber+","+status; + return HEADER + "&" + SRMNumber+"&"+status; } public static String getHEADER(){ diff --git a/web/src/main/java/com/zhehekeji/web/service/client/RealtimeCheckMap.java b/web/src/main/java/com/zhehekeji/web/service/client/RealtimeCheckMap.java index f68381e..59289ab 100644 --- a/web/src/main/java/com/zhehekeji/web/service/client/RealtimeCheckMap.java +++ b/web/src/main/java/com/zhehekeji/web/service/client/RealtimeCheckMap.java @@ -14,7 +14,7 @@ public class RealtimeCheckMap { public static void put(String SRMNumber,CheckInfo checkInfo){ checkInfo.setTime(LocalDateTime.now()); - String ip ="http://"+ClientChanel.getIpFromId(SRMNumber)+":9009/pic/"+checkInfo.getCheckCode()+"/"+checkInfo.getTaskNo()+"/"+checkInfo.getTaskNo()+"/"; + String ip ="http://"+ClientChanel.getIpFromId(SRMNumber)+":9009/pic/"+checkInfo.getCheckCode()+"/"+checkInfo.getTaskNo()+"/"; checkInfo.setIP(ip); checkInfo.setSidePic1(String.format("%s1.png",ip)); checkInfo.setSidePic2(String.format("%s2.png",ip)); diff --git a/web/src/main/java/com/zhehekeji/web/service/client/TMTransmission.java b/web/src/main/java/com/zhehekeji/web/service/client/TMTransmission.java index 395aa5d..2aa346a 100644 --- a/web/src/main/java/com/zhehekeji/web/service/client/TMTransmission.java +++ b/web/src/main/java/com/zhehekeji/web/service/client/TMTransmission.java @@ -1,7 +1,9 @@ package com.zhehekeji.web.service.client; import lombok.Data; +import lombok.extern.slf4j.Slf4j; +@Slf4j /** * 盘点指令 * 与客户端的传输内容 @@ -29,19 +31,19 @@ public class TMTransmission { */ private String trayNo; + + private String code; /** - * 品规 + * 上位机下发品规 */ - private String code; - + private String category; private Integer count; /** * 盘点结果 */ - private String rstCode; - - private String rstCount; + private String rstCategory; + private Integer rstCount; private String visualTest; @@ -111,20 +113,22 @@ public class TMTransmission { // //goodsLocation = strings[3]; // } // } - +//TM&6&UL062009050111&2121&11010019&30&NULL&NULL public TMTransmission(String body){ + log.info("tmtrans body: {}", body); String [] strings = body.split(Split); if(strings != null && strings.length >= 9 && strings[0].equals(header)){ if(strings.length == 9){ SRMNumber = strings[1]; goodsLocation = strings[2]; taskNo = strings[3]; - code = strings[4]; + category = strings[4]; count = Integer.valueOf(strings[5]); - rstCode = strings[6]; - rstCount = strings[7]; + rstCategory = strings[6]; + rstCount = strings[7].contains("NULL") ? -1 : Integer.valueOf(strings[7]); checkRst = strings[8]; collectOver = false; + log.info("taskNo:{}, srmNumber:{}, goodsLocation:{}", taskNo, SRMNumber, goodsLocation); // if("Y".equals(isDisConnect)){ // //需要拆分之前的 // } @@ -155,22 +159,22 @@ public class TMTransmission { } public RealtimeCheckMap.CheckInfo checkInfo(){ + log.info("cheinfo start"); RealtimeCheckMap.CheckInfo checkInfo = new RealtimeCheckMap.CheckInfo(); - checkInfo.setCheckCategory(code); - Integer row = Integer.valueOf(goodsLocation.substring(3,7)); - Integer column = Integer.valueOf(goodsLocation.substring(7)); - Integer leftRight = goodsLocation.substring(0,1).equals("L")?1:2; - Integer inout = Integer.valueOf(goodsLocation.substring(1,3)); + Integer row = Integer.valueOf(goodsLocation.substring(8,10)); + Integer column = Integer.valueOf(goodsLocation.substring(5,8)); + Integer leftRight = Integer.valueOf(goodsLocation.substring(4,5)); + Integer inout = Integer.valueOf(goodsLocation.substring(11,12)); checkInfo.setDirection(leftRight); checkInfo.setColumn(column); checkInfo.setRow(row); checkInfo.setSide(inout); checkInfo.setTaskNo(this.taskNo); - //checkInfo.setWMSCategory(); - //checkInfo.setWMSCount(); - //checkInfo.setWMSCode(); - checkInfo.setCheckCode(code); - checkInfo.setCheckCount(count); +// checkInfo.setWMSCategory(category); +// checkInfo.setWMSCount(count); +// checkInfo.setWMSCode(code); + checkInfo.setCheckCode(goodsLocation); + checkInfo.setCheckCount(rstCount); //checkInfo.setCheckCategory(); return checkInfo; } diff --git a/web/src/main/java/com/zhehekeji/web/service/putian/PTData.java b/web/src/main/java/com/zhehekeji/web/service/putian/PTData.java index 1da833d..a6903c0 100644 --- a/web/src/main/java/com/zhehekeji/web/service/putian/PTData.java +++ b/web/src/main/java/com/zhehekeji/web/service/putian/PTData.java @@ -6,7 +6,9 @@ import com.zhehekeji.web.service.client.ClientChanel; import com.zhehekeji.web.service.client.TMTransmission; import lombok.Data; import lombok.NoArgsConstructor; +import lombok.extern.slf4j.Slf4j; +@Slf4j @Data @NoArgsConstructor public class PTData { @@ -91,14 +93,14 @@ public class PTData { public static PTData IntoStock02(String SRMNumber,String taskId,String goodsLocation,String picPath){ StringBuffer contentSB = new StringBuffer(); contentSB.append(SRMNumber).append(",").append(taskId).append(",").append(goodsLocation).append(",").append(picPath); - PTData ptData = new PTData(contentSB.toString(),FLOW_NO_NEED_RES,Into_Stock_02); + PTData ptData = new PTData(contentSB.toString(),FLOW_R,Into_Stock_02); return ptData; } public static PTData IntoStock04(String SRMNumber,String taskId,String goodsLocation,String picPath,String code){ StringBuffer contentSB = new StringBuffer(); contentSB.append(SRMNumber).append(",").append(taskId).append(",").append(goodsLocation).append(",").append(picPath).append(",").append(code); - PTData ptData = new PTData(contentSB.toString(),FLOW_NO_NEED_RES,Into_Stock_04); + PTData ptData = new PTData(contentSB.toString(),FLOW_R,Into_Stock_04); return ptData; } @@ -109,13 +111,7 @@ public class PTData { return ptData; } - /** - * 盘点结果 - * @param SRMNumber - * @param taskId - * @param goodsLocation - * @return - */ + // public static PTData StockCheck04(String SRMNumber, String taskId, String goodsLocation, Stock stock){ // StringBuffer contentSB = new StringBuffer(); // String status = stock.getStatus().equals("2")?"Y":"N"; @@ -132,16 +128,23 @@ public class PTData { // PTData ptData = new PTData(contentSB.toString(),FLOW_R,STOCK_CHECK_04); // return ptData; // } - + /** + * 盘点结果 + * @param SRMNumber + * @param taskId + * @param goodsLocation + * @return + */ public static PTData StockCheck04(TMTransmission tmTransmission){ StringBuffer contentSB = new StringBuffer(); String SRMNumber = tmTransmission.getSRMNumber(); String goodsLocation = tmTransmission.getGoodsLocation(); String taskId = tmTransmission.getTaskNo(); - String smokeCode = tmTransmission.getCode(); + String smokeCategory = tmTransmission.getCategory(); String smokeCount = tmTransmission.getCount().toString(); - String checkSmokeCode = tmTransmission.getRstCode(); - String checkSmokeCount = tmTransmission.getRstCount(); + String smokeRstCategory = tmTransmission.getRstCategory(); + Integer rstCount = tmTransmission.getRstCount(); + String smokeRstCount = rstCount == -1 ? "NULL" : rstCount.toString(); String checkRst = tmTransmission.getCheckRst().equals("1")?"Y":"N"; String ip ="http://"+ClientChanel.getIpFromId(tmTransmission.getSRMNumber())+":9009/pic/"+tmTransmission.getGoodsLocation()+"/" +tmTransmission.getTaskNo()+"/"; @@ -151,9 +154,10 @@ public class PTData { String pic4 = ip + 4 + ".png"; String pic5 = ip + 5 + ".png"; String pic6 = ip + 6 + ".png"; - contentSB.append(SRMNumber).append(",").append(goodsLocation).append(",").append(taskId).append(",").append(smokeCode).append(",").append(smokeCount) - .append(",").append(checkSmokeCode).append(",").append(checkSmokeCount).append(",").append(checkRst).append(",").append(pic1) + contentSB.append(SRMNumber).append(",").append(goodsLocation).append(",").append(taskId).append(",").append(smokeCategory).append(",").append(smokeCount) + .append(",").append(smokeRstCategory).append(",").append(smokeRstCount).append(",").append(checkRst).append(",").append(pic1) .append("*").append(pic2).append("*").append(pic3).append("*").append(pic4).append("*").append(pic5).append("*").append(pic6); + log.info("stock check message:{}", contentSB.toString()); PTData ptData = new PTData(contentSB.toString(),FLOW_R,STOCK_CHECK_04); return ptData; }