From 3460c1b4136bc1e521c67ea3054c7f9531c7a549 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=AE=8F=E6=96=8C?= <2164406372@qq.com> Date: Mon, 23 Jun 2025 10:47:12 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=A4=87=E5=93=81?= =?UTF-8?q?=E5=A4=87=E4=BB=B6=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=E5=8F=96?= =?UTF-8?q?=E6=B6=88=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xujie/sys/modules/pms/entity/PurchaseOrder.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/com/xujie/sys/modules/pms/entity/PurchaseOrder.java b/src/main/java/com/xujie/sys/modules/pms/entity/PurchaseOrder.java index 332043b0..1c65f7f0 100644 --- a/src/main/java/com/xujie/sys/modules/pms/entity/PurchaseOrder.java +++ b/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; } From 1c768b7fa2a112342579185e8e3c8d24f6b82ab7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=AE=8F=E6=96=8C?= <2164406372@qq.com> Date: Mon, 23 Jun 2025 10:50:15 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=A4=87=E5=93=81?= =?UTF-8?q?=E5=A4=87=E4=BB=B6=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=E5=8F=96?= =?UTF-8?q?=E6=B6=88=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pms/service/Impl/PqcServiceImpl.java | 38 +++++++++++++++++-- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/PqcServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/PqcServiceImpl.java index 8dea78d6..c022936a 100644 --- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/PqcServiceImpl.java +++ b/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 queytOperationList() { + List list = pqcMapper.queytOperationList(); + return list; + } + + @Override + public IPage queryUserDefaultOperationList(UserDefaultOperation userDefaultOperation) { + Page 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 queryUserDefaultOperationListByUsername(String username) { + List list = pqcMapper.queryUserDefaultOperationListByUsername(username); + return list; + } + + @Override + public List queryPartDescByNo(QcFAIRecordData data) { + List list = pqcMapper.queryPartDescByNo(data); + return list; + } } From 906805843f8689acb37223b78aea7df4c3c2b92c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=AE=8F=E6=96=8C?= <2164406372@qq.com> Date: Mon, 23 Jun 2025 11:09:55 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=A6=86=E7=9B=96=E4=B8=8A=E6=AC=A1?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pms/service/Impl/PqcServiceImpl.java | 62 +++++++++---------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/PqcServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/PqcServiceImpl.java index c022936a..2801b64a 100644 --- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/PqcServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/PqcServiceImpl.java @@ -686,35 +686,35 @@ public class PqcServiceImpl implements PqcService { )); return collect; } - - @Override - public List queytOperationList() { - List list = pqcMapper.queytOperationList(); - return list; - } - - @Override - public IPage queryUserDefaultOperationList(UserDefaultOperation userDefaultOperation) { - Page 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 queryUserDefaultOperationListByUsername(String username) { - List list = pqcMapper.queryUserDefaultOperationListByUsername(username); - return list; - } - - @Override - public List queryPartDescByNo(QcFAIRecordData data) { - List list = pqcMapper.queryPartDescByNo(data); - return list; - } +// +// @Override +// public List queytOperationList() { +// List list = pqcMapper.queytOperationList(); +// return list; +// } +// +// @Override +// public IPage queryUserDefaultOperationList(UserDefaultOperation userDefaultOperation) { +// Page 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 queryUserDefaultOperationListByUsername(String username) { +// List list = pqcMapper.queryUserDefaultOperationListByUsername(username); +// return list; +// } +// +// @Override +// public List queryPartDescByNo(QcFAIRecordData data) { +// List list = pqcMapper.queryPartDescByNo(data); +// return list; +// } }