Merge remote-tracking branch 'origin/master'

hx-common/product-library/src/main/java/com/fjhx/entity/Material.java

@@ -42,41 +42,11 @@ public class Material extends BaseEntity {
     private String name;
 
     /**
-     * 规格
-     */
-    private String spec;
-
-    /**
      * 单位
      */
     private String unit;
 
     /**
-     * 安全库存
-     */
-    private BigDecimal safetyStock;
-
-    /**
-     * 采购周期/天
-     */
-    private Integer cycle;
-
-    /**
-     * 质检比例
-     */
-    private BigDecimal qualityTestingRate;
-
-    /**
-     * 是否卷材
-     */
-    private Integer coiled;
-
-    /**
-     * 头尾损耗
-     */
-    private BigDecimal loss;
-
-    /**
      * 物料说明
      */
     private String introduce;

hx-common/product-library/src/main/java/com/fjhx/entity/Product.java

@@ -39,11 +39,6 @@ public class Product extends BaseEntity {
     private String name;
 
     /**
-     * 型号
-     */
-    private String model;
-
-    /**
      * 单位
      */
     private String unit;

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();
+
 }

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>

hx-common/product-library/src/main/java/com/fjhx/service/MaterialService.java

@@ -1,12 +1,10 @@
 package com.fjhx.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.base.BaseService;
 import com.fjhx.entity.Material;
 import com.fjhx.params.MaterialVo;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -18,7 +16,7 @@ import java.util.Map;
  */
 public interface MaterialService extends BaseService<Material> {
 
-    Page<Material> getPage(Map<String, String> condition);
+//    Page<Material> getPage(Map<String, String> condition);
 
     void add(MaterialVo materialVo);
 

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

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

hx-common/product-library/src/main/java/com/fjhx/service/impl/MaterialServiceImpl.java

@@ -1,29 +1,21 @@
 package com.fjhx.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
-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.constant.ProductLibraryLockConstant;
 import com.fjhx.constants.ErrorMsgConstant;
-import com.fjhx.constants.StatusConstant;
 import com.fjhx.entity.Material;
 import com.fjhx.mapper.MaterialMapper;
 import com.fjhx.params.MaterialVo;
-import com.fjhx.service.ClassifyService;
 import com.fjhx.service.MaterialService;
 import com.fjhx.utils.Assert;
-import com.fjhx.utils.WrapperUtil;
 import lombok.RequiredArgsConstructor;
 import org.springblade.core.redis.lock.RedisLockClient;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springframework.stereotype.Service;
 
-import java.math.BigDecimal;
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -37,54 +29,37 @@ import java.util.Map;
 @RequiredArgsConstructor
 public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, Material> implements MaterialService {
 
-    private final ClassifyService classifyService;
+//    private final ClassifyService classifyService;
 
     private final RedisLockClient redisLockClient;
 
-    @Override
-    public Page<Material> getPage(Map<String, String> condition) {
-
-        QueryWrapper<Material> wrapper = Wrappers.query();
-
-        WrapperUtil.init(condition, wrapper)
-                .keyword("code", "name")
-                .eqTenantId();
-
-        // 编码正序
-        wrapper.orderByAsc("code");
-
-        // 如果传入分类id，查询分类已经分类下级
-        String classifyId = condition.get("classifyId");
-        if (ObjectUtil.isNotEmpty(classifyId)) {
-            List<Long> childrenIdList = classifyService.getChildrenIdList(Long.valueOf(classifyId));
-            wrapper.in("classify_id", childrenIdList);
-        }
-
-        return page(condition, wrapper);
-    }
+//    @Override
+//    public Page<Material> getPage(Map<String, String> condition) {
+//
+//        QueryWrapper<Material> wrapper = Wrappers.query();
+//
+//        WrapperUtil.init(condition, wrapper)
+//                .keyword("code", "name")
+//                .eqTenantId();
+//
+//        // 编码正序
+//        wrapper.orderByAsc("code");
+//
+//        // 如果传入分类id，查询分类已经分类下级
+//        String classifyId = condition.get("classifyId");
+//        if (ObjectUtil.isNotEmpty(classifyId)) {
+//            List<Long> childrenIdList = classifyService.getChildrenIdList(Long.valueOf(classifyId));
+//            wrapper.in("classify_id", childrenIdList);
+//        }
+//
+//        return page(condition, wrapper);
+//    }
 
     @Override
     public void add(MaterialVo materialVo) {
         Assert.notEmpty(materialVo.getName(), "物料名称不能为空");
         Assert.notEmpty(materialVo.getCode(), "物料编码不能为空");
-        Integer coiled = materialVo.getCoiled();
-        Assert.notEmpty(coiled, "是否卷材判断字段不能为空");
-
-        if (ObjectUtil.isEmpty(materialVo.getSafetyStock())) {
-            materialVo.setSafetyStock(BigDecimal.ZERO);
-        }
-
-        if (ObjectUtil.isEmpty(materialVo.getCycle())) {
-            materialVo.setCycle(0);
-        }
-
-        if (ObjectUtil.isEmpty(materialVo.getQualityTestingRate())) {
-            materialVo.setQualityTestingRate(BigDecimal.ZERO);
-        }
 
-        if (ObjectUtil.isEmpty(materialVo.getLoss()) || coiled.equals(StatusConstant.No)) {
-            materialVo.setLoss(BigDecimal.ZERO);
-        }
 
         String tenantId = AuthUtil.getTenantId();
 

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

@@ -1,9 +1,6 @@
 package com.fjhx.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
-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.constant.ProductLibraryLockConstant;
@@ -11,10 +8,8 @@ import com.fjhx.constants.ErrorMsgConstant;
 import com.fjhx.entity.Product;
 import com.fjhx.mapper.ProductMapper;
 import com.fjhx.params.ProductVo;
-import com.fjhx.service.ClassifyService;
 import com.fjhx.service.ProductService;
 import com.fjhx.utils.Assert;
-import com.fjhx.utils.WrapperUtil;
 import lombok.RequiredArgsConstructor;
 import org.springblade.core.redis.lock.RedisLockClient;
 import org.springblade.core.secure.utils.AuthUtil;
@@ -35,28 +30,28 @@ import java.util.Map;
 @RequiredArgsConstructor
 public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> implements ProductService {
 
-    private final ClassifyService classifyService;
+//    private final ClassifyService classifyService;
 
     private final RedisLockClient redisLockClient;
 
-    @Override
-    public Page<Product> getPage(Map<String, String> condition) {
-
-        QueryWrapper<Product> wrapper = Wrappers.query();
-
-        WrapperUtil.init(condition, wrapper)
-                .keyword("code", "name")
-                .eqTenantId();
-
-        // 如果传入分类id，查询分类已经分类下级
-        Object classifyId = condition.get("classifyId");
-        if (ObjectUtil.isNotEmpty(classifyId)) {
-            List<Long> childrenIdList = classifyService.getChildrenIdList(Long.valueOf(classifyId.toString()));
-            wrapper.in("classify_id", childrenIdList);
-        }
-
-        return page(condition, wrapper);
-    }
+//    @Override
+//    public Page<Product> getPage(Map<String, String> condition) {
+//
+//        QueryWrapper<Product> wrapper = Wrappers.query();
+//
+//        WrapperUtil.init(condition, wrapper)
+//                .keyword("code", "name")
+//                .eqTenantId();
+//
+//        // 如果传入分类id，查询分类已经分类下级
+//        Object classifyId = condition.get("classifyId");
+//        if (ObjectUtil.isNotEmpty(classifyId)) {
+//            List<Long> childrenIdList = classifyService.getChildrenIdList(Long.valueOf(classifyId.toString()));
+//            wrapper.in("classify_id", childrenIdList);
+//        }
+//
+//        return page(condition, wrapper);
+//    }
 
     @Override
     public void add(ProductVo productVo) {

hx-service-api/iot-management-api/src/main/java/com/fjhx/entity/material/MaterialEx.java

@@ -0,0 +1,59 @@
+package com.fjhx.entity.material;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 物料拓展表
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-07-14
+ */
+@Data
+public class MaterialEx implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 物料id
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 规格
+     */
+    private String spec;
+
+    /**
+     * 安全库存
+     */
+    private BigDecimal safetyStock;
+
+    /**
+     * 采购周期/天
+     */
+    private Integer cycle;
+
+    /**
+     * 质检比例
+     */
+    private BigDecimal qualityTestingRate;
+
+    /**
+     * 是否卷材
+     */
+    private Integer coiled;
+
+    /**
+     * 头尾损耗
+     */
+    private BigDecimal loss;
+
+
+}

hx-service-api/iot-management-api/src/main/java/com/fjhx/entity/product/ProductEx.java

@@ -0,0 +1,38 @@
+package com.fjhx.entity.product;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 产品
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-07-14
+ */
+@Data
+public class ProductEx implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 产品id
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 型号
+     */
+    private String model;
+
+    /**
+     * 生产流程id
+     */
+    private Long productionProcessId;
+
+
+}

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;
 

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;
 

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;
 
+
 }

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 {
-
-}

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 {
-
-}

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 {
-
-}

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 {
-
-}

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 {
-
-}

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;
-
-}

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 {
+
+}

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;
+
+}

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 {
+
+}

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 {
+
+}

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 {
+
+}

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 {
+
+}

hx-common/product-library/src/main/java/com/fjhx/controller/MaterialController.java → hx-service/iot-management/src/main/java/com/fjhx/material/controller/MaterialExController.java

@@ -1,8 +1,7 @@
-package com.fjhx.controller;
+package com.fjhx.material.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.entity.Material;
-import com.fjhx.params.MaterialVo;
+import com.fjhx.material.service.MaterialExService;
 import com.fjhx.service.MaterialService;
 import org.springblade.core.tool.api.R;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,47 +15,47 @@ import java.util.Map;
 
 /**
  * <p>
- * 物料 前端控制器
+ * 物料拓展表 前端控制器
  * </p>
  *
  * @author ${author}
- * @since 2022-07-06
+ * @since 2022-07-14
  */
 @RestController
 @RequestMapping("/material")
-public class MaterialController {
+public class MaterialExController {
+
+    @Autowired
+    private MaterialExService materialExService;
 
     @Autowired
     private MaterialService materialService;
 
     @PostMapping("/page")
     public R page(@RequestBody Map<String, String> condition) {
-        Page<Material> result = materialService.getPage(condition);
+        Page<Map<String, Object>> result = materialExService.getPage(condition);
         return R.success(result);
     }
 
     @PostMapping("/add")
-    public R add(@RequestBody MaterialVo materialVo) {
-        materialService.add(materialVo);
+    public R add(@RequestBody Map<String, Object> map) {
+        materialExService.add(map);
         return R.success();
     }
 
     @PostMapping("/edit")
-    public R edit(@RequestBody MaterialVo materialVo) {
-        materialService.edit(materialVo);
+    public R edit(@RequestBody Map<String, Object> map) {
+        materialExService.edit(map);
         return R.success();
     }
 
     @PostMapping("/delete")
-    public R delete(@RequestBody MaterialVo materialVo) {
-        materialService.delete(materialVo);
+    public R delete(@RequestBody Map<String, Object> map) {
+        materialExService.delete(map);
         return R.success();
     }
 
-    /**
-     * 获取租户添加过的物料单位集合
-     */
-    @PostMapping("/getUnitList")
+    @PostMapping("getUnitList")
     public R getUnitList() {
         List<String> unitList = materialService.getUnitList();
         return R.success(unitList);

hx-service/iot-management/src/main/java/com/fjhx/material/mapper/MaterialExMapper.java

@@ -0,0 +1,23 @@
+package com.fjhx.material.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.entity.material.MaterialEx;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 物料拓展表 Mapper 接口
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-07-14
+ */
+public interface MaterialExMapper extends BaseMapper<MaterialEx> {
+
+    Page<Map<String, Object>> getPage(@Param("page") Page<MaterialEx> page, @Param("ew") QueryWrapper<?> wrapper);
+
+}

hx-service/iot-management/src/main/java/com/fjhx/material/mapper/MaterialExMapper.xml

@@ -0,0 +1,23 @@
+<?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.material.mapper.MaterialExMapper">
+
+    <select id="getPage" resultType="java.util.LinkedHashMap">
+        select m.id,
+               m.type,
+               m.classify_id           classifyId,
+               m.code,
+               m.name,
+               me.spec,
+               me.safety_stock         safetyStock,
+               m.unit,
+               me.cycle,
+               me.quality_testing_rate qualityTestingRate,
+               me.coiled,
+               me.loss,
+               m.introduce
+        from material m
+                 left join material_ex me on m.id = me.id
+            ${ew.customSqlSegment}
+    </select>
+</mapper>

hx-service/iot-management/src/main/java/com/fjhx/material/service/MaterialExService.java

@@ -0,0 +1,27 @@
+package com.fjhx.material.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.base.BaseService;
+import com.fjhx.entity.material.MaterialEx;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 物料拓展表 服务类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-07-14
+ */
+public interface MaterialExService extends BaseService<MaterialEx> {
+
+    Page<Map<String, Object>> getPage(Map<String, String> condition);
+
+    void add(Map<String, Object> map);
+
+    void edit(Map<String, Object> map);
+
+    void delete(Map<String, Object> map);
+
+}

hx-service/iot-management/src/main/java/com/fjhx/material/service/impl/MaterialExServiceImpl.java

@@ -0,0 +1,111 @@
+package com.fjhx.material.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.constants.StatusConstant;
+import com.fjhx.entity.material.MaterialEx;
+import com.fjhx.material.mapper.MaterialExMapper;
+import com.fjhx.material.service.MaterialExService;
+import com.fjhx.params.MaterialVo;
+import com.fjhx.service.ClassifyService;
+import com.fjhx.service.MaterialService;
+import com.fjhx.utils.Assert;
+import com.fjhx.utils.WrapperUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 物料拓展表 服务实现类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-07-14
+ */
+@Service
+public class MaterialExServiceImpl extends ServiceImpl<MaterialExMapper, MaterialEx> implements MaterialExService {
+
+    @Autowired
+    private MaterialService materialService;
+
+    @Autowired
+    private ClassifyService classifyService;
+
+    @Override
+    public Page<Map<String, Object>> getPage(Map<String, String> condition) {
+        QueryWrapper<?> wrapper = WrapperUtil.init(condition)
+                .keyword("m.code", "m.name")
+                .eqTenantId("m")
+                .getWrapper();
+
+        // 编码正序
+        wrapper.orderByAsc("m.code");
+
+        // 如果传入分类id，查询分类已经分类下级
+        String classifyId = condition.get("classifyId");
+        if (ObjectUtil.isNotEmpty(classifyId)) {
+            List<Long> childrenIdList = classifyService.getChildrenIdList(Long.valueOf(classifyId));
+            wrapper.in("m.classify_id", childrenIdList);
+        }
+
+        return baseMapper.getPage(createPage(condition), wrapper);
+    }
+
+    @Transactional
+    @Override
+    public void add(Map<String, Object> map) {
+
+        MaterialVo material = BeanUtil.toBean(map, MaterialVo.class);
+        MaterialEx materialEx = BeanUtil.toBean(map, MaterialEx.class);
+
+        Integer coiled = materialEx.getCoiled();
+        Assert.notEmpty(coiled, "是否卷材判断字段不能为空");
+
+        if (ObjectUtil.isEmpty(materialEx.getSafetyStock())) {
+            materialEx.setSafetyStock(BigDecimal.ZERO);
+        }
+
+        if (ObjectUtil.isEmpty(materialEx.getCycle())) {
+            materialEx.setCycle(0);
+        }
+
+        if (ObjectUtil.isEmpty(materialEx.getQualityTestingRate())) {
+            materialEx.setQualityTestingRate(BigDecimal.ZERO);
+        }
+
+        if (ObjectUtil.isEmpty(materialEx.getLoss()) || coiled.equals(StatusConstant.No)) {
+            materialEx.setLoss(BigDecimal.ZERO);
+        }
+
+        materialService.add(material);
+
+        materialEx.setId(material.getId());
+        save(materialEx);
+    }
+
+    @Transactional
+    @Override
+    public void edit(Map<String, Object> map) {
+        MaterialVo material = BeanUtil.toBean(map, MaterialVo.class);
+        MaterialEx materialEx = BeanUtil.toBean(map, MaterialEx.class);
+
+        materialService.edit(material);
+        updateById(materialEx);
+    }
+
+    @Override
+    public void delete(Map<String, Object> map) {
+        MaterialVo material = BeanUtil.toBean(map, MaterialVo.class);
+
+        materialService.delete(material);
+    }
+
+}

hx-common/product-library/src/main/java/com/fjhx/controller/ProductController.java → hx-service/iot-management/src/main/java/com/fjhx/product/controller/ProductExController.java

@@ -1,8 +1,7 @@
-package com.fjhx.controller;
+package com.fjhx.product.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.entity.Product;
-import com.fjhx.params.ProductVo;
+import com.fjhx.product.service.ProductExService;
 import com.fjhx.service.ProductService;
 import org.springblade.core.tool.api.R;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,46 +19,52 @@ import java.util.Map;
  * </p>
  *
  * @author ${author}
- * @since 2022-07-06
+ * @since 2022-07-14
  */
 @RestController
 @RequestMapping("/product")
-public class ProductController {
+public class ProductExController {
+
+    @Autowired
+    private ProductExService productExService;
 
     @Autowired
     private ProductService productService;
 
     @PostMapping("/page")
     public R page(@RequestBody Map<String, String> condition) {
-        Page<Product> result = productService.getPage(condition);
+        Page<Map<String, Object>> result = productExService.getPage(condition);
         return R.success(result);
     }
 
     @PostMapping("/add")
-    public R add(@RequestBody ProductVo productVo) {
-        productService.add(productVo);
+    public R add(@RequestBody Map<String, Object> map) {
+        productExService.add(map);
         return R.success();
     }
 
     @PostMapping("/edit")
-    public R edit(@RequestBody ProductVo productVo) {
-        productService.edit(productVo);
+    public R edit(@RequestBody Map<String, Object> map) {
+        productExService.edit(map);
         return R.success();
     }
 
     @PostMapping("/delete")
-    public R delete(@RequestBody ProductVo productVo) {
-        productService.delete(productVo);
+    public R delete(@RequestBody Map<String, Object> map) {
+        productExService.delete(map);
         return R.success();
     }
 
-    /**
-     * 获取租户添加过的物料单位集合
-     */
-    @PostMapping("/getUnitList")
+    @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);
     }
 
 }

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

@@ -0,0 +1,26 @@
+package com.fjhx.product.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+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;
+
+/**
+ * <p>
+ * 产品 Mapper 接口
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-07-14
+ */
+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();
+
+}

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

@@ -0,0 +1,32 @@
+<?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.product.mapper.ProductExMapper">
+
+    <select id="getPage" resultType="java.util.LinkedHashMap">
+        select p.id,
+               p.classify_id classifyId,
+               p.code,
+               p.name,
+               pe.model,
+               p.unit,
+               p.introduce,
+               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>
+
+    <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>

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

@@ -0,0 +1,30 @@
+package com.fjhx.product.service;
+
+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;
+
+/**
+ * <p>
+ * 产品 服务类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-07-14
+ */
+public interface ProductExService extends BaseService<ProductEx> {
+
+    Page<Map<String, Object>> getPage(Map<String, String> condition);
+
+    void add(Map<String, Object> map);
+
+    void edit(Map<String, Object> map);
+
+    void delete(Map<String, Object> map);
+
+    List<Map<String, Object>> getList();
+    
+}

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

@@ -0,0 +1,91 @@
+package com.fjhx.product.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.entity.product.ProductEx;
+import com.fjhx.params.ProductVo;
+import com.fjhx.product.mapper.ProductExMapper;
+import com.fjhx.product.service.ProductExService;
+import com.fjhx.service.ClassifyService;
+import com.fjhx.service.ProductService;
+import com.fjhx.utils.WrapperUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 产品 服务实现类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-07-14
+ */
+@Service
+public class ProductExServiceImpl extends ServiceImpl<ProductExMapper, ProductEx> implements ProductExService {
+
+    @Autowired
+    private ProductService productService;
+
+    @Autowired
+    private ClassifyService classifyService;
+
+    @Override
+    public Page<Map<String, Object>> getPage(Map<String, String> condition) {
+
+        QueryWrapper<?> wrapper = WrapperUtil.init(condition)
+                .keyword("p.name", "p.code")
+                .eqTenantId("p")
+                .getWrapper();
+
+        // 编码正序
+        wrapper.orderByAsc("p.code");
+
+        // 如果传入分类id，查询分类已经分类下级
+        String classifyId = condition.get("classifyId");
+        if (ObjectUtil.isNotEmpty(classifyId)) {
+            List<Long> childrenIdList = classifyService.getChildrenIdList(Long.valueOf(classifyId));
+            wrapper.in("p.classify_id", childrenIdList);
+        }
+
+        return baseMapper.getPage(createPage(condition), wrapper);
+    }
+
+    @Override
+    public void add(Map<String, Object> map) {
+        ProductVo productVo = BeanUtil.toBean(map, ProductVo.class);
+        ProductEx productEx = BeanUtil.toBean(map, ProductEx.class);
+
+        productService.add(productVo);
+
+        productEx.setId(productVo.getId());
+        save(productEx);
+    }
+
+    @Override
+    public void edit(Map<String, Object> map) {
+        ProductVo productVo = BeanUtil.toBean(map, ProductVo.class);
+        ProductEx productEx = BeanUtil.toBean(map, ProductEx.class);
+
+        productService.edit(productVo);
+        updateById(productEx);
+    }
+
+    @Override
+    public void delete(Map<String, Object> map) {
+        ProductVo productVo = BeanUtil.toBean(map, ProductVo.class);
+
+        productService.delete(productVo);
+    }
+
+    @Override
+    public List<Map<String, Object>> getList() {
+        return baseMapper.getList();
+    }
+
+}

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();
-    }
-
-}
-

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);
-    }
-
-}
-

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> {
-
-}

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> {
-
-}

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> {
-
-}

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);
-
-}

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);
-
-}

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();
-
-}

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());
-    }
-
-}

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());
-    }
-
-}

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();
-    }
-
-}

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);
+    }
+
+}
+

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();
+    }
+
+}
+

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();
+    }
+
+}
+

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> {
+
+}

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>

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> {
+
+}

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>

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> {
+
+}

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>

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();
+
+}

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);
+
+}

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);
+
+}

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();
+    }
+
+}

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());
+    }
+
+}

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());
+    }
+
+}

hx-service/storage/src/main/java/com/fjhx/stock/service/impl/StockWaterServiceImpl.java

@@ -112,10 +112,7 @@ public class StockWaterServiceImpl extends ServiceImpl<StockWaterMapper, StockWa
                                 .divide(new BigDecimal("100"), 2, RoundingMode.HALF_UP))
                         .reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, RoundingMode.HALF_UP);
                 // 金额
-                BigDecimal money = value.stream().map(item -> ((BigDecimal) item.get("changeNum"))
-                                .multiply(BigDecimal.valueOf((float) item.get("materialWidth")))
-                                .multiply((BigDecimal) item.get("materialPrice"))
-                                .divide(new BigDecimal("100"), 2, RoundingMode.HALF_UP))
+                BigDecimal money = value.stream().map(item -> ((BigDecimal) item.get("changeNum")).multiply((BigDecimal) item.get("materialPrice")))
                         .reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, RoundingMode.HALF_UP);
 
                 // 添加到面料统计