diff --git a/src/main/java/com/gaotao/modules/productionPicking/service/impl/ProductionPickingServiceImpl.java b/src/main/java/com/gaotao/modules/productionPicking/service/impl/ProductionPickingServiceImpl.java
index bcfd5c3..49f62a1 100644
--- a/src/main/java/com/gaotao/modules/productionPicking/service/impl/ProductionPickingServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/productionPicking/service/impl/ProductionPickingServiceImpl.java
@@ -321,7 +321,7 @@ public class ProductionPickingServiceImpl implements ProductionPickingService {
             logEntity.setBuNo(buNo);
             logEntity.setDocumentType("生产领料");
             logEntity.setDocumentNo(outboundNo);
-            logEntity.setOrderLineNo(String.valueOf(itemNo));
+            logEntity.setOrderLineNo(itemNo.intValue() + "");
             logEntity.setPartNo(partNo);
             logEntity.setRollNo(labelCode);
             logEntity.setRollQty(BigDecimal.valueOf(quantity));
diff --git a/src/main/resources/mapper/productionPicking/ProductionPickingMapper.xml b/src/main/resources/mapper/productionPicking/ProductionPickingMapper.xml
index 85217b3..93f0daa 100644
--- a/src/main/resources/mapper/productionPicking/ProductionPickingMapper.xml
+++ b/src/main/resources/mapper/productionPicking/ProductionPickingMapper.xml
@@ -26,7 +26,7 @@
         <if test="searchCode != null and searchCode != ''">
             AND (b.NotifyNo LIKE CONCAT('%', #{searchCode}, '%') )
         </if>
-        <if test="searchCode != null and searchCode != ''">
+        <if test="searchCode == null or searchCode == ''">
             AND CONVERT(DATE, b.NotifyDate) = CONVERT(DATE, GETDATE())
         </if>
         GROUP BY
@@ -161,7 +161,7 @@
 
     <update id="updateSoBomPickedQty">
         UPDATE SOBOM
-        SET QtyIssue = QtyIssue + #{transQty}
+        SET QtyIssue = isnull(QtyIssue, 0) + #{transQty}
         WHERE Site = #{site}
           AND OrderNo = #{relatedNo}
           AND ComponentPartNo = #{partNo}