From 00c23dd7d4a8f229d5c7fbe3439c6ea230fa7f48 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期三, 09 四月 2025 16:20:21 +0800
Subject: [PATCH] 成品检验查询功能开发
---
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java | 180 ++++++++++++++++++++++++++++++-----------------------------
1 files changed, 92 insertions(+), 88 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java
index 4c81840..d02085a 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java
@@ -12,20 +12,35 @@
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.basic.dto.FactoryDto;
-import com.ruoyi.basic.dto.LaboratoryDto;
+import com.ruoyi.basic.dto.*;
+import com.ruoyi.basic.pojo.IfsInventoryQuantity;
+import com.ruoyi.common.constant.InsOrderTypeConstants;
+import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.core.domain.entity.User;
+import com.ruoyi.common.config.WechatProperty;
+import com.ruoyi.common.utils.LimsDateUtil;
+import com.ruoyi.common.utils.QueryWrappers;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.WxCpUtils;
+import com.ruoyi.inspect.dto.CopperInsOrderDto;
import com.ruoyi.inspect.dto.RawMaterialStandardTreeDto;
-import com.ruoyi.basic.dto.SampleTypeDto;
import com.ruoyi.basic.mapper.IfsInventoryQuantityMapper;
import com.ruoyi.basic.mapper.StandardTreeMapper;
+import com.ruoyi.inspect.dto.SampleProductDto;
+import com.ruoyi.inspect.mapper.InsOrderMapper;
+import com.ruoyi.inspect.mapper.InsProductMapper;
+import com.ruoyi.inspect.mapper.InsSampleMapper;
import com.ruoyi.inspect.pojo.InsOrder;
+import com.ruoyi.inspect.pojo.InsReport;
import com.ruoyi.inspect.service.InsOrderService;
+import com.ruoyi.inspect.service.InsReportService;
import com.ruoyi.inspect.service.RawMaterialOrderService;
import com.ruoyi.common.numgen.NumberGenerator;
import com.ruoyi.framework.exception.ErrorException;
+import com.ruoyi.performance.mapper.AuxiliaryOutputWorkingHoursMapper;
+import com.ruoyi.performance.pojo.AuxiliaryOutputWorkingHours;
import com.ruoyi.system.mapper.UserMapper;
import lombok.AllArgsConstructor;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
@@ -53,7 +68,6 @@
private StandardTreeMapper standardTreeMapper;
private IfsInventoryQuantityMapper ifsInventoryQuantityMapper;
- private GetLook getLook;
private UserMapper userMapper;
private InsOrderService insOrderService;
private InsOrderMapper insOrderMapper;
@@ -67,83 +81,77 @@
@Override
- public RawMaterialStandardTreeDto selectStandardTreeListByPartNo(String partNo) {
- if (StringUtils.isBlank(partNo)) {
- throw new ErrorException("闆朵欢鍙蜂涪澶�");
- }
+ public Result selectStandardTreeListByPartNo(String partNo) {
List<FactoryDto> factoryDtos = standardTreeMapper.selectStandardTreeListByPartNo(partNo);
if (CollectionUtil.isEmpty(factoryDtos)) {
- throw new ErrorException("闆朵欢鍙蜂负" + partNo + "鐨勫師鏉愭枡娌℃湁瀵瑰簲鐨勬爣鍑嗗簱閰嶇疆");
+ return Result.success(null, "闆朵欢鍙蜂负" + partNo + "鐨勫師鏉愭枡娌℃湁瀵瑰簲鐨勬爣鍑嗗簱閰嶇疆");
}
RawMaterialStandardTreeDto rawMaterialStandardTreeDto = new RawMaterialStandardTreeDto();
for (FactoryDto factoryDto : factoryDtos) {
for (LaboratoryDto laboratoryDto : factoryDto.getChildren()) {
- for (SampleTypeDto sampleTypeDto : laboratoryDto.getChildren()) {
- if (sampleTypeDto.getChildren().size() == 0) {
- sampleTypeDto.setChildren(standardTreeMapper.getStandardTree3(sampleTypeDto.getValue()));
- }
- // 鍒ゆ柇缁戝畾鐨勬槸鍚︽槸褰撳墠闆朵欢鍙�
- if (sampleTypeDto.getPartNo() != null && sampleTypeDto.getPartNo().equals(partNo)) {
- // 娣诲姞瀵硅薄
- rawMaterialStandardTreeDto.setTreeName(factoryDto.getValue() + "-"
- + laboratoryDto.getValue() + "-"
- + sampleTypeDto.getValue());
- rawMaterialStandardTreeDto.setCode(sampleTypeDto.getCode());
- rawMaterialStandardTreeDto.setLabel(sampleTypeDto.getLabel());
- rawMaterialStandardTreeDto.setValue(sampleTypeDto.getValue());
- rawMaterialStandardTreeDto.setChildren1(sampleTypeDto.getChildren());
- } else {
- for (SampleDto sampleDto : sampleTypeDto.getChildren()) {
- if (sampleDto.getPartNo() != null && sampleDto.getPartNo().equals(partNo)) {
+ for (ObjectTypeDto objectTypeDto : laboratoryDto.getChildren()) {
+ for (WorkShopNameDto workShopNameDto : objectTypeDto.getChildren()) {
+ for (SampleTypeDto sampleTypeDto : workShopNameDto.getChildren()) {
+ if (sampleTypeDto.getChildren().size() == 0) {
+ sampleTypeDto.setChildren(standardTreeMapper.getStandardTree3(sampleTypeDto.getValue()));
+ }
+ // 鍒ゆ柇缁戝畾鐨勬槸鍚︽槸褰撳墠闆朵欢鍙�
+ if (sampleTypeDto.getPartNo() != null && sampleTypeDto.getPartNo().equals(partNo)) {
// 娣诲姞瀵硅薄
rawMaterialStandardTreeDto.setTreeName(factoryDto.getValue() + "-"
- + laboratoryDto.getValue() + "-"
- + sampleTypeDto.getValue() + "-"
- + sampleDto.getValue());
- rawMaterialStandardTreeDto.setCode(sampleDto.getCode());
- rawMaterialStandardTreeDto.setLabel(sampleDto.getLabel());
- rawMaterialStandardTreeDto.setValue(sampleDto.getValue());
- rawMaterialStandardTreeDto.setChildren2(sampleDto.getChildren());
+ + laboratoryDto.getValue() + "-" + objectTypeDto.getValue() + "-" + workShopNameDto.getValue() + "-"
+ + sampleTypeDto.getValue());
+ rawMaterialStandardTreeDto.setCode(sampleTypeDto.getCode());
+ rawMaterialStandardTreeDto.setLabel(sampleTypeDto.getLabel());
+ rawMaterialStandardTreeDto.setValue(sampleTypeDto.getValue());
+ rawMaterialStandardTreeDto.setChildren1(sampleTypeDto.getChildren());
+ rawMaterialStandardTreeDto.setWorkShopName(sampleTypeDto.getWorkShopName());
+ rawMaterialStandardTreeDto.setWorkShopId(sampleTypeDto.getWorkShopId());
+ } else {
+ for (SampleDto sampleDto : sampleTypeDto.getChildren()) {
+ if (sampleDto.getPartNo() != null && sampleDto.getPartNo().equals(partNo)) {
+ // 娣诲姞瀵硅薄
+ rawMaterialStandardTreeDto.setTreeName(factoryDto.getValue() + "-"
+ + laboratoryDto.getValue() + "-" + objectTypeDto.getValue() + "-" + workShopNameDto.getValue() + "-"
+ + sampleTypeDto.getValue() + "-"
+ + sampleDto.getValue());
+ rawMaterialStandardTreeDto.setCode(sampleDto.getCode());
+ rawMaterialStandardTreeDto.setLabel(sampleDto.getLabel());
+ rawMaterialStandardTreeDto.setValue(sampleDto.getValue());
+ rawMaterialStandardTreeDto.setChildren2(sampleDto.getChildren());
+ rawMaterialStandardTreeDto.setWorkShopName(sampleTypeDto.getWorkShopName());
+ rawMaterialStandardTreeDto.setWorkShopId(sampleTypeDto.getWorkShopId());
+ }
+ }
}
}
}
}
}
}
- return rawMaterialStandardTreeDto;
+ return Result.success(rawMaterialStandardTreeDto);
}
@Override
- public Map<String, Object> getWarehouseSubmit(IPage<IfsInventoryQuantity> page, IfsInventoryQuantity ifsInventoryQuantity) {
- Map<String, Object> map = new HashMap<>();
- map.put("head", PrintChina.printChina(IfsInventoryQuantity.class));
- map.put("body", standardTreeMapper.selectIfsPage(page, QueryWrappers.queryWrappers(ifsInventoryQuantity)));
- return map;
+ public IPage<IfsInventoryQuantity> getWarehouseSubmit(IPage<IfsInventoryQuantity> page, IfsInventoryQuantity ifsInventoryQuantity) {
+ return standardTreeMapper.selectIfsPage(page, QueryWrappers.queryWrappers(ifsInventoryQuantity));
}
@Override
- public Map<String, Object> getIfsByStateOne(IPage<IfsInventoryQuantityDto> page, IfsInventoryQuantityDto ifsInventoryQuantityDto) {
- Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("getIfsByStateOne");
- if (map1.get("look") == 1) {
- //涓汉
- ifsInventoryQuantityDto.setCreateUser(map1.get("userId"));
- }
- Map<String, Object> map = new HashMap<>();
-// ifsInventoryQuantityDto.setOrderState(null);
- map.put("head", PrintChina.printChina(IfsInventoryQuantityDto.class));
- map.put("body", standardTreeMapper.getIfsByStateOne(page, QueryWrappers.queryWrappers(ifsInventoryQuantityDto)));
- return map;
+ public IPage<IfsInventoryQuantityDto> getIfsByStateOne(IPage<IfsInventoryQuantityDto> page, IfsInventoryQuantityDto ifsInventoryQuantityDto) {
+ return standardTreeMapper.getIfsByStateOne(page, QueryWrappers.queryWrappers(ifsInventoryQuantityDto));
}
/**
* 鎶ユ
+ *
* @param ids
* @return
*/
@Override
public int inspectionReport(List<Integer> ids) {
- Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
+ Integer userId = SecurityUtils.getUserId().intValue();
ifsInventoryQuantityMapper.update(null, Wrappers.<IfsInventoryQuantity>lambdaUpdate()
.in(IfsInventoryQuantity::getId, ids)
.set(IfsInventoryQuantity::getDeclareUser, userMapper.selectById(userId).getName())
@@ -181,6 +189,7 @@
/**
* 鎾ら攢鎶ユ
+ *
* @param id
* @return
*/
@@ -194,6 +203,7 @@
/**
* 鎵撳嵃鏍囩鏌ヨ
+ *
* @param ids
* @return
*/
@@ -204,12 +214,13 @@
/**
* 鎶ユ
+ *
* @param ifsInventoryQuantity
* @return
*/
@Override
public int inspectionReportOne(IfsInventoryQuantity ifsInventoryQuantity) {
- Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
+ Integer userId = SecurityUtils.getUserId().intValue();
ifsInventoryQuantityMapper.update(null, Wrappers.<IfsInventoryQuantity>lambdaUpdate()
.eq(IfsInventoryQuantity::getId, ifsInventoryQuantity.getId())
.set(IfsInventoryQuantity::getDeclareUser, userMapper.selectById(userId).getName())
@@ -234,6 +245,7 @@
/**
* 鑾峰彇閾滀骇涓氶摼妫�娴嬫暟鎹�
+ *
* @param id
* @return
*/
@@ -244,6 +256,7 @@
/**
* 鍘熸潗鏂欐挙閿�鎺ュ彛
+ *
* @param ifsInventoryId
* @return
*/
@@ -270,6 +283,7 @@
/**
* 鍘熸潗鏂欏厤妫�涓嬪崟
+ *
* @param list
* @param insOrder
* @return
@@ -346,44 +360,38 @@
/**
* 鏌ヨ寰呬笅鍗�
+ *
* @param page
* @param ifsInventoryQuantity
* @return
*/
@Override
- public Map<String, Object> selectIfsInventoryQuantity(Page<IfsInventoryQuantityCheckDto> page, IfsInventoryQuantityCheckDto ifsInventoryQuantity) {
- Map<String, Object> map = new HashMap<>();
- map.put("head", PrintChina.printChina(IfsInventoryQuantityCheckDto.class));
- map.put("body", standardTreeMapper.selectIfsInventoryQuantity(page, QueryWrappers.queryWrappers(ifsInventoryQuantity)));
- return map;
+ public IPage<IfsInventoryQuantityCheckDto> selectIfsInventoryQuantity(Page<IfsInventoryQuantityCheckDto> page, IfsInventoryQuantityCheckDto ifsInventoryQuantity) {
+ return standardTreeMapper.selectIfsInventoryQuantity(page, QueryWrappers.queryWrappers(ifsInventoryQuantity));
}
/**
* 鏌ヨ宸叉楠�
+ *
* @param page
* @param ifsInventoryQuantityDto
* @return
*/
@Override
- public Map<String, Object> getIfsByOver(Page<IfsInventoryQuantitySupplierDto> page, IfsInventoryQuantitySupplierDto ifsInventoryQuantityDto) {
- Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("getIfsByStateOne");
- if (map1.get("look") == 1) {
- //涓汉
- ifsInventoryQuantityDto.setCreateUser(map1.get("userId"));
- }
+ public IPage<IfsInventoryQuantitySupplierDto> getIfsByOver(Page<IfsInventoryQuantitySupplierDto> page, IfsInventoryQuantitySupplierDto ifsInventoryQuantityDto) {
+ // todo: 鍙湅鎴�
String beginDeclareDate = ifsInventoryQuantityDto.getBeginDeclareDate();
String endDeclareDate = ifsInventoryQuantityDto.getEndDeclareDate();
ifsInventoryQuantityDto.setBeginDeclareDate(null);
ifsInventoryQuantityDto.setEndDeclareDate(null);
- Map<String, Object> map = new HashMap<>();
- map.put("head", PrintChina.printChina(IfsInventoryQuantitySupplierDto.class));
- map.put("body", standardTreeMapper.getIfsByOver(page, QueryWrappers.queryWrappers(ifsInventoryQuantityDto), beginDeclareDate, endDeclareDate));
- return map;
+ IPage<IfsInventoryQuantitySupplierDto> ifsByOver = standardTreeMapper.getIfsByOver(page, QueryWrappers.queryWrappers(ifsInventoryQuantityDto), beginDeclareDate, endDeclareDate);
+ return ifsByOver;
}
/**
* 鍒犻櫎鍘熸潗鏂欐姤妫�淇℃伅
+ *
* @param id
* @return
*/
@@ -394,6 +402,7 @@
/**
* 鍘熸潗鏂欐斁琛屽厤妫�
+ *
* @param ifsInventoryId
* @return
*/
@@ -447,8 +456,9 @@
/**
* 0, 鏃犳彁绀�, 1鎻愮ず 褰撳墠鎵规鐨勬牱鍝佸凡妫�楠岃繃, 鍙互鍏嶆, 2 鎻愮ず 褰撳墠鎵规鐨勬牱鍝佸凡瓒�20鍚�, 闇�瑕佸绾у娆℃楠�
- *
+ * <p>
* 鍘熸潗鏂欎笅鍗曢�氱煡鍏嶆鎴栬�呭娆℃楠�
+ *
* @param ifsInventoryId
* @return
*/
@@ -488,6 +498,7 @@
/**
* 鎶ユ鍙互鏂板鎶ユ淇℃伅
+ *
* @param ifsInventoryQuantity
*/
@Override
@@ -498,17 +509,10 @@
ifsInventoryQuantityMapper.insert(ifsInventoryQuantity);
}
- @Override
- public void shiftingParking(List<Integer> ids) {
- for (Integer id : ids) {
- InsOrder order = insOrderService.getById(id);
- // todo: ifs鐩存帴绉诲簱
- insReportService.isRawMaterial(order);
- }
- }
/**
* 閾滃崟涓濅笅鍗曞厤妫�
+ *
* @param list
* @param insOrder
*/
@@ -605,6 +609,7 @@
/**
* 鍘熸潗鏂欒繘鍘傛挙閿�涓嬪崟
+ *
* @param enterOrderId
* @return
*/
@@ -643,6 +648,7 @@
/**
* 鍘熸潗鏂欏搴︽挙閿�涓嬪崟
+ *
* @param quarterOrderId
* @return
*/
@@ -683,6 +689,7 @@
/**
* 鍘熸潗鏂欐姤妫�鍏ㄩ儴淇℃伅瀵煎嚭
+ *
* @param ifsInventoryQuantityDto
* @param response
*/
@@ -745,30 +752,26 @@
/**
* 鍘熸潗鏂欐煡璇㈠彲浠ュ搴︽楠岀殑鍐呭
+ *
* @param page
* @param ifsInventoryQuantityDto
* @return
*/
@Override
- public Map<String, Object> getIfsByQuarter(Page page, IfsInventoryQuantitySupplierDto ifsInventoryQuantityDto) {
- Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("getIfsByStateOne");
- if (map1.get("look") == 1) {
- //涓汉
- ifsInventoryQuantityDto.setCreateUser(map1.get("userId"));
- }
+ public IPage<IfsInventoryQuantitySupplierDto> getIfsByQuarter(Page page, IfsInventoryQuantitySupplierDto ifsInventoryQuantityDto) {
+
+ // todo: 鍙湅鎴�
String beginDeclareDate = ifsInventoryQuantityDto.getBeginDeclareDate();
String endDeclareDate = ifsInventoryQuantityDto.getEndDeclareDate();
ifsInventoryQuantityDto.setBeginDeclareDate(null);
ifsInventoryQuantityDto.setEndDeclareDate(null);
- Map<String, Object> map = new HashMap<>();
- map.put("head", PrintChina.printChina(IfsInventoryQuantitySupplierDto.class));
- map.put("body", standardTreeMapper.getIfsByQuarter(page, QueryWrappers.queryWrappers(ifsInventoryQuantityDto), beginDeclareDate, endDeclareDate));
- return map;
+ return standardTreeMapper.getIfsByQuarter(page, QueryWrappers.queryWrappers(ifsInventoryQuantityDto), beginDeclareDate, endDeclareDate);
}
/**
* 鎻愬墠鍏ュ簱
+ *
* @param ifsInventoryId
* @return
*/
@@ -796,6 +799,7 @@
/**
* 娣诲姞宸ユ椂
+ *
* @param insOrder
* @param ifsInventoryQuantity
*/
@@ -817,7 +821,7 @@
DateTime parse = DateUtil.parse(localDateTime.format(formatter));
auxiliaryOutputWorkingHours.setWeekDay(getWeek(localDateTime.format(formatters)));//鏄熸湡
auxiliaryOutputWorkingHours.setWeek(String.valueOf(DateUtil.weekOfYear(DateUtil.offsetDay(parse, 1))));//鍛ㄦ
- auxiliaryOutputWorkingHours.setCheck(getLook.selectPowerByMethodAndUserId(null).get("userId"));//妫�娴嬩汉
+ auxiliaryOutputWorkingHours.setCheck(SecurityUtils.getUserId().intValue());//妫�娴嬩汉
auxiliaryOutputWorkingHours.setPrice(new BigDecimal("1"));//鍗曚环
auxiliaryOutputWorkingHoursMapper.insert(auxiliaryOutputWorkingHours);
--
Gitblit v1.9.3