物料页面后台

sto/src/main/java/com/shinsoft/sto/controller/main/MaterialController.java

@@ -0,0 +1,73 @@
+package com.shinsoft.sto.controller.main;
+
+import com.alibaba.fastjson.JSON;
+import com.shinsoft.sto.model.main.Material;
+import com.shinsoft.sto.service.main.MaterialService;
+import com.shinsoft.sto.model.system.ResultJSON;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+
+@RestController
+@RequestMapping("/Material")
+public class MaterialController {
+
+    @Autowired
+    private MaterialService materialService;
+
+    @GetMapping("/query")
+    public ResultJSON query(@RequestParam(defaultValue = "1") int page,
+                           @RequestParam(defaultValue = "50") int rows,
+                           @RequestParam(required = false) String material,
+                           @RequestParam(required = false) String standard,
+                           HttpServletRequest request) {
+        try {
+            String userId = (String) request.getHeader("userId");
+            String belongId = (String) request.getHeader("belongId");
+            
+            return materialService.query(page, rows, material, standard, userId, belongId);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            return ResultJSON.error("查询失败：" + ex.getMessage());
+        }
+    }
+
+    @PostMapping("/save")
+    public ResultJSON save(@RequestParam String json,
+                          HttpServletRequest request) {
+        try {
+            String userId = (String) request.getHeader("userId");
+            String belongId = (String) request.getHeader("belongId");
+            
+            Material material = JSON.parseObject(json, Material.class);
+            return materialService.save(material, userId, belongId);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            return ResultJSON.error("保存失败：" + ex.getMessage());
+        }
+    }
+
+    @PostMapping("/remove")
+    public ResultJSON remove(@RequestParam String id,
+                            HttpServletRequest request) {
+        try {
+            String userId = (String) request.getHeader("userId");
+            return materialService.remove(id, userId);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            return ResultJSON.error("删除失败：" + ex.getMessage());
+        }
+    }
+
+    @GetMapping("/options")
+    public ResultJSON getOptions(HttpServletRequest request) {
+        try {
+            String belongId = (String) request.getHeader("belongId");
+            return ResultJSON.success(materialService.getMaterialOptions(belongId));
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            return ResultJSON.error("获取选项失败：" + ex.getMessage());
+        }
+    }
+}

sto/src/main/java/com/shinsoft/sto/mapper/main/MaterialMapper.java

@@ -0,0 +1,29 @@
+package com.shinsoft.sto.mapper.main;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.shinsoft.sto.model.main.Material;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+public interface MaterialMapper extends BaseMapper<Material> {
+
+    /**
+     * 查询物料下拉框数据
+     */
+    @Select("SELECT id as value, material_name as label FROM T_MAIN_MATERIAL WHERE nvl(cancel_flag,'0') = '0' and belong_id = #{belongId}")
+    List<com.shinsoft.sto.model.common.selectModel> selectMaterialOptions(String belongId);
+
+    /**
+     * 分页查询物料列表
+     */
+    IPage<Material> selectMaterialPage(Page<Material> page, @Param("material") String material, @Param("standard") String standard, @Param("belongId") String belongId);
+
+    /**
+     * 根据物料名称查询
+     */
+    List<Material> selectByMaterialName(@Param("materialName") String materialName, @Param("belongId") String belongId);
+}

sto/src/main/java/com/shinsoft/sto/mapper/main/MaterialMapper.xml

@@ -0,0 +1,69 @@
+<?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.shinsoft.sto.mapper.main.MaterialMapper">
+
+    <resultMap id="BaseResultMap" type="com.shinsoft.sto.model.main.Material">
+        <id column="id" property="id" jdbcType="VARCHAR"/>
+        <result column="process_instance_id" property="processInstanceId" jdbcType="VARCHAR"/>
+        <result column="process_instance_status" property="processInstanceStatus" jdbcType="VARCHAR"/>
+        <result column="add_id" property="addId" jdbcType="VARCHAR"/>
+        <result column="add_code" property="addCode" jdbcType="VARCHAR"/>
+        <result column="add_name" property="addName" jdbcType="VARCHAR"/>
+        <result column="add_dept_id" property="addDeptId" jdbcType="VARCHAR"/>
+        <result column="add_dept_code" property="addDeptCode" jdbcType="VARCHAR"/>
+        <result column="add_dept_name" property="addDeptName" jdbcType="VARCHAR"/>
+        <result column="add_time" property="addTime" jdbcType="TIMESTAMP"/>
+        <result column="modify_id" property="modifyId" jdbcType="VARCHAR"/>
+        <result column="modify_code" property="modifyCode" jdbcType="VARCHAR"/>
+        <result column="modify_name" property="modifyName" jdbcType="VARCHAR"/>
+        <result column="modify_time" property="modifyTime" jdbcType="TIMESTAMP"/>
+        <result column="cancel_id" property="cancelId" jdbcType="VARCHAR"/>
+        <result column="cancel_code" property="cancelCode" jdbcType="VARCHAR"/>
+        <result column="cancel_name" property="cancelName" jdbcType="VARCHAR"/>
+        <result column="cancel_time" property="cancelTime" jdbcType="TIMESTAMP"/>
+        <result column="cancel_flag" property="cancelFlag" jdbcType="VARCHAR"/>
+        <result column="belong_id" property="belongId" jdbcType="VARCHAR"/>
+        <result column="material_name" property="materialName" jdbcType="VARCHAR"/>
+        <result column="material_code" property="materialCode" jdbcType="VARCHAR"/>
+        <result column="material_standard" property="materialStandard" jdbcType="VARCHAR"/>
+        <result column="material_model" property="materialModel" jdbcType="VARCHAR"/>
+        <result column="material_attr1" property="materialAttr1" jdbcType="VARCHAR"/>
+        <result column="material_attr2" property="materialAttr2" jdbcType="VARCHAR"/>
+        <result column="material_attr3" property="materialAttr3" jdbcType="VARCHAR"/>
+        <result column="material_attr4" property="materialAttr4" jdbcType="VARCHAR"/>
+        <result column="material_attr5" property="materialAttr5" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id, process_instance_id, process_instance_status, add_id, add_code, add_name, add_dept_id,
+        add_dept_code, add_dept_name, add_time, modify_id, modify_code, modify_name, modify_time, cancel_id,
+        cancel_code, cancel_name, cancel_time, cancel_flag, belong_id, material_name, material_code,
+        material_standard, material_model, material_attr1, material_attr2, material_attr3, material_attr4, material_attr5
+    </sql>
+
+    <select id="selectMaterialPage" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from T_MAIN_MATERIAL
+        where nvl(cancel_flag,'0') = '0'
+        and belong_id = #{belongId}
+        <if test="material != null and material != ''">
+            and (material_name like '%' || #{material} || '%'
+            or material_code like '%' || #{material} || '%')
+        </if>
+        <if test="standard != null and standard != ''">
+            and material_standard like '%' || #{standard} || '%'
+        </if>
+        order by add_time desc
+    </select>
+
+    <select id="selectByMaterialName" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from T_MAIN_MATERIAL
+        where nvl(cancel_flag,'0') = '0'
+        and belong_id = #{belongId}
+        and material_name = #{materialName}
+    </select>
+
+</mapper>

sto/src/main/java/com/shinsoft/sto/model/main/Material.java

@@ -0,0 +1,107 @@
+package com.shinsoft.sto.model.main;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.shinsoft.generator.model.BaseModel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+@Getter
+@Setter
+@Accessors(chain = true)
+@TableName("T_MAIN_MATERIAL")
+@ApiModel(value = "物料", description = "物料基本信息表")
+public class Material extends BaseModel {
+
+    @TableId(type = IdType.ASSIGN_UUID)
+    @ApiModelProperty("主键ID")
+    private String id;
+
+    @ApiModelProperty("流程实例ID")
+    private String processInstanceId;
+
+    @ApiModelProperty("流程实例状态")
+    private String processInstanceStatus;
+
+    @ApiModelProperty("添加人ID")
+    private String addId;
+
+    @ApiModelProperty("添加人编码")
+    private String addCode;
+
+    @ApiModelProperty("添加人名称")
+    private String addName;
+
+    @ApiModelProperty("添加部门ID")
+    private String addDeptId;
+
+    @ApiModelProperty("添加部门编码")
+    private String addDeptCode;
+
+    @ApiModelProperty("添加部门名称")
+    private String addDeptName;
+
+    @ApiModelProperty("添加时间")
+    private Date addTime;
+
+    @ApiModelProperty("修改人ID")
+    private String modifyId;
+
+    @ApiModelProperty("修改人编码")
+    private String modifyCode;
+
+    @ApiModelProperty("修改人名称")
+    private String modifyName;
+
+    @ApiModelProperty("修改时间")
+    private Date modifyTime;
+
+    @ApiModelProperty("作废人ID")
+    private String cancelId;
+
+    @ApiModelProperty("作废人编码")
+    private String cancelCode;
+
+    @ApiModelProperty("作废人名称")
+    private String cancelName;
+
+    @ApiModelProperty("作废时间")
+    private Date cancelTime;
+
+    @ApiModelProperty("作废标记")
+    private String cancelFlag;
+
+    @ApiModelProperty("所属组织ID")
+    private String belongId;
+
+    @ApiModelProperty("物料名称")
+    private String materialName;
+
+    @ApiModelProperty("物料编码")
+    private String materialCode;
+
+    @ApiModelProperty("物料类别")
+    private String materialStandard;
+
+    @ApiModelProperty("物料尺寸")
+    private String materialModel;
+
+    @ApiModelProperty("物料属性1")
+    private String materialAttr1;
+
+    @ApiModelProperty("物料属性2")
+    private String materialAttr2;
+
+    @ApiModelProperty("物料属性3")
+    private String materialAttr3;
+
+    @ApiModelProperty("物料属性4")
+    private String materialAttr4;
+
+    @ApiModelProperty("物料属性5")
+    private String materialAttr5;
+}

sto/src/main/java/com/shinsoft/sto/service/impl/main/MaterialServiceImp.java

@@ -0,0 +1,103 @@
+package com.shinsoft.sto.service.impl.main;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.shinsoft.sto.mapper.main.MaterialMapper;
+import com.shinsoft.sto.model.main.Material;
+import com.shinsoft.sto.service.main.MaterialService;
+import com.shinsoft.sto.model.system.ResponseCodeMsg;
+import com.shinsoft.sto.model.system.ResultJSON;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+@Service
+public class MaterialServiceImp extends ServiceImpl<MaterialMapper, Material> implements MaterialService {
+
+    @Override
+    public ResultJSON query(int page, int rows, String material, String standard, String userId, String belongId) {
+        try {
+            Page<Material> pageParam = new Page<>(page, rows);
+            IPage<Material> materialPage = baseMapper.selectMaterialPage(pageParam, material, standard, belongId);
+
+            return ResultJSON.success(materialPage);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            return ResultJSON.error(ResponseCodeMsg.CODE_EX, ex.getMessage());
+        }
+    }
+
+    @Override
+    public ResultJSON save(Material material, String userId, String belongId) {
+        try {
+            // 检查物料名称是否重复
+            if (material.getId() == null || material.getId().isEmpty()) {
+                // 新增
+                List<Material> existingMaterials = baseMapper.selectByMaterialName(material.getMaterialName(), belongId);
+                if (existingMaterials != null && !existingMaterials.isEmpty()) {
+                    return ResultJSON.error("物料名称已存在，请勿重复添加");
+                }
+
+                // 设置新增信息
+                material.setAddId(userId);
+                material.setAddTime(new Date());
+                material.setCancelFlag("0");
+                material.setBelongId(belongId);
+
+                boolean success = save(material);
+                return success ? ResultJSON.success("新增成功") : ResultJSON.error("新增失败");
+            } else {
+                // 更新
+                Material existingMaterial = getById(material.getId());
+                if (existingMaterial == null) {
+                    return ResultJSON.error("物料不存在");
+                }
+
+                // 检查除当前记录外是否有相同物料名称
+                List<Material> sameNameMaterials = baseMapper.selectByMaterialName(material.getMaterialName(), belongId);
+                if (sameNameMaterials != null && sameNameMaterials.stream()
+                        .anyMatch(m -> !m.getId().equals(material.getId()))) {
+                    return ResultJSON.error("物料名称已存在，请修改");
+                }
+
+                // 设置更新信息
+                material.setModifyId(userId);
+                material.setModifyTime(new Date());
+
+                boolean success = updateById(material);
+                return success ? ResultJSON.success("更新成功") : ResultJSON.error("更新失败");
+            }
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            return ResultJSON.error(ResponseCodeMsg.CODE_EX, ex.getMessage());
+        }
+    }
+
+    @Override
+    public ResultJSON remove(String id, String userId) {
+        try {
+            Material material = getById(id);
+            if (material == null) {
+                return ResultJSON.error("物料不存在");
+            }
+
+            // 软删除
+            material.setCancelFlag("9");
+            material.setCancelId(userId);
+            material.setCancelTime(new Date());
+
+            boolean success = updateById(material);
+            return success ? ResultJSON.success("删除成功") : ResultJSON.error("删除失败");
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            return ResultJSON.error(ResponseCodeMsg.CODE_EX, ex.getMessage());
+        }
+    }
+
+    @Override
+    public List<com.shinsoft.sto.model.common.selectModel> getMaterialOptions(String belongId) {
+        return baseMapper.selectMaterialOptions(belongId);
+    }
+}

sto/src/main/java/com/shinsoft/sto/service/main/MaterialService.java

@@ -0,0 +1,29 @@
+package com.shinsoft.sto.service.main;
+
+import com.shinsoft.sto.model.main.Material;
+import com.shinsoft.sto.model.system.ResultJSON;
+
+import java.util.List;
+
+public interface MaterialService {
+
+    /**
+     * 分页查询物料列表
+     */
+    ResultJSON query(int page, int rows, String material, String standard, String userId, String belongId);
+
+    /**
+     * 保存物料信息
+     */
+    ResultJSON save(Material material, String userId, String belongId);
+
+    /**
+     * 删除物料（软删除）
+     */
+    ResultJSON remove(String id, String userId);
+
+    /**
+     * 获取物料下拉选项
+     */
+    List<com.shinsoft.sto.model.common.selectModel> getMaterialOptions(String belongId);
+}