添加分区管理

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

@@ -0,0 +1,105 @@
+package com.shinsoft.sto.controller.main;
+
+import com.shinsoft.sto.service.main.AreaService;
+import com.shinsoft.sto.service.main.WareService;
+import com.shinsoft.tools.JSONTools;
+import com.shinsoft.tools.model.common.ResponseCodeMsg;
+import com.shinsoft.tools.model.common.ResultJSON;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+@RestController
+@RequestMapping("/Area")
+public class AreaController {
+
+    @Autowired
+    private AreaService areaService;
+
+    @Autowired
+    private WareService wareService;
+
+    ResultJSON resultJSON;
+
+    @GetMapping("/query")
+    public ResultJSON query(@RequestParam(defaultValue = "1") int page,
+                            @RequestParam(defaultValue = "50") int rows,
+                            @RequestParam(required = false) String wareId,
+                            HttpServletRequest request) {
+        try {
+            return areaService.query(page, rows, wareId);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            return JSONTools.toResultJSON(ResponseCodeMsg.CODE_EX, ex);
+        }
+    }
+
+    @RequestMapping(value = "/queryByPK")
+    public ResultJSON queryByPK(String id, HttpServletRequest request) {
+        try {
+            String userId = (String) request.getHeader("userId");
+            resultJSON = areaService.queryByPK(id);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            resultJSON = JSONTools.toResultJSON(ResponseCodeMsg.CODE_EX, ex);
+        } finally {
+            return resultJSON;
+        }
+    }
+
+    @RequestMapping(value = "/save")
+    public ResultJSON save(String json, HttpServletRequest request) {
+        try {
+            String userId = (String) request.getHeader("userId");
+            resultJSON = areaService.save(userId, json);
+        } catch (Exception ex) {
+            resultJSON = JSONTools.toResultJSON(ResponseCodeMsg.CODE_EX, ex);
+            ex.printStackTrace();
+        } finally {
+            return resultJSON;
+        }
+    }
+
+    @RequestMapping(value = "/remove")
+    public ResultJSON remove(String id, HttpServletRequest request) {
+        try {
+            String userId = (String) request.getHeader("userId");
+            resultJSON = areaService.remove(userId, id);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            resultJSON = JSONTools.toResultJSON(ResponseCodeMsg.CODE_EX, ex);
+        } finally {
+            return resultJSON;
+        }
+    }
+
+    @RequestMapping(value = "/removeBatch")
+    public ResultJSON removeBatch(String ids, HttpServletRequest request) {
+        try {
+            String userId = (String) request.getHeader("userId");
+            resultJSON = areaService.removeBatch(userId, ids);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            resultJSON = JSONTools.toResultJSON(ResponseCodeMsg.CODE_EX, ex);
+        } finally {
+            return resultJSON;
+        }
+    }
+
+    @RequestMapping(value = "/wareOptions")
+    public ResultJSON wareOptions(HttpServletRequest request) {
+        try {
+            String userId = (String) request.getHeader("userId");
+            resultJSON = wareService.getWareOptions();
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            resultJSON = JSONTools.toResultJSON(ResponseCodeMsg.CODE_EX, ex);
+        } finally {
+            return resultJSON;
+        }
+    }
+}
+

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

@@ -90,5 +90,17 @@ public class WareController {
             return resultJSON;
         }
     }
+    @RequestMapping(value = "/options")
+    public ResultJSON options(HttpServletRequest request) {
+        try {
+            String userId = (String) request.getHeader("userId");
+            resultJSON = wareService.getWareOptions();
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            resultJSON = JSONTools.toResultJSON(ResponseCodeMsg.CODE_EX, ex);
+        } finally {
+            return resultJSON;
+        }
+    }
 }
 

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

@@ -0,0 +1,14 @@
+package com.shinsoft.sto.mapper.main;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.shinsoft.sto.model.main.Area;
+import org.apache.ibatis.annotations.Param;
+
+public interface AreaMapper extends BaseMapper<Area> {
+
+
+    Page<Area> selectAreaPage(Page<Area> page,
+                              @Param("wareId") String wareId);
+}
+

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

@@ -0,0 +1,53 @@
+<?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.AreaMapper">
+
+    <resultMap id="BaseResultMap" type="com.shinsoft.sto.model.main.Area">
+        <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="ware_id" property="wareId" jdbcType="VARCHAR"/>
+        <result column="area_name" property="areaName" jdbcType="VARCHAR"/>
+        <result column="area_code" property="areaCode" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        a.id, a.process_instance_id, a.process_instance_status, a.add_id, a.add_code, a.add_name, a.add_dept_id,
+        a.add_dept_code, a.add_dept_name, a.add_time, a.modify_id, a.modify_code, a.modify_name, a.modify_time,
+        a.cancel_id, a.cancel_code, a.cancel_name, a.cancel_time, a.cancel_flag, a.belong_id, a.ware_id,
+        a.area_name, a.area_code
+    </sql>
+
+    <select id="selectAreaPage" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>,
+        w.ware_nm as ware_name
+        from T_MAIN_AREA a
+                 left join T_MAIN_WARE w on w.id = a.ware_id
+        where nvl(a.cancel_flag,'0') = '0'
+        <if test="wareId != null and wareId != ''">
+            and a.ware_id = #{wareId}
+        </if>
+        order by a.add_time desc
+    </select>
+
+</mapper>
+
+

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

@@ -1,9 +1,14 @@
 package com.shinsoft.sto.mapper.main;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.shinsoft.sto.model.common.selectModel;
 import com.shinsoft.sto.model.main.Ware;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 public interface WareMapper extends BaseMapper<Ware> {
 
+    @Select("SELECT id AS value, ware_nm AS label FROM T_MAIN_WARE WHERE NVL(cancel_flag,'0') = '0' ORDER BY add_time DESC")
+    List<selectModel> selectWareOptions();
 }
-

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

@@ -0,0 +1,31 @@
+package com.shinsoft.sto.model.main;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+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;
+
+@Getter
+@Setter
+@Accessors(chain = true)
+@TableName("T_MAIN_AREA")
+@ApiModel(value = "库房分区", description = "库房分区信息表")
+public class Area extends BaseModel {
+
+    @ApiModelProperty("所属库房ID")
+    private String wareId;
+    @TableField(exist = false)
+    @ApiModelProperty("所属库房")
+    private String wareName;
+
+    @ApiModelProperty("分区名称")
+    private String areaName;
+
+    @ApiModelProperty("分区编码")
+    private String areaCode;
+}
+

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

@@ -0,0 +1,96 @@
+package com.shinsoft.sto.service.impl.main;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.TypeReference;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.shinsoft.sto.mapper.main.AreaMapper;
+import com.shinsoft.sto.model.main.Area;
+import com.shinsoft.sto.service.main.AreaService;
+import com.shinsoft.tools.JSONTools;
+import com.shinsoft.tools.model.common.ResultJSON;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 库房分区 服务实现类
+ * </p>
+ */
+@Service
+public class AreaServiceImp extends ServiceImpl<AreaMapper, Area> implements AreaService {
+
+    @Autowired
+    private AreaMapper areaMapper;
+
+    ResultJSON resultJSON;
+
+    @Override
+    public ResultJSON query(int page, int rows, String wareId) {
+        Page<Area> areaPage = new Page<>(page, rows);
+        Page<Area> list = areaMapper.selectAreaPage(areaPage, wareId);
+        resultJSON = JSONTools.toResultJSON(list);
+        return resultJSON;
+    }
+
+    @Override
+    public ResultJSON queryByPK(String id) {
+        Area area = areaMapper.selectById(id);
+        resultJSON = JSONTools.toResultJSON(area);
+        return resultJSON;
+    }
+
+    @Override
+    public ResultJSON save(String userId, String json) {
+        Date date = new Date();
+        Area area = JSON.parseObject(json, new TypeReference<Area>() {
+        });
+        if (StringUtils.isEmpty(area.getId())) {
+            area.setCancelFlag("0");
+            area.setAddId(userId);
+            area.setAddTime(date);
+            areaMapper.insert(area);
+        } else {
+            area.setModifyId(userId);
+            area.setModifyTime(date);
+            areaMapper.updateById(area);
+        }
+
+        resultJSON = JSONTools.toResultJSON(area);
+        return resultJSON;
+    }
+
+    @Override
+    public ResultJSON remove(String userId, String id) {
+        Date date = new Date();
+        Area area = areaMapper.selectById(id);
+        area.setCancelFlag("1");
+        area.setModifyId(userId);
+        area.setModifyTime(date);
+        areaMapper.updateById(area);
+        resultJSON = JSONTools.toResultJSON("");
+        return resultJSON;
+    }
+
+    @Override
+    public ResultJSON removeBatch(String userId, String ids) {
+        Date date = new Date();
+        List<String> list = JSON.parseObject(ids, new TypeReference<List<String>>() {
+        });
+        Area area;
+        for (String id : list) {
+            area = areaMapper.selectById(id);
+            area.setCancelFlag("1");
+            area.setModifyId(userId);
+            area.setModifyTime(date);
+            areaMapper.updateById(area);
+        }
+        resultJSON = JSONTools.toResultJSON("");
+        return resultJSON;
+    }
+}
+

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

@@ -7,6 +7,7 @@ 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.shinsoft.sto.mapper.main.WareMapper;
+import com.shinsoft.sto.model.common.selectModel;
 import com.shinsoft.sto.model.main.Ware;
 import com.shinsoft.sto.service.main.WareService;
 import com.shinsoft.tools.JSONTools;
@@ -113,5 +114,12 @@ public class WareServiceImp extends ServiceImpl<WareMapper, Ware> implements War
         resultJSON = JSONTools.toResultJSON("");
         return resultJSON;
     }
+
+    @Override
+    public ResultJSON getWareOptions() {
+        List<selectModel> options = wareMapper.selectWareOptions();
+        resultJSON = JSONTools.toResultJSON(options);
+        return resultJSON;
+    }
 }
 

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

@@ -0,0 +1,25 @@
+package com.shinsoft.sto.service.main;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.shinsoft.sto.model.main.Area;
+import com.shinsoft.tools.model.common.ResultJSON;
+
+/**
+ * <p>
+ * 库房分区 服务类
+ * </p>
+ */
+public interface AreaService extends IService<Area> {
+
+    ResultJSON query(int page, int rows, String wareId);
+
+    ResultJSON queryByPK(String id);
+
+    ResultJSON save(String userId, String json);
+
+    ResultJSON remove(String userId, String id);
+
+    ResultJSON removeBatch(String userId, String ids);
+}
+
+

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

@@ -25,5 +25,7 @@ public interface WareService extends IService<Ware> {
     ResultJSON remove(String userId, String id);
 
     ResultJSON removeBatch(String userId, String ids);
+
+    ResultJSON getWareOptions();
 }