nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentOutboundController.java

@@ -168,7 +168,6 @@ public class ComponentOutboundController extends BaseController {
      * 确认出库单
      * @param request 确认出库单的参数对象
      */
-    @Transactional
     @PostMapping("pda/confirm")
     public ApiResult<Void> confirmPda(@Valid @RequestBody ComponentOutboundInputQO request) {
         // 根据装箱单号获取装箱单

nflg-wms-repository/src/main/resources/mapper/WmsReturnRequestMapper.xml

@@ -46,28 +46,28 @@
             left join user_supplier us on rr.supplier_code=us.supplier_code
             where (rr.create_user_id=#{request.userId} or rr.purchase_group=#{request.purchaseGroup})
             <if test="request.applicationNo !=null and request.applicationNo !=''">
-                and rr.application_no =#{request.applicationNo}
+                and a.application_no =#{request.applicationNo}
             </if>
             <if test="request.supplierCode !=null and request.supplierCode !=''">
-                and rr.supplier_code =#{ request.supplierCode}
+                and a.supplier_code =#{ request.supplierCode}
             </if>
             <if test="request.poNum !=null and request.poNum !=''">
-                and rr.po_num =#{ request.poNum}
+                and a.po_num =#{ request.poNum}
             </if>
             <if test="request.approvalStatus !=null and request.approvalStatus !=''">
-                and rr.approval_status =#{ request.approvalStatus}
+                and a.approval_status =#{ request.approvalStatus}
             </if>
             <if test="request.documentType !=null and request.documentType !=''">
-                and rr.document_type =#{ request.documentType}
+                and a.document_type =#{ request.documentType}
             </if>
             <if test="request.purchaseGroup !=null and request.purchaseGroup !=''">
-                and rr.purchase_group =#{ request.purchaseGroup}
+                and a.purchase_group =#{ request.purchaseGroup}
             </if>
             <if test="request.startDate !=null">
-                and rr.approve_time>= #{request.startDate}
+                and a.approve_time>= #{request.startDate}
             </if>
             <if test="request.endDate !=null">
-                and rr.approve_time &lt;= #{request.endDate}
+                and a.approve_time &lt;= #{request.endDate}
             </if>
         </select>