楚江ERP-查询可撤销或变更的订货单数据接口调整

@@ -5,6 +5,8 @@ import com.lframework.starter.web.core.dto.BaseDto;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
+import java.util.List;
+
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.lframework.starter.web.core.entity.BaseEntity;
 import com.lframework.starter.web.core.entity.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -207,6 +209,13 @@ public class PurchaseOrderInfo extends BaseEntity implements BaseDto {
     private Boolean showExamine;
     private Boolean showExamine;
 
 
     /**
     /**
+     * 订货单表物料行
+     * 非持久化字段
+     */
+    @TableField(exist = false)
+    private List<PurchaseOrderLine> purchaseOrderLineList;
+
+    /**
      * 创建人ID
      * 创建人ID
      */
      */
     @TableField(fill = FieldFill.INSERT)
     @TableField(fill = FieldFill.INSERT)

@@ -23,6 +23,7 @@ import com.lframework.starter.common.utils.Assert;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
 import com.lframework.xingyun.sc.entity.CustomerCredit;
 import com.lframework.xingyun.sc.entity.CustomerCredit;
 import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
 import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
+import com.lframework.xingyun.sc.entity.PurchaseOrderLine;
 import com.lframework.xingyun.sc.enums.OrderSpecChangeStatus;
 import com.lframework.xingyun.sc.enums.OrderSpecChangeStatus;
 import com.lframework.xingyun.sc.mappers.PurchaseOrderInfoMapper;
 import com.lframework.xingyun.sc.mappers.PurchaseOrderInfoMapper;
 import com.lframework.xingyun.sc.service.customer.CustomerCreditService;
 import com.lframework.xingyun.sc.service.customer.CustomerCreditService;
@@ -36,7 +37,10 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
 import javax.annotation.Resource;
 import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 
 @Service
 @Service
@@ -99,8 +103,29 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
 
 
     @Override
     @Override
     public List<PurchaseOrderInfo> queryCanRevokeOrChangeList(QueryPurchaseOrderInfoVo vo) {
     public List<PurchaseOrderInfo> queryCanRevokeOrChangeList(QueryPurchaseOrderInfoVo vo) {
+        List<PurchaseOrderInfo> orderInfoList = getBaseMapper().queryCanRevokeOrChangeList(vo);
+        if (CollectionUtils.isEmpty(orderInfoList)) {
+            return new ArrayList<>();
+        }
+        List<String> orderIds = orderInfoList.stream().map(PurchaseOrderInfo::getId).distinct().collect(Collectors.toList());
+        // 获取物料行数据
+        List<PurchaseOrderLine> orderLineList = purchaseOrderLineService.listByOrderIds(orderIds);
+        if (CollectionUtils.isEmpty(orderLineList)) {
+            return orderInfoList;
+        }
+        Map<String, List<PurchaseOrderLine>> orderLineMap = new HashMap<>();
+        for (PurchaseOrderLine orderLine : orderLineList) {
+            String orderId = orderLine.getPurchaseOrderId();
+            List<PurchaseOrderLine> list = orderLineMap.computeIfAbsent(orderId, k -> new ArrayList<>());
+            list.add(orderLine);
+        }
+        for (PurchaseOrderInfo purchaseOrderInfo : orderInfoList) {
+            String orderId = purchaseOrderInfo.getId();
+            List<PurchaseOrderLine> lineList = orderLineMap.get(orderId);
+            purchaseOrderInfo.setPurchaseOrderLineList(lineList);
+        }
 
 
-        return getBaseMapper().queryCanRevokeOrChangeList(vo);
+        return orderInfoList;
     }
     }
 
 
     @Override
     @Override

@@ -166,17 +166,22 @@
             <if test="vo.workshopId != null and vo.workshopId != ''">
             <if test="vo.workshopId != null and vo.workshopId != ''">
                 AND tb.workshop_id = #{vo.workshopId}
                 AND tb.workshop_id = #{vo.workshopId}
             </if>
             </if>
-            <if test="vo.queryType == 'REVOKE'">
+            <choose>
+            <when test="vo.queryType == 'REVOKE'">
             AND (tb.revoke_status = '' OR tb.revoke_status = null OR tb.revoke_status='CANCEL' OR
             AND (tb.revoke_status = '' OR tb.revoke_status = null OR tb.revoke_status='CANCEL' OR
             tb.revoke_status='PARTIAL')
             tb.revoke_status='PARTIAL')
             AND (tb.status='ISSUED' OR tb.status='WAIT' OR tb.status='TRANSIT')
             AND (tb.status='ISSUED' OR tb.status='WAIT' OR tb.status='TRANSIT')
             AND tb.type ='PRODUCTION'
             AND tb.type ='PRODUCTION'
-            </if>
-            <if test="vo.queryType == 'CHANGE'">
+            </when>
+            <when test="vo.queryType == 'CHANGE'">
                 and tb.examine_status = 'PASS'
                 and tb.examine_status = 'PASS'
                 and tb.status != 'SHIPPED'
                 and tb.status != 'SHIPPED'
                 and tb.revoke_status != 'UNDOING'
                 and tb.revoke_status != 'UNDOING'
-            </if>
+            </when>
+            <otherwise>
+                AND 1 = 0  <!-- 确保查询不到任何数据 -->
+            </otherwise>
+            </choose>
         </where>
         </where>
         ORDER BY tb.update_time DESC
         ORDER BY tb.update_time DESC
     </select>
     </select>