1.UID出库页面模糊搜索增加barcode.batch。2.空库位出库时发送库位的尺寸给客户端。

src/main/java/com/neotel/smfcore/core/device/handler/impl/BaseDeviceHandler.java

@@ -932,6 +932,9 @@ public class BaseDeviceHandler implements IDeviceHandler {
                 plateH = codeObj.getHeight();
             } else {
                 log.warn("出库无料仓位" + storage.getName() + "[" + posName + "]");
+                StoragePos pos=storagePosManager.getByPosName(posName);
+                plateW = pos.getW();
+                plateH = pos.getH();
             }
             statusBean.addPosInfo(outTask.getBarcode(), posName, plateW, plateH, false,outTask.isNgReel(),0);
             log.info("出库" + storage.getName() + "[" + posName + "]物料[" + outTask.getBarcode() + "] 发送到客户端" + storage.getCid());

src/main/java/com/neotel/smfcore/core/device/handler/impl/MimoBoxHandler.java

@@ -132,6 +132,9 @@ public class MimoBoxHandler extends BaseDeviceHandler {
                         plateH = codeObj.getHeight();
                     } else {
                         log.warn("MIMO紧急出库无料仓位" + storage.getName() + "[" + posName + "]");
+                        StoragePos pos=storagePosManager.getByPosName(posName);
+                        plateW = pos.getW();
+                        plateH = pos.getH();
                     }
                     statusBean.addPosInfo(singleOutTask.getBarcode(), posName, plateW, plateH, true);
                     log.info("出库紧急物料" + storage.getName() + "[" + posName + "]物料[" + singleOutTask.getBarcode() + "]" + "发送到客户端" + cid);

src/main/java/com/neotel/smfcore/core/storage/rest/query/StoragePosFindCriteria.java

@@ -14,7 +14,7 @@ import java.util.List;
 
 @Data
 public class StoragePosFindCriteria {
-    @QueryCondition(blurry = "barcode.partNumber,barcode.barcode,barcode.subCodeList.barcode,barcode.subCodeList.partNumber,posName")
+    @QueryCondition(blurry = "barcode.partNumber,barcode.barcode,barcode.subCodeList.barcode,barcode.subCodeList.partNumber,posName,barcode.batch")
     private String blurry;
 
     @QueryCondition(type = QueryCondition.Type.BETWEEN, propName = "barcode.putInDate")

src/main/java/com/neotel/smfcore/core/system/util/TaskService.java

@@ -499,6 +499,9 @@ public class TaskService {
                         }
                     } else {
                         log.warn("出库无料仓位" + storage.getName() + "[" + posName + "]");
+                        StoragePos pos=storagePosManager.getByPosName(posName);
+                        plateW = pos.getW();
+                        plateH = pos.getH();
                     }
                     statusBean.addData("hSerial",task.getSourceName());
                     statusBean.addPosInfo(task.getBarcode(), posName, plateW, plateH, isSingleOut);

src/main/java/com/neotel/smfcore/custom/micron1053/bean/ML5NgReelInfo.java

@@ -12,7 +12,7 @@ import java.io.Serializable;
 public class ML5NgReelInfo implements Serializable {
 
     @ApiModelProperty("NG口位置，1=左侧，2=右侧")
-    private int NgPos=0;
+    private int ngPos=0;
 
     @ApiModelProperty("物料类型：pizzaBox,pcb,tray,reel")
     private String mType;