Merge remote-tracking branch 'origin/master'

src/main/java/com/xujie/sys/modules/pms/entity/PurchaseOrder.java

@@ -58,7 +58,10 @@ public class PurchaseOrder {
     private String purchasereason;
     private Long purchaseOrderHeadId;
     private Long headNum;
+    @TableField(exist = false)
     private String supplierName;
+    @TableField(exist = false)
     private String spec;
+    @TableField(exist = false)
     private String warehouseId;
 }

src/main/java/com/xujie/sys/modules/pms/service/Impl/PqcServiceImpl.java

@@ -3,9 +3,11 @@ package com.xujie.sys.modules.pms.service.Impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xujie.sys.common.utils.PageUtils;
+import com.xujie.sys.modules.orderIssure.vo.Part;
 import com.xujie.sys.modules.oss.dao.SysOssDao;
 import com.xujie.sys.modules.oss.service.SysOssService;
 import com.xujie.sys.modules.pms.data.*;
+import com.xujie.sys.modules.pms.entity.PurchaseOrder;
 import com.xujie.sys.modules.pms.entity.vo.CheckSubDetailValueVo;
 import com.xujie.sys.modules.pms.mapper.PqcMapper;
 import com.xujie.sys.modules.pms.mapper.QcDao;
@@ -24,10 +26,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-import java.util.TreeSet;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
@@ -687,4 +686,35 @@ public class PqcServiceImpl implements PqcService {
                 ));
         return collect;
     }
+//
+//    @Override
+//    public List<QcPqcRecordOperation> queytOperationList() {
+//        List<QcPqcRecordOperation> list = pqcMapper.queytOperationList();
+//        return list;
+//    }
+//
+//    @Override
+//    public IPage<UserDefaultOperation> queryUserDefaultOperationList(UserDefaultOperation userDefaultOperation) {
+//        Page<UserDefaultOperation> page = new Page<>(userDefaultOperation.getPage(), userDefaultOperation.getPageCount());
+//
+//        return pqcMapper.queryUserDefaultOperationList(page,userDefaultOperation);
+//    }
+//
+//    @Override
+//    public int saveUserDefaultOperation(UserDefaultOperation userDefaultOperation) {
+//        int i = pqcMapper.saveUserDefaultOperation(userDefaultOperation);
+//        return i;
+//    }
+//
+//    @Override
+//    public List<UserDefaultOperation> queryUserDefaultOperationListByUsername(String username) {
+//        List<UserDefaultOperation> list = pqcMapper.queryUserDefaultOperationListByUsername(username);
+//        return list;
+//    }
+//
+//    @Override
+//    public List<Part> queryPartDescByNo(QcFAIRecordData data) {
+//        List<Part> list = pqcMapper.queryPartDescByNo(data);
+//        return list;
+//    }
 }