From fd1efdba56dbf07943b82c971694579af034fc5a Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 03 十一月 2026 20:10:12 +0800
Subject: [PATCH] feat: 新增废料管理并完善合同导出
---
sql/mysql/20261103_wm_scrap.sql | 61 +++++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/scrap/MesWmScrapSaleLineDO.java | 20 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/scrap/MesWmScrapSaleService.java | 98 ++++++++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/scrap/MesWmScrapSaleApprovalListener.java | 15 +
sql/mysql/wm_scrap_sale_finance.bpmn | 27 ++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/scrap/MesWmScrapSaleMapper.java | 18 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/scrap/MesWmScrapSaleLineMapper.java | 13 +
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/CrmContractController.java | 8
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/scrap/MesWmScrapReceiptController.java | 109 +++++++++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/vo/MesWmWarehousePageReqVO.java | 3
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/warehouse/MesWmWarehouseMapper.java | 1
yudao-module-crm/src/main/resources/templates/contract/sale-contract.docx | 0
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/warehouse/MesWmWarehouseDO.java | 2
sql/mysql/20261103_wm_scrap_menu.sql | 24 ++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialstock/MesWmMaterialStockMapper.java | 5
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/scrap/MesWmScrapSaleDO.java | 19 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/scrap/MesWmScrapReceiptMapper.java | 34 +++
sql/mysql/20261103_warehouse_type.sql | 3
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractDocumentRenderer.java | 6
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/vo/MesWmWarehouseRespVO.java | 4
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/vo/MesWmWarehouseSaveReqVO.java | 5
yudao-module-crm/src/test/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractDocumentRendererTest.java | 7
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/MesBizTypeConstants.java | 2
yudao-module-mdm-api/src/main/java/cn/iocoder/yudao/module/mdm/api/item/dto/MdmItemRespDTO.java | 3
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/scrap/MesWmScrapSaleController.java | 113 ++++++++++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockRespVO.java | 4
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/MesWmMaterialStockController.java | 1
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/scrap/MesWmScrapReceiptDO.java | 31 ++
28 files changed, 632 insertions(+), 4 deletions(-)
diff --git a/sql/mysql/20261103_warehouse_type.sql b/sql/mysql/20261103_warehouse_type.sql
new file mode 100644
index 0000000..f88dd67
--- /dev/null
+++ b/sql/mysql/20261103_warehouse_type.sql
@@ -0,0 +1,3 @@
+-- 浠撳簱绫诲瀷涓哄彲閫夋枃鏈紝淇濈暀鍘嗗彶浠撳簱璁板綍鍘熷�笺��
+ALTER TABLE `mes_wm_warehouse`
+ ADD COLUMN `warehouse_type` varchar(50) NULL DEFAULT NULL COMMENT '浠撳簱绫诲瀷' AFTER `name`;
diff --git a/sql/mysql/20261103_wm_scrap.sql b/sql/mysql/20261103_wm_scrap.sql
new file mode 100644
index 0000000..7f8dac8
--- /dev/null
+++ b/sql/mysql/20261103_wm_scrap.sql
@@ -0,0 +1,61 @@
+-- 鐙珛搴熸枡涓氬姟锛氬叆搴撴寜鐢熶骇璁㈠崟鐧昏锛涘嚭鍞崟鍦ㄨ储鍔″鎵归�氳繃鍚庤繃璐︺��
+-- 姝よ剼鏈粎鍒涘缓涓氬姟琛紝涓嶅垱寤哄鎵规ā鍨嬨�佽彍鍗曟垨浠撳簱鍩虹鏁版嵁銆�
+CREATE TABLE IF NOT EXISTS `mes_wm_scrap_receipt` (
+ `id` bigint NOT NULL AUTO_INCREMENT,
+ `code` varchar(64) NOT NULL COMMENT '鍏ュ簱鍗曞彿',
+ `work_order_id` bigint NOT NULL COMMENT '鐢熶骇宸ュ崟缂栧彿',
+ `work_order_code` varchar(64) NOT NULL COMMENT '鐢熶骇宸ュ崟鍙峰揩鐓�',
+ `item_id` bigint NOT NULL COMMENT '搴熸枡鐗╂枡缂栧彿',
+ `quantity` decimal(20,4) NOT NULL COMMENT '鍏ュ簱鏁伴噺',
+ `warehouse_id` bigint NOT NULL,
+ `location_id` bigint NOT NULL,
+ `area_id` bigint NOT NULL,
+ `batch_id` bigint DEFAULT NULL,
+ `batch_code` varchar(100) DEFAULT NULL,
+ `receipt_time` datetime NOT NULL,
+ `transaction_id` bigint DEFAULT NULL COMMENT '鍏ュ簱搴撳瓨娴佹按缂栧彿',
+ `remark` varchar(500) DEFAULT NULL,
+ `creator` varchar(64) DEFAULT '',
+ `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+ `updater` varchar(64) DEFAULT '',
+ `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+ `deleted` bit(1) NOT NULL DEFAULT b'0',
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `uk_scrap_receipt_code` (`code`),
+ KEY `idx_scrap_receipt_order_time` (`work_order_id`,`receipt_time`),
+ KEY `idx_scrap_receipt_area` (`area_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='搴熸枡鍏ュ簱';
+
+CREATE TABLE IF NOT EXISTS `mes_wm_scrap_sale` (
+ `id` bigint NOT NULL AUTO_INCREMENT,
+ `code` varchar(64) NOT NULL COMMENT '鍑哄敭鍗曞彿',
+ `buyer` varchar(200) NOT NULL COMMENT '璐拱鏂�',
+ `status` tinyint NOT NULL DEFAULT 0 COMMENT '0鑽夌 1瀹℃壒涓� 2宸插嚭搴� 3宸查┏鍥� 4宸插彇娑�',
+ `process_instance_id` varchar(64) DEFAULT NULL COMMENT '瀹℃壒娴佺▼瀹炰緥',
+ `remark` varchar(500) DEFAULT NULL,
+ `creator` varchar(64) DEFAULT '',
+ `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+ `updater` varchar(64) DEFAULT '',
+ `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+ `deleted` bit(1) NOT NULL DEFAULT b'0',
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `uk_scrap_sale_code` (`code`),
+ KEY `idx_scrap_sale_process` (`process_instance_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='搴熸枡鍑哄敭鍗�';
+
+CREATE TABLE IF NOT EXISTS `mes_wm_scrap_sale_line` (
+ `id` bigint NOT NULL AUTO_INCREMENT,
+ `sale_id` bigint NOT NULL,
+ `material_stock_id` bigint NOT NULL COMMENT '鎸囧畾搴撳瓨璁板綍',
+ `quantity` decimal(20,4) NOT NULL,
+ `unit_price` decimal(20,4) NOT NULL,
+ `transaction_id` bigint DEFAULT NULL COMMENT '瀹℃壒閫氳繃鍚庣殑鍑哄簱娴佹按缂栧彿',
+ `creator` varchar(64) DEFAULT '',
+ `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+ `updater` varchar(64) DEFAULT '',
+ `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+ `deleted` bit(1) NOT NULL DEFAULT b'0',
+ PRIMARY KEY (`id`),
+ KEY `idx_scrap_sale_line_sale` (`sale_id`),
+ KEY `idx_scrap_sale_line_stock` (`material_stock_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='搴熸枡鍑哄敭鏄庣粏';
diff --git a/sql/mysql/20261103_wm_scrap_menu.sql b/sql/mysql/20261103_wm_scrap_menu.sql
new file mode 100644
index 0000000..af5c112
--- /dev/null
+++ b/sql/mysql/20261103_wm_scrap_menu.sql
@@ -0,0 +1,24 @@
+-- 搴熸枡绠$悊鑿滃崟鍜屾潈闄愶紱涓氬姟琛ㄩ渶鍏堟墽琛� 20261103_wm_scrap.sql銆�
+-- 鍒濆鎺堟潈瓒呯骇绠$悊鍛橈紝鍏朵粬瑙掕壊璇峰湪瑙掕壊绠$悊涓寜鑱岃矗閰嶇疆銆�
+INSERT INTO system_menu(name,permission,type,sort,parent_id,path,icon,component,component_name,status,visible,keep_alive,always_show,creator,updater,deleted)
+SELECT '搴熸枡绠$悊','',2,80,5780,'scrap','ep:box','wls/scrap/index','WlsScrap',0,b'1',b'0',b'1','1','1',b'0'
+WHERE EXISTS (SELECT 1 FROM system_menu WHERE id=5780 AND deleted=b'0')
+ AND NOT EXISTS (SELECT 1 FROM system_menu WHERE component='wls/scrap/index' AND deleted=b'0');
+
+SET @scrap_menu_id = (SELECT id FROM system_menu WHERE component='wls/scrap/index' AND deleted=b'0' ORDER BY id LIMIT 1);
+INSERT INTO system_menu(name,permission,type,sort,parent_id,path,icon,component,component_name,status,visible,keep_alive,always_show,creator,updater,deleted)
+SELECT p.name,p.permission,3,p.sort,@scrap_menu_id,'','','','',0,b'1',b'0',b'1','1','1',b'0'
+FROM (
+ SELECT '搴熸枡鍏ュ簱鏌ヨ' name,'mes:wm-scrap-receipt:query' permission,1 sort UNION ALL
+ SELECT '搴熸枡鍏ュ簱鐧昏','mes:wm-scrap-receipt:create',2 UNION ALL
+ SELECT '搴熸枡鍑哄敭鏌ヨ','mes:wm-scrap-sale:query',3 UNION ALL
+ SELECT '搴熸枡鍑哄敭鍒涘缓','mes:wm-scrap-sale:create',4 UNION ALL
+ SELECT '搴熸枡鍑哄敭鎻愪氦瀹℃壒','mes:wm-scrap-sale:submit',5
+) p
+WHERE @scrap_menu_id IS NOT NULL AND NOT EXISTS (SELECT 1 FROM system_menu m WHERE m.permission=p.permission AND m.deleted=b'0');
+
+INSERT INTO system_role_menu(role_id,menu_id,creator,updater,deleted)
+SELECT r.id,m.id,'1','1',b'0' FROM system_role r JOIN system_menu m
+ ON m.deleted=b'0' AND (m.id=@scrap_menu_id OR m.parent_id=@scrap_menu_id)
+WHERE r.code='super_admin' AND r.deleted=b'0'
+ AND NOT EXISTS (SELECT 1 FROM system_role_menu rm WHERE rm.role_id=r.id AND rm.menu_id=m.id AND rm.deleted=b'0');
diff --git a/sql/mysql/wm_scrap_sale_finance.bpmn b/sql/mysql/wm_scrap_sale_finance.bpmn
new file mode 100644
index 0000000..c7f52ef
--- /dev/null
+++ b/sql/mysql/wm_scrap_sale_finance.bpmn
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:flowable="http://flowable.org/bpmn"
+ xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI"
+ xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC"
+ xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI"
+ targetNamespace="http://www.iocoder.cn/bpmn">
+ <process id="wm_scrap_sale_finance" name="搴熸枡鍑哄敭璐㈠姟瀹℃壒" isExecutable="true">
+ <startEvent id="start" name="鎻愪氦" />
+ <sequenceFlow id="to_review" sourceRef="start" targetRef="finance_review" />
+ <userTask id="finance_review" name="璐㈠姟瀹℃牳" flowable:candidateStrategy="10" flowable:candidateParam="1">
+ <extensionElements><flowable:assignStartUserHandlerType>1</flowable:assignStartUserHandlerType></extensionElements>
+ </userTask>
+ <sequenceFlow id="to_end" sourceRef="finance_review" targetRef="end" />
+ <endEvent id="end" name="瀹屾垚" />
+ </process>
+ <bpmndi:BPMNDiagram id="diagram">
+ <bpmndi:BPMNPlane id="plane" bpmnElement="wm_scrap_sale_finance">
+ <bpmndi:BPMNShape id="start_shape" bpmnElement="start"><omgdc:Bounds x="100" y="100" width="36" height="36" /></bpmndi:BPMNShape>
+ <bpmndi:BPMNShape id="review_shape" bpmnElement="finance_review"><omgdc:Bounds x="200" y="78" width="120" height="80" /></bpmndi:BPMNShape>
+ <bpmndi:BPMNShape id="end_shape" bpmnElement="end"><omgdc:Bounds x="390" y="100" width="36" height="36" /></bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge id="to_review_edge" bpmnElement="to_review"><omgdi:waypoint x="136" y="118" /><omgdi:waypoint x="200" y="118" /></bpmndi:BPMNEdge>
+ <bpmndi:BPMNEdge id="to_end_edge" bpmnElement="to_end"><omgdi:waypoint x="320" y="118" /><omgdi:waypoint x="390" y="118" /></bpmndi:BPMNEdge>
+ </bpmndi:BPMNPlane>
+ </bpmndi:BPMNDiagram>
+</definitions>
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/CrmContractController.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/CrmContractController.java
index 7e59120..a03a34a 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/CrmContractController.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/CrmContractController.java
@@ -147,10 +147,18 @@
@GetMapping("/download-document")
@Operation(summary = "鎸夎喘閿�鍚堝悓妯℃澘涓嬭浇鍚堝悓 Word 鏂囦欢")
+ @PreAuthorize("@ss.hasPermission('crm:contract:query')")
public void downloadDocument(@RequestParam("id") Long id, HttpServletResponse response) throws IOException {
// getContract 鍖呭惈鍚堝悓鏁版嵁鏉冮檺鏍¢獙锛涙部鐢ㄨ鎯呴〉鐨勪骇鍝併�佸崟浣嶅拰瀹㈡埛淇℃伅銆�
CrmContractRespVO contract = buildContractDetail(contractService.getContract(id));
Assert.notNull(contract, "鍚堝悓涓嶅瓨鍦�");
+ if (contract.getProducts() == null || contract.getProducts().isEmpty()) {
+ throw new cn.iocoder.yudao.framework.common.exception.ServiceException(400, "鍚堝悓娌℃湁浜у搧鏄庣粏锛岃鍏堢淮鎶や骇鍝佸悗瀵煎嚭");
+ }
+ if (contract.getTotalPrice() == null || contract.getProducts().stream()
+ .anyMatch(product -> product.getContractPrice() == null || product.getCount() == null)) {
+ throw new cn.iocoder.yudao.framework.common.exception.ServiceException(400, "鍚堝悓閲戦銆佷骇鍝佹暟閲忓拰鍗曚环涓嶈兘涓虹┖锛岃鍏堣ˉ鍏ㄥ悗瀵煎嚭");
+ }
byte[] content = cn.iocoder.yudao.module.crm.service.contract.CrmContractDocumentRenderer.render(contract);
String filename = "璐攢鍚堝悓-" + contract.getNo() + ".docx";
response.setContentType("application/vnd.openxmlformats-officedocument.wordprocessingml.document");
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractDocumentRenderer.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractDocumentRenderer.java
index 8b9ef51..cd05bb6 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractDocumentRenderer.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractDocumentRenderer.java
@@ -78,9 +78,12 @@
BigDecimal discount = productTotal.subtract(total);
replace(document, Map.of("customerName", text(contract.getCustomerName()),
"contractNo", text(contract.getNo()),
+ "contractName", text(contract.getName()),
"contractDate", contract.getOrderDate() == null ? "____________" : contract.getOrderDate().format(DateTimeFormatter.ofPattern("yyyy骞碝M鏈坉d鏃�")),
+ "startDate", date(contract.getStartTime()),
+ "endDate", date(contract.getEndTime()),
"totalPrice", money(total), "totalUpper", Convert.digitToChinese(total),
- "discountNote", discount.signum() == 0 ? "" : "锛堟槑缁嗗悎璁� " + money(productTotal) + " 鍏冿紝鏁村崟浼樻儬 " + money(discount) + " 鍏冿級"));
+ "discountNote", discount.signum() == 0 ? "" : "锛堟槑缁嗗悎璁� " + money(productTotal) + " 鍏冿紝涓庡悎鍚岄噾棰濈殑宸 " + money(discount) + " 鍏冿級"));
if (document.getDocumentElement().getTextContent().contains("${")) throw new IOException("鍚堝悓妯℃澘瀛樺湪鏈~鍐欐Ы浣�");
var transformerFactory = TransformerFactory.newInstance();
transformerFactory.setAttribute(XMLConstants.ACCESS_EXTERNAL_DTD, "");
@@ -103,5 +106,6 @@
}
private static String money(BigDecimal value) { return value.setScale(2, RoundingMode.HALF_UP).toPlainString(); }
+ private static String date(java.time.LocalDateTime value) { return value == null ? "____________" : value.format(DateTimeFormatter.ofPattern("yyyy骞碝M鏈坉d鏃�")); }
private static String text(String value) { return value == null ? "" : value; }
}
diff --git a/yudao-module-crm/src/main/resources/templates/contract/sale-contract.docx b/yudao-module-crm/src/main/resources/templates/contract/sale-contract.docx
index d4c19be..58fb169 100644
--- a/yudao-module-crm/src/main/resources/templates/contract/sale-contract.docx
+++ b/yudao-module-crm/src/main/resources/templates/contract/sale-contract.docx
Binary files differ
diff --git a/yudao-module-crm/src/test/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractDocumentRendererTest.java b/yudao-module-crm/src/test/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractDocumentRendererTest.java
index d83553d..e5e5018 100644
--- a/yudao-module-crm/src/test/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractDocumentRendererTest.java
+++ b/yudao-module-crm/src/test/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractDocumentRendererTest.java
@@ -36,7 +36,8 @@
String xml = new String(parts.get("word/document.xml"), StandardCharsets.UTF_8);
assertTrue(xml.contains("HT20261015001")); assertTrue(xml.contains("2026骞�10鏈�15鏃�"));
assertTrue(xml.contains("10000.00")); assertTrue(xml.contains("澹逛竾鍏冩暣"));
- assertTrue(xml.contains("鍐诲共鍐櫕澶忚崏锛�2500绾т竴绛夛級")); assertTrue(xml.contains("璇氫俊鍚堣"));
+ assertTrue(xml.contains("鍐诲共鍐櫕澶忚崏锛�2500绾т竴绛夛級")); assertTrue(xml.contains("浜や粯涓庨獙鏀�"));
+ assertFalse(xml.contains("鍖椾含鍚屼粊鍫�")); assertFalse(xml.contains("28504001040001454"));
assertFalse(xml.contains("${"));
try(var template = new ClassPathResource("templates/contract/sale-contract.docx").getInputStream()) {
var original = unzip(template.readAllBytes()); assertEquals(original.keySet(),parts.keySet());
@@ -50,11 +51,11 @@
contract.setProducts(Collections.nCopies(25,contract.getProducts().getFirst()));
contract.setTotalPrice(new BigDecimal("249000"));
String xml = new String(unzip(CrmContractDocumentRenderer.render(contract)).get("word/document.xml"),StandardCharsets.UTF_8);
- assertTrue(xml.contains("瀹㈡埛<&>鍏徃")); assertTrue(xml.contains("鏁村崟浼樻儬 1000.00 鍏�"));
+ assertTrue(xml.contains("瀹㈡埛<&>鍏徃")); assertTrue(xml.contains("涓庡悎鍚岄噾棰濈殑宸 1000.00 鍏�"));
assertEquals(25,xml.split("鍐诲共鍐櫕澶忚崏锛�2500绾т竴绛夛級",-1).length-1);
assertEquals(25,xml.split("<w:cantSplit",-1).length-1);
assertTrue(xml.contains("249000.00")); assertFalse(xml.contains("${"));
- assertFalse(xml.contains("涔欐柟锛堥渶鏂癸級锛氫腑鍥界瀛﹂櫌瑗垮寳楂樺師鐢熺墿鐮旂┒鎵�"));
+ assertTrue(xml.contains("涔欐柟锛堥渶鏂癸級锛氬鎴�<&>鍏徃"));
String output = System.getProperty("contract.document.sample");
if (output != null) Files.write(Path.of(output).resolveSibling("generated-contract-many.docx"), CrmContractDocumentRenderer.render(contract));
}
diff --git a/yudao-module-mdm-api/src/main/java/cn/iocoder/yudao/module/mdm/api/item/dto/MdmItemRespDTO.java b/yudao-module-mdm-api/src/main/java/cn/iocoder/yudao/module/mdm/api/item/dto/MdmItemRespDTO.java
index db505c1..f54d1a9 100644
--- a/yudao-module-mdm-api/src/main/java/cn/iocoder/yudao/module/mdm/api/item/dto/MdmItemRespDTO.java
+++ b/yudao-module-mdm-api/src/main/java/cn/iocoder/yudao/module/mdm/api/item/dto/MdmItemRespDTO.java
@@ -24,6 +24,9 @@
@Schema(description = "瑙勬牸鍨嬪彿", example = "M8*20")
private String specification;
+ @Schema(description = "鎶�鏈弬鏁�")
+ private String technicalParameters;
+
@Schema(description = "鐗╂枡鍒嗙被缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private Long categoryId;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/MesWmMaterialStockController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/MesWmMaterialStockController.java
index f63fa52..1a283a0 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/MesWmMaterialStockController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/MesWmMaterialStockController.java
@@ -191,6 +191,7 @@
MapUtils.findAndThen(batchMap, vo.getBatchId(), batch -> vo.setReelNo(batch.getReelNo()));
MapUtils.findAndThen(itemMap, vo.getItemId(), item -> {
vo.setItemCode(item.getCode()).setItemName(item.getName()).setSpecification(item.getSpecification());
+ vo.setTechnicalParameters(item.getTechnicalParameters());
MapUtils.findAndThen(unitMeasureMap, item.getUnitMeasureId(),
unitMeasure -> vo.setUnitMeasureName(unitMeasure.getName()));
});
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockRespVO.java
index e41c0fd..8637ec8 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockRespVO.java
@@ -35,6 +35,10 @@
@ExcelProperty("瑙勬牸鍨嬪彿")
private String specification;
+ @Schema(description = "鎶�鏈弬鏁�")
+ @ExcelProperty("鎶�鏈弬鏁�")
+ private String technicalParameters;
+
@Schema(description = "璁¢噺鍗曚綅鍚嶇О", example = "鍗冨厠")
@ExcelProperty("璁¢噺鍗曚綅")
private String unitMeasureName;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/scrap/MesWmScrapReceiptController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/scrap/MesWmScrapReceiptController.java
new file mode 100644
index 0000000..b77debc
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/scrap/MesWmScrapReceiptController.java
@@ -0,0 +1,109 @@
+package cn.iocoder.yudao.module.mes.controller.admin.wm.scrap;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.scrap.MesWmScrapReceiptDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.pro.workorder.MesProWorkOrderMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.scrap.MesWmScrapReceiptMapper;
+import cn.iocoder.yudao.module.mes.enums.wm.MesWmTransactionTypeEnum;
+import cn.iocoder.yudao.module.mes.service.wm.transaction.MesWmTransactionService;
+import cn.iocoder.yudao.module.mes.service.wm.transaction.dto.MesWmTransactionSaveReqDTO;
+import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseAreaService;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.Digits;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Pattern;
+import lombok.Data;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.time.YearMonth;
+import java.util.List;
+import java.util.Map;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+/** 鐙珛搴熸枡鍏ュ簱锛氳褰曞拰搴撳瓨娴佹按鍦ㄥ悓涓�涓簨鍔′腑鎻愪氦銆� */
+@RestController
+@RequestMapping("/mes/wm/scrap-receipt")
+@Validated
+public class MesWmScrapReceiptController {
+ @Resource private MesWmScrapReceiptMapper receiptMapper;
+ @Resource private MesProWorkOrderMapper workOrderMapper;
+ @Resource private MesWmTransactionService transactionService;
+ @Resource private MesWmWarehouseAreaService areaService;
+
+ @PostMapping("/create")
+ @PreAuthorize("@ss.hasPermission('mes:wm-scrap-receipt:create')")
+ @Transactional(rollbackFor = Exception.class)
+ public CommonResult<Long> create(@Valid @RequestBody CreateReq req) {
+ var order = workOrderMapper.selectById(req.getWorkOrderId());
+ if (order == null) throw new ServiceException(400, "鐢熶骇宸ュ崟涓嶅瓨鍦�");
+ areaService.validateWarehouseAreaExists(req.getWarehouseId(), req.getLocationId(), req.getAreaId());
+ String code = "SCR-" + req.getRequestId();
+ if (receiptMapper.selectByCode(code) != null) throw new ServiceException(400, "璇锋眰宸叉彁浜わ紝璇峰埛鏂板叆搴撹褰�");
+ MesWmScrapReceiptDO receipt = new MesWmScrapReceiptDO();
+ receipt.setCode(code);
+ receipt.setWorkOrderId(order.getId());
+ receipt.setWorkOrderCode(order.getCode());
+ receipt.setItemId(req.getItemId());
+ receipt.setQuantity(req.getQuantity());
+ receipt.setWarehouseId(req.getWarehouseId());
+ receipt.setLocationId(req.getLocationId());
+ receipt.setAreaId(req.getAreaId());
+ receipt.setBatchId(req.getBatchId());
+ receipt.setBatchCode(req.getBatchCode());
+ receipt.setReceiptTime(LocalDateTime.now());
+ receipt.setRemark(req.getRemark());
+ receiptMapper.insert(receipt);
+ Long transactionId = transactionService.createTransaction(new MesWmTransactionSaveReqDTO()
+ .setType(MesWmTransactionTypeEnum.IN.getType()).setBizType(cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants.WM_SCRAP_RECEIPT)
+ .setBizId(receipt.getId()).setBizLineId(receipt.getId()).setBizCode(receipt.getCode())
+ .setItemId(receipt.getItemId()).setQuantity(receipt.getQuantity())
+ .setWarehouseId(receipt.getWarehouseId()).setLocationId(receipt.getLocationId())
+ .setAreaId(receipt.getAreaId()).setBatchId(receipt.getBatchId()).setBatchCode(receipt.getBatchCode())
+ .setReceiptTime(receipt.getReceiptTime()).setForceCreateNewStock(true));
+ receipt.setTransactionId(transactionId);
+ receiptMapper.updateById(receipt);
+ return success(receipt.getId());
+ }
+
+ @GetMapping("/monthly-summary")
+ @PreAuthorize("@ss.hasPermission('mes:wm-scrap-receipt:query')")
+ public CommonResult<List<Map<String, Object>>> monthlySummary(@RequestParam String month) {
+ YearMonth period = YearMonth.parse(month);
+ return success(receiptMapper.summarize(period.atDay(1).atStartOfDay(),
+ period.plusMonths(1).atDay(1).atStartOfDay()));
+ }
+
+ @GetMapping("/page")
+ @PreAuthorize("@ss.hasPermission('mes:wm-scrap-receipt:query')")
+ public CommonResult<PageResult<MesWmScrapReceiptDO>> page(@Valid PageParam page,
+ @RequestParam(required = false) Long workOrderId) {
+ return success(receiptMapper.selectReceiptPage(page, workOrderId));
+ }
+
+ @Data
+ public static class CreateReq {
+ @NotBlank @Pattern(regexp = "[A-Za-z0-9-]{1,60}") private String requestId;
+ @NotNull private Long workOrderId;
+ @NotNull private Long itemId;
+ @NotNull @DecimalMin(value = "0", inclusive = false) @Digits(integer = 16, fraction = 4) private BigDecimal quantity;
+ @NotNull private Long warehouseId;
+ @NotNull private Long locationId;
+ @NotNull private Long areaId;
+ private Long batchId;
+ @Size(max = 100) private String batchCode;
+ @Size(max = 500) private String remark;
+ }
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/scrap/MesWmScrapSaleController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/scrap/MesWmScrapSaleController.java
new file mode 100644
index 0000000..8e583d9
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/scrap/MesWmScrapSaleController.java
@@ -0,0 +1,113 @@
+package cn.iocoder.yudao.module.mes.controller.admin.wm.scrap;
+
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.scrap.MesWmScrapSaleDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.scrap.MesWmScrapSaleLineDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.scrap.MesWmScrapReceiptMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.scrap.MesWmScrapSaleLineMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.scrap.MesWmScrapSaleMapper;
+import cn.iocoder.yudao.module.mes.service.wm.materialstock.MesWmMaterialStockService;
+import cn.iocoder.yudao.module.mes.service.wm.scrap.MesWmScrapSaleService;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.Digits;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.math.BigDecimal;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
+
+@RestController
+@RequestMapping("/mes/wm/scrap-sale")
+@Validated
+public class MesWmScrapSaleController {
+ @Resource private MesWmScrapSaleMapper saleMapper;
+ @Resource private MesWmScrapSaleLineMapper lineMapper;
+ @Resource private MesWmScrapReceiptMapper receiptMapper;
+ @Resource private MesWmMaterialStockService stockService;
+ @Resource private MesWmScrapSaleService saleService;
+
+ @GetMapping("/page")
+ @PreAuthorize("@ss.hasPermission('mes:wm-scrap-sale:query')")
+ public CommonResult<PageResult<MesWmScrapSaleDO>> page(@Valid PageParam page) {
+ return success(saleMapper.selectPage(page, new LambdaQueryWrapperX<MesWmScrapSaleDO>()
+ .orderByDesc(MesWmScrapSaleDO::getId)));
+ }
+
+ @GetMapping("/lines")
+ @PreAuthorize("@ss.hasPermission('mes:wm-scrap-sale:query')")
+ public CommonResult<List<MesWmScrapSaleLineDO>> lines(@RequestParam Long id) {
+ return success(lineMapper.selectBySaleId(id));
+ }
+
+ @PutMapping("/submit")
+ @PreAuthorize("@ss.hasPermission('mes:wm-scrap-sale:submit')")
+ public CommonResult<Boolean> submit(@RequestParam Long id) {
+ saleService.submit(id, getLoginUserId());
+ return success(true);
+ }
+
+ /** requestId 鐢卞鎴风涓烘瘡娆′笟鍔℃搷浣滅敓鎴愬苟鍦ㄩ噸璇曟椂澶嶇敤銆� */
+ @PostMapping("/create")
+ @PreAuthorize("@ss.hasPermission('mes:wm-scrap-sale:create')")
+ @Transactional(rollbackFor = Exception.class)
+ public CommonResult<Long> create(@Valid @RequestBody CreateReq req) {
+ String code = "SS-" + req.getRequestId();
+ if (saleMapper.selectByCode(code) != null) {
+ throw new ServiceException(400, "璇锋眰宸叉彁浜わ紝璇峰埛鏂板嚭鍞崟鍒楄〃");
+ }
+ Set<Long> stocks = new HashSet<>();
+ for (LineReq line : req.getLines()) {
+ if (!stocks.add(line.getMaterialStockId())) throw new ServiceException(400, "鍚屼竴搴撳瓨涓嶈兘閲嶅娣诲姞");
+ if (stockService.getMaterialStock(line.getMaterialStockId()) == null
+ || receiptMapper.countByStockId(line.getMaterialStockId()) == 0) {
+ throw new ServiceException(400, "璇烽�夋嫨搴熸枡鍏ュ簱浜х敓鐨勫簱瀛�");
+ }
+ }
+ MesWmScrapSaleDO sale = new MesWmScrapSaleDO();
+ sale.setCode(code);
+ sale.setBuyer(req.getBuyer());
+ sale.setRemark(req.getRemark());
+ sale.setStatus(0);
+ saleMapper.insert(sale);
+ for (LineReq input : req.getLines()) {
+ MesWmScrapSaleLineDO line = new MesWmScrapSaleLineDO();
+ line.setSaleId(sale.getId());
+ line.setMaterialStockId(input.getMaterialStockId());
+ line.setQuantity(input.getQuantity());
+ line.setUnitPrice(input.getUnitPrice());
+ lineMapper.insert(line);
+ }
+ return success(sale.getId());
+ }
+
+ @Data public static class CreateReq {
+ @NotBlank @Pattern(regexp = "[A-Za-z0-9-]{1,60}") private String requestId;
+ @NotBlank @Size(max = 200) private String buyer;
+ @Size(max = 500) private String remark;
+ @NotEmpty @Size(max = 100) private List<@Valid LineReq> lines;
+ }
+ @Data public static class LineReq {
+ @NotNull private Long materialStockId;
+ @NotNull @DecimalMin(value = "0", inclusive = false) @Digits(integer = 16, fraction = 4) private BigDecimal quantity;
+ @NotNull @DecimalMin("0") @Digits(integer = 16, fraction = 4) private BigDecimal unitPrice;
+ }
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/vo/MesWmWarehousePageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/vo/MesWmWarehousePageReqVO.java
index e6861e3..b7c171e 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/vo/MesWmWarehousePageReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/vo/MesWmWarehousePageReqVO.java
@@ -18,6 +18,9 @@
@Schema(description = "浠撳簱鍚嶇О", example = "鍘熸枡浠�")
private String name;
+ @Schema(description = "浠撳簱绫诲瀷")
+ private String warehouseType;
+
@Schema(description = "鏄惁鍐荤粨", example = "false")
private Boolean frozen;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/vo/MesWmWarehouseRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/vo/MesWmWarehouseRespVO.java
index 6c85e3b..882b5fc 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/vo/MesWmWarehouseRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/vo/MesWmWarehouseRespVO.java
@@ -25,6 +25,10 @@
@ExcelProperty("浠撳簱鍚嶇О")
private String name;
+ @Schema(description = "浠撳簱绫诲瀷", example = "鍘熸枡浠�")
+ @ExcelProperty("浠撳簱绫诲瀷")
+ private String warehouseType;
+
@Schema(description = "浠撳簱鍦板潃", example = "A 鍖轰竴鍙锋ゼ")
@ExcelProperty("浠撳簱鍦板潃")
private String address;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/vo/MesWmWarehouseSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/vo/MesWmWarehouseSaveReqVO.java
index a05c861..e86a4d2 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/vo/MesWmWarehouseSaveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/vo/MesWmWarehouseSaveReqVO.java
@@ -3,6 +3,7 @@
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
import lombok.Data;
import java.math.BigDecimal;
@@ -22,6 +23,10 @@
@NotEmpty(message = "浠撳簱鍚嶇О涓嶈兘涓虹┖")
private String name;
+ @Schema(description = "浠撳簱绫诲瀷", example = "鍘熸枡浠�")
+ @Size(max = 50, message = "浠撳簱绫诲瀷涓嶈兘瓒呰繃 50 涓瓧绗�")
+ private String warehouseType;
+
@Schema(description = "浠撳簱鍦板潃", example = "A 鍖轰竴鍙锋ゼ")
private String address;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/scrap/MesWmScrapReceiptDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/scrap/MesWmScrapReceiptDO.java
new file mode 100644
index 0000000..7e0d6a2
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/scrap/MesWmScrapReceiptDO.java
@@ -0,0 +1,31 @@
+package cn.iocoder.yudao.module.mes.dal.dataobject.wm.scrap;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@TableName("mes_wm_scrap_receipt")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class MesWmScrapReceiptDO extends BaseDO {
+ @TableId
+ private Long id;
+ private String code;
+ private Long workOrderId;
+ private String workOrderCode;
+ private Long itemId;
+ private BigDecimal quantity;
+ private Long warehouseId;
+ private Long locationId;
+ private Long areaId;
+ private Long batchId;
+ private String batchCode;
+ private LocalDateTime receiptTime;
+ private Long transactionId;
+ private String remark;
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/scrap/MesWmScrapSaleDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/scrap/MesWmScrapSaleDO.java
new file mode 100644
index 0000000..dc04a72
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/scrap/MesWmScrapSaleDO.java
@@ -0,0 +1,19 @@
+package cn.iocoder.yudao.module.mes.dal.dataobject.wm.scrap;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("mes_wm_scrap_sale")
+public class MesWmScrapSaleDO extends BaseDO {
+ @TableId private Long id;
+ private String code;
+ private String buyer;
+ private Integer status;
+ private String processInstanceId;
+ private String remark;
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/scrap/MesWmScrapSaleLineDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/scrap/MesWmScrapSaleLineDO.java
new file mode 100644
index 0000000..a3f0f21
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/scrap/MesWmScrapSaleLineDO.java
@@ -0,0 +1,20 @@
+package cn.iocoder.yudao.module.mes.dal.dataobject.wm.scrap;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.math.BigDecimal;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("mes_wm_scrap_sale_line")
+public class MesWmScrapSaleLineDO extends BaseDO {
+ @TableId private Long id;
+ private Long saleId;
+ private Long materialStockId;
+ private BigDecimal quantity;
+ private BigDecimal unitPrice;
+ private Long transactionId;
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/warehouse/MesWmWarehouseDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/warehouse/MesWmWarehouseDO.java
index 0c8a9b2..bc29a99 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/warehouse/MesWmWarehouseDO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/warehouse/MesWmWarehouseDO.java
@@ -43,6 +43,8 @@
* 浠撳簱鍚嶇О
*/
private String name;
+ /** 浠撳簱绫诲瀷 */
+ private String warehouseType;
/**
* 浠撳簱鍦板潃
*/
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialstock/MesWmMaterialStockMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialstock/MesWmMaterialStockMapper.java
index 7444c05..e7a10e3 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialstock/MesWmMaterialStockMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialstock/MesWmMaterialStockMapper.java
@@ -20,6 +20,11 @@
@Mapper
public interface MesWmMaterialStockMapper extends BaseMapperX<MesWmMaterialStockDO> {
+ default MesWmMaterialStockDO lockById(Long id) {
+ return selectOne(new LambdaQueryWrapperX<MesWmMaterialStockDO>()
+ .eq(MesWmMaterialStockDO::getId, id).last("FOR UPDATE"));
+ }
+
default PageResult<MesWmMaterialStockDO> selectPage(MesWmMaterialStockPageReqVO reqVO,
Collection<Long> itemTypeIds,
Collection<Long> itemIds,
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/scrap/MesWmScrapReceiptMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/scrap/MesWmScrapReceiptMapper.java
new file mode 100644
index 0000000..eec7891
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/scrap/MesWmScrapReceiptMapper.java
@@ -0,0 +1,34 @@
+package cn.iocoder.yudao.module.mes.dal.mysql.wm.scrap;
+
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.scrap.MesWmScrapReceiptDO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface MesWmScrapReceiptMapper extends BaseMapperX<MesWmScrapReceiptDO> {
+ default MesWmScrapReceiptDO selectByCode(String code) {
+ return selectOne(MesWmScrapReceiptDO::getCode, code);
+ }
+ @Select("SELECT COUNT(*) FROM mes_wm_scrap_receipt r JOIN mes_wm_transaction t " +
+ "ON t.id = r.transaction_id AND t.deleted = 0 " +
+ "WHERE r.deleted = 0 AND t.material_stock_id = #{stockId}")
+ long countByStockId(@Param("stockId") Long stockId);
+ default PageResult<MesWmScrapReceiptDO> selectReceiptPage(PageParam page, Long workOrderId) {
+ return selectPage(page, new LambdaQueryWrapperX<MesWmScrapReceiptDO>()
+ .eqIfPresent(MesWmScrapReceiptDO::getWorkOrderId, workOrderId)
+ .orderByDesc(MesWmScrapReceiptDO::getId));
+ }
+ @Select("SELECT work_order_id AS workOrderId, work_order_code AS workOrderCode, item_id AS itemId, " +
+ "SUM(quantity) AS quantity FROM mes_wm_scrap_receipt " +
+ "WHERE deleted = 0 AND receipt_time >= #{start} AND receipt_time < #{end} " +
+ "GROUP BY work_order_id, work_order_code, item_id ORDER BY work_order_code, item_id")
+ List<Map<String, Object>> summarize(@Param("start") LocalDateTime start, @Param("end") LocalDateTime end);
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/scrap/MesWmScrapSaleLineMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/scrap/MesWmScrapSaleLineMapper.java
new file mode 100644
index 0000000..77f6595
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/scrap/MesWmScrapSaleLineMapper.java
@@ -0,0 +1,13 @@
+package cn.iocoder.yudao.module.mes.dal.mysql.wm.scrap;
+
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.scrap.MesWmScrapSaleLineDO;
+import org.apache.ibatis.annotations.Mapper;
+import java.util.List;
+
+@Mapper
+public interface MesWmScrapSaleLineMapper extends BaseMapperX<MesWmScrapSaleLineDO> {
+ default List<MesWmScrapSaleLineDO> selectBySaleId(Long id) {
+ return selectList(MesWmScrapSaleLineDO::getSaleId, id);
+ }
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/scrap/MesWmScrapSaleMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/scrap/MesWmScrapSaleMapper.java
new file mode 100644
index 0000000..e1c0f61
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/scrap/MesWmScrapSaleMapper.java
@@ -0,0 +1,18 @@
+package cn.iocoder.yudao.module.mes.dal.mysql.wm.scrap;
+
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.scrap.MesWmScrapSaleDO;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface MesWmScrapSaleMapper extends BaseMapperX<MesWmScrapSaleDO> {
+ default MesWmScrapSaleDO lockById(Long id) {
+ return selectOne(new LambdaQueryWrapperX<MesWmScrapSaleDO>()
+ .eq(MesWmScrapSaleDO::getId, id).last("FOR UPDATE"));
+ }
+
+ default MesWmScrapSaleDO selectByCode(String code) {
+ return selectOne(MesWmScrapSaleDO::getCode, code);
+ }
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/warehouse/MesWmWarehouseMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/warehouse/MesWmWarehouseMapper.java
index 2353b9e..edfc9d1 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/warehouse/MesWmWarehouseMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/warehouse/MesWmWarehouseMapper.java
@@ -20,6 +20,7 @@
return selectPage(reqVO, new LambdaQueryWrapperX<MesWmWarehouseDO>()
.likeIfPresent(MesWmWarehouseDO::getCode, reqVO.getCode())
.likeIfPresent(MesWmWarehouseDO::getName, reqVO.getName())
+ .likeIfPresent(MesWmWarehouseDO::getWarehouseType, reqVO.getWarehouseType())
.eqIfPresent(MesWmWarehouseDO::getFrozen, reqVO.getFrozen())
.orderByDesc(MesWmWarehouseDO::getId));
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/MesBizTypeConstants.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/MesBizTypeConstants.java
index b089810..744b923 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/MesBizTypeConstants.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/MesBizTypeConstants.java
@@ -49,6 +49,8 @@
public static final int WM_RETURN_VENDOR = 125; // 渚涘簲鍟嗛��璐у嚭搴擄細MesWmReturnVendorDO
public static final int WM_STOCK_ADJUST_IN = 126; // 搴撳瓨璋冩暣鍏ュ簱锛堣嚜瀹氫箟鍏ュ簱锛�
public static final int WM_STOCK_ADJUST_OUT = 127; // 搴撳瓨璋冩暣鍑哄簱锛堣嚜瀹氫箟鍑哄簱锛�
+ public static final int WM_SCRAP_RECEIPT = 128; // 搴熸枡鍏ュ簱
+ public static final int WM_SCRAP_SALE = 129; // 搴熸枡鍑哄敭鍑哄簱
// ========== CAL 鎺掔彮妯″潡 [200, 300) ==========
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/scrap/MesWmScrapSaleApprovalListener.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/scrap/MesWmScrapSaleApprovalListener.java
new file mode 100644
index 0000000..08291e5
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/scrap/MesWmScrapSaleApprovalListener.java
@@ -0,0 +1,15 @@
+package cn.iocoder.yudao.module.mes.service.wm.scrap;
+
+import cn.iocoder.yudao.module.bpm.api.event.BpmProcessInstanceStatusEvent;
+import cn.iocoder.yudao.module.bpm.api.event.BpmProcessInstanceStatusEventListener;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Component;
+
+@Component
+public class MesWmScrapSaleApprovalListener extends BpmProcessInstanceStatusEventListener {
+ @Resource private MesWmScrapSaleService service;
+ @Override protected String getProcessDefinitionKey() { return MesWmScrapSaleService.PROCESS_KEY; }
+ @Override protected void onEvent(BpmProcessInstanceStatusEvent event) {
+ service.onApproval(Long.valueOf(event.getBusinessKey()), event.getId(), event.getStatus());
+ }
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/scrap/MesWmScrapSaleService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/scrap/MesWmScrapSaleService.java
new file mode 100644
index 0000000..47f5e76
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/scrap/MesWmScrapSaleService.java
@@ -0,0 +1,98 @@
+package cn.iocoder.yudao.module.mes.service.wm.scrap;
+
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
+import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi;
+import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
+import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceStatusEnum;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.scrap.MesWmScrapSaleDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.scrap.MesWmScrapSaleLineDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.materialstock.MesWmMaterialStockMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.scrap.MesWmScrapReceiptMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.scrap.MesWmScrapSaleLineMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.scrap.MesWmScrapSaleMapper;
+import cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants;
+import cn.iocoder.yudao.module.mes.enums.wm.MesWmTransactionTypeEnum;
+import cn.iocoder.yudao.module.mes.service.wm.transaction.MesWmTransactionService;
+import cn.iocoder.yudao.module.mes.service.wm.transaction.dto.MesWmTransactionSaveReqDTO;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import java.math.BigDecimal;
+import java.util.Comparator;
+import java.util.Objects;
+import java.util.Map;
+
+@Service
+public class MesWmScrapSaleService {
+ public static final String PROCESS_KEY = "wm_scrap_sale_finance";
+ @Resource private MesWmScrapSaleMapper saleMapper;
+ @Resource private MesWmScrapSaleLineMapper lineMapper;
+ @Resource private MesWmScrapReceiptMapper receiptMapper;
+ @Resource private MesWmMaterialStockMapper stockMapper;
+ @Resource private MesWmTransactionService transactionService;
+ @Resource private BpmProcessInstanceApi processApi;
+
+ @Transactional(rollbackFor = Exception.class)
+ public void submit(Long id, Long userId) {
+ MesWmScrapSaleDO sale = saleMapper.lockById(id);
+ if (sale == null || !Objects.equals(sale.getStatus(), 0)) throw new ServiceException(400, "浠呰崏绋垮彲鎻愪氦瀹℃壒");
+ var lines = lineMapper.selectBySaleId(id);
+ if (lines.isEmpty()) throw new ServiceException(400, "鍑哄敭鍗曟病鏈夋槑缁�");
+ // 璐㈠姟瀹℃牳涓嶅彲琚叏灞�鍏嶅鎵圭粫杩囥��
+ if (processApi.isGlobalAutoApprove()) throw new ServiceException(400, "鍏ㄥ眬鍏嶅鎵瑰凡寮�鍚紝搴熸枡鍑哄敭蹇呴』缁忚繃璐㈠姟瀹℃牳");
+ MesWmScrapSaleDO update = new MesWmScrapSaleDO();
+ update.setId(id);
+ update.setStatus(1);
+ saleMapper.updateById(update);
+ String processId = processApi.createProcessInstance(userId, new BpmProcessInstanceCreateReqDTO()
+ .setProcessDefinitionKey(PROCESS_KEY).setBusinessKey(String.valueOf(id))
+ .setVariables(Map.of("saleCode", sale.getCode(), "buyer", sale.getBuyer(),
+ "totalAmount", lines.stream().map(line -> line.getQuantity().multiply(line.getUnitPrice()))
+ .reduce(BigDecimal.ZERO, BigDecimal::add))));
+ MesWmScrapSaleDO processUpdate = new MesWmScrapSaleDO();
+ processUpdate.setId(id);
+ processUpdate.setProcessInstanceId(processId);
+ saleMapper.updateById(processUpdate);
+ }
+
+ @Transactional(rollbackFor = Exception.class)
+ public void onApproval(Long id, String processId, Integer status) {
+ MesWmScrapSaleDO sale = saleMapper.lockById(id);
+ if (sale == null || !Objects.equals(sale.getStatus(), 1)) return;
+ if (sale.getProcessInstanceId() != null && !sale.getProcessInstanceId().equals(processId)) return;
+ if (Objects.equals(status, BpmProcessInstanceStatusEnum.APPROVE.getStatus())) {
+ var lines = lineMapper.selectBySaleId(id);
+ lines.sort(Comparator.comparing(MesWmScrapSaleLineDO::getMaterialStockId));
+ for (MesWmScrapSaleLineDO line : lines) {
+ var stock = stockMapper.lockById(line.getMaterialStockId());
+ if (stock == null || receiptMapper.countByStockId(line.getMaterialStockId()) == 0)
+ throw new ServiceException(400, "搴熸枡搴撳瓨涓嶅瓨鍦ㄦ垨宸插彉鍔�");
+ BigDecimal available = zero(stock.getQuantity()).subtract(zero(stock.getFrozenQuantity())).subtract(zero(stock.getReservedQuantity()));
+ if (available.compareTo(line.getQuantity()) < 0) throw new ServiceException(400, "搴熸枡鍙敤搴撳瓨涓嶈冻锛屾棤娉曞嚭搴�");
+ Long transactionId = transactionService.createTransaction(new MesWmTransactionSaveReqDTO()
+ .setType(MesWmTransactionTypeEnum.OUT.getType()).setBizType(MesBizTypeConstants.WM_SCRAP_SALE)
+ .setBizId(id).setBizCode(sale.getCode()).setBizLineId(line.getId())
+ .setMaterialStockId(stock.getId()).setItemId(stock.getItemId()).setQuantity(line.getQuantity().negate())
+ .setWarehouseId(stock.getWarehouseId()).setLocationId(stock.getLocationId()).setAreaId(stock.getAreaId())
+ .setBatchId(stock.getBatchId()).setBatchCode(stock.getBatchCode()));
+ MesWmScrapSaleLineDO updateLine = new MesWmScrapSaleLineDO();
+ updateLine.setId(line.getId());
+ updateLine.setTransactionId(transactionId);
+ lineMapper.updateById(updateLine);
+ }
+ setStatus(id, 2);
+ } else if (Objects.equals(status, BpmProcessInstanceStatusEnum.REJECT.getStatus())) {
+ setStatus(id, 3);
+ } else if (Objects.equals(status, BpmProcessInstanceStatusEnum.CANCEL.getStatus())) {
+ setStatus(id, 4);
+ }
+ }
+
+ private void setStatus(Long id, int status) {
+ MesWmScrapSaleDO update = new MesWmScrapSaleDO();
+ update.setId(id);
+ update.setStatus(status);
+ saleMapper.updateById(update);
+ }
+ private BigDecimal zero(BigDecimal value) { return value == null ? BigDecimal.ZERO : value; }
+}
--
Gitblit v1.9.3