瀏覽代碼

工艺、工序改名

home 2 年之前
父節點
當前提交
18a81eb6a6
共有 50 個文件被更改,包括 680 次插入578 次删除
  1. 3 0
      hx-common/product-library/src/main/java/com/fjhx/mapper/ProductMapper.java
  2. 4 0
      hx-common/product-library/src/main/java/com/fjhx/mapper/ProductMapper.xml
  3. 1 1
      hx-common/product-library/src/main/java/com/fjhx/service/ProductService.java
  4. 1 0
      hx-common/product-library/src/main/java/com/fjhx/service/impl/ProductServiceImpl.java
  5. 10 7
      hx-service-api/iot-management-api/src/main/java/com/fjhx/entity/working/WorkingProcedure.java
  6. 11 7
      hx-service-api/iot-management-api/src/main/java/com/fjhx/entity/working/WorkingRoute.java
  7. 14 9
      hx-service-api/iot-management-api/src/main/java/com/fjhx/entity/working/WorkingRouteProcedure.java
  8. 0 17
      hx-service-api/iot-management-api/src/main/java/com/fjhx/params/production/ProductionProcessEx.java
  9. 0 17
      hx-service-api/iot-management-api/src/main/java/com/fjhx/params/production/ProductionProcessVo.java
  10. 0 17
      hx-service-api/iot-management-api/src/main/java/com/fjhx/params/production/ProductionProcessWorkmanshipEx.java
  11. 0 17
      hx-service-api/iot-management-api/src/main/java/com/fjhx/params/production/ProductionProcessWorkmanshipVo.java
  12. 0 17
      hx-service-api/iot-management-api/src/main/java/com/fjhx/params/production/ProductionWorkmanshipEx.java
  13. 0 23
      hx-service-api/iot-management-api/src/main/java/com/fjhx/params/production/ProductionWorkmanshipVo.java
  14. 17 0
      hx-service-api/iot-management-api/src/main/java/com/fjhx/params/working/WorkingProcedureEx.java
  15. 20 0
      hx-service-api/iot-management-api/src/main/java/com/fjhx/params/working/WorkingProcedureVo.java
  16. 17 0
      hx-service-api/iot-management-api/src/main/java/com/fjhx/params/working/WorkingRouteEx.java
  17. 17 0
      hx-service-api/iot-management-api/src/main/java/com/fjhx/params/working/WorkingRouteProcedureEx.java
  18. 17 0
      hx-service-api/iot-management-api/src/main/java/com/fjhx/params/working/WorkingRouteProcedureVo.java
  19. 17 0
      hx-service-api/iot-management-api/src/main/java/com/fjhx/params/working/WorkingRouteVo.java
  20. 8 2
      hx-service/iot-management/src/main/java/com/fjhx/product/controller/ProductExController.java
  21. 3 0
      hx-service/iot-management/src/main/java/com/fjhx/product/mapper/ProductExMapper.java
  22. 12 0
      hx-service/iot-management/src/main/java/com/fjhx/product/mapper/ProductExMapper.xml
  23. 3 0
      hx-service/iot-management/src/main/java/com/fjhx/product/service/ProductExService.java
  24. 5 0
      hx-service/iot-management/src/main/java/com/fjhx/product/service/impl/ProductExServiceImpl.java
  25. 0 56
      hx-service/iot-management/src/main/java/com/fjhx/production/controller/ProductionProcessController.java
  26. 0 63
      hx-service/iot-management/src/main/java/com/fjhx/production/controller/ProductionWorkmanshipController.java
  27. 0 16
      hx-service/iot-management/src/main/java/com/fjhx/production/mapper/ProductionProcessMapper.java
  28. 0 16
      hx-service/iot-management/src/main/java/com/fjhx/production/mapper/ProductionProcessWorkmanshipMapper.java
  29. 0 16
      hx-service/iot-management/src/main/java/com/fjhx/production/mapper/ProductionWorkmanshipMapper.java
  30. 0 28
      hx-service/iot-management/src/main/java/com/fjhx/production/service/ProductionProcessService.java
  31. 0 28
      hx-service/iot-management/src/main/java/com/fjhx/production/service/ProductionProcessWorkmanshipService.java
  32. 0 31
      hx-service/iot-management/src/main/java/com/fjhx/production/service/ProductionWorkmanshipService.java
  33. 0 55
      hx-service/iot-management/src/main/java/com/fjhx/production/service/impl/ProductionProcessServiceImpl.java
  34. 0 55
      hx-service/iot-management/src/main/java/com/fjhx/production/service/impl/ProductionProcessWorkmanshipServiceImpl.java
  35. 0 77
      hx-service/iot-management/src/main/java/com/fjhx/production/service/impl/ProductionWorkmanshipServiceImpl.java
  36. 63 0
      hx-service/iot-management/src/main/java/com/fjhx/working/controller/WorkingProcedureController.java
  37. 56 0
      hx-service/iot-management/src/main/java/com/fjhx/working/controller/WorkingRouteController.java
  38. 56 0
      hx-service/iot-management/src/main/java/com/fjhx/working/controller/WorkingRouteProcedureController.java
  39. 16 0
      hx-service/iot-management/src/main/java/com/fjhx/working/mapper/WorkingProcedureMapper.java
  40. 1 1
      hx-service/iot-management/src/main/java/com/fjhx/working/mapper/WorkingProcedureMapper.xml
  41. 16 0
      hx-service/iot-management/src/main/java/com/fjhx/working/mapper/WorkingRouteMapper.java
  42. 1 1
      hx-service/iot-management/src/main/java/com/fjhx/working/mapper/WorkingRouteMapper.xml
  43. 16 0
      hx-service/iot-management/src/main/java/com/fjhx/working/mapper/WorkingRouteProcedureMapper.java
  44. 1 1
      hx-service/iot-management/src/main/java/com/fjhx/working/mapper/WorkingRouteProcedureMapper.xml
  45. 31 0
      hx-service/iot-management/src/main/java/com/fjhx/working/service/WorkingProcedureService.java
  46. 28 0
      hx-service/iot-management/src/main/java/com/fjhx/working/service/WorkingRouteProcedureService.java
  47. 28 0
      hx-service/iot-management/src/main/java/com/fjhx/working/service/WorkingRouteService.java
  48. 77 0
      hx-service/iot-management/src/main/java/com/fjhx/working/service/impl/WorkingProcedureServiceImpl.java
  49. 55 0
      hx-service/iot-management/src/main/java/com/fjhx/working/service/impl/WorkingRouteProcedureServiceImpl.java
  50. 55 0
      hx-service/iot-management/src/main/java/com/fjhx/working/service/impl/WorkingRouteServiceImpl.java

+ 3 - 0
hx-common/product-library/src/main/java/com/fjhx/mapper/ProductMapper.java

@@ -4,6 +4,7 @@ import com.fjhx.entity.Product;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -17,4 +18,6 @@ public interface ProductMapper extends BaseMapper<Product> {
 
     List<String> getUnitList(String tenantId);
 
+    List<Map<String, Object>> getList();
+
 }

+ 4 - 0
hx-common/product-library/src/main/java/com/fjhx/mapper/ProductMapper.xml

@@ -9,4 +9,8 @@
           and p.tenant_id = #{tenantId}
     </select>
 
+    <select id="getList" resultType="java.util.Map">
+
+    </select>
+
 </mapper>

+ 1 - 1
hx-common/product-library/src/main/java/com/fjhx/service/ProductService.java

@@ -27,7 +27,7 @@ public interface ProductService extends BaseService<Product> {
     void delete(ProductVo productVo);
 
     /**
-     * 获取租户添加过的物料单位集合
+     * 获取租户添加过的产品单位集合
      */
     List<String> getUnitList();
 

+ 1 - 0
hx-common/product-library/src/main/java/com/fjhx/service/impl/ProductServiceImpl.java

@@ -16,6 +16,7 @@ import org.springblade.core.secure.utils.AuthUtil;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>

+ 10 - 7
hx-service-api/iot-management-api/src/main/java/com/fjhx/entity/production/ProductionWorkmanship.java → hx-service-api/iot-management-api/src/main/java/com/fjhx/entity/working/WorkingProcedure.java

@@ -1,32 +1,35 @@
-package com.fjhx.entity.production;
+package com.fjhx.entity.working;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.Version;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.fjhx.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
  * <p>
- * 生产工艺
+ * 工序
  * </p>
  *
  * @author ${author}
- * @since 2022-07-13
+ * @since 2022-07-14
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class ProductionWorkmanship extends BaseEntity {
+public class WorkingProcedure extends BaseEntity {
 
 
     /**
-     * 工名称
+     * 工名称
      */
     private String name;
 
     /**
-     * 工说明
+     * 工说明
      */
     private String introduce;
 

+ 11 - 7
hx-service-api/iot-management-api/src/main/java/com/fjhx/entity/production/ProductionProcess.java → hx-service-api/iot-management-api/src/main/java/com/fjhx/entity/working/WorkingRoute.java

@@ -1,31 +1,35 @@
-package com.fjhx.entity.production;
+package com.fjhx.entity.working;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.Version;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.fjhx.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
  * <p>
- * 生产流程
+ * 工艺路线
  * </p>
  *
  * @author ${author}
- * @since 2022-07-13
+ * @since 2022-07-14
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class ProductionProcess extends BaseEntity {
+public class WorkingRoute extends BaseEntity {
+
 
     /**
-     * 生产流程名称
+     * 工艺路线名称
      */
     private String name;
 
     /**
-     * 流程说明
+     * 工艺路线说明
      */
     private String introduce;
 

+ 14 - 9
hx-service-api/iot-management-api/src/main/java/com/fjhx/entity/production/ProductionProcessWorkmanship.java → hx-service-api/iot-management-api/src/main/java/com/fjhx/entity/working/WorkingRouteProcedure.java

@@ -1,33 +1,37 @@
-package com.fjhx.entity.production;
+package com.fjhx.entity.working;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.Version;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.fjhx.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
  * <p>
- * 流程工艺关联表
+ * 工艺路线工序关联表
  * </p>
  *
  * @author ${author}
- * @since 2022-07-13
+ * @since 2022-07-14
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class ProductionProcessWorkmanship extends BaseEntity {
+public class WorkingRouteProcedure extends BaseEntity {
+
 
     /**
-     * 流程id
+     * 工艺路线id
      */
-    private Long productionProcessId;
+    private Long workingRouteId;
 
     /**
-     * 工id
+     * 工id
      */
-    private Long productionWorkmanshipId;
+    private Long workingProcedureId;
 
     /**
      * 是否自动流转
@@ -46,4 +50,5 @@ public class ProductionProcessWorkmanship extends BaseEntity {
     @TableLogic
     private Integer delFlag;
 
+
 }

+ 0 - 17
hx-service-api/iot-management-api/src/main/java/com/fjhx/params/production/ProductionProcessEx.java

@@ -1,17 +0,0 @@
-package com.fjhx.params.production;
-
-import com.fjhx.entity.production.ProductionProcess;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 生产流程
- *
- * @author ${author}
- * @since 2022-07-13
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class ProductionProcessEx extends ProductionProcess {
-
-}

+ 0 - 17
hx-service-api/iot-management-api/src/main/java/com/fjhx/params/production/ProductionProcessVo.java

@@ -1,17 +0,0 @@
-package com.fjhx.params.production;
-
-import com.fjhx.entity.production.ProductionProcess;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 生产流程
- *
- * @author ${author}
- * @since 2022-07-13
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class ProductionProcessVo extends ProductionProcess {
-
-}

+ 0 - 17
hx-service-api/iot-management-api/src/main/java/com/fjhx/params/production/ProductionProcessWorkmanshipEx.java

@@ -1,17 +0,0 @@
-package com.fjhx.params.production;
-
-import com.fjhx.entity.production.ProductionProcessWorkmanship;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 流程工艺关联表
- *
- * @author ${author}
- * @since 2022-07-13
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class ProductionProcessWorkmanshipEx extends ProductionProcessWorkmanship {
-
-}

+ 0 - 17
hx-service-api/iot-management-api/src/main/java/com/fjhx/params/production/ProductionProcessWorkmanshipVo.java

@@ -1,17 +0,0 @@
-package com.fjhx.params.production;
-
-import com.fjhx.entity.production.ProductionProcessWorkmanship;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 流程工艺关联表
- *
- * @author ${author}
- * @since 2022-07-13
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class ProductionProcessWorkmanshipVo extends ProductionProcessWorkmanship {
-
-}

+ 0 - 17
hx-service-api/iot-management-api/src/main/java/com/fjhx/params/production/ProductionWorkmanshipEx.java

@@ -1,17 +0,0 @@
-package com.fjhx.params.production;
-
-import com.fjhx.entity.production.ProductionWorkmanship;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 生产工艺
- *
- * @author ${author}
- * @since 2022-07-13
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class ProductionWorkmanshipEx extends ProductionWorkmanship {
-
-}

+ 0 - 23
hx-service-api/iot-management-api/src/main/java/com/fjhx/params/production/ProductionWorkmanshipVo.java

@@ -1,23 +0,0 @@
-package com.fjhx.params.production;
-
-import com.fjhx.entity.production.ProductionWorkmanship;
-import com.fjhx.params.FileInfoParam;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 生产工艺
- *
- * @author ${author}
- * @since 2022-07-13
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class ProductionWorkmanshipVo extends ProductionWorkmanship {
-
-    /**
-     * 文件
-     */
-    private FileInfoParam fileInfoParam;
-
-}

+ 17 - 0
hx-service-api/iot-management-api/src/main/java/com/fjhx/params/working/WorkingProcedureEx.java

@@ -0,0 +1,17 @@
+package com.fjhx.params.working;
+
+import com.fjhx.entity.working.WorkingProcedure;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 工序
+ *
+ * @author ${author}
+ * @since 2022-07-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class WorkingProcedureEx extends WorkingProcedure {
+
+}

+ 20 - 0
hx-service-api/iot-management-api/src/main/java/com/fjhx/params/working/WorkingProcedureVo.java

@@ -0,0 +1,20 @@
+package com.fjhx.params.working;
+
+import com.fjhx.entity.working.WorkingProcedure;
+import com.fjhx.params.FileInfoParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 工序
+ *
+ * @author ${author}
+ * @since 2022-07-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class WorkingProcedureVo extends WorkingProcedure {
+
+    private FileInfoParam fileInfoParam;
+
+}

+ 17 - 0
hx-service-api/iot-management-api/src/main/java/com/fjhx/params/working/WorkingRouteEx.java

@@ -0,0 +1,17 @@
+package com.fjhx.params.working;
+
+import com.fjhx.entity.working.WorkingRoute;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 工艺路线
+ *
+ * @author ${author}
+ * @since 2022-07-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class WorkingRouteEx extends WorkingRoute {
+
+}

+ 17 - 0
hx-service-api/iot-management-api/src/main/java/com/fjhx/params/working/WorkingRouteProcedureEx.java

@@ -0,0 +1,17 @@
+package com.fjhx.params.working;
+
+import com.fjhx.entity.working.WorkingRouteProcedure;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 工艺路线工序关联表
+ *
+ * @author ${author}
+ * @since 2022-07-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class WorkingRouteProcedureEx extends WorkingRouteProcedure {
+
+}

+ 17 - 0
hx-service-api/iot-management-api/src/main/java/com/fjhx/params/working/WorkingRouteProcedureVo.java

@@ -0,0 +1,17 @@
+package com.fjhx.params.working;
+
+import com.fjhx.entity.working.WorkingRouteProcedure;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 工艺路线工序关联表
+ *
+ * @author ${author}
+ * @since 2022-07-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class WorkingRouteProcedureVo extends WorkingRouteProcedure {
+
+}

+ 17 - 0
hx-service-api/iot-management-api/src/main/java/com/fjhx/params/working/WorkingRouteVo.java

@@ -0,0 +1,17 @@
+package com.fjhx.params.working;
+
+import com.fjhx.entity.working.WorkingRoute;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 工艺路线
+ *
+ * @author ${author}
+ * @since 2022-07-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class WorkingRouteVo extends WorkingRoute {
+
+}

+ 8 - 2
hx-service/iot-management/src/main/java/com/fjhx/product/controller/ProductExController.java

@@ -57,8 +57,14 @@ public class ProductExController {
 
     @PostMapping("getUnitList")
     public R getUnitList() {
-        List<String> unitList = productService.getUnitList();
-        return R.success(unitList);
+        List<String> result = productService.getUnitList();
+        return R.success(result);
+    }
+
+    @PostMapping("list")
+    public R list() {
+        List<Map<String, Object>> result = productExService.getList();
+        return R.success(result);
     }
 
 }

+ 3 - 0
hx-service/iot-management/src/main/java/com/fjhx/product/mapper/ProductExMapper.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.entity.product.ProductEx;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -20,4 +21,6 @@ public interface ProductExMapper extends BaseMapper<ProductEx> {
 
     Page<Map<String, Object>> getPage(@Param("page") Page<ProductEx> page, @Param("ew") QueryWrapper<?> wrapper);
 
+    List<Map<String, Object>> getList();
+
 }

+ 12 - 0
hx-service/iot-management/src/main/java/com/fjhx/product/mapper/ProductExMapper.xml

@@ -17,4 +17,16 @@
             ${ew.customSqlSegment}
     </select>
 
+    <select id="getList" resultType="java.util.Map">
+        select p.id,
+               p.code,
+               p.name,
+               pe.production_process_id productionProcessId,
+               pp.name                  productionProcessName
+        from product p
+                 left join product_ex pe on p.id = pe.id
+                 left join production_process pp on pe.production_process_id = pp.id
+            ${ew.customSqlSegment}
+    </select>
+
 </mapper>

+ 3 - 0
hx-service/iot-management/src/main/java/com/fjhx/product/service/ProductExService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.base.BaseService;
 import com.fjhx.entity.product.ProductEx;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -24,4 +25,6 @@ public interface ProductExService extends BaseService<ProductEx> {
 
     void delete(Map<String, Object> map);
 
+    List<Map<String, Object>> getList();
+    
 }

+ 5 - 0
hx-service/iot-management/src/main/java/com/fjhx/product/service/impl/ProductExServiceImpl.java

@@ -83,4 +83,9 @@ public class ProductExServiceImpl extends ServiceImpl<ProductExMapper, ProductEx
         productService.delete(productVo);
     }
 
+    @Override
+    public List<Map<String, Object>> getList() {
+        return baseMapper.getList();
+    }
+
 }

+ 0 - 56
hx-service/iot-management/src/main/java/com/fjhx/production/controller/ProductionProcessController.java

@@ -1,56 +0,0 @@
-package com.fjhx.production.controller;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.springblade.core.tool.api.R;
-import com.fjhx.entity.production.ProductionProcess;
-import com.fjhx.params.production.ProductionProcessVo;
-import com.fjhx.production.service.ProductionProcessService;
-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;
-
-import java.util.Map;
-
-/**
- * <p>
- * 生产流程 前端控制器
- * </p>
- *
- * @author ${author}
- * @since 2022-07-13
- */
-@RestController
-@RequestMapping("/productionProcess")
-public class ProductionProcessController {
-
-    @Autowired
-    private ProductionProcessService productionProcessService;
-
-    @PostMapping("/page")
-    public R page(@RequestBody Map<String, String> condition){
-        Page<ProductionProcess> result = productionProcessService.getPage(condition);
-        return R.success(result);
-    }
-
-    @PostMapping("/add")
-    public R add(@RequestBody ProductionProcessVo productionProcessVo){
-        productionProcessService.add(productionProcessVo);
-        return R.success();
-    }
-
-    @PostMapping("/edit")
-    public R edit(@RequestBody ProductionProcessVo productionProcessVo){
-        productionProcessService.edit(productionProcessVo);
-        return R.success();
-    }
-
-    @PostMapping("/delete")
-    public R delete(@RequestBody ProductionProcessVo productionProcessVo){
-        productionProcessService.delete(productionProcessVo);
-        return R.success();
-    }
-
-}
-

+ 0 - 63
hx-service/iot-management/src/main/java/com/fjhx/production/controller/ProductionWorkmanshipController.java

@@ -1,63 +0,0 @@
-package com.fjhx.production.controller;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.entity.production.ProductionWorkmanship;
-import com.fjhx.params.production.ProductionWorkmanshipVo;
-import com.fjhx.production.service.ProductionWorkmanshipService;
-import org.springblade.core.tool.api.R;
-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;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 生产工艺 前端控制器
- * </p>
- *
- * @author ${author}
- * @since 2022-07-13
- */
-@RestController
-@RequestMapping("/productionWorkmanship")
-public class ProductionWorkmanshipController {
-
-    @Autowired
-    private ProductionWorkmanshipService productionWorkmanshipService;
-
-    @PostMapping("/page")
-    public R page(@RequestBody Map<String, String> condition) {
-        Page<ProductionWorkmanship> result = productionWorkmanshipService.getPage(condition);
-        return R.success(result);
-    }
-
-    @PostMapping("/add")
-    public R add(@RequestBody ProductionWorkmanshipVo productionWorkmanshipVo) {
-        productionWorkmanshipService.add(productionWorkmanshipVo);
-        return R.success();
-    }
-
-    @PostMapping("/edit")
-    public R edit(@RequestBody ProductionWorkmanshipVo productionWorkmanshipVo) {
-        productionWorkmanshipService.edit(productionWorkmanshipVo);
-        return R.success();
-    }
-
-    @PostMapping("/delete")
-    public R delete(@RequestBody ProductionWorkmanshipVo productionWorkmanshipVo) {
-        productionWorkmanshipService.delete(productionWorkmanshipVo);
-        return R.success();
-    }
-
-    @PostMapping("/list")
-    public R list() {
-        List<ProductionWorkmanship> result = productionWorkmanshipService.getList();
-        return R.success(result);
-    }
-
-}
-

+ 0 - 16
hx-service/iot-management/src/main/java/com/fjhx/production/mapper/ProductionProcessMapper.java

@@ -1,16 +0,0 @@
-package com.fjhx.production.mapper;
-
-import com.fjhx.entity.production.ProductionProcess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 生产流程 Mapper 接口
- * </p>
- *
- * @author ${author}
- * @since 2022-07-13
- */
-public interface ProductionProcessMapper extends BaseMapper<ProductionProcess> {
-
-}

+ 0 - 16
hx-service/iot-management/src/main/java/com/fjhx/production/mapper/ProductionProcessWorkmanshipMapper.java

@@ -1,16 +0,0 @@
-package com.fjhx.production.mapper;
-
-import com.fjhx.entity.production.ProductionProcessWorkmanship;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 流程工艺关联表 Mapper 接口
- * </p>
- *
- * @author ${author}
- * @since 2022-07-13
- */
-public interface ProductionProcessWorkmanshipMapper extends BaseMapper<ProductionProcessWorkmanship> {
-
-}

+ 0 - 16
hx-service/iot-management/src/main/java/com/fjhx/production/mapper/ProductionWorkmanshipMapper.java

@@ -1,16 +0,0 @@
-package com.fjhx.production.mapper;
-
-import com.fjhx.entity.production.ProductionWorkmanship;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 生产工艺 Mapper 接口
- * </p>
- *
- * @author ${author}
- * @since 2022-07-13
- */
-public interface ProductionWorkmanshipMapper extends BaseMapper<ProductionWorkmanship> {
-
-}

+ 0 - 28
hx-service/iot-management/src/main/java/com/fjhx/production/service/ProductionProcessService.java

@@ -1,28 +0,0 @@
-package com.fjhx.production.service;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.entity.production.ProductionProcess;
-import com.fjhx.params.production.ProductionProcessVo;
-import com.fjhx.base.BaseService;
-
-import java.util.Map;
-
-/**
- * <p>
- * 生产流程 服务类
- * </p>
- *
- * @author ${author}
- * @since 2022-07-13
- */
-public interface ProductionProcessService extends BaseService<ProductionProcess> {
-
-    Page<ProductionProcess> getPage(Map<String, String> condition);
-
-    void add(ProductionProcessVo productionProcessVo);
-
-    void edit(ProductionProcessVo productionProcessVo);
-
-    void delete(ProductionProcessVo productionProcessVo);
-
-}

+ 0 - 28
hx-service/iot-management/src/main/java/com/fjhx/production/service/ProductionProcessWorkmanshipService.java

@@ -1,28 +0,0 @@
-package com.fjhx.production.service;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.entity.production.ProductionProcessWorkmanship;
-import com.fjhx.params.production.ProductionProcessWorkmanshipVo;
-import com.fjhx.base.BaseService;
-
-import java.util.Map;
-
-/**
- * <p>
- * 流程工艺关联表 服务类
- * </p>
- *
- * @author ${author}
- * @since 2022-07-13
- */
-public interface ProductionProcessWorkmanshipService extends BaseService<ProductionProcessWorkmanship> {
-
-    Page<ProductionProcessWorkmanship> getPage(Map<String, String> condition);
-
-    void add(ProductionProcessWorkmanshipVo productionProcessWorkmanshipVo);
-
-    void edit(ProductionProcessWorkmanshipVo productionProcessWorkmanshipVo);
-
-    void delete(ProductionProcessWorkmanshipVo productionProcessWorkmanshipVo);
-
-}

+ 0 - 31
hx-service/iot-management/src/main/java/com/fjhx/production/service/ProductionWorkmanshipService.java

@@ -1,31 +0,0 @@
-package com.fjhx.production.service;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.entity.production.ProductionWorkmanship;
-import com.fjhx.params.production.ProductionWorkmanshipVo;
-import com.fjhx.base.BaseService;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 生产工艺 服务类
- * </p>
- *
- * @author ${author}
- * @since 2022-07-13
- */
-public interface ProductionWorkmanshipService extends BaseService<ProductionWorkmanship> {
-
-    Page<ProductionWorkmanship> getPage(Map<String, String> condition);
-
-    void add(ProductionWorkmanshipVo productionWorkmanshipVo);
-
-    void edit(ProductionWorkmanshipVo productionWorkmanshipVo);
-
-    void delete(ProductionWorkmanshipVo productionWorkmanshipVo);
-
-    List<ProductionWorkmanship> getList();
-
-}

+ 0 - 55
hx-service/iot-management/src/main/java/com/fjhx/production/service/impl/ProductionProcessServiceImpl.java

@@ -1,55 +0,0 @@
-package com.fjhx.production.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.utils.WrapperUtil;
-import com.fjhx.entity.production.ProductionProcess;
-import com.fjhx.params.production.ProductionProcessVo;
-import com.fjhx.production.mapper.ProductionProcessMapper;
-import com.fjhx.production.service.ProductionProcessService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-import java.util.Map;
-
-/**
- * <p>
- * 生产流程 服务实现类
- * </p>
- *
- * @author ${author}
- * @since 2022-07-13
- */
-@Service
-public class ProductionProcessServiceImpl extends ServiceImpl<ProductionProcessMapper, ProductionProcess> implements ProductionProcessService {
-
-    @Override
-    public Page<ProductionProcess> getPage(Map<String, String> condition) {
-
-        QueryWrapper<ProductionProcess> wrapper = Wrappers.query();
-
-        WrapperUtil.init(condition, wrapper)
-                .eqTenantId()
-                .createTimeDesc();
-
-        Page<ProductionProcess> page = page(condition, wrapper);
-        return page;
-    }
-
-    @Override
-    public void add(ProductionProcessVo productionProcessVo) {
-        save(productionProcessVo);
-    }
-
-    @Override
-    public void edit(ProductionProcessVo productionProcessVo) {
-        updateById(productionProcessVo);
-    }
-
-    @Override
-    public void delete(ProductionProcessVo productionProcessVo) {
-        removeById(productionProcessVo.getId());
-    }
-
-}

+ 0 - 55
hx-service/iot-management/src/main/java/com/fjhx/production/service/impl/ProductionProcessWorkmanshipServiceImpl.java

@@ -1,55 +0,0 @@
-package com.fjhx.production.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.utils.WrapperUtil;
-import com.fjhx.entity.production.ProductionProcessWorkmanship;
-import com.fjhx.params.production.ProductionProcessWorkmanshipVo;
-import com.fjhx.production.mapper.ProductionProcessWorkmanshipMapper;
-import com.fjhx.production.service.ProductionProcessWorkmanshipService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-import java.util.Map;
-
-/**
- * <p>
- * 流程工艺关联表 服务实现类
- * </p>
- *
- * @author ${author}
- * @since 2022-07-13
- */
-@Service
-public class ProductionProcessWorkmanshipServiceImpl extends ServiceImpl<ProductionProcessWorkmanshipMapper, ProductionProcessWorkmanship> implements ProductionProcessWorkmanshipService {
-
-    @Override
-    public Page<ProductionProcessWorkmanship> getPage(Map<String, String> condition) {
-
-        QueryWrapper<ProductionProcessWorkmanship> wrapper = Wrappers.query();
-
-        WrapperUtil.init(condition, wrapper)
-                .eqTenantId()
-                .createTimeDesc();
-
-        Page<ProductionProcessWorkmanship> page = page(condition, wrapper);
-        return page;
-    }
-
-    @Override
-    public void add(ProductionProcessWorkmanshipVo productionProcessWorkmanshipVo) {
-        save(productionProcessWorkmanshipVo);
-    }
-
-    @Override
-    public void edit(ProductionProcessWorkmanshipVo productionProcessWorkmanshipVo) {
-        updateById(productionProcessWorkmanshipVo);
-    }
-
-    @Override
-    public void delete(ProductionProcessWorkmanshipVo productionProcessWorkmanshipVo) {
-        removeById(productionProcessWorkmanshipVo.getId());
-    }
-
-}

+ 0 - 77
hx-service/iot-management/src/main/java/com/fjhx/production/service/impl/ProductionWorkmanshipServiceImpl.java

@@ -1,77 +0,0 @@
-package com.fjhx.production.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fjhx.base.BaseEntity;
-import com.fjhx.entity.production.ProductionWorkmanship;
-import com.fjhx.params.production.ProductionWorkmanshipVo;
-import com.fjhx.production.mapper.ProductionWorkmanshipMapper;
-import com.fjhx.production.service.ProductionWorkmanshipService;
-import com.fjhx.utils.FileClientUtil;
-import com.fjhx.utils.WrapperUtil;
-import org.springblade.core.secure.utils.AuthUtil;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 生产工艺 服务实现类
- * </p>
- *
- * @author ${author}
- * @since 2022-07-13
- */
-@Service
-public class ProductionWorkmanshipServiceImpl extends ServiceImpl<ProductionWorkmanshipMapper, ProductionWorkmanship> implements ProductionWorkmanshipService {
-
-    @Override
-    public Page<ProductionWorkmanship> getPage(Map<String, String> condition) {
-
-        QueryWrapper<ProductionWorkmanship> wrapper = Wrappers.query();
-
-        WrapperUtil.init(condition, wrapper)
-                .eqTenantId()
-                .keyword("name", "name")
-                .eq("whether_packing", "whetherPacking")
-                .createTimeDesc();
-
-        return page(condition, wrapper);
-    }
-
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public void add(ProductionWorkmanshipVo productionWorkmanshipVo) {
-        save(productionWorkmanshipVo);
-        FileClientUtil.bindingFile(productionWorkmanshipVo.getId(), productionWorkmanshipVo.getFileInfoParam());
-    }
-
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public void edit(ProductionWorkmanshipVo productionWorkmanshipVo) {
-        updateById(productionWorkmanshipVo);
-        FileClientUtil.againBindingFile(productionWorkmanshipVo.getId(), productionWorkmanshipVo.getFileInfoParam());
-    }
-
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public void delete(ProductionWorkmanshipVo productionWorkmanshipVo) {
-        Long id = productionWorkmanshipVo.getId();
-        removeById(id);
-        FileClientUtil.relieveBindingFile(id);
-    }
-
-    @Override
-    public List<ProductionWorkmanship> getList() {
-        return lambdaQuery()
-                .select(BaseEntity::getId, ProductionWorkmanship::getName, ProductionWorkmanship::getWhetherPacking)
-                .eq(BaseEntity::getTenantId, AuthUtil.getTenantId())
-                .orderByDesc(BaseEntity::getId)
-                .list();
-    }
-
-}

+ 63 - 0
hx-service/iot-management/src/main/java/com/fjhx/working/controller/WorkingProcedureController.java

@@ -0,0 +1,63 @@
+package com.fjhx.working.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.entity.working.WorkingProcedure;
+import com.fjhx.params.working.WorkingProcedureVo;
+import com.fjhx.working.service.WorkingProcedureService;
+import org.springblade.core.tool.api.R;
+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;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 工序 前端控制器
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-07-14
+ */
+@RestController
+@RequestMapping("/workingProcedure")
+public class WorkingProcedureController {
+
+    @Autowired
+    private WorkingProcedureService workingProcedureService;
+
+    @PostMapping("/page")
+    public R page(@RequestBody Map<String, String> condition) {
+        Page<WorkingProcedure> result = workingProcedureService.getPage(condition);
+        return R.success(result);
+    }
+
+    @PostMapping("/add")
+    public R add(@RequestBody WorkingProcedureVo workingProcedureVo) {
+        workingProcedureService.add(workingProcedureVo);
+        return R.success();
+    }
+
+    @PostMapping("/edit")
+    public R edit(@RequestBody WorkingProcedureVo workingProcedureVo) {
+        workingProcedureService.edit(workingProcedureVo);
+        return R.success();
+    }
+
+    @PostMapping("/delete")
+    public R delete(@RequestBody WorkingProcedureVo workingProcedureVo) {
+        workingProcedureService.delete(workingProcedureVo);
+        return R.success();
+    }
+
+    @PostMapping("/list")
+    public R list() {
+        List<WorkingProcedure> result = workingProcedureService.getList();
+        return R.success(result);
+    }
+
+}
+

+ 56 - 0
hx-service/iot-management/src/main/java/com/fjhx/working/controller/WorkingRouteController.java

@@ -0,0 +1,56 @@
+package com.fjhx.working.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springblade.core.tool.api.R;
+import com.fjhx.entity.working.WorkingRoute;
+import com.fjhx.params.working.WorkingRouteVo;
+import com.fjhx.working.service.WorkingRouteService;
+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;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 工艺路线 前端控制器
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-07-14
+ */
+@RestController
+@RequestMapping("/workingRoute")
+public class WorkingRouteController {
+
+    @Autowired
+    private WorkingRouteService workingRouteService;
+
+    @PostMapping("/page")
+    public R page(@RequestBody Map<String, String> condition){
+        Page<WorkingRoute> result = workingRouteService.getPage(condition);
+        return R.success(result);
+    }
+
+    @PostMapping("/add")
+    public R add(@RequestBody WorkingRouteVo workingRouteVo){
+        workingRouteService.add(workingRouteVo);
+        return R.success();
+    }
+
+    @PostMapping("/edit")
+    public R edit(@RequestBody WorkingRouteVo workingRouteVo){
+        workingRouteService.edit(workingRouteVo);
+        return R.success();
+    }
+
+    @PostMapping("/delete")
+    public R delete(@RequestBody WorkingRouteVo workingRouteVo){
+        workingRouteService.delete(workingRouteVo);
+        return R.success();
+    }
+
+}
+

+ 56 - 0
hx-service/iot-management/src/main/java/com/fjhx/working/controller/WorkingRouteProcedureController.java

@@ -0,0 +1,56 @@
+package com.fjhx.working.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springblade.core.tool.api.R;
+import com.fjhx.entity.working.WorkingRouteProcedure;
+import com.fjhx.params.working.WorkingRouteProcedureVo;
+import com.fjhx.working.service.WorkingRouteProcedureService;
+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;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 工艺路线工序关联表 前端控制器
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-07-14
+ */
+@RestController
+@RequestMapping("/workingRouteProcedure")
+public class WorkingRouteProcedureController {
+
+    @Autowired
+    private WorkingRouteProcedureService workingRouteProcedureService;
+
+    @PostMapping("/page")
+    public R page(@RequestBody Map<String, String> condition){
+        Page<WorkingRouteProcedure> result = workingRouteProcedureService.getPage(condition);
+        return R.success(result);
+    }
+
+    @PostMapping("/add")
+    public R add(@RequestBody WorkingRouteProcedureVo workingRouteProcedureVo){
+        workingRouteProcedureService.add(workingRouteProcedureVo);
+        return R.success();
+    }
+
+    @PostMapping("/edit")
+    public R edit(@RequestBody WorkingRouteProcedureVo workingRouteProcedureVo){
+        workingRouteProcedureService.edit(workingRouteProcedureVo);
+        return R.success();
+    }
+
+    @PostMapping("/delete")
+    public R delete(@RequestBody WorkingRouteProcedureVo workingRouteProcedureVo){
+        workingRouteProcedureService.delete(workingRouteProcedureVo);
+        return R.success();
+    }
+
+}
+

+ 16 - 0
hx-service/iot-management/src/main/java/com/fjhx/working/mapper/WorkingProcedureMapper.java

@@ -0,0 +1,16 @@
+package com.fjhx.working.mapper;
+
+import com.fjhx.entity.working.WorkingProcedure;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 工序 Mapper 接口
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-07-14
+ */
+public interface WorkingProcedureMapper extends BaseMapper<WorkingProcedure> {
+
+}

+ 1 - 1
hx-service/iot-management/src/main/java/com/fjhx/production/mapper/ProductionProcessMapper.xml → hx-service/iot-management/src/main/java/com/fjhx/working/mapper/WorkingProcedureMapper.xml

@@ -1,5 +1,5 @@
 <?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.production.mapper.ProductionProcessMapper">
+<mapper namespace="com.fjhx.working.mapper.WorkingProcedureMapper">
 
 </mapper>

+ 16 - 0
hx-service/iot-management/src/main/java/com/fjhx/working/mapper/WorkingRouteMapper.java

@@ -0,0 +1,16 @@
+package com.fjhx.working.mapper;
+
+import com.fjhx.entity.working.WorkingRoute;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 工艺路线 Mapper 接口
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-07-14
+ */
+public interface WorkingRouteMapper extends BaseMapper<WorkingRoute> {
+
+}

+ 1 - 1
hx-service/iot-management/src/main/java/com/fjhx/production/mapper/ProductionWorkmanshipMapper.xml → hx-service/iot-management/src/main/java/com/fjhx/working/mapper/WorkingRouteMapper.xml

@@ -1,5 +1,5 @@
 <?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.production.mapper.ProductionWorkmanshipMapper">
+<mapper namespace="com.fjhx.working.mapper.WorkingRouteMapper">
 
 </mapper>

+ 16 - 0
hx-service/iot-management/src/main/java/com/fjhx/working/mapper/WorkingRouteProcedureMapper.java

@@ -0,0 +1,16 @@
+package com.fjhx.working.mapper;
+
+import com.fjhx.entity.working.WorkingRouteProcedure;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 工艺路线工序关联表 Mapper 接口
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-07-14
+ */
+public interface WorkingRouteProcedureMapper extends BaseMapper<WorkingRouteProcedure> {
+
+}

+ 1 - 1
hx-service/iot-management/src/main/java/com/fjhx/production/mapper/ProductionProcessWorkmanshipMapper.xml → hx-service/iot-management/src/main/java/com/fjhx/working/mapper/WorkingRouteProcedureMapper.xml

@@ -1,5 +1,5 @@
 <?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.production.mapper.ProductionProcessWorkmanshipMapper">
+<mapper namespace="com.fjhx.working.mapper.WorkingRouteProcedureMapper">
 
 </mapper>

+ 31 - 0
hx-service/iot-management/src/main/java/com/fjhx/working/service/WorkingProcedureService.java

@@ -0,0 +1,31 @@
+package com.fjhx.working.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.entity.working.WorkingProcedure;
+import com.fjhx.params.working.WorkingProcedureVo;
+import com.fjhx.base.BaseService;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 工序 服务类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-07-14
+ */
+public interface WorkingProcedureService extends BaseService<WorkingProcedure> {
+
+    Page<WorkingProcedure> getPage(Map<String, String> condition);
+
+    void add(WorkingProcedureVo workingProcedureVo);
+
+    void edit(WorkingProcedureVo workingProcedureVo);
+
+    void delete(WorkingProcedureVo workingProcedureVo);
+
+    List<WorkingProcedure> getList();
+
+}

+ 28 - 0
hx-service/iot-management/src/main/java/com/fjhx/working/service/WorkingRouteProcedureService.java

@@ -0,0 +1,28 @@
+package com.fjhx.working.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.entity.working.WorkingRouteProcedure;
+import com.fjhx.params.working.WorkingRouteProcedureVo;
+import com.fjhx.base.BaseService;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 工艺路线工序关联表 服务类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-07-14
+ */
+public interface WorkingRouteProcedureService extends BaseService<WorkingRouteProcedure> {
+
+    Page<WorkingRouteProcedure> getPage(Map<String, String> condition);
+
+    void add(WorkingRouteProcedureVo workingRouteProcedureVo);
+
+    void edit(WorkingRouteProcedureVo workingRouteProcedureVo);
+
+    void delete(WorkingRouteProcedureVo workingRouteProcedureVo);
+
+}

+ 28 - 0
hx-service/iot-management/src/main/java/com/fjhx/working/service/WorkingRouteService.java

@@ -0,0 +1,28 @@
+package com.fjhx.working.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.entity.working.WorkingRoute;
+import com.fjhx.params.working.WorkingRouteVo;
+import com.fjhx.base.BaseService;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 工艺路线 服务类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-07-14
+ */
+public interface WorkingRouteService extends BaseService<WorkingRoute> {
+
+    Page<WorkingRoute> getPage(Map<String, String> condition);
+
+    void add(WorkingRouteVo workingRouteVo);
+
+    void edit(WorkingRouteVo workingRouteVo);
+
+    void delete(WorkingRouteVo workingRouteVo);
+
+}

+ 77 - 0
hx-service/iot-management/src/main/java/com/fjhx/working/service/impl/WorkingProcedureServiceImpl.java

@@ -0,0 +1,77 @@
+package com.fjhx.working.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.base.BaseEntity;
+import com.fjhx.entity.working.WorkingProcedure;
+import com.fjhx.params.working.WorkingProcedureVo;
+import com.fjhx.utils.FileClientUtil;
+import com.fjhx.utils.WrapperUtil;
+import com.fjhx.working.mapper.WorkingProcedureMapper;
+import com.fjhx.working.service.WorkingProcedureService;
+import org.springblade.core.secure.utils.AuthUtil;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 工序 服务实现类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-07-14
+ */
+@Service
+public class WorkingProcedureServiceImpl extends ServiceImpl<WorkingProcedureMapper, WorkingProcedure> implements WorkingProcedureService {
+
+    @Override
+    public Page<WorkingProcedure> getPage(Map<String, String> condition) {
+
+        QueryWrapper<WorkingProcedure> wrapper = Wrappers.query();
+
+        WrapperUtil.init(condition, wrapper)
+                .eqTenantId()
+                .keyword("name", "name")
+                .eq("whether_packing", "whetherPacking")
+                .createTimeDesc();
+
+        return page(condition, wrapper);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void add(WorkingProcedureVo workingProcedureVo) {
+        save(workingProcedureVo);
+        FileClientUtil.bindingFile(workingProcedureVo.getId(), workingProcedureVo.getFileInfoParam());
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void edit(WorkingProcedureVo workingProcedureVo) {
+        updateById(workingProcedureVo);
+        FileClientUtil.againBindingFile(workingProcedureVo.getId(), workingProcedureVo.getFileInfoParam());
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void delete(WorkingProcedureVo workingProcedureVo) {
+        Long id = workingProcedureVo.getId();
+        removeById(id);
+        FileClientUtil.relieveBindingFile(id);
+    }
+
+    @Override
+    public List<WorkingProcedure> getList() {
+        return lambdaQuery()
+                .select(BaseEntity::getId, WorkingProcedure::getName, WorkingProcedure::getWhetherPacking)
+                .eq(BaseEntity::getTenantId, AuthUtil.getTenantId())
+                .orderByDesc(BaseEntity::getId)
+                .list();
+    }
+
+}

+ 55 - 0
hx-service/iot-management/src/main/java/com/fjhx/working/service/impl/WorkingRouteProcedureServiceImpl.java

@@ -0,0 +1,55 @@
+package com.fjhx.working.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.utils.WrapperUtil;
+import com.fjhx.entity.working.WorkingRouteProcedure;
+import com.fjhx.params.working.WorkingRouteProcedureVo;
+import com.fjhx.working.mapper.WorkingRouteProcedureMapper;
+import com.fjhx.working.service.WorkingRouteProcedureService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 工艺路线工序关联表 服务实现类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-07-14
+ */
+@Service
+public class WorkingRouteProcedureServiceImpl extends ServiceImpl<WorkingRouteProcedureMapper, WorkingRouteProcedure> implements WorkingRouteProcedureService {
+
+    @Override
+    public Page<WorkingRouteProcedure> getPage(Map<String, String> condition) {
+
+        QueryWrapper<WorkingRouteProcedure> wrapper = Wrappers.query();
+
+        WrapperUtil.init(condition, wrapper)
+                .eqTenantId()
+                .createTimeDesc();
+
+        Page<WorkingRouteProcedure> page = page(condition, wrapper);
+        return page;
+    }
+
+    @Override
+    public void add(WorkingRouteProcedureVo workingRouteProcedureVo) {
+        save(workingRouteProcedureVo);
+    }
+
+    @Override
+    public void edit(WorkingRouteProcedureVo workingRouteProcedureVo) {
+        updateById(workingRouteProcedureVo);
+    }
+
+    @Override
+    public void delete(WorkingRouteProcedureVo workingRouteProcedureVo) {
+        removeById(workingRouteProcedureVo.getId());
+    }
+
+}

+ 55 - 0
hx-service/iot-management/src/main/java/com/fjhx/working/service/impl/WorkingRouteServiceImpl.java

@@ -0,0 +1,55 @@
+package com.fjhx.working.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.utils.WrapperUtil;
+import com.fjhx.entity.working.WorkingRoute;
+import com.fjhx.params.working.WorkingRouteVo;
+import com.fjhx.working.mapper.WorkingRouteMapper;
+import com.fjhx.working.service.WorkingRouteService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 工艺路线 服务实现类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-07-14
+ */
+@Service
+public class WorkingRouteServiceImpl extends ServiceImpl<WorkingRouteMapper, WorkingRoute> implements WorkingRouteService {
+
+    @Override
+    public Page<WorkingRoute> getPage(Map<String, String> condition) {
+
+        QueryWrapper<WorkingRoute> wrapper = Wrappers.query();
+
+        WrapperUtil.init(condition, wrapper)
+                .eqTenantId()
+                .createTimeDesc();
+
+        Page<WorkingRoute> page = page(condition, wrapper);
+        return page;
+    }
+
+    @Override
+    public void add(WorkingRouteVo workingRouteVo) {
+        save(workingRouteVo);
+    }
+
+    @Override
+    public void edit(WorkingRouteVo workingRouteVo) {
+        updateById(workingRouteVo);
+    }
+
+    @Override
+    public void delete(WorkingRouteVo workingRouteVo) {
+        removeById(workingRouteVo.getId());
+    }
+
+}