diff --git a/src/main/java/com/huaheng/api/general/service/ShipmentApiService.java b/src/main/java/com/huaheng/api/general/service/ShipmentApiService.java
index 5e7e48c..74fda47 100644
--- a/src/main/java/com/huaheng/api/general/service/ShipmentApiService.java
+++ b/src/main/java/com/huaheng/api/general/service/ShipmentApiService.java
@@ -318,8 +318,7 @@ public class ShipmentApiService {
             }
             List<ShipmentDetail> a = null;
             LambdaQueryWrapper<Material> materialLamb = Wrappers.lambdaQuery();
-            materialLamb.eq(Material::getCode, shipmentDetail.getMaterialCode())
-                    .eq(Material::getWarehouseCode, shipmentHeader.getWarehouseCode());
+            materialLamb.eq(Material::getCode, shipmentDetail.getMaterialCode()).eq(Material::getWarehouseCode, shipmentHeader.getWarehouseCode());
             Material material = materialService.getOne(materialLamb);
             if (material == null) {
                 return AjaxResult.error("wms没有此物料," + shipmentDetail.getMaterialCode());
diff --git a/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java b/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java
index 0996e9c..1c88120 100644
--- a/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java
+++ b/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java
@@ -258,6 +258,13 @@ public class InventoryDetailController extends BaseController
                 return AjaxResult.error("没有这个电池包二维码");
             }
             list.add(pdaTraceability);
+        }else if(productCode.startsWith("A")||productCode.startsWith("B")||productCode.startsWith("C")||productCode.startsWith("D")||productCode.startsWith("E")||productCode.startsWith("F")||productCode.startsWith("G")||productCode.startsWith("H")||productCode.startsWith("J")||productCode.startsWith("K")||productCode.startsWith("M")){
+            //库位号
+            List<PdaTraceability> pdaTraceabilitys =selectLocationCode(productCode);
+            if (pdaTraceabilitys==null){
+                return AjaxResult.error("没有这个库位号");
+            }
+            return AjaxResult.success(pdaTraceabilitys);
         }else{
             //电池信息码
             PdaTraceability pdaTraceability = selectPro(productCode);
@@ -269,6 +276,38 @@ public class InventoryDetailController extends BaseController
         return AjaxResult.success(list);
     }
 
+    private List<PdaTraceability> selectLocationCode(String code) {
+        List<InventoryHeader> inventoryHeaders = inventoryHeaderService.list(new LambdaQueryWrapper<InventoryHeader>().eq(InventoryHeader::getLocationCode, code));
+        List<PdaTraceability> list = new ArrayList<>();
+        if (inventoryHeaders.size() != 0) {
+            InventoryHeader inventoryHeader = inventoryHeaders.get(0);
+            List<InventoryDetail> inventoryDetails = inventoryDetailService.list(new LambdaQueryWrapper<InventoryDetail>().eq(InventoryDetail::getInventoryHeaderId, inventoryHeader.getId()));
+            for (InventoryDetail i : inventoryDetails) {
+                PdaTraceability pdaTraceability = new PdaTraceability();
+                Zone zone = zoneService.list(new LambdaQueryWrapper<Zone>().eq(Zone::getCode, inventoryHeader.getZoneCode())).get(0);
+                if (zone != null) {
+                    pdaTraceability.setZone(zone.getName());
+                }else {
+                    pdaTraceability.setZone("");
+                }
+                pdaTraceability.setBarcodeDetailsCode(i.getBarcodeDetailsCode());
+                pdaTraceability.setLocationCode(inventoryHeader.getLocationCode());
+                pdaTraceability.setMaterialCode(i.getMaterialCode());
+                pdaTraceability.setMaterialName(i.getMaterialName());
+                pdaTraceability.setMaterialSpec(i.getMaterialSpec());
+                pdaTraceability.setMaterialUnit(i.getMaterialUnit());
+                pdaTraceability.setCreated(inventoryHeader.getCreated());
+                pdaTraceability.setCreatedBy(inventoryHeader.getCreatedBy());
+                pdaTraceability.setContainerCode(inventoryHeader.getContainerCode());
+                pdaTraceability.setLocked("已入库");
+                pdaTraceability.setBatteryPackTwoCode(i.getBatteryPackTwoCode());
+                list.add(pdaTraceability);
+            }
+            return list;
+        }
+        return null;
+    }
+
     private List<PdaTraceability> selectContainerCode(String code) {
         List<InventoryHeader> inventoryHeaders = inventoryHeaderService.list(new LambdaQueryWrapper<InventoryHeader>().eq(InventoryHeader::getContainerCode, code));
         List<ReceiptContainerHeader> receiptContainerHeaders = receiptContainerHeaderService.list(new LambdaQueryWrapper<ReceiptContainerHeader>().eq(ReceiptContainerHeader::getContainerCode, code).ne(ReceiptContainerHeader::getStatus, 20));
@@ -282,7 +321,9 @@ public class InventoryDetailController extends BaseController
                 if (zone!=null) {
                     pdaTraceability.setZone(zone.getName());
                 }
-                pdaTraceability.setZone("");
+                else {
+                    pdaTraceability.setZone("");
+                }
                 pdaTraceability.setBarcodeDetailsCode(i.getBarcodeDetailsCode());
                 pdaTraceability.setLocationCode(inventoryHeader.getLocationCode());
                 pdaTraceability.setMaterialCode(i.getMaterialCode());
diff --git a/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailServiceImpl.java b/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailServiceImpl.java
index f1f823d..11160cf 100644
--- a/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailServiceImpl.java
+++ b/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailServiceImpl.java
@@ -139,18 +139,18 @@ public class InventoryDetailServiceImpl extends ServiceImpl<InventoryDetailMappe
            sql = sql +"'" + shipmentDetail.getId() + "' \n"+
                    "and i.qcCheck=1\n"+ sqll;
        }
-       if(StringUtils.isNotEmpty(shipmentDetail.getBatteryPackTwoCode())){
-           String[] strArr=shipmentDetail.getBatteryPackTwoCode().split(",");
-           StringBuffer sb = new StringBuffer();
-           for(int i = 0;i < strArr.length; i++){
-               if(i == strArr.length-1){
-                   sb.append("'"+strArr[i]+"'");
-               }else{
-                   sb.append("'"+strArr[i]+"'"+",");
-               }
-           }
-           sql=sql+" and i.batteryPackTwoCode in("+sb.toString()+")";
-       }
+       //if(StringUtils.isNotEmpty(shipmentDetail.getBatteryPackTwoCode())){
+       //    String[] strArr=shipmentDetail.getBatteryPackTwoCode().split(",");
+       //    StringBuffer sb = new StringBuffer();
+       //    for(int i = 0;i < strArr.length; i++){
+       //        if(i == strArr.length-1){
+       //            sb.append("'"+strArr[i]+"'");
+       //        }else{
+       //            sb.append("'"+strArr[i]+"'"+",");
+       //        }
+       //    }
+       //    sql=sql+" and i.batteryPackTwoCode in("+sb.toString()+")";
+       //}
         return inventoryDetailMapper.selectBysql(sql);
     }
 
diff --git a/src/main/resources/templates/shipment/shippingCombination/shippingCombination.html b/src/main/resources/templates/shipment/shippingCombination/shippingCombination.html
index 6754b2f..5ea712b 100644
--- a/src/main/resources/templates/shipment/shippingCombination/shippingCombination.html
+++ b/src/main/resources/templates/shipment/shippingCombination/shippingCombination.html
@@ -296,7 +296,7 @@
         contentType: "application/x-www-form-urlencoded",
         pagination: true,   // 是否显示分页（*）
         pageNumber: 1,                                      // 初始化加载第一页，默认第一页
-        pageSize: 200,                                       // 每页的记录行数（*）
+        pageSize: 10,                                       // 每页的记录行数（*）
         pageList: [10, 25, 50,500],
         columns: [
             {