代码清理调整

hx-mes/src/main/java/com/fjhx/mes/controller/completion/CompletionInfoController.java

@@ -1,71 +0,0 @@
-package com.fjhx.mes.controller.completion;
-
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.fjhx.common.constant.SourceConstant;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.mes.entity.completion.vo.CompletionInfoVo;
-import com.fjhx.mes.entity.completion.dto.CompletionInfoSelectDto;
-import com.fjhx.mes.entity.completion.dto.CompletionInfoDto;
-import com.ruoyi.common.core.domain.BaseSelectDto;
-import com.fjhx.mes.service.completion.CompletionInfoService;
-import org.springframework.beans.factory.annotation.Autowired;
-
-
-/**
- * <p>
- * 完工入库 前端控制器
- * </p>
- *
- * @author 
- * @since 2023-03-31
- */
-//@DS(SourceConstant.MES)
-@RestController
-@RequestMapping("/completionInfo")
-public class CompletionInfoController {
-
-    @Autowired
-    private CompletionInfoService completionInfoService;
-
-    /**
-     * 完工入库分页
-     */
-    @PostMapping("/page")
-    public Page<CompletionInfoVo> page(@RequestBody CompletionInfoSelectDto dto) {
-        return completionInfoService.getPage(dto);
-    }
-
-    /**
-     * 完工入库明细
-     */
-    @PostMapping("/detail")
-    public CompletionInfoVo detail(@RequestBody BaseSelectDto dto) {
-        return completionInfoService.detail(dto.getId());
-    }
-
-    /**
-     * 完工入库新增
-     */
-    @PostMapping("/add")
-    public void add(@RequestBody CompletionInfoDto completionInfoDto) {
-        completionInfoService.add(completionInfoDto);
-    }
-
-    /**
-     * 完工入库编辑
-     */
-    @PostMapping("/edit")
-    public void edit(@RequestBody CompletionInfoDto completionInfoDto) {
-        completionInfoService.edit(completionInfoDto);
-    }
-
-    /**
-     * 完工入库删除
-     */
-    @PostMapping("/delete")
-    public void delete(@RequestBody BaseSelectDto dto) {
-        completionInfoService.delete(dto.getId());
-    }
-
-}

hx-mes/src/main/java/com/fjhx/mes/controller/production/ProduceOrderDetailController.java

@@ -4,7 +4,6 @@ import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.mes.entity.production.dto.ProduceOrderDetailSelectDto;
 import com.fjhx.mes.entity.production.dto.ProductionOrderDetailDto;
-import com.fjhx.mes.entity.production.dto.ProductionTaskDetailDto;
 import com.fjhx.mes.entity.production.vo.ProductionOrderDetailVo;
 import com.fjhx.mes.service.production.ProduceOrderDetailService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -51,7 +50,7 @@ public class ProduceOrderDetailController {
      * 生产任务详情
      */
     @PostMapping("/detail")
-    public ProductionOrderDetailVo detail(@RequestBody ProductionTaskDetailDto dto) {
+    public ProductionOrderDetailVo detail(@RequestBody ProductionOrderDetailDto dto) {
         return produceOrderDetailService.detail(dto);
     }
 

hx-mes/src/main/java/com/fjhx/mes/controller/production/ProductionPlanController.java

@@ -1,71 +0,0 @@
-package com.fjhx.mes.controller.production;
-
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.fjhx.common.constant.SourceConstant;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.mes.entity.production.vo.ProductionPlanVo;
-import com.fjhx.mes.entity.production.dto.ProductionPlanSelectDto;
-import com.fjhx.mes.entity.production.dto.ProductionPlanDto;
-import com.ruoyi.common.core.domain.BaseSelectDto;
-import com.fjhx.mes.service.production.ProductionPlanService;
-import org.springframework.beans.factory.annotation.Autowired;
-
-
-/**
- * <p>
- * 生产计划 前端控制器
- * </p>
- *
- * @author 
- * @since 2023-03-29
- */
-//@DS(SourceConstant.MES)
-@RestController
-@RequestMapping("/productionPlan")
-public class ProductionPlanController {
-
-    @Autowired
-    private ProductionPlanService productionPlanService;
-
-    /**
-     * 生产计划分页
-     */
-    @PostMapping("/page")
-    public Page<ProductionPlanVo> page(@RequestBody ProductionPlanSelectDto dto) {
-        return productionPlanService.getPage(dto);
-    }
-
-    /**
-     * 生产计划明细
-     */
-    @PostMapping("/detail")
-    public ProductionPlanVo detail(@RequestBody BaseSelectDto dto) {
-        return productionPlanService.detail(dto.getId());
-    }
-
-    /**
-     * 生产计划新增
-     */
-    @PostMapping("/add")
-    public void add(@RequestBody ProductionPlanDto productionPlanDto) {
-        productionPlanService.add(productionPlanDto);
-    }
-
-    /**
-     * 生产计划编辑
-     */
-    @PostMapping("/edit")
-    public void edit(@RequestBody ProductionPlanDto productionPlanDto) {
-        productionPlanService.edit(productionPlanDto);
-    }
-
-    /**
-     * 生产计划删除
-     */
-    @PostMapping("/delete")
-    public void delete(@RequestBody BaseSelectDto dto) {
-        productionPlanService.delete(dto.getId());
-    }
-
-}

hx-mes/src/main/java/com/fjhx/mes/controller/production/ProductionTaskController.java

@@ -1,88 +0,0 @@
-package com.fjhx.mes.controller.production;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.mes.entity.production.dto.ProductionTaskDto;
-import com.fjhx.mes.entity.production.dto.ProductionTaskSelectDto;
-import com.fjhx.mes.entity.production.vo.ProductionTaskVo;
-import com.fjhx.mes.service.production.ProductionTaskService;
-import com.ruoyi.common.core.domain.BaseSelectDto;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-
-/**
- * <p>
- * 生产任务 前端控制器
- * </p>
- *
- * @author 
- * @since 2023-03-30
- */
-//@DS(SourceConstant.MES)
-@RestController
-@RequestMapping("/productionTask")
-public class ProductionTaskController {
-
-    @Autowired
-    private ProductionTaskService productionTaskService;
-
-    /**
-     * 生产任务分页
-     */
-    @PostMapping("/page")
-    public Page<ProductionTaskVo> page(@RequestBody ProductionTaskSelectDto dto) {
-        return productionTaskService.getPage(dto);
-    }
-
-    /**
-     * 生产任务明细
-     */
-    @PostMapping("/detail")
-    public ProductionTaskVo detail(@RequestBody BaseSelectDto dto) {
-        return productionTaskService.detail(dto.getId());
-    }
-
-//    /**
-//     * 生产任务新增
-//     */
-//    @PostMapping("/add")
-//    public void add(@RequestBody ProductionTaskDto productionTaskDto) {
-//        productionTaskService.add(productionTaskDto);
-//    }
-
-    /**
-     * 生产任务编辑
-     */
-    @PostMapping("/edit")
-    public void edit(@RequestBody ProductionTaskDto productionTaskDto) {
-        productionTaskService.edit(productionTaskDto);
-    }
-
-    /**
-     * 生产任务删除
-     */
-    @PostMapping("/delete")
-    public void delete(@RequestBody BaseSelectDto dto) {
-        productionTaskService.delete(dto.getId());
-    }
-
-    /**
-     * 生产任务新增 嘉兴双拓
-     */
-    @PostMapping("/addByJxst")
-    public void addByJxst(@RequestBody ProductionTaskDto productionTaskDto) {
-        productionTaskService.addByJxst(productionTaskDto);
-    }
-
-    /**
-     * 生产任务明细 嘉兴双拓
-     */
-    @PostMapping("/detailByJxst")
-    public ProductionTaskVo detailByJxst(@RequestBody BaseSelectDto dto) {
-        return productionTaskService.detailByJxst(dto.getId());
-    }
-
-}

hx-mes/src/main/java/com/fjhx/mes/controller/production/ProductionTaskDetailController.java

@@ -1,93 +0,0 @@
-package com.fjhx.mes.controller.production;
-
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.mes.entity.production.vo.ProductionTaskDetailVo;
-import com.fjhx.mes.entity.production.dto.ProductionTaskDetailSelectDto;
-import com.fjhx.mes.entity.production.dto.ProductionTaskDetailDto;
-import com.fjhx.mes.service.production.ProductionTaskDetailService;
-import org.springframework.beans.factory.annotation.Autowired;
-
-
-/**
- * <p>
- * 生产任务明细 前端控制器
- * </p>
- *
- * @author 
- * @since 2023-05-18
- */
-@RestController
-@RequestMapping("/productionTaskDetail")
-public class ProductionTaskDetailController {
-
-    @Autowired
-    private ProductionTaskDetailService productionTaskDetailService;
-
-    /**
-     * 生产任务明细分页
-     */
-    @PostMapping("/page")
-    public Page<ProductionTaskDetailVo> page(@RequestBody ProductionTaskDetailSelectDto dto) {
-        return productionTaskDetailService.getPage(dto);
-    }
-
-    /**
-     * 生产任务明细分页
-     */
-    @PostMapping("/circulationPage")
-    public Page<ProductionTaskDetailVo> circulationPage(@RequestBody ProductionTaskDetailSelectDto dto) {
-        return productionTaskDetailService.circulationPage(dto);
-    }
-
-    /**
-     * 生产任务流转
-     */
-    @PostMapping("/circulation")
-    public void circulation(@RequestBody ProductionTaskDetailDto productionTaskDetailDto) {
-        productionTaskDetailService.circulation(productionTaskDetailDto);
-    }
-
-    /**
-     * 生产任务流转完工入库
-     */
-    @PostMapping("/productStorage")
-    public void productStorage(@RequestBody ProductionTaskDetailDto productionTaskDetailDto) {
-        productionTaskDetailService.productStorage(productionTaskDetailDto.getId());
-    }
-
-
-
-    /**
-     * 生产任务接收分页
-     */
-    @PostMapping("/receivePage")
-    public Page<ProductionTaskDetailVo> receivePage(@RequestBody ProductionTaskDetailSelectDto dto) {
-        return productionTaskDetailService.receivePage(dto);
-    }
-
-    /**
-     * 生产任务接收
-     */
-    @PostMapping("/receive")
-    public void receive(@RequestBody ProductionTaskDetailDto productionTaskDetailDto) {
-        productionTaskDetailService.receive(productionTaskDetailDto);
-    }
-
-    /**
-     * 生产任务拒绝接收
-     */
-    @PostMapping("/rejection")
-    public void rejection(@RequestBody ProductionTaskDetailDto productionTaskDetailDto) {
-        productionTaskDetailService.rejection(productionTaskDetailDto);
-    }
-
-    /**
-     * 获取sn信息
-     */
-    @PostMapping("/snInfo")
-    public ProductionTaskDetailVo snInfo(@RequestBody ProductionTaskDetailDto productionTaskDetailDto) {
-        return productionTaskDetailService.snInfo(productionTaskDetailDto.getProductSn());
-    }
-
-}

hx-mes/src/main/java/com/fjhx/mes/service/production/ProduceOrderDetailService.java

@@ -4,7 +4,6 @@ import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.mes.entity.production.dto.ProduceOrderDetailSelectDto;
 import com.fjhx.mes.entity.production.dto.ProductionOrderDetailDto;
-import com.fjhx.mes.entity.production.dto.ProductionTaskDetailDto;
 import com.fjhx.mes.entity.production.po.ProductionOrderDetail;
 import com.fjhx.mes.entity.production.vo.ProductionOrderDetailVo;
 import com.ruoyi.common.core.service.BaseService;
@@ -35,7 +34,7 @@ public interface ProduceOrderDetailService extends BaseService<ProductionOrderDe
     /**
      * 生产任务详情
      */
-    ProductionOrderDetailVo detail(ProductionTaskDetailDto dto);
+    ProductionOrderDetailVo detail(ProductionOrderDetailDto dto);
 
     /**
      * 批量任务详情

hx-mes/src/main/java/com/fjhx/mes/service/production/impl/ProduceOrderDetailServiceImpl.java

@@ -15,7 +15,6 @@ import com.fjhx.item.service.product.ProductClassifyService;
 import com.fjhx.item.service.product.ProductInfoService;
 import com.fjhx.mes.entity.production.dto.ProduceOrderDetailSelectDto;
 import com.fjhx.mes.entity.production.dto.ProductionOrderDetailDto;
-import com.fjhx.mes.entity.production.dto.ProductionTaskDetailDto;
 import com.fjhx.mes.entity.production.po.ProductionOrder;
 import com.fjhx.mes.entity.production.po.ProductionOrderDetail;
 import com.fjhx.mes.entity.production.po.ProductionScheduling;
@@ -305,7 +304,7 @@ public class ProduceOrderDetailServiceImpl extends ServiceImpl<ProduceOrderDetai
     }
 
     @Override
-    public ProductionOrderDetailVo detail(ProductionTaskDetailDto dto) {
+    public ProductionOrderDetailVo detail(ProductionOrderDetailDto dto) {
         ProductionOrderDetailVo detail = BeanUtil.copyProperties(getById(dto.getId()), ProductionOrderDetailVo.class);
         Assert.notEmpty(detail, "查询不到任务明细信息！");
 

hx-mes/src/main/java/com/fjhx/mes/service/production/impl/ProductionReportingServiceImpl.java

@@ -17,8 +17,6 @@ import com.fjhx.mes.entity.technology.po.TechnologyProcessLine;
 import com.fjhx.mes.mapper.production.ProductionReportingMapper;
 import com.fjhx.mes.service.production.*;
 import com.fjhx.mes.service.technology.TechnologyProcessLineService;
-import com.fjhx.wms.service.stock.StockWaitDetailsService;
-import com.fjhx.wms.service.stock.StockWaitService;
 import com.ruoyi.common.core.domain.BasePo;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.wrapper.IWrapper;
@@ -50,8 +48,6 @@ public class ProductionReportingServiceImpl extends ServiceImpl<ProductionReport
     @Autowired
     ProductionProcessesService productionProcessesService;
     @Autowired
-    ProductionTaskService productionTaskService;
-    @Autowired
     private ProductionTaskProgressService productionTaskProgressService;
     @Autowired
     private ProduceOrderDetailService produceOrderDetailService;
@@ -61,11 +57,6 @@ public class ProductionReportingServiceImpl extends ServiceImpl<ProductionReport
     private ProduceOrderService produceOrderService;
     @Autowired
     private ProductionSchedulingService productionSchedulingService;
-    @Autowired
-    private StockWaitService stockWaitService;
-    @Autowired
-    private StockWaitDetailsService stockWaitDetailsService;
-
 
     @Override
     public Page<ProductionReportingVo> getPage(ProductionReportingSelectDto dto) {

hx-mes/src/main/java/com/fjhx/mes/utils/code/CodeEnum.java

@@ -6,8 +6,6 @@ import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.fjhx.mes.service.production.ProductionPlanService;
-import com.fjhx.mes.service.production.ProductionTaskService;
 import com.fjhx.mes.service.work.WorkOrderService;
 import com.ruoyi.common.exception.ServiceException;
 import lombok.Getter;
@@ -19,10 +17,7 @@ import java.util.Map;
 public enum CodeEnum {
 
     // 供应商
-    WORK_ORDER("WO", "yyMM-", "code", 3, WorkOrderService.class),
-    PRODUCTION_PLAN("WP", "yyMM-", "code", 3, ProductionPlanService.class),
-    PRODUCTION_TASK("WT", "yyMM-", "code", 3, ProductionTaskService.class),
-    ;
+    WORK_ORDER("WO", "yyMM-", "code", 3, WorkOrderService.class);
 
     CodeEnum(String prefix, String dateFormat, String codeFieldName, Integer length, Class<? extends IService<?>> serviceCls) {
         this.prefix = prefix;

hx-mes/src/main/resources/mapper/completion/CompletionInfoMapper.xml

@@ -1,17 +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.fjhx.mes.mapper.completion.CompletionInfoMapper">
-    <select id="getPage" resultType="com.fjhx.mes.entity.completion.vo.CompletionInfoVo">
-        select
-            ci.id,
-            ci.production_task_id,
-            ci.quantity,
-            ci.create_user,
-            ci.create_time,
-            ci.update_user,
-            ci.update_time
-        from completion_info ci
-            ${ew.customSqlSegment}
-    </select>
-
-</mapper>

hx-mes/src/main/resources/mapper/production/ProductionPlanMapper.xml

@@ -1,21 +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.fjhx.mes.mapper.production.ProductionPlanMapper">
-    <select id="getPage" resultType="com.fjhx.mes.entity.production.vo.ProductionPlanVo">
-        select
-            pp.id,
-            pp.code,
-            pp.work_order_id,
-            pp.start_date,
-            pp.stop_date,
-            pp.quantity,
-            pp.status,
-            pp.create_user,
-            pp.create_time,
-            pp.update_user,
-            pp.update_time
-        from production_plan pp
-            ${ew.customSqlSegment}
-    </select>
-
-</mapper>

hx-mes/src/main/resources/mapper/production/ProductionTaskDetailMapper.xml

@@ -1,47 +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.fjhx.mes.mapper.production.ProductionTaskDetailMapper">
-    <select id="getPage" resultType="com.fjhx.mes.entity.production.vo.ProductionTaskDetailVo">
-        select
-            ptd.id,
-            ptd.product_id,
-            ptd.production_task_id,
-            ptd.product_sn,
-            ptd.production_processes_id,
-            ptd.finish_time,
-            ptd.finish_status,
-            ptd.person_liable_id,
-            ptd.create_user,
-            ptd.create_time,
-            ptd.update_user,
-            ptd.update_time,
-            ptd.next_production_processes_id,
-            ptd.circulation_user_id,
-            ptd.circulation_status
-        from production_task_detail ptd
-            ${ew.customSqlSegment}
-    </select>
-    <select id="getWorkOrderByProductionTask" resultType="com.fjhx.mes.entity.work.vo.WorkOrderVo">
-        SELECT
-            wo.*,
-            pt.id productionTaskId
-        FROM
-            work_order wo
-                LEFT JOIN production_plan pp ON pp.work_order_id = wo.id
-                LEFT JOIN production_task pt ON pt.production_plan_id = pp.id
-            ${ew.customSqlSegment}
-    </select>
-    <select id="snInfo" resultType="com.fjhx.mes.entity.production.vo.ProductionTaskDetailVo">
-        SELECT ptd.product_id,
-               ptd.product_sn,
-               sc.`code`,
-               wo.id workOrderId
-        FROM production_task_detail ptd
-                 JOIN production_task pt ON ptd.production_task_id = pt.id
-                 JOIN production_plan pp ON pt.production_plan_id = pp.id
-                 JOIN work_order wo ON pp.work_order_id = wo.id
-                 JOIN sales_contract sc ON wo.source_id = sc.id
-        WHERE ptd.product_sn = #{sn}
-    </select>
-
-</mapper>

hx-mes/src/main/resources/mapper/production/ProductionTaskDetailRecordMapper.xml

@@ -1,4 +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.fjhx.mes.mapper.production.ProductionTaskDetailRecordMapper">
-</mapper>

hx-mes/src/main/resources/mapper/production/ProductionTaskMapper.xml

@@ -1,46 +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.fjhx.mes.mapper.production.ProductionTaskMapper">
-    <select id="getPage" resultType="com.fjhx.mes.entity.production.vo.ProductionTaskVo">
-        SELECT
-            pt.id,
-            pt.production_plan_id,
-            pt.CODE,
-            pt.quantity,
-            pt.person_liable_id,
-            pt.STATUS,
-            pt.due_date,
-            pt.create_user,
-            pt.create_time,
-            pt.update_user,
-            pt.update_time,
-            wo.product_id
-        FROM
-            production_task pt
-                LEFT JOIN production_plan pp ON pt.production_plan_id = pp.id
-                LEFT JOIN work_order wo ON pp.work_order_id = wo.id
-            ${ew.customSqlSegment}
-    </select>
-    <select id="detail" resultType="com.fjhx.mes.entity.production.vo.ProductionTaskVo">
-        SELECT
-            pt.*,
-            wo.product_id
-        FROM
-            production_task pt
-                LEFT JOIN production_plan pp ON pt.production_plan_id = pp.id
-                LEFT JOIN work_order wo ON pp.work_order_id = wo.id
-        WHERE
-            pt.id = #{id}
-    </select>
-    <select id="myListByIds" resultType="com.fjhx.mes.entity.production.vo.ProductionTaskVo">
-        SELECT
-            pt.*,
-            wo.product_id
-        FROM
-            production_task pt
-                LEFT JOIN production_plan pp ON pt.production_plan_id = pp.id
-                LEFT JOIN work_order wo ON pp.work_order_id = wo.id
-            ${ew.customSqlSegment}
-    </select>
-
-</mapper>