签收BUG修复

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml

@@ -1274,7 +1274,9 @@
         AND ldpl.order_package_loading_status = 10
         AND ldpl.conditions = 1
         AND order_package_status IN (10,20)
-        and ldpl.stock_article_id = #{param.orderId} and ldpl.warehouse_id = #{warehouseId}
+        and ldpl.stock_article_id = #{param.orderId}
+        and ldpl.warehouse_id = #{warehouseId}
+        and ldpl.is_transfer = 0
         <if test="param.waybillNumber != null and param.waybillNumber != ''">
             and ldpl.waybill_number like concat('%',#{param.waybillNumber},'%')
         </if>

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java

@@ -9140,10 +9140,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		distributionLoadscanEntity.setSigningUserId(user.getUserId());
 		distributionLoadscanEntity.setSignforType(LoadScanSigningTypeStatusConstant.sijiqianshou.getValue());
 		distributionLoadscanEntity.setSignforState(LoadScanSigningStatusConstant.weiqianshou.getValue());
-		if (loadscanEntity.getLoadedNub().equals(distributionLoadscanEntity.getReceivedQuantity())) {
+		if (Objects.equals(loadscanEntity.getLoadedNub(),distributionLoadscanEntity.getReceivedQuantity())) {
 			distributionLoadscanEntity.setSignforState(LoadScanSigningStatusConstant.yiqianshou.getValue());
 		}
-
 		return distributionLoadscanEntity;
 
 	}