From 8338a7d485f7c9f8431c6d2bf39d33fa7df9194c Mon Sep 17 00:00:00 2001 From: zhanghl <253316343@qq.com> Date: 星期五, 18 四月 2025 16:06:48 +0800 Subject: [PATCH] work——order 同步零件工单数据 --- aps-modules/aps-job/src/main/java/com/aps/job/service/IApsWorkOrderJobService.java | 4 ++ aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderJobMapper.xml | 30 +++++++++++++++ aps-modules/aps-job/src/main/java/com/aps/job/controller/ApsWorkOrderJobController.java | 45 +++++----------------- aps-modules/aps-job/src/main/java/com/aps/job/mapper/ApsWorkOrderJobMapper.java | 9 ++++ aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderJobServiceImpl.java | 9 ++++ 5 files changed, 62 insertions(+), 35 deletions(-) diff --git a/aps-modules/aps-job/src/main/java/com/aps/job/controller/ApsWorkOrderJobController.java b/aps-modules/aps-job/src/main/java/com/aps/job/controller/ApsWorkOrderJobController.java index 791a662..54db310 100644 --- a/aps-modules/aps-job/src/main/java/com/aps/job/controller/ApsWorkOrderJobController.java +++ b/aps-modules/aps-job/src/main/java/com/aps/job/controller/ApsWorkOrderJobController.java @@ -1,7 +1,6 @@ package com.aps.job.controller; import java.util.List; -import java.io.IOException; import com.aps.job.param.ApsWorkOrderJobParam; import jakarta.servlet.http.HttpServletResponse; @@ -73,43 +72,21 @@ } /** - * 鏂板宸ュ崟鍚屾 - */ - @RequiresPermissions("ApsWorkOrderJob:ApsWorkOrderJob:add") - @Log(title = "宸ュ崟鍚屾", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody ApsWorkOrderJob apsWorkOrderJob) - { - return toAjax(apsWorkOrderJobService.insertApsWorkOrderJob(apsWorkOrderJob)); - } - - /** - * 淇敼宸ュ崟鍚屾 - */ - @RequiresPermissions("ApsWorkOrderJob:ApsWorkOrderJob:edit") - @Log(title = "宸ュ崟鍚屾", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody ApsWorkOrderJob apsWorkOrderJob) - { - return toAjax(apsWorkOrderJobService.updateApsWorkOrderJob(apsWorkOrderJob)); - } - - /** - * 鍒犻櫎宸ュ崟鍚屾 - */ - @RequiresPermissions("ApsWorkOrderJob:ApsWorkOrderJob:remove") - @Log(title = "宸ュ崟鍚屾", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { - return toAjax(apsWorkOrderJobService.deleteApsWorkOrderJobByIds(ids)); - } - - + * 鍚屾宸ュ崟鏁版嵁 + * */ @PostMapping("/batchInsertApsWorkOrderJob") public AjaxResult batchInsertApsWorkOrderJob(@RequestBody ApsWorkOrderJobParam param) { apsWorkOrderJobService.batchInsertApsWorkOrderJob(param); return success(); } + /** + * 鍚屾闆朵欢宸ュ崟 + * */ + @PostMapping("/batchInsertPartOrderJob") + public AjaxResult batchInsertPartOrderJob() + { + apsWorkOrderJobService.syncPartOrderData(); + return success(); + } } diff --git a/aps-modules/aps-job/src/main/java/com/aps/job/mapper/ApsWorkOrderJobMapper.java b/aps-modules/aps-job/src/main/java/com/aps/job/mapper/ApsWorkOrderJobMapper.java index af9b270..5b4690f 100644 --- a/aps-modules/aps-job/src/main/java/com/aps/job/mapper/ApsWorkOrderJobMapper.java +++ b/aps-modules/aps-job/src/main/java/com/aps/job/mapper/ApsWorkOrderJobMapper.java @@ -71,5 +71,12 @@ * @return */ public int updateApsWorkOrderJobPrccessStatus(String docNo); - + /** + * 鎵归噺鍒犻櫎闆朵欢宸ュ崟鏁版嵁 + * */ + int deleteAllPartPlan(); + /** + * 鎵归噺鎻掑叆闆朵欢璁″垝宸ュ崟 + * */ + int batchInsertPartPlan(); } diff --git a/aps-modules/aps-job/src/main/java/com/aps/job/service/IApsWorkOrderJobService.java b/aps-modules/aps-job/src/main/java/com/aps/job/service/IApsWorkOrderJobService.java index ad5c62a..83e0405 100644 --- a/aps-modules/aps-job/src/main/java/com/aps/job/service/IApsWorkOrderJobService.java +++ b/aps-modules/aps-job/src/main/java/com/aps/job/service/IApsWorkOrderJobService.java @@ -3,6 +3,7 @@ import java.util.List; import com.aps.job.domain.ApsWorkOrderJob; import com.aps.job.param.ApsWorkOrderJobParam; +import org.springframework.transaction.annotation.Transactional; /** * 宸ュ崟鍚屾Service鎺ュ彛 @@ -62,4 +63,7 @@ void batchInsertApsWorkOrderJob(ApsWorkOrderJobParam param); + + @Transactional + void syncPartOrderData(); } diff --git a/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderJobServiceImpl.java b/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderJobServiceImpl.java index 3f8a10b..543600a 100644 --- a/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderJobServiceImpl.java +++ b/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderJobServiceImpl.java @@ -202,4 +202,13 @@ return apsWorkOrderJobMapper.batchInsertApsWorkOrderJob(jobs); } + /** + * 鍚屾闆朵欢宸ュ崟淇℃伅 + * */ + @Transactional + @Override + public void syncPartOrderData() { + apsWorkOrderJobMapper.deleteAllPartPlan(); + apsWorkOrderJobMapper.batchInsertPartPlan(); + } } diff --git a/aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderJobMapper.xml b/aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderJobMapper.xml index b8a6848..eb00fd7 100644 --- a/aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderJobMapper.xml +++ b/aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderJobMapper.xml @@ -287,4 +287,34 @@ update aps_work_order_job set process_status='1' where doc_no = #{docNo} </update> + <delete id="deleteAllPartPlan" > + delete from aps_part_plan where del_flag in ('0','1') + </delete> + <insert id="batchInsertPartPlan"> + insert into aps_part_plan + ( + document_number,main_part_number,main_part_drawing_number, + customer,business_type,requirement_type, + document_status,item_number,drawing_no, + version_number,production_quantity,good_products_quantity, + process_number,work_center,department, + plan_start_day,plan_end_day,next_process_deparment, + is_suspended,is_outsourcing,account, + id,create_time,del_flag,plant,order_status + ) + select + doc_no,mainitem_code,mainitem_figure, + customer_name,business_type,demand_type, + doc_status,item_code,item_figure, + item_figure_version,pruduct_qty,work_qty, + op_num,work_center,dept, + start_date,complete_date,next_dept, + is_hold_release,is_out_source,org_code, + order_id,now(),'0',org_code,doc_status + from aps_work_order_job + where ( doc_status in (0,1,2,4) and + (mainitem_code like 'M01%' or mainitem_code like 'M02%'or mainitem_code like 'M05%' or mainitem_code like 'M10%' + or mainitem_code like 'M14%'or mainitem_code like 'M15%' or mainitem_code like 'F%' or mainitem_code like 'Z%') + ); + </insert> </mapper> \ No newline at end of file -- Gitblit v1.9.3