Merge remote-tracking branch 'origin/master_0929' into master_0929

@@ -299,6 +299,10 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
                 if (b) {
                 if (b) {
                     //全部撤销
                     //全部撤销
                     purchaseOrderInfoService.updateRevokeStatus(revoke.getPurchaseOrderId(), "ALL");
                     purchaseOrderInfoService.updateRevokeStatus(revoke.getPurchaseOrderId(), "ALL");
+                    //全部撤销订货单状态改为已取消
+                    List<String> ids = new ArrayList<>();
+                    ids.add(revoke.getPurchaseOrderId());
+                    purchaseOrderInfoService.updateStatus(ids, "CANCEL");
                 } else {
                 } else {
                     //部分撤销
                     //部分撤销
                     purchaseOrderInfoService.updateRevokeStatus(revoke.getPurchaseOrderId(), "PARTIAL");
                     purchaseOrderInfoService.updateRevokeStatus(revoke.getPurchaseOrderId(), "PARTIAL");

@@ -311,6 +311,8 @@ public class PurchaseOrderLineServiceImpl extends BaseMpServiceImpl<PurchaseOrde
         if (!includeShipment) {
         if (!includeShipment) {
             queryWrapper.eq(PurchaseOrderLine::getShipment, Boolean.FALSE);
             queryWrapper.eq(PurchaseOrderLine::getShipment, Boolean.FALSE);
         }
         }
+        // 只查询 quantity > 0 的记录
+        queryWrapper.gt(PurchaseOrderLine::getQuantity, BigDecimal.ZERO);
         queryWrapper.in(PurchaseOrderLine::getDeliveryDate, shipmentDateList);
         queryWrapper.in(PurchaseOrderLine::getDeliveryDate, shipmentDateList);
 
 
         return getBaseMapper().selectList(queryWrapper);
         return getBaseMapper().selectList(queryWrapper);

@@ -153,6 +153,7 @@
         <include refid="PurchaseOrderInfo_sql"/>
         <include refid="PurchaseOrderInfo_sql"/>
         <where>
         <where>
             AND tb.type = 'PRODUCTION'
             AND tb.type = 'PRODUCTION'
+            AND tb.status != 'CANCEL'
             <if test="vo.orderNo != null and vo.orderNo != ''">
             <if test="vo.orderNo != null and vo.orderNo != ''">
                 AND tb.order_no = #{vo.orderNo}
                 AND tb.order_no = #{vo.orderNo}
             </if>
             </if>