From c7e7ed6d05cd1586b37396bcabc9f3f7e6ec589f Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期三, 21 十月 2026 16:08:51 +0800
Subject: [PATCH] feat(销售台账/产品维护): 图号必填唯一、合同号唯一、明细产品编码与导入物料编码
---
src/main/java/com/ruoyi/basic/dto/ProductImportRowDto.java | 3
src/main/resources/mapper/basic/ProductModelMapper.xml | 4
src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java | 5
src/main/resources/static/产品导入模板.xlsx | 0
src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java | 6 +
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java | 88 +++++++++++++++++++--
src/main/java/com/ruoyi/sales/dto/SalesLedgerProductImportDto.java | 12 ++
sql/20261021_longyi_drawing_no_product_code.sql | 27 ++++++
src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java | 31 +++++++
src/main/java/com/ruoyi/basic/pojo/ProductModel.java | 6 +
src/main/resources/static/销售台账导入模板.xlsx | 0
11 files changed, 166 insertions(+), 16 deletions(-)
diff --git a/sql/20261021_longyi_drawing_no_product_code.sql b/sql/20261021_longyi_drawing_no_product_code.sql
new file mode 100644
index 0000000..be2991e
--- /dev/null
+++ b/sql/20261021_longyi_drawing_no_product_code.sql
@@ -0,0 +1,27 @@
+-- ============================================================
+-- 姹熻嫃闅嗕箟锛坧rofile: jsnygcjx锛夋湰娆¢渶姹� DDL
+-- 鎵ц搴擄細product-inventory-management-jsnygcjxkj
+-- 闇�姹�1锛氫骇鍝佺淮鎶�-瑙勬牸鍨嬪彿鏂板鈥滃浘鍙封�濓紙蹇呭~銆佸敮涓�锛�
+-- 闇�姹�3锛氶攢鍞彴璐︿骇鍝佹槑缁嗘柊澧炩�滀骇鍝佺紪鐮佲�濓紙瀵煎叆鍒楀悕锛氱墿鏂欑紪鐮侊級
+-- ============================================================
+
+-- 1. 浜у搧鍨嬪彿琛細鍥惧彿
+ALTER TABLE `product_model`
+ ADD COLUMN `drawing_no` varchar(255) NULL COMMENT '鍥惧彿' AFTER `product_code`;
+
+-- 鍙�夛細纭鍘嗗彶鏁版嵁鏃犻噸澶嶅浘鍙凤紙褰撳墠鍧囦负 NULL锛夊悗锛屽啀寤哄敮涓�绱㈠紩
+-- ALTER TABLE `product_model` ADD UNIQUE KEY `uk_product_model_drawing_no` (`drawing_no`);
+
+-- 2. 閿�鍞彴璐︿骇鍝佹槑缁嗭細浜у搧缂栫爜锛�= 浜у搧缁存姢涓殑浜у搧缂栧彿 product_code锛�
+ALTER TABLE `sales_ledger_product`
+ ADD COLUMN `product_code` varchar(255) NULL COMMENT '浜у搧缂栫爜' AFTER `specification_model`;
+
+-- 3. 瀛橀噺鏁版嵁鍥炲~锛氭寜浜у搧鍨嬪彿鍏宠仈鍥炲~浜у搧缂栫爜
+UPDATE `sales_ledger_product` slp
+ JOIN `product_model` pm ON pm.id = slp.product_model_id
+SET slp.product_code = pm.product_code
+WHERE slp.product_model_id IS NOT NULL
+ AND (slp.product_code IS NULL OR slp.product_code = '');
+
+-- 4. 鍙�夛細閿�鍞悎鍚屽彿鍞竴锛堢‘璁ゆ棤閲嶅鍚庡彲寮�鍚級
+-- ALTER TABLE `sales_ledger` ADD UNIQUE KEY `uk_sales_ledger_contract_no` (`sales_contract_no`);
diff --git a/src/main/java/com/ruoyi/basic/dto/ProductImportRowDto.java b/src/main/java/com/ruoyi/basic/dto/ProductImportRowDto.java
index c472e06..73a269b 100644
--- a/src/main/java/com/ruoyi/basic/dto/ProductImportRowDto.java
+++ b/src/main/java/com/ruoyi/basic/dto/ProductImportRowDto.java
@@ -25,6 +25,9 @@
@Excel(name = "瑙勬牸鍨嬪彿")
private String model;
+ @Excel(name = "鍥惧彿")
+ private String drawingNo;
+
@Excel(name = "鍗曚綅")
private String unit;
diff --git a/src/main/java/com/ruoyi/basic/pojo/ProductModel.java b/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
index dc7201c..2962d2c 100644
--- a/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
+++ b/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
@@ -41,6 +41,12 @@
private String productCode;
/**
+ * 鍥惧彿锛堝繀濉�佸敮涓�锛�
+ */
+ @Excel(name = "鍥惧彿")
+ private String drawingNo;
+
+ /**
* 鍗曚綅
*/
@Excel(name = "鍗曚綅")
diff --git a/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java
index dd0e7ab..c2f5ab5 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java
@@ -58,9 +58,16 @@
public int addOrEditProductModel(ProductModelDto productModelDto) {
String model = StringUtils.trim(productModelDto.getModel());
String productCode = StringUtils.trim(productModelDto.getProductCode());
+ String drawingNo = StringUtils.trim(productModelDto.getDrawingNo());
productModelDto.setModel(model);
productModelDto.setProductCode(productCode);
+ productModelDto.setDrawingNo(drawingNo);
+ // 鍥惧彿蹇呭~
+ if (StringUtils.isEmpty(drawingNo)) {
+ throw new ServiceException("鍥惧彿涓嶈兘涓虹┖");
+ }
checkModelAndProductCodeUnique(model, productCode, productModelDto.getId());
+ checkDrawingNoUnique(drawingNo, productModelDto.getId());
if (productModelDto.getId() == null) {
ProductModel productModel = new ProductModel();
@@ -68,6 +75,23 @@
return productModelMapper.insert(productModel);
} else {
return productModelMapper.updateById(productModelDto);
+ }
+ }
+
+ /**
+ * 鍥惧彿鍞竴鏍¢獙锛堝叏灞�锛岀紪杈戞椂鎺掗櫎鑷韩锛�
+ */
+ private void checkDrawingNoUnique(String drawingNo, Long currentId) {
+ if (StringUtils.isEmpty(drawingNo)) {
+ return;
+ }
+ LambdaQueryWrapper<ProductModel> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(ProductModel::getDrawingNo, drawingNo)
+ .ne(currentId != null, ProductModel::getId, currentId)
+ .last("limit 1");
+ ProductModel duplicateProductModel = productModelMapper.selectOne(queryWrapper);
+ if (duplicateProductModel != null) {
+ throw new ServiceException("鍥惧彿" + drawingNo + "宸茬粡瀛樺湪");
}
}
@@ -200,10 +224,17 @@
code = generateUniqueCode(generatedCodes);
}
+ // 鍥惧彿锛氬鍏ユ椂鍙�夛紝濉啓鍒欐牎楠屽敮涓�
+ String drawingNo = trimToNull(row.getDrawingNo());
+ if (drawingNo != null) {
+ checkDrawingNoUnique(drawingNo, null);
+ }
+
ProductModel productModel = new ProductModel();
productModel.setProductId(leafId);
productModel.setProductCode(code);
productModel.setModel(model);
+ productModel.setDrawingNo(drawingNo);
productModel.setUnit(trimToNull(row.getUnit()));
productModelMapper.insert(productModel);
successCount++;
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
index 048cffc..a46bd78 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
@@ -257,9 +257,8 @@
boolean planIssued = isFlagTrue(editFlag == null ? null : editFlag.getPlanIssued());
boolean shipped = isFlagTrue(editFlag == null ? null : editFlag.getShipped());
- // 闇�瑕佺敓浜х殑璁㈠崟锛氱敓浜ц鍒掑凡涓嬪彂锛堝惈閮ㄥ垎涓嬪彂锛夊垯涓嶅厑璁哥紪杈�
- // 璧板簱瀛樼殑璁㈠崟锛氬凡鍙戣揣鍒欎笉鍏佽缂栬緫锛屽惁鍒欏彲浠ョ紪杈�
- salesLedgerVo.setIsEdit(needsProduction ? !planIssued : !shipped);
+ // 宸插彂璐х殑璁㈠崟涓嶅厑璁哥紪杈戯紱闇�瑕佺敓浜т笖鐢熶骇璁″垝宸蹭笅鍙戯紙鍚儴鍒嗕笅鍙戯級鐨勮鍗曞厑璁哥紪杈戯紝鍓嶇鍙斁寮�鏃堕棿绫诲瓧娈�
+ salesLedgerVo.setIsEdit(!shipped);
salesLedgerVo.setHasProductionRecord(planIssued);
salesLedgerVo.setStorageBlobVOs(fileUtil.getStorageBlobVOsByApplicationAndRecordTypeAndRecordId(ApplicationTypeEnum.FILE, RecordTypeEnum.SALES_LEDGER, ledgerId));
diff --git a/src/main/java/com/ruoyi/sales/dto/SalesLedgerProductImportDto.java b/src/main/java/com/ruoyi/sales/dto/SalesLedgerProductImportDto.java
index 9f05b60..5b1d303 100644
--- a/src/main/java/com/ruoyi/sales/dto/SalesLedgerProductImportDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/SalesLedgerProductImportDto.java
@@ -32,6 +32,12 @@
private String specificationModel;
/**
+ * 鐗╂枡缂栫爜锛堝搴斾骇鍝佺紪鐮� product_model.product_code锛�
+ */
+ @Excel(name = "鐗╂枡缂栫爜")
+ private String materialCode;
+
+ /**
* 鍗曚綅
*/
@Excel(name = "鍗曚綅")
@@ -74,8 +80,8 @@
private Boolean isChecked;
/**
- * 鏄惁鐢熶骇
+ * 鏄惁鐢熶骇锛堝~ 1/鏄� 琛ㄧず鐢熶骇锛�0/鍚� 琛ㄧず涓嶇敓浜э級
*/
- @Excel(name = "鏄惁鐢熶骇", readConverterExp = "0=鍚�,1=鏄�")
- private Integer isProduction;
+ @Excel(name = "鏄惁鐢熶骇")
+ private String isProduction;
}
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
index 1e44dc9..9afc483 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
@@ -56,6 +56,12 @@
private String specificationModel;
/**
+ * 浜у搧缂栫爜锛堝嵆浜у搧缁存姢涓殑浜у搧缂栧彿 product_model.product_code锛�
+ */
+ @Excel(name = "鐗╂枡缂栫爜")
+ private String productCode;
+
+ /**
* 鍗曚綅
*/
@Excel(name = "鍗曚綅")
diff --git a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
index 170bd12..86ed7cf 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
@@ -19,6 +19,7 @@
import com.ruoyi.basic.mapper.ProductMapper;
import com.ruoyi.basic.mapper.ProductModelMapper;
import com.ruoyi.basic.pojo.Customer;
+import com.ruoyi.basic.pojo.ProductModel;
import com.ruoyi.basic.utils.FileUtil;
import com.ruoyi.common.enums.FileNameType;
import com.ruoyi.common.enums.SaleEnum;
@@ -361,13 +362,34 @@
// 褰曞叆浜烘暟鎹�
List<SysUser> sysUsers = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>().in(SysUser::getNickName,
salesLedgerImportDtoList.stream().map(SalesLedgerImportDto::getEntryPerson).collect(Collectors.toList())));
- for (SalesLedgerImportDto salesLedgerImportDto : salesLedgerImportDtoList) {
- SalesLedger salesLedger1 = salesLedgerMapper.selectOne(new LambdaQueryWrapper<SalesLedger>()
- .eq(SalesLedger::getSalesContractNo, salesLedgerImportDto.getSalesContractNo())
- .last("LIMIT 1"));
- if (salesLedger1 != null) {
+ // 閿�鍞崟鍙烽噸澶嶆牎楠岋細鏂囦欢鍐呴噸澶嶆垨搴撳唴宸插瓨鍦ㄧ殑锛岀洿鎺ュけ璐ュ苟鍥炴樉鍘熸湁閿�鍞崟鍙�
+ List<String> duplicateContractNos = new ArrayList<>();
+ Set<String> importContractNos = new HashSet<>();
+ for (SalesLedgerImportDto item : salesLedgerImportDtoList) {
+ String contractNo = StringUtils.trim(item.getSalesContractNo());
+ if (StringUtils.isEmpty(contractNo)) {
continue;
}
+ if (!importContractNos.add(contractNo)) {
+ duplicateContractNos.add(contractNo);
+ }
+ }
+ if (CollectionUtils.isNotEmpty(duplicateContractNos)) {
+ return AjaxResult.error("瀵煎叆鏂囦欢涓瓨鍦ㄩ噸澶嶇殑閿�鍞崟鍙凤細" + String.join("銆�", duplicateContractNos));
+ }
+ if (CollectionUtils.isNotEmpty(importContractNos)) {
+ List<SalesLedger> existLedgers = salesLedgerMapper.selectList(new LambdaQueryWrapper<SalesLedger>()
+ .in(SalesLedger::getSalesContractNo, importContractNos)
+ .select(SalesLedger::getId, SalesLedger::getSalesContractNo));
+ if (CollectionUtils.isNotEmpty(existLedgers)) {
+ String existNos = existLedgers.stream()
+ .map(SalesLedger::getSalesContractNo)
+ .distinct()
+ .collect(Collectors.joining("銆�"));
+ return AjaxResult.error("浠ヤ笅閿�鍞崟鍙峰凡瀛樺湪锛屼笉鑳介噸澶嶆柊澧烇細" + existNos);
+ }
+ }
+ for (SalesLedgerImportDto salesLedgerImportDto : salesLedgerImportDtoList) {
SalesLedger salesLedger = new SalesLedger();
BeanUtils.copyProperties(salesLedgerImportDto, salesLedger);
salesLedger.setExecutionDate(DateUtils.toLocalDate(salesLedgerImportDto.getExecutionDate()));
@@ -408,6 +430,11 @@
BeanUtils.copyProperties(salesLedgerProductImportDto, salesLedgerProduct);
salesLedgerProduct.setSalesLedgerId(salesLedger.getId());
salesLedgerProduct.setType(1);
+ // 鐗╂枡缂栫爜 -> 浜у搧缂栫爜
+ String materialCode = StringUtils.trim(salesLedgerProductImportDto.getMaterialCode());
+ if (StringUtils.isNotEmpty(materialCode)) {
+ salesLedgerProduct.setProductCode(materialCode);
+ }
AmountUtils.normalizeSalesLedgerProduct(salesLedgerProduct);
// 璁$畻涓嶅惈绋庢�讳环
salesLedgerProduct.setTaxExclusiveTotalPrice(
@@ -422,6 +449,10 @@
.ifPresent(map -> {
salesLedgerProduct.setProductModelId(Long.parseLong(map.get("modelId").toString()));
salesLedgerProduct.setProductId(Long.parseLong(map.get("id").toString()));
+ // 鏈~鐗╂枡缂栫爜鏃讹紝鎸変骇鍝佸瀷鍙峰洖濉骇鍝佺紪鐮�
+ if (StringUtils.isEmpty(salesLedgerProduct.getProductCode()) && map.get("productCode") != null) {
+ salesLedgerProduct.setProductCode(map.get("productCode").toString());
+ }
});
// salesLedgerProduct.setProductId(productList.stream()
// .filter(product -> product.getProductName().equals(salesLedgerProduct.getProductCategory()))
@@ -436,7 +467,7 @@
salesLedgerProduct.setRegister(loginUser.getNickName());
salesLedgerProduct.setRegisterDate(LocalDateTime.now());
salesLedgerProduct.setApproveStatus(0);
- salesLedgerProduct.setIsProduction(salesLedgerProductImportDto.getIsProduction() == 1);
+ salesLedgerProduct.setIsProduction(parseProductionFlag(salesLedgerProductImportDto.getIsProduction()));
salesLedgerProductMapper.insert(salesLedgerProduct);
// 娣诲姞鐢熶骇鏁版嵁
salesLedgerProductServiceImpl.addProductionData(salesLedgerProduct);
@@ -582,9 +613,14 @@
AmountUtils.normalizeContractAmount(salesLedger);
salesLedger.setCustomerName(customer.getCustomerName());
salesLedger.setTenantId(customer.getTenantId());
- // 3. 鏂板鎴栨洿鏂颁富琛�
+ // 3. 閿�鍞悎鍚屽彿鍞竴鏍¢獙锛堟敮鎸佸瓧姣嶃�佹暟瀛楀強鐗规畩瀛楃锛屼笉鍋氬瓧绗﹂泦闄愬埗锛�
+ String contractNo = StringUtils.trim(salesLedger.getSalesContractNo());
+ if (StringUtils.isNotEmpty(contractNo)) {
+ checkSalesContractNoUnique(contractNo, salesLedger.getId());
+ salesLedger.setSalesContractNo(contractNo);
+ }
+ // 4. 鏂板鎴栨洿鏂颁富琛�
if (salesLedger.getId() == null) {
- String contractNo = salesLedger.getSalesContractNo();
if (StringUtils.isEmpty(contractNo)) {
contractNo = generateSalesContractNo();
}
@@ -595,7 +631,7 @@
}
- // 4. 澶勭悊瀛愯〃鏁版嵁
+ // 5. 澶勭悊瀛愯〃鏁版嵁
List<SalesLedgerProduct> productList = salesLedgerDto.getProductData();
if (productList != null && !productList.isEmpty()) {
AmountUtils.normalizeSalesLedgerProducts(productList);
@@ -615,8 +651,31 @@
return 1;
}
+ /**
+ * 閿�鍞悎鍚屽彿鍞竴鏍¢獙锛堢紪杈戞椂鎺掗櫎鑷韩锛�
+ */
+ private void checkSalesContractNoUnique(String salesContractNo, Long currentId) {
+ LambdaQueryWrapper<SalesLedger> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(SalesLedger::getSalesContractNo, salesContractNo)
+ .ne(currentId != null, SalesLedger::getId, currentId)
+ .last("limit 1");
+ SalesLedger duplicate = salesLedgerMapper.selectOne(queryWrapper);
+ if (duplicate != null) {
+ throw new BaseException("閿�鍞悎鍚屽彿" + salesContractNo + "宸插瓨鍦紙閿�鍞崟鍙凤細" + duplicate.getSalesContractNo() + "锛夛紝璇烽噸鏂板~鍐�");
+ }
+ }
+
@Override
public void handleSalesLedgerProducts(Long salesLedgerId, List<SalesLedgerProduct> products, SaleEnum type) {
+ // 浜у搧缂栫爜鍏滃簳锛氬墠绔湭浼犳椂鎸変骇鍝佸瀷鍙峰洖濉�
+ products.forEach(p -> {
+ if (StringUtils.isEmpty(p.getProductCode()) && p.getProductModelId() != null) {
+ ProductModel productModel = productModelMapper.selectById(p.getProductModelId());
+ if (productModel != null) {
+ p.setProductCode(productModel.getProductCode());
+ }
+ }
+ });
// 鎸塈D鍒嗙粍锛屽尯鍒嗘柊澧炲拰鏇存柊鐨勮褰�
Map<Boolean, List<SalesLedgerProduct>> partitionedProducts = products.stream()
.peek(p -> p.setSalesLedgerId(salesLedgerId))
@@ -645,6 +704,17 @@
}
}
+ /**
+ * 瑙f瀽瀵煎叆鐨勨�滄槸鍚︾敓浜р�濆垪锛氭敮鎸� 1/0銆佹槸/鍚�
+ */
+ private static boolean parseProductionFlag(String value) {
+ if (StringUtils.isEmpty(value)) {
+ return false;
+ }
+ String v = value.trim();
+ return "1".equals(v) || "鏄�".equals(v) || "true".equalsIgnoreCase(v) || "yes".equalsIgnoreCase(v);
+ }
+
private SalesLedger convertToEntity(SalesLedgerDto dto) {
SalesLedger entity = new SalesLedger();
BeanUtils.copyProperties(dto, entity);
diff --git a/src/main/resources/mapper/basic/ProductModelMapper.xml b/src/main/resources/mapper/basic/ProductModelMapper.xml
index b485059..5d73858 100644
--- a/src/main/resources/mapper/basic/ProductModelMapper.xml
+++ b/src/main/resources/mapper/basic/ProductModelMapper.xml
@@ -146,7 +146,9 @@
select p.id as id,
pm.id as modelId,
p.product_name as productName ,
- pm.model as model
+ pm.model as model,
+ pm.product_code as productCode,
+ pm.drawing_no as drawingNo
from product_model pm
left join product p on p.id = pm.product_id
order by p.id,pm.id desc
diff --git "a/src/main/resources/static/\344\272\247\345\223\201\345\257\274\345\205\245\346\250\241\346\235\277.xlsx" "b/src/main/resources/static/\344\272\247\345\223\201\345\257\274\345\205\245\346\250\241\346\235\277.xlsx"
index 088e7a7..a621250 100644
--- "a/src/main/resources/static/\344\272\247\345\223\201\345\257\274\345\205\245\346\250\241\346\235\277.xlsx"
+++ "b/src/main/resources/static/\344\272\247\345\223\201\345\257\274\345\205\245\346\250\241\346\235\277.xlsx"
Binary files differ
diff --git "a/src/main/resources/static/\351\224\200\345\224\256\345\217\260\350\264\246\345\257\274\345\205\245\346\250\241\346\235\277.xlsx" "b/src/main/resources/static/\351\224\200\345\224\256\345\217\260\350\264\246\345\257\274\345\205\245\346\250\241\346\235\277.xlsx"
index 0dad163..bc7e251 100644
--- "a/src/main/resources/static/\351\224\200\345\224\256\345\217\260\350\264\246\345\257\274\345\205\245\346\250\241\346\235\277.xlsx"
+++ "b/src/main/resources/static/\351\224\200\345\224\256\345\217\260\350\264\246\345\257\274\345\205\245\346\250\241\346\235\277.xlsx"
Binary files differ
--
Gitblit v1.9.3