1.异常出库以及报表查询优化

src/main/java/com/neotel/smfcore/core/storage/rest/StoragePosController.java

@@ -639,11 +639,24 @@ public class StoragePosController {
 
 
     @ApiOperation("根据料箱号查询barcode信息")
     @ApiOperation("根据料箱号查询barcode信息")
     @GetMapping("/getBarcodeInfo")
     @GetMapping("/getBarcodeInfo")
-    public BarcodeDto getBarcodeInfo(String boxStr) {
+    public BarcodeDto getBarcodeInfo(String boxStr,String barcodeStr) {
         StoragePos pos = storagePosManager.getByBarcode(boxStr);
         StoragePos pos = storagePosManager.getByBarcode(boxStr);
         if (pos != null) {
         if (pos != null) {
             StoragePosDto dto = storagePosMapper.toDto(pos);
             StoragePosDto dto = storagePosMapper.toDto(pos);
             BarcodeDto barcode = dto.getBarcode();
             BarcodeDto barcode = dto.getBarcode();
+            List<BarcodeDto> newSubCodeList = new ArrayList<>();
+            List<BarcodeDto> subCodeList = barcode.getSubCodeList();
+            if (subCodeList != null && !subCodeList.isEmpty()){
+                for (BarcodeDto barcodeDto : subCodeList) {
+                    if (StringUtils.isNotEmpty(barcodeStr)){
+                        if(!barcodeStr.equals(barcodeDto.getBarcode())){
+                            continue;
+                        }
+                    }
+                    newSubCodeList.add(barcodeDto);
+                }
+            }
+            barcode.setSubCodeList(newSubCodeList);
             return barcode;
             return barcode;
         }
         }
         return null;
         return null;

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")
+    @QueryCondition(propName = "barcode")
     private String barcode;
     private String barcode;
 
 
     @QueryCondition(blurry = "posName")
     @QueryCondition(blurry = "posName")

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

@@ -1717,7 +1717,7 @@ public class CDeviceController {
         Barcode barcode = codeBean.getBarcode();
         Barcode barcode = codeBean.getBarcode();
         if (StringUtils.isEmpty(barcode.getPosName())) {
         if (StringUtils.isEmpty(barcode.getPosName())) {
             log.info(code + "对应的库位为空,直接返回ok");
             log.info(code + "对应的库位为空,直接返回ok");
-            return ResultBean.newOkResult("");
+            return ResultBean.newErrorResult(-1, "", code + "对应的库位为空,请库存处理后,重新入库");
         }
         }
         //按位置进行加锁
         //按位置进行加锁
         Object lockObj = lockBoxMap.get(currentLoc);
         Object lockObj = lockBoxMap.get(currentLoc);
@@ -1736,7 +1736,7 @@ public class CDeviceController {
                 if (currentBoxPos != null) {
                 if (currentBoxPos != null) {
                     currentBoxBarcode = currentBoxPos.getBarcode();
                     currentBoxBarcode = currentBoxPos.getBarcode();
                 }
                 }
-                String errorMsg = notifyCurrentBarcodeToWms(barcode, currentLoc, stacker);
+                String errorMsg = notifyCurrentBarcodeToWms(barcode, currentLoc, "");
                 //标记一下信息
                 //标记一下信息
                 currentBoxBarcode.updateExtraData(CommonUtil.outExpPrefix + posName, posName);
                 currentBoxBarcode.updateExtraData(CommonUtil.outExpPrefix + posName, posName);
                 currentBoxBarcode.removeFromSubCodes(barcode);
                 currentBoxBarcode.removeFromSubCodes(barcode);
@@ -1877,7 +1877,7 @@ public class CDeviceController {
                         , barcode.getWarehouseCode(), orderItem.getBrand(), orderItem.getFace(), batchCode, Arrays.asList(barcode.getBarcode())));
                         , barcode.getWarehouseCode(), orderItem.getBrand(), orderItem.getFace(), batchCode, Arrays.asList(barcode.getBarcode())));
                 //绑定线体
                 //绑定线体
                 String targetLoc = order.getLoc();
                 String targetLoc = order.getLoc();
-                if (StringUtils.isNotEmpty(targetLoc)){
+                if (StringUtils.isNotEmpty(targetLoc) && StringUtils.isNotEmpty(stacker)){
                     if (targetLoc.endsWith("BG")) {
                     if (targetLoc.endsWith("BG")) {
                         log.info(barcode.getBarcode()+"自动绑定料串[" + stacker + "]目的地:C2-3F-BG");
                         log.info(barcode.getBarcode()+"自动绑定料串[" + stacker + "]目的地:C2-3F-BG");
                         MaterialLocUtil.updateStackerLoc(stacker, "", "C2-3F-BG", 1, orderItem.getOrderNo(),barcode);
                         MaterialLocUtil.updateStackerLoc(stacker, "", "C2-3F-BG", 1, orderItem.getOrderNo(),barcode);