From 49c3ba90feb4f14fb2f0c911aadeb865bb07f26f Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期一, 01 六月 2026 13:59:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_新疆马铃薯pro' into dev_新疆马铃薯pro
---
src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java | 155 ++++++++++++++++++++++++++++--
src/main/java/com/ruoyi/stock/pojo/StockInventory.java | 3
src/main/java/com/ruoyi/quality/dto/BatchQuickInspectRequest.java | 42 ++++++++
src/main/java/com/ruoyi/stock/pojo/StockInRecord.java | 3
src/main/java/com/ruoyi/quality/service/IQualityInspectService.java | 6
src/main/resources/mapper/stock/StockInventoryMapper.xml | 23 +++
docs/大罗素.sql | 7 +
src/main/java/com/ruoyi/stock/service/impl/StockInRecordServiceImpl.java | 2
src/main/resources/mapper/quality/QualityInspectMapper.xml | 4
src/main/java/com/ruoyi/quality/controller/QualityInspectController.java | 7
src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java | 2
src/main/resources/mapper/stock/StockUninventoryMapper.xml | 3
src/main/java/com/ruoyi/stock/pojo/StockUninventory.java | 3
src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java | 13 ++
14 files changed, 250 insertions(+), 23 deletions(-)
diff --git "a/docs/\345\244\247\347\275\227\347\264\240.sql" "b/docs/\345\244\247\347\275\227\347\264\240.sql"
new file mode 100644
index 0000000..12af2f4
--- /dev/null
+++ "b/docs/\345\244\247\347\275\227\347\264\240.sql"
@@ -0,0 +1,7 @@
+
+alter table stock_inventory
+ add warehouse varchar(255) null comment '浠撳簱';
+alter table stock_uninventory
+ add warehouse varchar(255) null comment '浠撳簱';
+alter table stock_in_record
+ add warehouse varchar(255) null comment '浠撳簱';
diff --git a/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java b/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java
index 88f0576..676c915 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java
@@ -5,6 +5,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.quality.dto.BatchQuickInspectRequest;
import com.ruoyi.quality.dto.QualityInspectDto;
import com.ruoyi.quality.pojo.QualityInspect;
import com.ruoyi.quality.pojo.QualityInspectFile;
@@ -143,13 +144,13 @@
}
/**
- * 鎵归噺蹇�熸楠岋細涓�閿�氳繃骞舵彁浜�
+ * 鎵归噺蹇�熸楠岋細鏀寔鍘熸潗鏂欐楠屻�佽繃绋嬫楠屻�佸嚭鍘傛楠�
*/
@PostMapping("/batchQuickInspect")
@Operation(summary = "鎵归噺蹇�熸楠�")
@Log(title = "鎵归噺蹇�熸楠�", businessType = BusinessType.OTHER)
- public R<?> batchQuickInspect(@RequestBody List<Long> ids) {
- return qualityInspectService.batchQuickInspect(ids);
+ public R<?> batchQuickInspect(@RequestBody BatchQuickInspectRequest request) {
+ return qualityInspectService.batchQuickInspect(request);
}
/**
diff --git a/src/main/java/com/ruoyi/quality/dto/BatchQuickInspectRequest.java b/src/main/java/com/ruoyi/quality/dto/BatchQuickInspectRequest.java
new file mode 100644
index 0000000..6342539
--- /dev/null
+++ b/src/main/java/com/ruoyi/quality/dto/BatchQuickInspectRequest.java
@@ -0,0 +1,42 @@
+package com.ruoyi.quality.dto;
+
+import com.ruoyi.quality.pojo.QualityInspectParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+public class BatchQuickInspectRequest {
+
+ @Schema(description = "妫�楠屽崟ID鍒楄〃")
+ private List<Long> ids;
+
+ @Schema(description = "妫�娴嬬粨鏋滐細鍚堟牸/涓嶅悎鏍�/閮ㄥ垎鍚堟牸")
+ private String checkResult;
+
+ @Schema(description = "鎸囨爣鏍囧噯ID")
+ private Long testStandardId;
+
+ @Schema(description = "鎬绘暟閲�")
+ private BigDecimal quantity;
+
+ @Schema(description = "鍚堟牸鏁伴噺")
+ private BigDecimal qualifiedQuantity;
+
+ @Schema(description = "涓嶅悎鏍兼暟閲�")
+ private BigDecimal unqualifiedQuantity;
+
+ @Schema(description = "妫�娴嬪崟浣�")
+ private String checkCompany;
+
+ @Schema(description = "妫�楠屽憳濮撳悕")
+ private String checkName;
+
+ @Schema(description = "妫�娴嬫棩鏈燂紝鏍煎紡锛歒YYY-MM-DD")
+ private String checkTime;
+
+ @Schema(description = "妫�楠屽弬鏁板垪琛�")
+ private List<QualityInspectParam> paramList;
+}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/quality/service/IQualityInspectService.java b/src/main/java/com/ruoyi/quality/service/IQualityInspectService.java
index ee27be0..2562995 100644
--- a/src/main/java/com/ruoyi/quality/service/IQualityInspectService.java
+++ b/src/main/java/com/ruoyi/quality/service/IQualityInspectService.java
@@ -4,11 +4,11 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.quality.dto.BatchQuickInspectRequest;
import com.ruoyi.quality.dto.QualityInspectDto;
import com.ruoyi.quality.pojo.QualityInspect;
import jakarta.servlet.http.HttpServletResponse;
-import java.util.List;
public interface IQualityInspectService extends IService<QualityInspect> {
@@ -28,9 +28,9 @@
R autoSubmit(Long id);
/**
- * 鎵归噺蹇�熸楠岋細涓�閿�氳繃骞舵彁浜�
+ * 鎵归噺蹇�熸楠�
*/
- R batchQuickInspect(List<Long> ids);
+ R batchQuickInspect(BatchQuickInspectRequest request);
void down(HttpServletResponse response, QualityInspect qualityInspect);
}
diff --git a/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java b/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
index 6b38c30..590700d 100644
--- a/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
+++ b/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
@@ -17,6 +17,7 @@
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.procurementrecord.service.ProcurementRecordService;
import com.ruoyi.procurementrecord.utils.StockUtils;
+import com.ruoyi.quality.dto.BatchQuickInspectRequest;
import com.ruoyi.quality.dto.QualityInspectDto;
import com.ruoyi.quality.mapper.QualityInspectMapper;
import com.ruoyi.quality.mapper.QualityTestStandardMapper;
@@ -35,14 +36,17 @@
import lombok.AllArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import java.io.InputStream;
import java.io.OutputStream;
import java.math.BigDecimal;
import java.net.URLEncoder;
+import java.sql.Date;
import java.time.LocalDate;
import java.time.LocalDateTime;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
@@ -187,21 +191,150 @@
}
@Override
- public R batchQuickInspect(List<Long> ids) {
- if (ids == null || ids.isEmpty()) {
+ public R batchQuickInspect(BatchQuickInspectRequest request) {
+ // 1. 鏁版嵁鏍￠獙
+ if (request.getIds() == null || request.getIds().isEmpty()) {
return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃楠屽崟");
}
- int success = 0;
- int fail = 0;
- for (Long id : ids) {
- R result = autoSubmit(id);
- if (R.isSuccess(result)) {
- success++;
- } else {
- fail++;
+ List<String> validResults = Arrays.asList("鍚堟牸", "涓嶅悎鏍�", "閮ㄥ垎鍚堟牸");
+ if (!validResults.contains(request.getCheckResult())) {
+ return R.fail("妫�娴嬬粨鏋滃繀椤讳负锛氬悎鏍笺�佷笉鍚堟牸銆侀儴鍒嗗悎鏍�");
+ }
+ if (request.getQuantity() == null || request.getQuantity().compareTo(BigDecimal.ZERO) <= 0) {
+ return R.fail("鎬绘暟閲忓繀椤诲ぇ浜�0");
+ }
+ if (request.getTestStandardId() == null) {
+ return R.fail("鎸囨爣鏍囧噯ID涓嶈兘涓虹┖");
+ }
+ // quantity = qualifiedQuantity + unqualifiedQuantity
+ BigDecimal qty = request.getQuantity();
+ BigDecimal qualified = request.getQualifiedQuantity() != null ? request.getQualifiedQuantity() : BigDecimal.ZERO;
+ BigDecimal unqualified = request.getUnqualifiedQuantity() != null ? request.getUnqualifiedQuantity() : BigDecimal.ZERO;
+ if (qty.compareTo(qualified.add(unqualified)) != 0) {
+ return R.fail("鎬绘暟閲忓繀椤荤瓑浜庡悎鏍兼暟閲忓姞涓嶅悎鏍兼暟閲�");
+ }
+ String checkResult = request.getCheckResult();
+ if ("鍚堟牸".equals(checkResult)) {
+ if (qualified.compareTo(qty) != 0 || unqualified.compareTo(BigDecimal.ZERO) != 0) {
+ return R.fail("妫�楠岀粨鏋滀负鍚堟牸鏃讹紝鍚堟牸鏁伴噺搴旂瓑浜庢�绘暟閲忥紝涓嶅悎鏍兼暟閲忓簲涓�0");
+ }
+ } else if ("涓嶅悎鏍�".equals(checkResult)) {
+ if (qualified.compareTo(BigDecimal.ZERO) != 0 || unqualified.compareTo(qty) != 0) {
+ return R.fail("妫�楠岀粨鏋滀负涓嶅悎鏍兼椂锛屽悎鏍兼暟閲忓簲涓�0锛屼笉鍚堟牸鏁伴噺搴旂瓑浜庢�绘暟閲�");
+ }
+ } else {
+ if (qualified.compareTo(BigDecimal.ZERO) <= 0 || unqualified.compareTo(BigDecimal.ZERO) <= 0) {
+ return R.fail("妫�楠岀粨鏋滀负閮ㄥ垎鍚堟牸鏃讹紝鍚堟牸鏁伴噺鍜屼笉鍚堟牸鏁伴噺閮藉繀椤诲ぇ浜�0");
}
}
- return R.ok(String.format("蹇�熸楠屽畬鎴愶細鎴愬姛 %d 鏉★紝澶辫触 %d 鏉�", success, fail));
+
+ // 瑙ｆ瀽妫�娴嬫棩鏈�
+ Date checkTimeDate = null;
+ if (request.getCheckTime() != null && !request.getCheckTime().isEmpty()) {
+ checkTimeDate = Date.valueOf(LocalDate.parse(request.getCheckTime()));
+ }
+
+ int success = 0;
+ List<String> errors = new ArrayList<>();
+
+ for (Long id : request.getIds()) {
+ try {
+ // 浣跨敤鐙珛浜嬪姟澶勭悊姣忎釜妫�楠屽崟锛岄伩鍏嶅崟涓け璐ュ奖鍝嶆暣浣撲簨鍔�
+ processSingleInspect(id, request, checkResult, qty, qualified, unqualified, checkTimeDate);
+ success++;
+ } catch (Exception e) {
+ errors.add("妫�楠屽崟 " + id + " 澶勭悊澶辫触锛�" + e.getMessage());
+ }
+ }
+
+ if (!errors.isEmpty()) {
+ return R.ok(String.format("蹇�熸楠屽畬鎴愶細鎴愬姛 %d 鏉★紝澶辫触 %d 鏉°�傚け璐ュ師鍥狅細%s",
+ success, errors.size(), String.join("锛�", errors)));
+ }
+ return R.ok(String.format("蹇�熸楠屽畬鎴愶細鎴愬姛 %d 鏉�", success));
+ }
+
+ /**
+ * 鍦ㄧ嫭绔嬩簨鍔′腑澶勭悊鍗曚釜妫�楠屽崟
+ */
+ @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRES_NEW)
+ public void processSingleInspect(Long id, BatchQuickInspectRequest request,
+ String checkResult, BigDecimal qty,
+ BigDecimal qualified, BigDecimal unqualified,
+ Date checkTimeDate) {
+ QualityInspect qualityInspect = qualityInspectMapper.selectById(id);
+ if (qualityInspect == null) {
+ throw new RuntimeException("妫�楠屽崟涓嶅瓨鍦�");
+ }
+ if (Integer.valueOf(1).equals(qualityInspect.getInspectState())) {
+ throw new RuntimeException("妫�楠屽崟宸叉彁浜�");
+ }
+
+ // 2. 鏇存柊妫�楠屽崟瀛楁
+ qualityInspect.setCheckResult(checkResult);
+ qualityInspect.setTestStandardId(request.getTestStandardId());
+ qualityInspect.setQuantity(qty);
+ qualityInspect.setQualifiedQuantity(qualified);
+ qualityInspect.setUnqualifiedQuantity(unqualified);
+ if (request.getCheckCompany() != null) {
+ qualityInspect.setCheckCompany(request.getCheckCompany());
+ }
+ if (request.getCheckName() != null) {
+ qualityInspect.setCheckName(request.getCheckName());
+ }
+ if (checkTimeDate != null) {
+ qualityInspect.setCheckTime(checkTimeDate);
+ }
+ qualityInspect.setInspectState(1);
+
+ // 3. 淇濆瓨妫�楠屽弬鏁�
+ if (request.getParamList() != null && !request.getParamList().isEmpty()) {
+ qualityInspectParamService.remove(Wrappers.<QualityInspectParam>lambdaQuery()
+ .eq(QualityInspectParam::getInspectId, id));
+ for (QualityInspectParam param : request.getParamList()) {
+ param.setInspectId(id);
+ param.setId(null);
+ }
+ qualityInspectParamService.saveBatch(request.getParamList());
+ }
+
+ // 4. 鏇存柊妫�楠屽崟
+ qualityInspectMapper.updateById(qualityInspect);
+
+ // 5. 鍚堟牸鍏ュ簱澶勭悊
+ if (qualified.compareTo(BigDecimal.ZERO) > 0) {
+ StockInventoryDto stockInventoryDto = new StockInventoryDto();
+ stockInventoryDto.setRecordType(String.valueOf(StockInQualifiedRecordTypeEnum.QUALITYINSPECT_STOCK_IN.getCode()));
+ if (ObjectUtils.isNotEmpty(qualityInspect.getPurchaseLedgerId())) {
+ stockInventoryDto.setRecordType(String.valueOf(StockInQualifiedRecordTypeEnum.CUSTOMIZATION_UNSTOCK_OUT.getCode()));
+ }
+ stockInventoryDto.setRecordId(qualityInspect.getId());
+ stockInventoryDto.setProductModelId(qualityInspect.getProductModelId());
+ stockInventoryDto.setQualitity(qualified);
+ if (qualityInspect.getCheckTime() != null) {
+ LocalDate stockCreateDate = DateUtils.toLocalDate(qualityInspect.getCheckTime()).plusDays(1);
+ stockInventoryDto.setCreateTime(LocalDateTime.of(stockCreateDate, java.time.LocalTime.MIDNIGHT));
+ }
+ stockInventoryDto.setBatchNo(resolveProductionBatchNo(
+ qualityInspect.getProductMainId(),
+ qualityInspect.getId(),
+ qualityInspect.getProductModelId()));
+ stockInventoryService.addStockInRecordOnly(stockInventoryDto);
+ }
+
+ // 6. 涓嶅悎鏍煎鐞�
+ if (unqualified.compareTo(BigDecimal.ZERO) > 0) {
+ QualityUnqualified qualityUnqualified = new QualityUnqualified();
+ BeanUtils.copyProperties(qualityInspect, qualityUnqualified);
+ qualityUnqualified.setInspectState(0);
+ qualityUnqualified.setQuantity(unqualified);
+ List<QualityInspectParam> inspectParams = qualityInspectParamService.list(
+ Wrappers.<QualityInspectParam>lambdaQuery().eq(QualityInspectParam::getInspectId, id));
+ String text = inspectParams.stream().map(QualityInspectParam::getParameterItem).collect(Collectors.joining(","));
+ qualityUnqualified.setDefectivePhenomena(text + "杩欎簺鎸囨爣涓瓨鍦ㄤ笉鍚堟牸");
+ qualityUnqualified.setInspectId(id);
+ qualityUnqualifiedMapper.insert(qualityUnqualified);
+ }
}
private String resolveProductionBatchNo(Long productionProductMainId,
diff --git a/src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java b/src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java
index a608401..db550dd 100644
--- a/src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java
+++ b/src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java
@@ -22,6 +22,8 @@
@Excel(name = "鎵瑰彿")
private String batchNo;
+ @Excel(name = "浠撳簱")
+ private String warehouse;
@Excel(name = "鍚堟牸搴撳瓨鏁伴噺")
private BigDecimal qualifiedQuantity;
diff --git a/src/main/java/com/ruoyi/stock/pojo/StockInRecord.java b/src/main/java/com/ruoyi/stock/pojo/StockInRecord.java
index d020761..73cd6f1 100644
--- a/src/main/java/com/ruoyi/stock/pojo/StockInRecord.java
+++ b/src/main/java/com/ruoyi/stock/pojo/StockInRecord.java
@@ -73,4 +73,7 @@
@TableField(fill = FieldFill.INSERT)
private Long deptId;
+
+ @Schema(description = "浠撳簱")
+ private String warehouse;
}
diff --git a/src/main/java/com/ruoyi/stock/pojo/StockInventory.java b/src/main/java/com/ruoyi/stock/pojo/StockInventory.java
index 5652ec7..8c9411b 100644
--- a/src/main/java/com/ruoyi/stock/pojo/StockInventory.java
+++ b/src/main/java/com/ruoyi/stock/pojo/StockInventory.java
@@ -72,4 +72,7 @@
@TableField(fill = FieldFill.INSERT)
private Long deptId;
+ @Schema(description = "浠撳簱")
+ private String warehouse;
+
}
diff --git a/src/main/java/com/ruoyi/stock/pojo/StockUninventory.java b/src/main/java/com/ruoyi/stock/pojo/StockUninventory.java
index 6272c2a..1d8b6d5 100644
--- a/src/main/java/com/ruoyi/stock/pojo/StockUninventory.java
+++ b/src/main/java/com/ruoyi/stock/pojo/StockUninventory.java
@@ -68,4 +68,7 @@
@TableField(fill = FieldFill.INSERT)
private Long deptId;
+ @Schema(description = "浠撳簱")
+ private String warehouse;
+
}
diff --git a/src/main/java/com/ruoyi/stock/service/impl/StockInRecordServiceImpl.java b/src/main/java/com/ruoyi/stock/service/impl/StockInRecordServiceImpl.java
index 61aac8b..5f02cca 100644
--- a/src/main/java/com/ruoyi/stock/service/impl/StockInRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/stock/service/impl/StockInRecordServiceImpl.java
@@ -247,6 +247,7 @@
setBatchNo(stockInRecord.getBatchNo());
setRemark(stockInRecord.getRemark());
setWarnNum(stockInRecord.getWarnNum());
+ setWarehouse(stockInRecord.getWarehouse());
setVersion(1);
}});
} else {
@@ -266,6 +267,7 @@
setQualitity(stockInRecord.getStockInNum());
setBatchNo(stockInRecord.getBatchNo());
setRemark(stockInRecord.getRemark());
+ setWarehouse(stockInRecord.getWarehouse());
setVersion(1);
}});
} else {
diff --git a/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java b/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java
index d4b058f..5dc8d4a 100644
--- a/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java
+++ b/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java
@@ -14,6 +14,7 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.project.system.service.ISysDictDataService;
import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import com.ruoyi.stock.dto.StockInRecordDto;
@@ -60,6 +61,7 @@
private final StockUninventoryService stockUninventoryService;
private final SalesLedgerProductMapper salesLedgerProductMapper;
private final ProductModelMapper productModelMapper;
+ private final ISysDictDataService sysDictDataService;
@Override
public IPage<StockInventoryDto> pagestockInventory(Page page, StockInventoryDto stockInventoryDto) {
@@ -171,6 +173,7 @@
stockInRecordDto.setRemark(stockInventoryDto.getRemark());
stockInRecordDto.setWarnNum(stockInventoryDto.getWarnNum());
stockInRecordDto.setCreateTime(stockInventoryDto.getCreateTime());
+ stockInRecordDto.setWarehouse(stockInventoryDto.getWarehouse());
stockInRecordService.add(stockInRecordDto);
return true;
}
@@ -316,6 +319,14 @@
int successCount = 0;
for (StockInventoryExportData dto : list) {
+ // 楠岃瘉浠撳簱鏄惁瀛樺湪浜庡瓧鍏镐腑
+ if (StringUtils.isNotEmpty(dto.getWarehouse())) {
+ String warehouseLabel = sysDictDataService.selectDictLabel("warehouse", dto.getWarehouse());
+ if (StringUtils.isEmpty(warehouseLabel)) {
+ throw new RuntimeException("浠撳簱鍊� " + dto.getWarehouse() + " 涓嶅瓨鍦ㄤ簬瀛楀吀涓�");
+ }
+ }
+
// 鏋勫缓鏌ユ壘閿�
String key = dto.getProductName() + "|" + dto.getModel();
SalesLedgerProduct matchedProduct = productMap.get(key);
@@ -329,6 +340,7 @@
stockInventoryDto.setQualitity(dto.getQualifiedQuantity());
stockInventoryDto.setRemark(dto.getRemark());
stockInventoryDto.setWarnNum(dto.getWarnNum());
+ stockInventoryDto.setWarehouse(dto.getWarehouse());
// 楠岃瘉鍚堟牸鍐荤粨鏁伴噺
if (ObjectUtils.isNotEmpty(dto.getQualifiedLockedQuantity())) {
@@ -352,6 +364,7 @@
stockUninventoryDto.setRecordType(StockInQualifiedRecordTypeEnum.CUSTOMIZATION_UNSTOCK_IN.getCode());
stockUninventoryDto.setQualitity(dto.getUnQualifiedQuantity());
stockUninventoryDto.setRemark(dto.getRemark());
+ stockUninventoryDto.setWarehouse(dto.getWarehouse());
// 楠岃瘉涓嶅悎鏍煎喕缁撴暟閲�
if (ObjectUtils.isNotEmpty(dto.getUnQualifiedLockedQuantity())) {
diff --git a/src/main/resources/mapper/quality/QualityInspectMapper.xml b/src/main/resources/mapper/quality/QualityInspectMapper.xml
index 6086121..74b3e98 100644
--- a/src/main/resources/mapper/quality/QualityInspectMapper.xml
+++ b/src/main/resources/mapper/quality/QualityInspectMapper.xml
@@ -5,7 +5,7 @@
SELECT
qi.*,
<choose>
- <when test="qualityInspect.inspectType == 0">
+ <when test="qualityInspect.inspectType != 2">
pl.purchase_contract_number as purchase_contract_no
</when>
<otherwise>
@@ -16,7 +16,7 @@
FROM
quality_inspect qi
<choose>
- <when test="qualityInspect.inspectType == 0 ">
+ <when test="qualityInspect.inspectType != 2 ">
LEFT JOIN purchase_ledger pl ON pl.id = qi.purchase_ledger_id
</when>
<otherwise>
diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index ed780a7..aad917a 100644
--- a/src/main/resources/mapper/stock/StockInventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockInventoryMapper.xml
@@ -31,6 +31,9 @@
<if test="ew.lockedQuantity != null and ew.lockedQuantity !=''">
locked_quantity = locked_quantity + #{ew.lockedQuantity},
</if>
+ <if test="ew.warehouse != null and ew.warehouse !=''">
+ warehouse = #{ew.warehouse},
+ </if>
update_time = now()
</set>
where product_model_id = #{ew.productModelId}
@@ -65,6 +68,7 @@
</update>
<select id="pagestockInventory" resultType="com.ruoyi.stock.dto.StockInventoryDto">
select si.id,
+ si.warehouse,
si.qualitity,
COALESCE(si.locked_quantity, 0) as locked_quantity,
si.product_model_id,
@@ -120,6 +124,7 @@
unit,
product_name,
product_id,
+ MAX(warehouse) as warehouse,
'combined' as stockType
from (
select
@@ -142,6 +147,7 @@
pm.unit,
p.product_name,
p.id as product_id,
+ si.warehouse,
(
select IFNULL(SUM(sor.stock_out_num), 0)
from stock_out_record sor
@@ -180,6 +186,7 @@
pm.unit,
p.product_name,
p.id as product_id,
+ su.warehouse,
0 as qualifiedPendingOut,
(
select IFNULL(SUM(sor.stock_out_num), 0)
@@ -221,8 +228,9 @@
model,
unit,
product_name,
- product_id
- order by combined.create_time desc
+ product_id,
+ warehouse
+ order by create_time desc
</select>
<select id="listStockInventoryExportData" resultType="com.ruoyi.stock.execl.StockInventoryExportData">
@@ -259,6 +267,7 @@
unit,
product_name,
product_id,
+ MAX(warehouse) as warehouse,
'combined' as stockType
from (
select
@@ -281,6 +290,7 @@
pm.unit,
p.product_name,
p.id as product_id,
+ si.warehouse,
(
select IFNULL(SUM(sor.stock_out_num), 0)
from stock_out_record sor
@@ -316,6 +326,7 @@
pm.unit,
p.product_name,
p.id as product_id,
+ su.warehouse,
0 as qualifiedPendingOut,
(
select IFNULL(SUM(sor.stock_out_num), 0)
@@ -342,7 +353,7 @@
and combined.product_id in (select id from product_tree)
</if>
</where>
- group by batch_no, product_model_id, model, unit, product_name, product_id
+ group by batch_no, product_model_id, model, unit, product_name, product_id, warehouse
</select>
<select id="stockInventoryPage" resultType="com.ruoyi.stock.dto.StockInRecordDto">
select sir.*,si.qualitity as current_stock,
@@ -562,6 +573,7 @@
unit,
product_name,
product_id,
+ MAX(warehouse) as warehouse,
MAX(create_time) as create_time,
MAX(update_time) as update_time,
@@ -593,6 +605,7 @@
COALESCE(si.warn_num, 0) as warn_num,
si.version,
si.remark,
+ si.warehouse,
(
select IFNULL(SUM(sor.stock_out_num), 0)
@@ -635,6 +648,7 @@
0 as warn_num,
su.version,
su.remark,
+ su.warehouse,
0 as qualifiedPendingOut,
@@ -668,7 +682,8 @@
model,
unit,
product_name,
- product_id
+ product_id,
+ warehouse
order by
batch_no
</select>
diff --git a/src/main/resources/mapper/stock/StockUninventoryMapper.xml b/src/main/resources/mapper/stock/StockUninventoryMapper.xml
index 582542c..49acb4a 100644
--- a/src/main/resources/mapper/stock/StockUninventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockUninventoryMapper.xml
@@ -50,6 +50,9 @@
<if test="ew.remark != null and ew.remark !=''">
remark = #{ew.remark},
</if>
+ <if test="ew.warehouse != null and ew.warehouse !=''">
+ warehouse = #{ew.warehouse},
+ </if>
update_time = now()
</set>
where product_model_id = #{ew.productModelId}
--
Gitblit v1.9.3