杰生迭代

hx-common/code-generator/src/main/java/com/fjhx/modular/Storage.java

@@ -37,7 +37,7 @@ public class Storage {
     public static String MODULAR_NAME = "storage";
 
     // 需要生成的表名称,多表用,隔开
-    public static String INCLUDE = "stock_tag";
+    public static String INCLUDE = "material_category";
 
     // mysql连接
     public static String MYSQL_URL = "rm-wz9f1jcr5466b42415o.mysql.rds.aliyuncs.com:3306";
@@ -47,7 +47,7 @@ public class Storage {
     // 业务位置
     public static String SERVICE_PATH = "hx-service";
 
-    public static String BASE_ENTITY_PATH = "com.fjhx.base.BaseEntity";
+    public static String BASE_ENTITY_PATH = "com.fjhx.base.BasicEntity";
     public static String BASE_SERVICE_PATH = "com.fjhx.base.BaseService";
 
     // 执行代码生成

hx-service-api/storage-api/src/main/java/com/fjhx/entity/material/Material.java

@@ -1,16 +1,15 @@
 package com.fjhx.entity.material;
 
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fjhx.base.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fjhx.base.BasicEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.math.BigDecimal;
+import java.util.Date;
+
 /**
  * <p>
  * 物料
@@ -21,14 +20,15 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
+@TableName("material_copy1")
 public class Material extends BasicEntity {
 
-
     /**
      * 软删除
      */
+    @TableLogic
     @TableField("IsDelete")
-    private Boolean isdelete;
+    private Integer isdelete;
 
     /**
      * 物料名称
@@ -168,5 +168,4 @@ public class Material extends BasicEntity {
     @TableField("TechnologyType")
     private Integer technologytype;
 
-
 }

hx-service-api/storage-api/src/main/java/com/fjhx/entity/material/MaterialCategory.java

@@ -0,0 +1,79 @@
+package com.fjhx.entity.material;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fjhx.base.BasicEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 物料分类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-11-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("material_category_copy1")
+public class MaterialCategory extends BasicEntity {
+
+    /**
+     * 软删除
+     */
+    @TableField("IsDelete")
+    private Integer IsDelete;
+
+    /**
+     * 创建时间
+     */
+    @TableField("CreatedTime")
+    private Date CreatedTime;
+
+    /**
+     * 修改时间
+     */
+    @TableField("UpdatedTime")
+    private Date UpdatedTime;
+
+    /**
+     * 编码
+     */
+    @TableField("Code")
+    private String Code;
+
+    /**
+     * 名称
+     */
+    @TableField("Name")
+    private String Name;
+
+    /**
+     * 跳转链接
+     */
+    @TableField("ParentCode")
+    private String ParentCode;
+
+    /**
+     * 是否选择
+     */
+    @TableField("IsForChose")
+    private Integer IsForChose;
+
+    /**
+     * 仓库
+     */
+    @TableField("Warehouse")
+    private String Warehouse;
+
+    /**
+     * 拓展表名称
+     */
+    @TableField("ExtTableName")
+    private String ExtTableName;
+
+
+}

hx-service-api/storage-api/src/main/java/com/fjhx/params/material/EditMaterialCategoryVo.java

@@ -0,0 +1,32 @@
+package com.fjhx.params.material;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+
+@Data
+public class EditMaterialCategoryVo {
+
+    /**
+     * 更新类型：1新增 2修改 3删除
+     */
+    Integer type;
+
+    /**
+     * 编码
+     */
+    @TableField("Code")
+    private String Code;
+
+    /**
+     * 名称
+     */
+    @TableField("Name")
+    private String Name;
+
+    /**
+     * 跳转链接
+     */
+    @TableField("ParentCode")
+    private String ParentCode;
+
+}

hx-service-api/storage-api/src/main/java/com/fjhx/params/material/EditMaterialVo.java

@@ -0,0 +1,43 @@
+package com.fjhx.params.material;
+
+import lombok.Data;
+
+@Data
+public class EditMaterialVo {
+
+    /**
+     * 更新类型：1新增 2修改 3删除
+     */
+    Integer type;
+
+    /**
+     * 编码
+     */
+    private String code;
+
+    /**
+     * 物料名称
+     */
+    private String name;
+
+    /**
+     * 规格
+     */
+    private String spec;
+
+    /**
+     * 克重
+     */
+    private Float unitWeight;
+
+    /**
+     * 门幅
+     */
+    private Float width;
+
+    /**
+     * 库存单位
+     */
+    private String stockUnit;
+
+}

hx-service-api/storage-api/src/main/java/com/fjhx/params/material/MaterialCategoryEx.java

@@ -0,0 +1,17 @@
+package com.fjhx.params.material;
+
+import com.fjhx.entity.material.MaterialCategory;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 物料分类
+ *
+ * @author ${author}
+ * @since 2022-11-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class MaterialCategoryEx extends MaterialCategory {
+
+}

hx-service-api/storage-api/src/main/java/com/fjhx/params/material/MaterialCategoryVo.java

@@ -0,0 +1,17 @@
+package com.fjhx.params.material;
+
+import com.fjhx.entity.material.MaterialCategory;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 物料分类
+ *
+ * @author ${author}
+ * @since 2022-11-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class MaterialCategoryVo extends MaterialCategory {
+
+}

hx-service/storage/src/main/java/com/fjhx/material/controller/MaterialCategoryController.java

@@ -0,0 +1,36 @@
+package com.fjhx.material.controller;
+
+import com.fjhx.params.material.EditMaterialCategoryVo;
+import org.springblade.core.tool.api.R;
+import com.fjhx.material.service.MaterialCategoryService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 物料分类 前端控制器
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-11-23
+ */
+@RestController
+@RequestMapping("/materialCategory")
+public class MaterialCategoryController {
+
+    @Autowired
+    private MaterialCategoryService materialCategoryService;
+
+
+    @PostMapping("edit")
+    public R edit(@RequestBody EditMaterialCategoryVo editMaterialCategoryVo) {
+        boolean flag = materialCategoryService.edit(editMaterialCategoryVo);
+        return R.success(flag);
+    }
+
+
+}
+

hx-service/storage/src/main/java/com/fjhx/material/controller/MaterialController.java

@@ -3,6 +3,7 @@ package com.fjhx.material.controller;
 import com.fjhx.base.ListPageMap;
 import com.fjhx.entity.material.Material;
 import com.fjhx.material.service.MaterialService;
+import com.fjhx.params.material.EditMaterialVo;
 import org.springblade.core.tool.api.R;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -50,5 +51,11 @@ public class MaterialController {
         return R.success(result);
     }
 
+    @PostMapping("edit")
+    public R edit(@RequestBody EditMaterialVo editMaterialVo) {
+        boolean flag = materialService.edit(editMaterialVo);
+        return R.success(flag);
+    }
+
 }
 

hx-service/storage/src/main/java/com/fjhx/material/mapper/MaterialCategoryMapper.java

@@ -0,0 +1,16 @@
+package com.fjhx.material.mapper;
+
+import com.fjhx.entity.material.MaterialCategory;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 物料分类 Mapper 接口
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-11-23
+ */
+public interface MaterialCategoryMapper extends BaseMapper<MaterialCategory> {
+
+}

hx-service/storage/src/main/java/com/fjhx/material/mapper/MaterialCategoryMapper.xml

@@ -0,0 +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.material.mapper.MaterialCategoryMapper">
+
+</mapper>

hx-service/storage/src/main/java/com/fjhx/material/service/MaterialCategoryService.java

@@ -0,0 +1,20 @@
+package com.fjhx.material.service;
+
+import com.fjhx.base.BaseService;
+import com.fjhx.base.BasicEntity;
+import com.fjhx.entity.material.MaterialCategory;
+import com.fjhx.params.material.EditMaterialCategoryVo;
+
+/**
+ * <p>
+ * 物料分类 服务类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-11-23
+ */
+public interface MaterialCategoryService extends BaseService<MaterialCategory> {
+
+    boolean edit(EditMaterialCategoryVo editMaterialCategoryVo);
+
+}

hx-service/storage/src/main/java/com/fjhx/material/service/MaterialService.java

@@ -2,6 +2,7 @@ package com.fjhx.material.service;
 
 import com.fjhx.entity.material.Material;
 import com.fjhx.base.BaseService;
+import com.fjhx.params.material.EditMaterialVo;
 
 import java.util.List;
 import java.util.Map;
@@ -37,4 +38,6 @@ public interface MaterialService extends BaseService<Material> {
 
     List<Map<String, Object>> getOutRfidData(List<String> rfidList, String stockHouseId);
 
+    boolean edit(EditMaterialVo editMaterialVo);
+
 }

hx-service/storage/src/main/java/com/fjhx/material/service/impl/MaterialCategoryServiceImpl.java

@@ -0,0 +1,64 @@
+package com.fjhx.material.service.impl;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.entity.material.MaterialCategory;
+import com.fjhx.material.mapper.MaterialCategoryMapper;
+import com.fjhx.material.service.MaterialCategoryService;
+import com.fjhx.params.material.EditMaterialCategoryVo;
+import com.fjhx.utils.Assert;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 物料分类 服务实现类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-11-23
+ */
+@Service
+public class MaterialCategoryServiceImpl extends ServiceImpl<MaterialCategoryMapper, MaterialCategory> implements MaterialCategoryService {
+
+    @Override
+    public boolean edit(EditMaterialCategoryVo editMaterialCategoryVo) {
+
+        MaterialCategory materialCategory = new MaterialCategory();
+
+        String code = editMaterialCategoryVo.getCode();
+        Assert.notEmpty(code, "分类编码不能为空");
+
+        materialCategory.setCode(editMaterialCategoryVo.getCode());
+        materialCategory.setName(editMaterialCategoryVo.getName());
+        materialCategory.setParentCode(editMaterialCategoryVo.getParentCode());
+
+        MaterialCategory oldMaterialCategory = getOne(Wrappers.<MaterialCategory>lambdaQuery()
+                .eq(MaterialCategory::getCode, editMaterialCategoryVo.getCode())
+                .last("limit 1")
+        );
+
+        Date date = new Date();
+
+        switch (editMaterialCategoryVo.getType()) {
+            case 1:
+                Assert.empty(oldMaterialCategory, "新增失败，分类编码已存在");
+                materialCategory.setIsDelete(0);
+                materialCategory.setCreatedTime(date);
+                materialCategory.setUpdatedTime(date);
+                materialCategory.setIsForChose(0);
+                return save(materialCategory);
+            case 2:
+                Assert.notEmpty(oldMaterialCategory, "编辑失败，分类编码不存在");
+                materialCategory.setId(oldMaterialCategory.getId());
+                materialCategory.setUpdatedTime(date);
+                return updateById(materialCategory);
+            case 3:
+                Assert.notEmpty(oldMaterialCategory, "删除失败，分类编码不存在");
+                return removeById(oldMaterialCategory.getId());
+            default:
+                return false;
+        }
+    }
+}

hx-service/storage/src/main/java/com/fjhx/material/mapper/impl/MaterialReceivingDetailsServiceImpl.java → hx-service/storage/src/main/java/com/fjhx/material/service/impl/MaterialReceivingDetailsServiceImpl.java

@@ -1,4 +1,4 @@
-package com.fjhx.material.mapper.impl;
+package com.fjhx.material.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

hx-service/storage/src/main/java/com/fjhx/material/mapper/impl/MaterialReceivingServiceImpl.java → hx-service/storage/src/main/java/com/fjhx/material/service/impl/MaterialReceivingServiceImpl.java

@@ -1,4 +1,4 @@
-package com.fjhx.material.mapper.impl;
+package com.fjhx.material.service.impl;
 
 
 import com.alibaba.fastjson.JSONObject;

hx-service/storage/src/main/java/com/fjhx/material/mapper/impl/MaterialServiceImpl.java → hx-service/storage/src/main/java/com/fjhx/material/service/impl/MaterialServiceImpl.java

@@ -1,4 +1,4 @@
-package com.fjhx.material.mapper.impl;
+package com.fjhx.material.service.impl;
 
 import com.alibaba.cloud.commons.lang.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -8,8 +8,12 @@ import com.fjhx.constants.StatusConstant;
 import com.fjhx.entity.material.Material;
 import com.fjhx.material.mapper.MaterialSMapper;
 import com.fjhx.material.service.MaterialService;
+import com.fjhx.params.material.EditMaterialVo;
+import com.fjhx.utils.Assert;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -76,4 +80,59 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialSMapper, Material>
 
         return baseMapper.getOutRfidData(wrapper);
     }
+
+    @Override
+    public boolean edit(EditMaterialVo editMaterialVo) {
+
+        Material material = new Material();
+
+        String code = editMaterialVo.getCode();
+        Assert.notEmpty(code, "物料编码不能为空");
+
+        material.setCode(editMaterialVo.getCode());
+        material.setName(editMaterialVo.getName());
+        material.setSpec(editMaterialVo.getSpec());
+        material.setUnitweight(editMaterialVo.getUnitWeight());
+        material.setWidth(editMaterialVo.getWidth());
+        material.setStockunitid(editMaterialVo.getStockUnit());
+
+        Material oldMaterial = getOne(Wrappers.<Material>lambdaQuery()
+                .eq(Material::getCode, editMaterialVo.getCode())
+                .last("limit 1")
+        );
+
+        Date date = new Date();
+
+        switch (editMaterialVo.getType()) {
+            case 1:
+                Assert.empty(oldMaterial, "新增失败，物料编码已存在");
+                material.setIsdelete(0);
+                material.setSafetystock(0);
+                material.setCreatedTime(date);
+                material.setUpdatedTime(date);
+                material.setAutotasktime(date);
+                material.setCheckrate(new BigDecimal("0.3"));
+                material.setSafetywarnday(0);
+                material.setDelayperiod(30);
+                material.setPrice(BigDecimal.ZERO);
+                material.setStockstandard(BigDecimal.ZERO);
+                material.setUnitnum(BigDecimal.ZERO);
+                material.setTechnologytype(4);
+
+                return save(material);
+            case 2:
+                Assert.notEmpty(oldMaterial, "编辑失败，物料编码不存在");
+
+                material.setId(oldMaterial.getId());
+                material.setUpdatedTime(date);
+
+                return updateById(material);
+            case 3:
+                Assert.notEmpty(oldMaterial, "删除失败，物料编码不存在");
+
+                return removeById(oldMaterial.getId());
+            default:
+                return false;
+        }
+    }
 }