diff --git a/src/main/java/com/huaheng/pc/config/location/service/LocationServiceImpl.java b/src/main/java/com/huaheng/pc/config/location/service/LocationServiceImpl.java
index aadd323..9e0ff75 100644
--- a/src/main/java/com/huaheng/pc/config/location/service/LocationServiceImpl.java
+++ b/src/main/java/com/huaheng/pc/config/location/service/LocationServiceImpl.java
@@ -490,7 +490,7 @@ public class LocationServiceImpl extends ServiceImpl<LocationMapper, Location> i
     @Override
     public Location getInsideNear(Location location) {
         LambdaQueryWrapper<Location> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(Location::getWarehouseCode, location.getWarehouseCode());
+        //queryWrapper.eq(Location::getWarehouseCode, location.getWarehouseCode());
         queryWrapper.eq(Location::getZoneCode, location.getZoneCode());
         queryWrapper.eq(Location::getRoadway, location.getRoadway());//巷道
         queryWrapper.eq(Location::getIColumn, location.getIColumn());//列
diff --git a/src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java b/src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java
index e4398f9..a51f13d 100644
--- a/src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java
+++ b/src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java
@@ -179,7 +179,7 @@ public class ReceiptHeaderController extends BaseController {
         //ReceiptHeader receiptHeaderData = new ReceiptHeader();
         ReceiptDetail receiptDetail = receiptDetailService.getOne(new LambdaQueryWrapper<ReceiptDetail>().eq(ReceiptDetail::getSNNO, receiptHeader.getSNNO()));
         if (receiptDetail == null) {
-            receiptDetail = receiptDetailService.getOne(new LambdaQueryWrapper<ReceiptDetail>().eq(ReceiptDetail::getReceiptCode, receiptHeader.getSNNO()));
+            receiptDetail = receiptDetailService.getOne(new LambdaQueryWrapper<ReceiptDetail>().like(ReceiptDetail::getReceiptCode, receiptHeader.getSNNO()));
             if (receiptDetail == null) {
                 return AjaxResult.error("该SN或入库单号不存在");
             }
diff --git a/src/main/java/com/huaheng/pc/shipment/shippingCombination/service/ShippingCombinationService.java b/src/main/java/com/huaheng/pc/shipment/shippingCombination/service/ShippingCombinationService.java
index d933d86..9ff6e85 100644
--- a/src/main/java/com/huaheng/pc/shipment/shippingCombination/service/ShippingCombinationService.java
+++ b/src/main/java/com/huaheng/pc/shipment/shippingCombination/service/ShippingCombinationService.java
@@ -84,11 +84,11 @@ public class ShippingCombinationService {
         if (policy.equals("PL") || noticeNo.contains("展会")) {
             list.removeIf(detail -> !detail.getNoticeCode().equals(noticeNo));
         }
-        
+
         //排序：主体颜色加喷漆状态、喷漆状态、主体颜色、喷漆状态（底漆）、无颜色、先进先出
         return list.stream()
                 .sorted(Comparator.comparing((InventoryDetail detail) -> {
-                    if (StringUtils.isNotEmpty(noticeNo) && paintStatus.equals(detail.getNoticeCode())) {
+                    if (StringUtils.isNotEmpty(noticeNo) && noticeNo.equals(detail.getNoticeCode())) {
                         return 1;
                     } else if (StringUtils.isNotEmpty(color) && StringUtils.isNotEmpty(paintStatus) && color.equals(detail.getMaterialColor()) && paintStatus.equals(detail.getPaintStatus())) {
                         return 2;
diff --git a/src/main/resources/templates/shipment/shipmentHeaderHistory/shipmentHeaderHistory.html b/src/main/resources/templates/shipment/shipmentHeaderHistory/shipmentHeaderHistory.html
index 28355eb..fec2c31 100644
--- a/src/main/resources/templates/shipment/shipmentHeaderHistory/shipmentHeaderHistory.html
+++ b/src/main/resources/templates/shipment/shipmentHeaderHistory/shipmentHeaderHistory.html
@@ -376,7 +376,8 @@
                     align: 'center',
                     formatter: function (value, row, index) {
                         var actions = [];
-                        actions.push('<a id="table_edit" class="btn btn-success btn-xs ' + printFlag + '" href="#" onclick="receiptPrint(\'' + row.id + '\')"><i class="fa fa-print"></i>打印</a> ');
+                        actions.push('<a id="table_edit" class="btn btn-success btn-xs ' + printFlag + '" href="#" onclick="receiptPrint(\'' + row.id + '\',1)"><i class="fa fa-print"></i>打印1</a> ');
+                        actions.push('<a id="table_edit" class="btn btn-success btn-xs ' + printFlag + '" href="#" onclick="receiptPrint(\'' + row.id + '\',2)"><i class="fa fa-print"></i>打印2</a> ');
                         return actions.join('');
                     }
                 },
@@ -942,21 +943,22 @@
         }
     }
 
-        /* 打印 */
-        function receiptPrint(id) {
-            var url = prefix + "/autoreport/" + id;
-            $.ajax({
-                url: url,
-                type: "get",
-                success: function (response) {
-                    if (response.code === 200) {
-                        $.modal.alertSuccess('打印成功:' + response.msg);
-                    } else {
-                        $.modal.alertError('打印失败:' + response.msg);
-                    }
+
+    /* 打印 */
+    function receiptPrint(id, version) {
+        var url = prefix + "/autoreport/" + id + "/" + version;
+        $.ajax({
+            url: url,
+            type: "get",
+            success: function (response) {
+                if (response.code === 200) {
+                    $.modal.alertSuccess('打印成功:' + response.msg);
+                } else {
+                    $.modal.alertError('打印失败:' + response.msg);
                 }
-            })
-        }
+            }
+        })
+    }
 
 
     /* 单个删除 */