| doc/20260615_add_plan_person_and_executor_to_routing_operation.sql | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| docs/routing_operation_plan_person.md | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/ruoyi/production/pojo/ProductionOrderRoutingOperation.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/ruoyi/technology/bean/vo/TechnologyOperationVo.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/ruoyi/technology/pojo/TechnologyOperation.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/ruoyi/technology/pojo/TechnologyRoutingOperation.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/resources/mapper/production/ProductionOrderRoutingOperationMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/resources/mapper/technology/TechnologyOperationMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/resources/mapper/technology/TechnologyRoutingOperationMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
doc/20260615_add_plan_person_and_executor_to_routing_operation.sql
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,15 @@ # çäº§å·¥åºæ°å¢è®¡å人åãè®¡åæ§è¡äººåãå·¥åºç±»ååæ®µ ALTER TABLE technology_operation ADD plan_person bigint NULL COMMENT '计å人åID', ADD executor bigint NULL COMMENT 'è®¡åæ§è¡äººåID', ADD process_type varchar(255) NULL COMMENT 'å·¥åºç±»å'; ALTER TABLE technology_routing_operation ADD plan_person bigint NULL COMMENT '计å人åID', ADD executor bigint NULL COMMENT 'è®¡åæ§è¡äººåID', ADD process_type varchar(255) NULL COMMENT 'å·¥åºç±»å'; ALTER TABLE production_order_routing_operation ADD plan_person bigint NULL COMMENT '计å人åID', ADD executor bigint NULL COMMENT 'è®¡åæ§è¡äººåID', ADD process_type varchar(255) NULL COMMENT 'å·¥åºç±»å'; docs/routing_operation_plan_person.md
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,103 @@ # çäº§å·¥åºæ°å¢è®¡å人ååè®¡åæ§è¡äººå ## æ¶åé¡µé¢ - åºç¡å·¥åºç®¡ç页é¢ï¼technology_operation / å·¥åºç®¡çï¼ - å·¥èºè·¯çº¿å·¥åºç®¡ç页é¢ï¼technology_routing_operationï¼ - ç产订åå·¥åºï¼production_order_routing_operationï¼ ## API ### åºç¡å·¥åºï¼technologyOperationï¼ | æ¹æ³ | è·¯å¾ | 说æ | |------|------|------| | GET | /technologyOperation/listPage | å页æ¥è¯¢ | | GET | /technologyOperation/list | æ¥è¯¢å ¨é¨ | | POST | /technologyOperation/add | æ°å¢ | | PUT | /technologyOperation/update | ä¿®æ¹ | | DELETE | /technologyOperation/batchDelete | æ¹éå é¤ | ### å·¥èºè·¯çº¿å·¥åºï¼technologyRoutingOperationï¼ | æ¹æ³ | è·¯å¾ | 说æ | |------|------|------| | GET | /technologyRoutingOperation/page | å页æ¥è¯¢ | | GET | /technologyRoutingOperation/list | å表æ¥è¯¢ | | GET | /technologyRoutingOperation/{id} | 详æ | | POST | /technologyRoutingOperation/add | æ°å¢ | | PUT | /technologyRoutingOperation | ä¿®æ¹ | **æ°å¢ååº/请æ±å段ï¼** | åæ° | ç±»å | å¿ å¡« | 说æ | |------|------|------|------| | planPerson | Long | å¦ | 计å人åID | | executor | Long | å¦ | è®¡åæ§è¡äººåID | | planPersonName | String | å¦ | 计å人åå§åï¼ååºå段ï¼å端èªå¨å ³èæ¥è¯¢ï¼ | | executorName | String | å¦ | è®¡åæ§è¡äººåå§åï¼ååºå段ï¼å端èªå¨å ³èæ¥è¯¢ï¼ | ## å端修æ¹ç¹ ### 1. è¡¨åæ°å¢å段 å¨å·¥åºè¡¨å䏿°å¢ä¸¤ä¸ªäººå鿩䏿æ¡ï¼ ```html <el-form-item label="计å人å" prop="planPerson"> <el-select v-model="processForm.planPerson" placeholder="è¯·éæ©è®¡å人å" clearable filterable style="width: 100%"> <el-option v-for="item in employeeOptions" :key="item.id" :label="item.staffName" :value="item.id" /> </el-select> </el-form-item> <el-form-item label="è®¡åæ§è¡äººå" prop="executor"> <el-select v-model="processForm.executor" placeholder="è¯·éæ©è®¡åæ§è¡äººå" clearable filterable style="width: 100%"> <el-option v-for="item in employeeOptions" :key="item.id" :label="item.staffName" :value="item.id" /> </el-select> </el-form-item> ``` ### 2. data æ°æ® ```js data() { return { processForm: { planPerson: null, executor: null, // ...å ¶ä»å段 }, employeeOptions: [], // åå·¥å表ï¼é仿¥å£è·å } } ``` ### 3. è¡¨æ ¼åæ°å¢ å表ä¸å¯ç´æ¥ä½¿ç¨å端è¿åçå§åå±ç¤ºï¼ ```html <el-table-column label="计å人å" prop="planPersonName" /> <el-table-column label="è®¡åæ§è¡äººå" prop="executorName" /> ``` ## 注æäºé¡¹ - `planPerson` å `executor` åå¨çæ¯åå·¥IDï¼Longç±»åï¼ï¼æäº¤è¡¨åæ¶ä¼ ID - ååºä¸ `planPersonName` å `executorName` ç±å端éè¿ `staff_on_job` 表èªå¨å ³èæ¥è¯¢ï¼å端æ éé¢å¤è½¬æ¢ - å工䏿åè¡¨æ°æ®éä»åå·¥æ¥å£è·åï¼åèç°æ `employeeOptions` æ°æ®æºï¼ - æ°æ®åºè¿ç§»SQLï¼`doc/20260615_add_plan_person_and_executor_to_routing_operation.sql` - ä¸å¼ è¡¨åæ¯æï¼`technology_operation`ã`technology_routing_operation`ã`production_order_routing_operation` src/main/java/com/ruoyi/production/pojo/ProductionOrderRoutingOperation.java
@@ -76,4 +76,7 @@ @Schema(description = "è®¡åæ§è¡äººåID") private Long executor; @Schema(description = "å·¥åºç±»å") private String processType; } src/main/java/com/ruoyi/technology/bean/vo/TechnologyOperationVo.java
@@ -9,4 +9,10 @@ @Data @Schema(name = "TechnologyOperationVo对象", description = "å·¥åºè¿å对象") public class TechnologyOperationVo extends TechnologyOperation { @Schema(description = "计å人åå§å") private String planPersonName; @Schema(description = "è®¡åæ§è¡äººåå§å") private String executorName; } src/main/java/com/ruoyi/technology/pojo/TechnologyOperation.java
@@ -65,4 +65,13 @@ @Schema(description = "æ¯å¦ç产") private Boolean isProduction; @Schema(description = "计å人åID") private Long planPerson; @Schema(description = "è®¡åæ§è¡äººåID") private Long executor; @Schema(description = "å·¥åºç±»å") private String processType; } src/main/java/com/ruoyi/technology/pojo/TechnologyRoutingOperation.java
@@ -67,4 +67,7 @@ @Schema(description = "è®¡åæ§è¡äººåID") private Long executor; @Schema(description = "å·¥åºç±»å") private String processType; } src/main/resources/mapper/production/ProductionOrderRoutingOperationMapper.xml
@@ -16,6 +16,7 @@ <result column="type" property="type" /> <result column="plan_person" property="planPerson" /> <result column="executor" property="executor" /> <result column="process_type" property="processType" /> <result column="create_user" property="createUser" /> <result column="dept_id" property="deptId" /> </resultMap> src/main/resources/mapper/technology/TechnologyOperationMapper.xml
@@ -14,13 +14,20 @@ <result column="is_quality" property="isQuality" /> <result column="type" property="type" /> <result column="device_ledger_id" property="deviceLedgerId" /> <result column="plan_person" property="planPerson" /> <result column="executor" property="executor" /> <result column="process_type" property="processType" /> <result column="create_user" property="createUser" /> <result column="dept_id" property="deptId" /> </resultMap> <select id="listPage" resultType="com.ruoyi.technology.bean.vo.TechnologyOperationVo"> select * select t.*, sp.staff_name as planPersonName, se.staff_name as executorName from technology_operation t left join staff_on_job sp on t.plan_person = sp.id left join staff_on_job se on t.executor = se.id <where> <if test="c.name != null and c.name != ''"> and t.name like concat('%', #{c.name}, '%') src/main/resources/mapper/technology/TechnologyRoutingOperationMapper.xml
@@ -15,6 +15,7 @@ <result column="type" property="type" /> <result column="plan_person" property="planPerson" /> <result column="executor" property="executor" /> <result column="process_type" property="processType" /> <result column="create_user" property="createUser" /> <result column="dept_id" property="deptId" /> </resultMap>