品规名

web/src/main/java/com/zhehekeji/web/entity/Stock.java

@@ -43,6 +43,7 @@ public class Stock {
     private String wmsCode;
 
     private String wmsCategory;
+    private String wmsCategoryName;
 
     private Integer wmsCount;
 

web/src/main/java/com/zhehekeji/web/service/PlcCmdInfo.java

@@ -70,6 +70,8 @@ public class PlcCmdInfo {
 
     private String lotnum;
 
+    private String categoryName;
+
     public PlcCmdInfo(String plcId, String taskId, Integer side1, Integer leftRight1, Integer column1, Integer row1, Integer separation1, Integer side2, Integer leftRight2, Integer column2, Integer row2, Integer separation2,String lotnum) {
         this.taskId = taskId;
         this.side1 = side1;

web/src/main/java/com/zhehekeji/web/service/PlcService.java

@@ -717,6 +717,7 @@ public class PlcService {
         stock.setWmsCount(dataInfo.getQuantity());
         stock.setCategory(dataInfo.getTypeNum());
         stock.setCount(dataInfo.getQuantity());
+        stock.setWmsCategoryName(dataInfo.getCategoryName());
         stock.setTaskId((dataInfo.getTaskId()));
         //默认未盘点
         stock.setStatus(StockStatus.PENDING.getStatus());

web/src/main/java/com/zhehekeji/web/service/ksec/KsecDataInfo.java

@@ -38,6 +38,7 @@ public class KsecDataInfo {
     private Integer ackStatus;
 
     private String trayCode;
+    private String categoryName;
     private String typeNum;
     private Integer quantity;
     private Integer checkRlt;

web/src/main/java/com/zhehekeji/web/service/ksec/KsecDecoder.java

@@ -93,7 +93,7 @@ public class KsecDecoder extends DelimiterBasedFrameDecoder {
 //                        dataInfo.setFromDirection(1);
 //                    }
                     plcCmdInfo = new PlcCmdInfo(dataInfo.getSRMNumber(), dataInfo.getTaskId(), dataInfo.getFromSide(), dataInfo.getFromDirection(), dataInfo.getFromColumn(), dataInfo.getFromRow(), dataInfo.getFromSeparation(),dataInfo.getToSide(), dataInfo.getToDirection(), dataInfo.getToColumn(), dataInfo.getToRow(),dataInfo.getToSeparation(),lotnum);
-
+                    plcCmdInfo.setCategoryName(dataInfo.getCategoryName());
                     srmNumber = dataInfo.getSRMNumber();
                     cmdName = dataInfo.getCmdName();
                 }
@@ -179,6 +179,11 @@ public class KsecDecoder extends DelimiterBasedFrameDecoder {
 
                     plcService.check(plcCmdInfo,  dataInfo);
 
+                }else if (Cmd.SC.name().equals(ksecInfo.getType())) {
+                    //站台盘点
+
+                    plcService.check(plcCmdInfo,  dataInfo);
+
                 }
                 //找到该货位的最后一张照片与现在的照片比照
                 //plcService.recordStock(plcCmdInfo, dataInfo.getCode(), 0, 0);