From 0674b30cb6e106ca23d432430aad1cad93cbbc99 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 10 三月 2026 10:12:43 +0800
Subject: [PATCH] refactor: 合并生产需求子表
---
src/main/java/com/ruoyi/productionPlan/mapper/ProductionPlanMapper.java | 16 +
src/main/java/com/ruoyi/productionPlan/pojo/ProductionPlan.java | 171 +++++++++++++++
src/main/java/com/ruoyi/productionPlan/service/impl/ProductionPlanServiceImpl.java | 23 ++
src/main/java/com/ruoyi/productionPlan/service/impl/ProdDemandService.java | 165 +++++++++++++++
src/main/java/com/ruoyi/common/utils/http/HttpUtils.java | 13
src/main/resources/mapper/productionPlan/ProductionPlanMapper.xml | 39 +++
src/main/java/com/ruoyi/productionPlan/service/ProductionPlanService.java | 16 +
src/main/java/com/ruoyi/productionPlan/task/ProductionPlanTask.java | 13 +
src/test/com/ruoyi/productionPlan/service/ProdDemandServiceTest.java | 27 ++
/dev/null | 30 --
src/main/java/com/ruoyi/productionPlan/controller/ProductionPlanController.java | 19 +
doc/宁夏-中盛建材.sql | 83 ++----
src/main/resources/application-zsjc.yml | 2
13 files changed, 530 insertions(+), 87 deletions(-)
diff --git "a/doc/\345\256\201\345\244\217-\344\270\255\347\233\233\345\273\272\346\235\220.sql" "b/doc/\345\256\201\345\244\217-\344\270\255\347\233\233\345\273\272\346\235\220.sql"
index 16572ba..ee0341f 100644
--- "a/doc/\345\256\201\345\244\217-\344\270\255\347\233\233\345\273\272\346\235\220.sql"
+++ "b/doc/\345\256\201\345\244\217-\344\270\255\347\233\233\345\273\272\346\235\220.sql"
@@ -1,53 +1,34 @@
-CREATE TABLE `prod_demand_main`
+CREATE TABLE `production_plan`
(
- `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '鑷涓婚敭',
- `tenant_id` bigint(20) NOT NULL COMMENT '绉熸埛缂栧彿',
- `dept_id` bigint(20) DEFAULT NULL COMMENT '閮ㄩ棬ID (鐢ㄤ簬鏁版嵁鏉冮檺闅旂)',
- `form_instance_id` varchar(64) NOT NULL COMMENT '琛ㄥ崟瀹炰緥鍞竴ID (鍏宠仈瀛愯〃鐢�)',
- `serial_no` varchar(64) DEFAULT NULL COMMENT '鍗曟嵁娴佹按鍙� (serialNo)',
- `title` varchar(128) DEFAULT NULL COMMENT '鍗曟嵁鏍囬 (title)',
- `originator_user_id` varchar(64) DEFAULT NULL COMMENT '绗笁鏂瑰彂璧蜂汉ID (creatorUserId)',
- `originator_name` varchar(64) DEFAULT NULL COMMENT '绗笁鏂瑰彂璧蜂汉濮撳悕 (originator.userName)',
- `biz_create_time` datetime DEFAULT NULL COMMENT '绗笁鏂瑰崟鎹垱寤烘椂闂� (createdTimeGMT)',
- `project_name` varchar(128) DEFAULT NULL COMMENT '椤圭洰鍚嶇О/瀹㈡埛 (textField_lbkozohg)',
- `batch_no` varchar(128) DEFAULT NULL COMMENT '鎵规/鍏宠仈缂栧彿 (textField_l7fytfco)',
- `contact_person` varchar(128) DEFAULT NULL COMMENT '鑱旂郴浜�/澶囨敞 (textareaField_l7fytfcy)',
- `ext_text1` varchar(128) DEFAULT NULL COMMENT '棰勭暀鏂囨湰1 (textField_l7fytfcx)',
- `ext_text2` varchar(128) DEFAULT NULL COMMENT '棰勭暀鏂囨湰2 (textField_lbknlltp)',
- `create_user` bigint(20) DEFAULT NULL COMMENT '鍒涘缓鑰�',
- `create_time` datetime DEFAULT NULL COMMENT '鍒涘缓鏃堕棿',
- `update_user` bigint(20) DEFAULT NULL COMMENT '鏇存柊鑰�',
- `update_time` datetime DEFAULT NULL COMMENT '鏇存柊鏃堕棿',
- `remark` varchar(500) DEFAULT NULL COMMENT '澶囨敞',
-
+ `id` BIGINT NOT NULL AUTO_INCREMENT COMMENT '鑷涓婚敭',
+ `form_instance_id` VARCHAR(64) NOT NULL COMMENT '琛ㄥ崟瀹炰緥ID',
+ `serial_no` VARCHAR(64) DEFAULT NULL COMMENT '鍗曟嵁娴佹按鍙�',
+ `title` VARCHAR(128) DEFAULT NULL COMMENT '鍗曟嵁鏍囬',
+ `originator_user_id` VARCHAR(64) DEFAULT NULL COMMENT '鍙戣捣浜篒D',
+ `originator_name` VARCHAR(64) DEFAULT NULL COMMENT '鍙戣捣浜哄鍚�',
+ `biz_create_time` DATETIME DEFAULT NULL COMMENT '鍗曟嵁鍒涘缓鏃堕棿',
+ `project_name` VARCHAR(128) DEFAULT NULL COMMENT '椤圭洰鍚嶇О',
+ `batch_no` VARCHAR(128) DEFAULT NULL COMMENT '鎵规鍙�',
+ `contact_person` VARCHAR(128) DEFAULT NULL COMMENT '鑱旂郴浜�',
+ `ext_text1` VARCHAR(128) DEFAULT NULL COMMENT '棰勭暀1',
+ `ext_text2` VARCHAR(128) DEFAULT NULL COMMENT '棰勭暀2',
+ `material_code` VARCHAR(64) DEFAULT NULL COMMENT '鐗╂枡缂栫爜',
+ `material_category` VARCHAR(64) DEFAULT NULL COMMENT '鐗╂枡鍒嗙被',
+ `spec_desc` VARCHAR(128) DEFAULT NULL COMMENT '瑙勬牸鎻忚堪',
+ `grade_type` VARCHAR(32) DEFAULT NULL COMMENT '绛夌骇',
+ `length` DECIMAL(10, 2) DEFAULT NULL COMMENT '闀垮害',
+ `width` DECIMAL(10, 2) DEFAULT NULL COMMENT '瀹藉害',
+ `thickness` DECIMAL(10, 2) DEFAULT NULL COMMENT '鍘氬害',
+ `quantity` INT DEFAULT NULL COMMENT '鏁伴噺',
+ `volume` DECIMAL(10, 4) DEFAULT NULL COMMENT '鎬讳綋绉�',
+ `date_start` DATETIME DEFAULT NULL COMMENT '寮�濮嬫椂闂�',
+ `date_end` DATETIME DEFAULT NULL COMMENT '缁撴潫鏃堕棿',
+ `association_receipt` TEXT COMMENT '鍏宠仈鍗曟嵁',
+ `data_sync_type` TINYINT DEFAULT 1 COMMENT '鏁版嵁鏂瑰紡: 1=鎵嬪姩 2=瀹氭椂',
+ `data_source_type` TINYINT DEFAULT 1 COMMENT '鏁版嵁鏉ユ簮: 1=閿�鍞鍗� 2=鐢熶骇棰勬祴',
+ `create_time` DATETIME DEFAULT CURRENT_TIMESTAMP,
+ `update_time` DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
PRIMARY KEY (`id`),
- UNIQUE KEY `uk_form_instance_id` (`form_instance_id`)
-) ENGINE = InnoDB
- DEFAULT CHARSET = utf8mb4 COMMENT ='閿�鍞敓浜ч渶姹�';
-
-CREATE TABLE `prod_demand_detail`
-(
- `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '鑷涓婚敭',
- `tenant_id` bigint(20) NOT NULL COMMENT '绉熸埛缂栧彿',
- `prod_demand_main_id` bigint(20) NOT NULL COMMENT '鐖剁被鍏宠仈ID',
- `material_code` varchar(64) DEFAULT NULL COMMENT '鐗╂枡缂栫爜 (textField_l9xo62q5)',
- `material_category` varchar(64) DEFAULT NULL COMMENT '鐗╂枡鍒嗙被 (textField_l9xo62q7)',
- `spec_desc` varchar(128) DEFAULT NULL COMMENT '瑙勬牸鎻忚堪 (textField_l9xo62q8)',
- `grade_type` varchar(32) DEFAULT NULL COMMENT '绛夌骇/绫诲瀷 (radioField_m9urarr2)',
- `length` decimal(10, 2) DEFAULT NULL COMMENT '闀垮害 (numberField_lb7lgatg)',
- `width` decimal(10, 2) DEFAULT NULL COMMENT '瀹藉害 (numberField_lb7lgath)',
- `thickness` decimal(10, 2) DEFAULT NULL COMMENT '鍘氬害 (numberField_lb7lgati)',
- `quantity` int(11) DEFAULT NULL COMMENT '鏁伴噺 (numberField_lb7lgatj)',
- `volume` decimal(10, 4) DEFAULT NULL COMMENT '鎬讳綋绉� (numberField_l7fytfd3)',
- `date_range` varchar(255) DEFAULT NULL COMMENT '鏃堕棿鍖洪棿鏁扮粍瀛楃涓� (cascadeDateField_lfxqqluw)',
- `association_receipt` text DEFAULT NULL COMMENT '鍏宠仈鐨勫叾浠栧崟鎹� (associationFormField_l9xo62q6_id)',
- `create_user` bigint(20) DEFAULT NULL COMMENT '鍒涘缓鑰�',
- `create_time` datetime DEFAULT NULL COMMENT '鍒涘缓鏃堕棿',
- `update_user` bigint(20) DEFAULT NULL COMMENT '鏇存柊鑰�',
- `update_time` datetime DEFAULT NULL COMMENT '鏇存柊鏃堕棿',
- `remark` varchar(500) DEFAULT NULL COMMENT '澶囨敞',
-
- PRIMARY KEY (`id`),
- KEY `idx_prod_demand_main_id` (`prod_demand_main_id`)
-) ENGINE = InnoDB
- DEFAULT CHARSET = utf8mb4 COMMENT ='閿�鍞敓浜ч渶姹俖鏄庣粏琛�';
\ No newline at end of file
+ KEY `idx_form_instance_id` (`form_instance_id`)
+) ENGINE = INNODB
+ DEFAULT CHARSET = utf8mb4 COMMENT = '閿�鍞敓浜ч渶姹�';
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java b/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
index 0a16b62..fc6d2e8 100644
--- a/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
+++ b/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
@@ -25,7 +25,7 @@
/**
* 閫氱敤http鍙戦�佹柟娉�
- *
+ *
* @author ruoyi
*/
public class HttpUtils
@@ -132,7 +132,7 @@
/**
* 鍚戞寚瀹� URL 鍙戦�丳OST鏂规硶鐨勮姹�
- *
+ *
* @param url 鍙戦�佽姹傜殑 URL
* @param param 璇锋眰鍙傛暟
* @param contentType 鍐呭绫诲瀷
@@ -299,7 +299,7 @@
*/
public static String sendPostJson(String url, String jsonParam) {
// 閲嶈浇璋冪敤锛岄粯璁や娇鐢║TF-8缂栫爜锛孋ontent-Type鍥哄畾涓篴pplication/json
- return sendPostJson(url, jsonParam, StandardCharsets.UTF_8.name(),null);
+ return sendPostJson(url, jsonParam, StandardCharsets.UTF_8.name(), null, "");
}
/**
@@ -311,7 +311,7 @@
*/
public static String sendPostJson(String url, String jsonParam, String headerValue) {
// 閲嶈浇璋冪敤锛岄粯璁や娇鐢║TF-8缂栫爜锛孋ontent-Type鍥哄畾涓篴pplication/json
- return sendPostJson(url, jsonParam, StandardCharsets.UTF_8.name(),headerValue);
+ return sendPostJson(url, jsonParam, StandardCharsets.UTF_8.name(),headerValue,"");
}
/**
@@ -321,7 +321,7 @@
* @param charset 缂栫爜绫诲瀷锛堝UTF-8銆丟BK绛夛紝寤鸿浣跨敤StandardCharsets甯搁噺锛�
* @return 杩滅▼璧勬簮鐨勫搷搴旂粨鏋�
*/
- public static String sendPostJson(String url, String jsonParam, String charset,String headerValue) {
+ public static String sendPostJson(String url, String jsonParam, String charset,String headerValue,String accessToken) {
PrintWriter out = null;
BufferedReader in = null;
StringBuilder result = new StringBuilder();
@@ -340,6 +340,9 @@
if(StringUtils.isNotEmpty(headerValue)){
conn.setRequestProperty("Authorization", headerValue);
}
+ if (StringUtils.isNotEmpty(accessToken)) {
+ conn.setRequestProperty("x-acs-dingtalk-access-token", accessToken);
+ }
// 2. 寮�鍚緭鍏ヨ緭鍑烘祦锛圥OST璇锋眰蹇呴』锛�
conn.setDoOutput(true);
conn.setDoInput(true);
diff --git a/src/main/java/com/ruoyi/prodDemand/controller/ProdDemandDetailController.java b/src/main/java/com/ruoyi/prodDemand/controller/ProdDemandDetailController.java
deleted file mode 100644
index 64e4478..0000000
--- a/src/main/java/com/ruoyi/prodDemand/controller/ProdDemandDetailController.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.ruoyi.prodDemand.controller;
-
-import com.ruoyi.prodDemand.service.ProdDemandDetailService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <br>
- * 閿�鍞敓浜ч渶姹�-鏄庣粏鎺у埗灞�
- * </br>
- *
- * @author deslrey
- * @version 1.0
- * @since 2026/03/09 17:17
- */
-@RestController
-@RequestMapping("/ProdDemandDetail")
-public class ProdDemandDetailController {
-
- @Autowired
- private ProdDemandDetailService prodDemandDetailService;
-
-}
diff --git a/src/main/java/com/ruoyi/prodDemand/controller/ProdDemandMainController.java b/src/main/java/com/ruoyi/prodDemand/controller/ProdDemandMainController.java
deleted file mode 100644
index 19f9b55..0000000
--- a/src/main/java/com/ruoyi/prodDemand/controller/ProdDemandMainController.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.ruoyi.prodDemand.controller;
-
-import com.ruoyi.prodDemand.service.ProdDemandMainService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <br>
- * 閿�鍞敓浜ч渶姹�-涓昏〃鎺у埗灞�
- * </br>
- *
- * @author deslrey
- * @version 1.0
- * @since 2026/03/09 17:17
- */
-@RestController
-@RequestMapping("/ProdDemandMain")
-public class ProdDemandMainController {
-
- @Autowired
- private ProdDemandMainService prodDemandMainService;
-
-}
diff --git a/src/main/java/com/ruoyi/prodDemand/mapper/ProdDemandDetailMapper.java b/src/main/java/com/ruoyi/prodDemand/mapper/ProdDemandDetailMapper.java
deleted file mode 100644
index f7c2f26..0000000
--- a/src/main/java/com/ruoyi/prodDemand/mapper/ProdDemandDetailMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.prodDemand.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.prodDemand.pojo.ProdDemandDetail;
-
-/**
- * <br>
- * 閿�鍞敓浜ч渶姹�-鏄庣粏琛╩apper
- * </br>
- *
- * @author deslrey
- * @version 1.0
- * @since 2026/03/09 17:04
- */
-public interface ProdDemandDetailMapper extends BaseMapper<ProdDemandDetail> {
-}
diff --git a/src/main/java/com/ruoyi/prodDemand/mapper/ProdDemandMainMapper.java b/src/main/java/com/ruoyi/prodDemand/mapper/ProdDemandMainMapper.java
deleted file mode 100644
index 7103673..0000000
--- a/src/main/java/com/ruoyi/prodDemand/mapper/ProdDemandMainMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.prodDemand.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.prodDemand.pojo.ProdDemandMain;
-
-/**
- * <br>
- * 閿�鍞敓浜ч渶姹�-涓昏〃mapper
- * </br>
- *
- * @author deslrey
- * @version 1.0
- * @since 2026/03/09 17:04
- */
-public interface ProdDemandMainMapper extends BaseMapper<ProdDemandMain> {
-}
diff --git a/src/main/java/com/ruoyi/prodDemand/pojo/ProdDemandDetail.java b/src/main/java/com/ruoyi/prodDemand/pojo/ProdDemandDetail.java
deleted file mode 100644
index 107c78d..0000000
--- a/src/main/java/com/ruoyi/prodDemand/pojo/ProdDemandDetail.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.ruoyi.prodDemand.pojo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-/**
- * <br>
- * 閿�鍞敓浜ч渶姹�-鏄庣粏琛�
- * </br>
- *
- * @author deslrey
- * @version 1.0
- * @since 2026/03/09 16:58
- */
-@Data
-public class ProdDemandDetail {
-
- /**
- * 鑷涓婚敭
- */
- private Long id;
-
- /**
- * 绉熸埛缂栧彿
- */
- private Long tenantId;
-
- /**
- * 鐖剁被鍏宠仈ID
- */
- private String prodDemandMainId;
-
- /**
- * 鐗╂枡缂栫爜
- */
- private String materialCode;
-
- /**
- * 鐗╂枡鍒嗙被
- */
- private String materialCategory;
-
- /**
- * 瑙勬牸鎻忚堪
- */
- private String specDesc;
-
- /**
- * 绛夌骇/绫诲瀷
- */
- private String gradeType;
-
- /**
- * 闀垮害
- */
- private BigDecimal length;
-
- /**
- * 瀹藉害
- */
- private BigDecimal width;
-
- /**
- * 鍘氬害
- */
- private BigDecimal thickness;
-
- /**
- * 鏁伴噺
- */
- private Integer quantity;
-
- /**
- * 鎬讳綋绉�
- */
- private BigDecimal volume;
-
- /**
- * 鏃堕棿鍖洪棿
- */
- private String dateRange;
-
- /**
- * 鍏宠仈鍗曟嵁
- */
- private String associationReceipt;
-
- /**
- * 鍒涘缓鑰�
- */
- private Long createUser;
-
- /**
- * 鍒涘缓鏃堕棿
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime createTime;
-
- /**
- * 鏇存柊鑰�
- */
- private Long updateUser;
-
- /**
- * 鏇存柊鏃堕棿
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime updateTime;
-
- /**
- * 澶囨敞
- */
- private String remark;
-}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/prodDemand/pojo/ProdDemandMain.java b/src/main/java/com/ruoyi/prodDemand/pojo/ProdDemandMain.java
deleted file mode 100644
index cdac6a4..0000000
--- a/src/main/java/com/ruoyi/prodDemand/pojo/ProdDemandMain.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package com.ruoyi.prodDemand.pojo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.time.LocalDateTime;
-
-/**
- * <br>
- * 閿�鍞敓浜ч渶姹�-涓昏〃
- * </br>
- *
- * @author deslrey
- * @version 1.0
- * @since 2026/03/09 16:47
- */
-@Data
-public class ProdDemandMain {
-
- /**
- * 鑷涓婚敭
- */
- private Long id;
-
- /**
- * 绉熸埛缂栧彿
- */
- private Long tenantId;
-
- /**
- * 閮ㄩ棬ID
- */
- private Long deptId;
-
- /**
- * 琛ㄥ崟瀹炰緥鍞竴ID
- */
- private String formInstanceId;
-
- /**
- * 鍗曟嵁娴佹按鍙�
- */
- private String serialNo;
-
- /**
- * 鍗曟嵁鏍囬
- */
- private String title;
-
- /**
- * 绗笁鏂瑰彂璧蜂汉ID
- */
- private String originatorUserId;
-
- /**
- * 绗笁鏂瑰彂璧蜂汉濮撳悕
- */
- private String originatorName;
-
- /**
- * 绗笁鏂瑰崟鎹垱寤烘椂闂�
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime bizCreateTime;
-
- /**
- * 椤圭洰鍚嶇О/瀹㈡埛
- */
- private String projectName;
-
- /**
- * 鎵规/鍏宠仈缂栧彿
- */
- private String batchNo;
-
- /**
- * 鑱旂郴浜�/澶囨敞
- */
- private String contactPerson;
-
- /**
- * 棰勭暀鏂囨湰1
- */
- private String extText1;
-
- /**
- * 棰勭暀鏂囨湰2
- */
- private String extText2;
-
- /**
- * 鍒涘缓鑰�
- */
- private Long createUser;
-
- /**
- * 鍒涘缓鏃堕棿
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime createTime;
-
- /**
- * 鏇存柊鑰�
- */
- private Long updateUser;
-
- /**
- * 鏇存柊鏃堕棿
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime updateTime;
-
- /**
- * 澶囨敞
- */
- private String remark;
-}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/prodDemand/service/ProdDemandDetailService.java b/src/main/java/com/ruoyi/prodDemand/service/ProdDemandDetailService.java
deleted file mode 100644
index 4cec099..0000000
--- a/src/main/java/com/ruoyi/prodDemand/service/ProdDemandDetailService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.prodDemand.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.prodDemand.pojo.ProdDemandDetail;
-
-/**
- * <br>
- * 閿�鍞敓浜ч渶姹�-鏄庣粏鎺ュ彛
- * </br>
- *
- * @author deslrey
- * @version 1.0
- * @since 2026/03/09 17:02
- */
-public interface ProdDemandDetailService extends IService<ProdDemandDetail> {
-}
diff --git a/src/main/java/com/ruoyi/prodDemand/service/ProdDemandMainService.java b/src/main/java/com/ruoyi/prodDemand/service/ProdDemandMainService.java
deleted file mode 100644
index f657fe8..0000000
--- a/src/main/java/com/ruoyi/prodDemand/service/ProdDemandMainService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.prodDemand.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.prodDemand.pojo.ProdDemandMain;
-
-/**
- * <br>
- * 閿�鍞敓浜ч渶姹�-涓昏〃鎺ュ彛
- * </br>
- *
- * @author deslrey
- * @version 1.0
- * @since 2026/03/09 17:03
- */
-public interface ProdDemandMainService extends IService<ProdDemandMain> {
-}
diff --git a/src/main/java/com/ruoyi/prodDemand/service/impl/ProdDemandDetailServiceImpl.java b/src/main/java/com/ruoyi/prodDemand/service/impl/ProdDemandDetailServiceImpl.java
deleted file mode 100644
index 19c785d..0000000
--- a/src/main/java/com/ruoyi/prodDemand/service/impl/ProdDemandDetailServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.ruoyi.prodDemand.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.prodDemand.mapper.ProdDemandDetailMapper;
-import com.ruoyi.prodDemand.pojo.ProdDemandDetail;
-import com.ruoyi.prodDemand.service.ProdDemandDetailService;
-import org.springframework.stereotype.Service;
-
-/**
- * <br>
- * 閿�鍞敓浜ч渶姹�-鏄庣粏鎺ュ彛瀹炵幇绫�
- * </br>
- *
- * @author deslrey
- * @version 1.0
- * @since 2026/03/09 17:03
- */
-@Service
-public class ProdDemandDetailServiceImpl extends ServiceImpl<ProdDemandDetailMapper, ProdDemandDetail> implements ProdDemandDetailService {
-}
diff --git a/src/main/java/com/ruoyi/prodDemand/service/impl/ProdDemandMainServiceImpl.java b/src/main/java/com/ruoyi/prodDemand/service/impl/ProdDemandMainServiceImpl.java
deleted file mode 100644
index 60040d8..0000000
--- a/src/main/java/com/ruoyi/prodDemand/service/impl/ProdDemandMainServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.ruoyi.prodDemand.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.prodDemand.mapper.ProdDemandMainMapper;
-import com.ruoyi.prodDemand.pojo.ProdDemandMain;
-import com.ruoyi.prodDemand.service.ProdDemandMainService;
-import org.springframework.stereotype.Service;
-
-/**
- * <br>
- * 閿�鍞敓浜ч渶姹�-涓昏〃鎺ュ彛瀹炵幇绫�
- * </br>
- *
- * @author deslrey
- * @version 1.0
- * @since 2026/03/09 17:03
- */
-@Service
-public class ProdDemandMainServiceImpl extends ServiceImpl<ProdDemandMainMapper, ProdDemandMain> implements ProdDemandMainService {
-}
diff --git a/src/main/java/com/ruoyi/prodDemand/task/ProdDemandTask.java b/src/main/java/com/ruoyi/prodDemand/task/ProdDemandTask.java
deleted file mode 100644
index bad7ba4..0000000
--- a/src/main/java/com/ruoyi/prodDemand/task/ProdDemandTask.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.ruoyi.prodDemand.task;
-
-/**
- * <br>
- *
- * </br>
- *
- * @author deslrey
- * @version 1.0
- * @since 2026/03/09 17:02
- */
-public class ProdDemandTask {
-}
diff --git a/src/main/java/com/ruoyi/productionPlan/controller/ProductionPlanController.java b/src/main/java/com/ruoyi/productionPlan/controller/ProductionPlanController.java
new file mode 100644
index 0000000..bd1f580
--- /dev/null
+++ b/src/main/java/com/ruoyi/productionPlan/controller/ProductionPlanController.java
@@ -0,0 +1,19 @@
+package com.ruoyi.productionPlan.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <br>
+ * 閿�鍞敓浜ч渶姹傛帶鍒跺眰
+ * </br>
+ *
+ * @author deslrey
+ * @version 1.0
+ * @since 2026/03/10 10:01
+ */
+
+@RestController
+@RequestMapping("/productionPlan")
+public class ProductionPlanController {
+}
diff --git a/src/main/java/com/ruoyi/productionPlan/mapper/ProductionPlanMapper.java b/src/main/java/com/ruoyi/productionPlan/mapper/ProductionPlanMapper.java
new file mode 100644
index 0000000..77d36e6
--- /dev/null
+++ b/src/main/java/com/ruoyi/productionPlan/mapper/ProductionPlanMapper.java
@@ -0,0 +1,16 @@
+package com.ruoyi.productionPlan.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.productionPlan.pojo.ProductionPlan;
+
+/**
+ * <br>
+ * 閿�鍞敓浜ч渶姹侻apper
+ * </br>
+ *
+ * @author deslrey
+ * @version 1.0
+ * @since 2026/03/10 9:56
+ */
+public interface ProductionPlanMapper extends BaseMapper<ProductionPlan> {
+}
diff --git a/src/main/java/com/ruoyi/productionPlan/pojo/ProductionPlan.java b/src/main/java/com/ruoyi/productionPlan/pojo/ProductionPlan.java
new file mode 100644
index 0000000..94602ad
--- /dev/null
+++ b/src/main/java/com/ruoyi/productionPlan/pojo/ProductionPlan.java
@@ -0,0 +1,171 @@
+package com.ruoyi.productionPlan.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * <br>
+ * 閿�鍞敓浜ч渶姹�
+ * </br>
+ *
+ * @author deslrey
+ * @version 1.0
+ * @since 2026/03/10 9:54
+ */
+@Data
+@TableName("production_plan")
+public class ProductionPlan {
+
+ /**
+ * 鑷涓婚敭
+ */
+ @TableId(type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 琛ㄥ崟瀹炰緥ID
+ */
+ private String formInstanceId;
+
+ /**
+ * 鍗曟嵁娴佹按鍙�
+ */
+ private String serialNo;
+
+ /**
+ * 鍗曟嵁鏍囬
+ */
+ private String title;
+
+ /**
+ * 鍙戣捣浜篒D
+ */
+ private String originatorUserId;
+
+ /**
+ * 鍙戣捣浜哄鍚�
+ */
+ private String originatorName;
+
+ /**
+ * 鍗曟嵁鍒涘缓鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime bizCreateTime;
+
+ /**
+ * 椤圭洰鍚嶇О
+ */
+ private String projectName;
+
+ /**
+ * 鎵规鍙�
+ */
+ private String batchNo;
+
+ /**
+ * 鑱旂郴浜�
+ */
+ private String contactPerson;
+
+ /**
+ * 棰勭暀1
+ */
+ private String extText1;
+
+ /**
+ * 棰勭暀2
+ */
+ private String extText2;
+
+ /**
+ * 鐗╂枡缂栫爜
+ */
+ private String materialCode;
+
+ /**
+ * 鐗╂枡鍒嗙被
+ */
+ private String materialCategory;
+
+ /**
+ * 瑙勬牸鎻忚堪
+ */
+ private String specDesc;
+
+ /**
+ * 绛夌骇
+ */
+ private String gradeType;
+
+ /**
+ * 闀垮害
+ */
+ private BigDecimal length;
+
+ /**
+ * 瀹藉害
+ */
+ private BigDecimal width;
+
+ /**
+ * 鍘氬害
+ */
+ private BigDecimal thickness;
+
+ /**
+ * 鏁伴噺
+ */
+ private Integer quantity;
+
+ /**
+ * 鎬讳綋绉�
+ */
+ private BigDecimal volume;
+
+ /**
+ * 寮�濮嬫椂闂�
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime dateStart;
+
+ /**
+ * 缁撴潫鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime dateEnd;
+
+ /**
+ * 鍏宠仈鍗曟嵁
+ */
+ private String associationReceipt;
+
+ /**
+ * 鏁版嵁鏂瑰紡: 1=鎵嬪姩 2=瀹氭椂
+ */
+ private Integer dataSyncType;
+
+ /**
+ * 鏁版嵁鏉ユ簮: 1=閿�鍞鍗� 2=鐢熶骇棰勬祴
+ */
+ private Integer dataSourceType;
+
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime createTime;
+
+ /**
+ * 鏇存柊鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime updateTime;
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/productionPlan/service/ProductionPlanService.java b/src/main/java/com/ruoyi/productionPlan/service/ProductionPlanService.java
new file mode 100644
index 0000000..5fe9ab9
--- /dev/null
+++ b/src/main/java/com/ruoyi/productionPlan/service/ProductionPlanService.java
@@ -0,0 +1,16 @@
+package com.ruoyi.productionPlan.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.productionPlan.pojo.ProductionPlan;
+
+/**
+ * <br>
+ * 閿�鍞敓浜ч渶姹傛帴鍙�
+ * </br>
+ *
+ * @author deslrey
+ * @version 1.0
+ * @since 2026/03/10 10:00
+ */
+public interface ProductionPlanService extends IService<ProductionPlan> {
+}
diff --git a/src/main/java/com/ruoyi/productionPlan/service/impl/ProdDemandService.java b/src/main/java/com/ruoyi/productionPlan/service/impl/ProdDemandService.java
new file mode 100644
index 0000000..f7c02a8
--- /dev/null
+++ b/src/main/java/com/ruoyi/productionPlan/service/impl/ProdDemandService.java
@@ -0,0 +1,165 @@
+package com.ruoyi.productionPlan.service.impl;
+
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.http.HttpUtils;
+import com.ruoyi.framework.config.AliDingConfig;
+import com.ruoyi.productionPlan.pojo.ProductionPlan;
+import com.ruoyi.productionPlan.service.ProductionPlanService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.nio.charset.StandardCharsets;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <br>
+ * 鎷夊彇閽夐拤鏁版嵁骞跺鍏�
+ * </br>
+ *
+ * @author deslrey
+ * @version 1.0
+ * @since 2026/03/09 17:31
+ */
+@Slf4j
+@Service
+public class ProdDemandService {
+
+ @Autowired
+ private ProductionPlanService productionPlanService;
+
+ @Autowired
+ private AliDingConfig aliDingConfig;
+
+ @Transactional(rollbackFor = Exception.class)
+ public void LoadProdDemandData(Integer currentPage, Integer pageSize) {
+ System.out.println("aliDingConfig = " + aliDingConfig);
+ String params = "appkey=" + "dingjnydbagc9ol7cwq4" + "&appsecret=" + "fO07qSZC5SMLw9It3Ydd3BuoFyVbRlsWXUnVr2kwPJXz0OpUntCAO5dqnr8G7zq5";
+ String tokenRes = HttpUtils.sendGet(aliDingConfig.getAccessTokenUrl(), params);
+ JSONObject tokenObj = JSON.parseObject(tokenRes);
+
+ String accessToken = tokenObj.getString("access_token");
+ if (StringUtils.isEmpty(accessToken)) {
+ log.error("鑾峰彇閽夐拤 AccessToken 澶辫触锛岃繑鍥炵粨鏋滐細{}", tokenRes);
+ return;
+ }
+ log.info("鎴愬姛鑾峰彇閽夐拤 AccessToken: {}", accessToken);
+
+ JSONObject searchParam = new JSONObject();
+ searchParam.put("appType", aliDingConfig.getAppType());
+ searchParam.put("systemToken", aliDingConfig.getSystemToken());
+ searchParam.put("userId", aliDingConfig.getUserId());
+ searchParam.put("formUuid", aliDingConfig.getFormUuid());
+ if (currentPage == null || currentPage <= 0) {
+ currentPage = 1;
+ }
+ searchParam.put("currentPage", currentPage);
+ if (pageSize == null || pageSize <= 0) {
+ pageSize = 1;
+ }
+ searchParam.put("pageSize", pageSize);
+
+ String dataRes = HttpUtils.sendPostJson(
+ aliDingConfig.getSearchFormDataUrl(),
+ searchParam.toJSONString(),
+ StandardCharsets.UTF_8.name(),
+ null,
+ accessToken
+ );
+
+ if (StringUtils.isEmpty(dataRes)) {
+ log.error("鎷夊彇瀹滄惌琛ㄥ崟鏁版嵁涓虹┖锛�");
+ return;
+ }
+
+ JSONObject resultObj = JSON.parseObject(dataRes);
+
+ JSONArray dataArr = resultObj.getJSONArray("data");
+ if (dataArr == null || dataArr.isEmpty()) {
+ log.warn("娌℃湁鑾峰彇鍒拌〃鍗曟暟鎹�");
+ return;
+ }
+
+ List<ProductionPlan> list = new ArrayList<>();
+
+ for (int i = 0; i < dataArr.size(); i++) {
+
+ JSONObject item = dataArr.getJSONObject(i);
+ String formInstanceId = item.getString("formInstanceId");
+ String serialNo = item.getString("serialNo");
+ String title = item.getString("title");
+
+ JSONObject originator = item.getJSONObject("originator");
+ String originatorUserId = originator.getString("userId");
+ String originatorName = originator.getJSONObject("userName").getString("nameInChinese");
+
+ JSONObject formData = item.getJSONObject("formData");
+ String projectName = formData.getString("textField_lbkozohg");
+ String batchNo = formData.getString("textField_l7fytfco");
+ String contactPerson = formData.getString("textareaField_l7fytfcy");
+
+ JSONArray tableArr = formData.getJSONArray("tableField_l7fytfcn");
+
+ if (tableArr == null) {
+ continue;
+ }
+
+ for (int j = 0; j < tableArr.size(); j++) {
+ JSONObject row = tableArr.getJSONObject(j);
+
+ ProductionPlan plan = new ProductionPlan();
+ plan.setFormInstanceId(formInstanceId);
+ plan.setSerialNo(serialNo);
+ plan.setTitle(title);
+ plan.setOriginatorUserId(originatorUserId);
+ plan.setOriginatorName(originatorName);
+ plan.setProjectName(projectName);
+ plan.setBatchNo(batchNo);
+ plan.setContactPerson(contactPerson);
+ plan.setMaterialCode(row.getString("textField_l9xo62q5"));
+ plan.setMaterialCategory(row.getString("textField_l9xo62q7"));
+ plan.setSpecDesc(row.getString("textField_l9xo62q8"));
+ plan.setGradeType(row.getString("radioField_m9urarr2"));
+ plan.setLength(row.getBigDecimal("numberField_lb7lgatg"));
+ plan.setWidth(row.getBigDecimal("numberField_lb7lgath"));
+ plan.setThickness(row.getBigDecimal("numberField_lb7lgati"));
+ plan.setQuantity(row.getInteger("numberField_lb7lgatj"));
+ plan.setVolume(row.getBigDecimal("numberField_l7fytfd3"));
+
+ // 鏃ユ湡
+ JSONArray dateArr = row.getJSONArray("cascadeDateField_lfxqqluw");
+ if (dateArr != null && dateArr.size() == 2) {
+ long start = dateArr.getLongValue(0);
+ long end = dateArr.getLongValue(1);
+
+ plan.setDateStart(Instant.ofEpochMilli(start)
+ .atZone(ZoneId.systemDefault())
+ .toLocalDateTime());
+
+ plan.setDateEnd(Instant.ofEpochMilli(end)
+ .atZone(ZoneId.systemDefault())
+ .toLocalDateTime());
+ }
+ plan.setDataSyncType(2);
+ plan.setDataSourceType(1);
+ plan.setCreateTime(LocalDateTime.now());
+
+ list.add(plan);
+ }
+ }
+
+ if (!list.isEmpty()) {
+ productionPlanService.saveBatch(list);
+ }
+ log.info("鍚屾鐢熶骇闇�姹傛暟鎹畬鎴愶紝鍏� {} 鏉�", list.size());
+ }
+
+}
diff --git a/src/main/java/com/ruoyi/productionPlan/service/impl/ProductionPlanServiceImpl.java b/src/main/java/com/ruoyi/productionPlan/service/impl/ProductionPlanServiceImpl.java
new file mode 100644
index 0000000..c39ee9e
--- /dev/null
+++ b/src/main/java/com/ruoyi/productionPlan/service/impl/ProductionPlanServiceImpl.java
@@ -0,0 +1,23 @@
+package com.ruoyi.productionPlan.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.productionPlan.mapper.ProductionPlanMapper;
+import com.ruoyi.productionPlan.pojo.ProductionPlan;
+import com.ruoyi.productionPlan.service.ProductionPlanService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * <br>
+ * 閿�鍞敓浜ч渶姹傛帴鍙ｅ疄鐜扮被
+ * </br>
+ *
+ * @author deslrey
+ * @version 1.0
+ * @since 2026/03/10 10:00
+ */
+
+@Slf4j
+@Service
+public class ProductionPlanServiceImpl extends ServiceImpl<ProductionPlanMapper, ProductionPlan> implements ProductionPlanService {
+}
diff --git a/src/main/java/com/ruoyi/productionPlan/task/ProductionPlanTask.java b/src/main/java/com/ruoyi/productionPlan/task/ProductionPlanTask.java
new file mode 100644
index 0000000..8bbae72
--- /dev/null
+++ b/src/main/java/com/ruoyi/productionPlan/task/ProductionPlanTask.java
@@ -0,0 +1,13 @@
+package com.ruoyi.productionPlan.task;
+
+/**
+ * <br>
+ * 閿�鍞敓浜ч渶姹傚畾鏃朵换鍔�
+ * </br>
+ *
+ * @author deslrey
+ * @version 1.0
+ * @since 2026/03/09 17:02
+ */
+public class ProductionPlanTask {
+}
diff --git a/src/main/resources/application-zsjc.yml b/src/main/resources/application-zsjc.yml
index f9d758e..49601be 100644
--- a/src/main/resources/application-zsjc.yml
+++ b/src/main/resources/application-zsjc.yml
@@ -33,7 +33,7 @@
form-uuid: "FORM-4IA66891C5H3QWMDBSGO05C0OX9628GRPYF7L8"
system-token: "4J766L91OFH3V612E7LG5B4DI8M13MQF9VF7LG4"
# 鎺ュ彛鍦板潃
- access-token-url: "https://api.dingtalk.com/v1.0/oauth2/accessToken"
+ access-token-url: "https://oapi.dingtalk.com/gettoken"
search-form-data-url: "https://api.dingtalk.com/v2.0/yida/forms/instances/search"
# 寮�鍙戠幆澧冮厤缃�
diff --git a/src/main/resources/mapper/prodDemand/ProdDemandDetailMapper.xml b/src/main/resources/mapper/prodDemand/ProdDemandDetailMapper.xml
deleted file mode 100644
index b142656..0000000
--- a/src/main/resources/mapper/prodDemand/ProdDemandDetailMapper.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-<mapper namespace="com.ruoyi.prodDemand.mapper.ProdDemandDetailMapper">
- <resultMap id="ProdDemandDetailResultMap" type="com.ruoyi.prodDemand.pojo.ProdDemandDetail">
- <id property="id" column="id"/>
- <result property="tenantId" column="tenant_id"/>
- <result property="prodDemandMainId" column="prod_demand_main_id"/>
- <result property="materialCode" column="material_code"/>
- <result property="materialCategory" column="material_category"/>
- <result property="specDesc" column="spec_desc"/>
- <result property="gradeType" column="grade_type"/>
- <result property="length" column="length"/>
- <result property="width" column="width"/>
- <result property="thickness" column="thickness"/>
- <result property="quantity" column="quantity"/>
- <result property="volume" column="volume"/>
- <result property="dateRange" column="date_range"/>
- <result property="associationReceipt" column="association_receipt"/>
- <result property="createUser" column="create_user"/>
- <result property="createTime" column="create_time"/>
- <result property="updateUser" column="update_user"/>
- <result property="updateTime" column="update_time"/>
- <result property="remark" column="remark"/>
- </resultMap>
-
-
-</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/prodDemand/ProdDemandMainMapper.xml b/src/main/resources/mapper/prodDemand/ProdDemandMainMapper.xml
deleted file mode 100644
index 1a4912d..0000000
--- a/src/main/resources/mapper/prodDemand/ProdDemandMainMapper.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-<mapper namespace="com.ruoyi.prodDemand.mapper.ProdDemandMainMapper">
-
- <resultMap id="ProdDemandMainResultMap" type="com.ruoyi.prodDemand.pojo.ProdDemandMain">
- <id property="id" column="id"/>
- <result property="tenantId" column="tenant_id"/>
- <result property="deptId" column="dept_id"/>
- <result property="formInstanceId" column="form_instance_id"/>
- <result property="serialNo" column="serial_no"/>
- <result property="title" column="title"/>
- <result property="originatorUserId" column="originator_user_id"/>
- <result property="originatorName" column="originator_name"/>
- <result property="bizCreateTime" column="biz_create_time"/>
- <result property="projectName" column="project_name"/>
- <result property="batchNo" column="batch_no"/>
- <result property="contactPerson" column="contact_person"/>
- <result property="extText1" column="ext_text1"/>
- <result property="extText2" column="ext_text2"/>
- <result property="createUser" column="create_user"/>
- <result property="createTime" column="create_time"/>
- <result property="updateUser" column="update_user"/>
- <result property="updateTime" column="update_time"/>
- <result property="remark" column="remark"/>
- </resultMap>
-
-</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/productionPlan/ProductionPlanMapper.xml b/src/main/resources/mapper/productionPlan/ProductionPlanMapper.xml
new file mode 100644
index 0000000..71533a4
--- /dev/null
+++ b/src/main/resources/mapper/productionPlan/ProductionPlanMapper.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.ruoyi.productionPlan.mapper.ProductionPlanMapper">
+
+ <resultMap id="ProductionPlanResultMap" type="com.ruoyi.productionPlan.pojo.ProductionPlan">
+ <id property="id" column="id"/>
+ <result property="formInstanceId" column="form_instance_id"/>
+ <result property="serialNo" column="serial_no"/>
+ <result property="title" column="title"/>
+ <result property="originatorUserId" column="originator_user_id"/>
+ <result property="originatorName" column="originator_name"/>
+ <result property="bizCreateTime" column="biz_create_time"/>
+ <result property="projectName" column="project_name"/>
+ <result property="batchNo" column="batch_no"/>
+ <result property="contactPerson" column="contact_person"/>
+ <result property="extText1" column="ext_text1"/>
+ <result property="extText2" column="ext_text2"/>
+ <result property="materialCode" column="material_code"/>
+ <result property="materialCategory" column="material_category"/>
+ <result property="specDesc" column="spec_desc"/>
+ <result property="gradeType" column="grade_type"/>
+ <result property="length" column="length"/>
+ <result property="width" column="width"/>
+ <result property="thickness" column="thickness"/>
+ <result property="quantity" column="quantity"/>
+ <result property="volume" column="volume"/>
+ <result property="dateStart" column="date_start"/>
+ <result property="dateEnd" column="date_end"/>
+ <result property="associationReceipt" column="association_receipt"/>
+ <result property="dataSyncType" column="data_sync_type"/>
+ <result property="dataSourceType" column="data_source_type"/>
+ <result property="createTime" column="create_time"/>
+ <result property="updateTime" column="update_time"/>
+ </resultMap>
+
+</mapper>
\ No newline at end of file
diff --git a/src/test/com/ruoyi/productionPlan/service/ProdDemandServiceTest.java b/src/test/com/ruoyi/productionPlan/service/ProdDemandServiceTest.java
new file mode 100644
index 0000000..dbd35d4
--- /dev/null
+++ b/src/test/com/ruoyi/productionPlan/service/ProdDemandServiceTest.java
@@ -0,0 +1,27 @@
+package com.ruoyi.productionPlan.service;
+
+import com.ruoyi.productionPlan.service.impl.ProdDemandService;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+/**
+ * <br>
+ *
+ * </br>
+ *
+ * @author deslrey
+ * @version 1.0
+ * @since 2026/03/10 9:15
+ */
+@SpringBootTest
+class ProdDemandServiceTest {
+
+ @Autowired
+ private ProdDemandService prodDemandService;
+
+ @Test
+ void loadProdDemandData() {
+ prodDemandService.LoadProdDemandData(1, 1);
+ }
+}
\ No newline at end of file
--
Gitblit v1.9.3