2025-12-03

pda功能默认查询去掉日期

src/main/resources/mapper/inboundNotification/InboundNotificationHeadMapper.xml

@@ -26,9 +26,9 @@
             OR h.related_order_no LIKE CONCAT('%', #{searchCode}, '%')
             )
         </if>
-        <if test="searchCode == null or searchCode == ''">
-            AND CONVERT(DATE, h.required_inbound_date) = CONVERT(DATE, GETDATE())
-        </if>
+<!--        <if test="searchCode == null or searchCode == ''">-->
+<!--            AND CONVERT(DATE, h.required_inbound_date) = CONVERT(DATE, GETDATE())-->
+<!--        </if>-->
         GROUP BY h.site,h.bu_no,h.order_no,h.required_inbound_date ,D.required_qty
         ORDER BY h.required_inbound_date DESC
     </select>

src/main/resources/mapper/otherInbound/OtherInboundMapper.xml

@@ -26,9 +26,9 @@
             OR h.related_order_no LIKE CONCAT('%', #{searchCode}, '%')
             )
         </if>
-        <if test="searchCode == null or searchCode == ''">
-            AND CONVERT(DATE, h.required_inbound_date) = CONVERT(DATE, GETDATE())
-        </if>
+<!--        <if test="searchCode == null or searchCode == ''">-->
+<!--            AND CONVERT(DATE, h.required_inbound_date) = CONVERT(DATE, GETDATE())-->
+<!--        </if>-->
         GROUP BY h.site,h.bu_no,h.order_no,h.required_inbound_date
         ORDER BY h.required_inbound_date DESC
     </select>

src/main/resources/mapper/otherOutbound/OtherOutboundMapper.xml

@@ -28,9 +28,9 @@
             OR h.related_order_no LIKE CONCAT('%', #{searchCode}, '%')
             )
         </if>
-        <if test="searchCode == null or searchCode == ''">
-            AND CONVERT(DATE, h.required_outbound_date) = CONVERT(DATE, GETDATE())
-        </if>
+<!--        <if test="searchCode == null or searchCode == ''">-->
+<!--            AND CONVERT(DATE, h.required_outbound_date) = CONVERT(DATE, GETDATE())-->
+<!--        </if>-->
         GROUP BY h.site, h.order_no, h.bu_no ,h.required_outbound_date
         ORDER BY h.required_outbound_date DESC
     </select>

src/main/resources/mapper/productionInbound/ProductionInboundMapper.xml

@@ -28,9 +28,9 @@
             OR d.part_no LIKE CONCAT('%', #{searchCode}, '%')
             )
         </if>
-        <if test="searchCode == null or searchCode == ''">
-            AND CONVERT(DATE, h.required_inbound_date) = CONVERT(DATE, GETDATE())
-        </if>
+<!--        <if test="searchCode == null or searchCode == ''">-->
+<!--            AND CONVERT(DATE, h.required_inbound_date) = CONVERT(DATE, GETDATE())-->
+<!--        </if>-->
         GROUP BY h.site,h.bu_no, h.order_no, h.required_inbound_date
         ORDER BY h.required_inbound_date DESC
     </select>

src/main/resources/mapper/productionPicking/ProductionPickingMapper.xml

@@ -26,9 +26,9 @@
         <if test="searchCode != null and searchCode != ''">
             AND (b.NotifyNo LIKE CONCAT('%', #{searchCode}, '%') )
         </if>
-        <if test="searchCode == null or searchCode == ''">
-            AND CONVERT(DATE, b.NotifyDate) = CONVERT(DATE, GETDATE())
-        </if>
+<!--        <if test="searchCode == null or searchCode == ''">-->
+<!--            AND CONVERT(DATE, b.NotifyDate) = CONVERT(DATE, GETDATE())-->
+<!--        </if>-->
         GROUP BY
             b.site, b.NotifyNo, b.bu ,b.NotifyDate
         ORDER BY b.NotifyDate  DESC

src/main/resources/mapper/purchaseReturn/PurchaseReturnMapper.xml

@@ -31,9 +31,9 @@
                 OR h.related_order_no LIKE CONCAT('%', #{searchCode}, '%')
             )
         </if>
-        <if test="searchCode == null or searchCode == ''">
-            AND CONVERT(DATE, h.required_outbound_date) = CONVERT(DATE, GETDATE())
-        </if>
+<!--        <if test="searchCode == null or searchCode == ''">-->
+<!--            AND CONVERT(DATE, h.required_outbound_date) = CONVERT(DATE, GETDATE())-->
+<!--        </if>-->
         GROUP BY h.site, h.order_no, h.bu_no,h.customer_id,C.CustomerName,required_outbound_date
         ORDER BY h.required_outbound_date DESC
     </select>

src/main/resources/mapper/salesOutbound/SalesOutboundMapper.xml

@@ -30,9 +30,9 @@
             OR h.related_order_no LIKE CONCAT('%', #{searchCode}, '%')
             )
         </if>
-        <if test="searchCode == null or searchCode == ''">
-            AND CONVERT(DATE, h.required_outbound_date) = CONVERT(DATE, GETDATE())
-        </if>
+<!--        <if test="searchCode == null or searchCode == ''">-->
+<!--            AND CONVERT(DATE, h.required_outbound_date) = CONVERT(DATE, GETDATE())-->
+<!--        </if>-->
         GROUP BY h.site, h.order_no, h.bu_no, h.required_outbound_date, d.related_order_no, d.related_order_line_no, d.actual_out_qty
         ORDER BY h.required_outbound_date DESC
     </select>

src/main/resources/mapper/salesReturn/SalesReturnMapper.xml

@@ -29,9 +29,9 @@
                     OR d.part_no LIKE CONCAT('%', #{searchCode}, '%')
                 )
             </if>
-            <if test="searchCode == null or searchCode == ''">
-                AND CONVERT(DATE, h.required_inbound_date) = CONVERT(DATE, GETDATE())
-            </if>
+<!--            <if test="searchCode == null or searchCode == ''">-->
+<!--                AND CONVERT(DATE, h.required_inbound_date) = CONVERT(DATE, GETDATE())-->
+<!--            </if>-->
         GROUP BY
             h.bu_no,
             h.order_no,

src/main/resources/mapper/wms/WmsPrintMapper.xml

@@ -27,8 +27,8 @@
         b.inspector_no
         from inbound_notification_head  a
         inner join inbound_notification_detail D on a.site = D.site and a.bu_no = D.bu_no and a.order_no = D.order_no AND A.order_type ='采购入库'
-        left join qc_iqc_record b on D.site = b.site and D.bu_no = b.bu_no and D.inspection_no = b.inspection_no
-        inner join Supplier c on a.site = c.Site and a.Supplier_ID = c.supplierID
+        inner join qc_iqc_record b on D.site = b.site and D.bu_no = b.bu_no and D.inspection_no = b.inspection_no
+        left join Supplier c on a.site = c.Site and a.Supplier_ID = c.supplierID
         <where>
             <if test="query.site != null and query.site != ''">
                 and A.site=#{query.site,jdbcType=VARCHAR}