1.UID出库和库存报表 增加唯一码查询

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

@@ -32,7 +32,7 @@ public class StoragePosFindCriteria {
     @QueryCondition(type = QueryCondition.Type.IN, propName = "storageId")
     @QueryCondition(type = QueryCondition.Type.IN, propName = "storageId")
     private List<String> storageIdList;
     private List<String> storageIdList;
 
 
-    @QueryCondition(propName = "barcode.barcode")
+    @QueryCondition(blurry = "barcode.barcode,barcode.subCodeList.barcode")
     @ApiModelProperty("条码")
     @ApiModelProperty("条码")
     private String barcode;
     private String barcode;
 
 

src/main/java/com/neotel/smfcore/custom/lizhen/report/bean/query/ReportQueryCondition.java

@@ -52,7 +52,7 @@ public class ReportQueryCondition {
 
 
 
 
     @ApiModelProperty("唯一码")
     @ApiModelProperty("唯一码")
-    @QueryCondition(blurry = "barcode.barcode,barcode")
+    @QueryCondition(blurry = "barcode")
     private String barcode;
     private String barcode;
 
 
     @QueryCondition(blurry = "posName")
     @QueryCondition(blurry = "posName")
@@ -113,7 +113,6 @@ public class ReportQueryCondition {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private BetweenData<Date> createDate;
     private BetweenData<Date> createDate;
 
 
-
     private int page;
     private int page;
 
 
     private int size;
     private int size;

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/controller/PkCheckOutController.java

@@ -190,8 +190,8 @@ public class PkCheckOutController {
             List<LiteOrderItem> orderItems = liteOrder.getOrderItems();
             List<LiteOrderItem> orderItems = liteOrder.getOrderItems();
             for (LiteOrderItem item : orderItems) {
             for (LiteOrderItem item : orderItems) {
                 for (GetPickingItemsResult pkItem : pickingItemList) {
                 for (GetPickingItemsResult pkItem : pickingItemList) {
-                    String mo = pkItem.getMO();
-                    if (mo.equals(item.getMo())) {
+                    String itemId = pkItem.getITEM_ID();
+                    if (itemId.equals(item.getItemId())) {
                         item.setPlantCode(pkItem.getPLANT_CODE());
                         item.setPlantCode(pkItem.getPLANT_CODE());
                         item.setItemId(pkItem.getITEM_ID());
                         item.setItemId(pkItem.getITEM_ID());
                         item.setPickingId(pkItem.getPICKING_ID());
                         item.setPickingId(pkItem.getPICKING_ID());