标签的录入与修改

pcbms/src/main/java/com/hssx/pcbms/controller/GoodsController.java

@@ -81,11 +81,11 @@ public class GoodsController {
     }
 
     /**
-     * 资产的删除
+     * 资产基本信息的删除
      * 参数：id：资产基本信息id
      * @return
      */
-    @ApiOperation(value = "资产的删除", notes = "资产的删除方法")
+    @ApiOperation(value = "资产基本信息的删除", notes = "资产的删除方法")
     @RequestMapping("/del")
     @ResponseBody
     public HttpRespMsg del(Goods goods) {
@@ -93,5 +93,18 @@ public class GoodsController {
         return msg;
     }
 
+    /**
+     * 资产编号的删除
+     * 参数：id：资产编号id
+     * @return
+     */
+    @ApiOperation(value = "资产的删除", notes = "资产的删除方法")
+    @RequestMapping("/delNo")
+    @ResponseBody
+    public HttpRespMsg delNo(GoodsNo goodsNo) {
+        HttpRespMsg msg = goodsService.delNo(goodsNo);
+        return msg;
+    }
+
 }
 

pcbms/src/main/java/com/hssx/pcbms/controller/OperaterRecordController.java

@@ -1,20 +1,17 @@
 package com.hssx.pcbms.controller;
 
 
+import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
 
 /**
- * <p>
- *  前端控制器
- * </p>
- *
  * @author 吴涛涛
  * @since 2019-10-25
  */
-@RestController
-@RequestMapping("/operater-record")
+@Controller
+@RequestMapping("/operaterrecord")
 public class OperaterRecordController {
 
 }

pcbms/src/main/java/com/hssx/pcbms/entity/Goods.java

@@ -43,10 +43,10 @@ public class Goods extends Model<Goods> {
     private String modelNumber;
 
     /**
-     * 单位（公司）
+     * 量词
      */
-    @TableField("company")
-    private String company;
+    @TableField("unit")
+    private String unit;
 
     /**
      * 地址
@@ -117,12 +117,12 @@ public class Goods extends Model<Goods> {
         this.modelNumber = modelNumber;
     }
 
-    public String getCompany() {
-        return company;
+    public String getUnit() {
+        return unit;
     }
 
-    public void setCompany(String company) {
-        this.company = company;
+    public void setUnit(String unit) {
+        this.unit = unit;
     }
 
     public String getAddress() {
@@ -185,7 +185,7 @@ public class Goods extends Model<Goods> {
         ", name=" + name +
         ", tagId=" + tagId +
         ", modelNumber=" + modelNumber +
-        ", company=" + company +
+        ", unit=" + unit +
         ", address=" + address +
         ", factory=" + factory +
         ", pic=" + pic +

pcbms/src/main/java/com/hssx/pcbms/entity/GoodsNo.java

@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
 import java.io.Serializable;
 
 /**
@@ -33,6 +31,18 @@ public class GoodsNo extends Model<GoodsNo> {
     @TableField("model_no")
     private String modelNo;
 
+    /**
+     * 用于比较的部门代码
+     */
+    @TableField("division_code")
+    private String divisionCode;
+
+    /**
+     * 用于比较的前缀代码
+     */
+    @TableField("suffix_code")
+    private String suffixCode;
+
     /**
      * 资产状态0-空闲 1-在用 2-维护 3-报废
      */
@@ -43,7 +53,6 @@ public class GoodsNo extends Model<GoodsNo> {
      * 创建日期
      */
     @TableField("indate")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime indate;
 
     /**
@@ -52,6 +61,12 @@ public class GoodsNo extends Model<GoodsNo> {
     @TableField("goods_id")
     private Integer goodsId;
 
+    /**
+     * 用户表关联外键
+     */
+    @TableField("user_id")
+    private Integer userId;
+
 
     public Integer getId() {
         return id;
@@ -69,6 +84,22 @@ public class GoodsNo extends Model<GoodsNo> {
         this.modelNo = modelNo;
     }
 
+    public String getDivisionCode() {
+        return divisionCode;
+    }
+
+    public void setDivisionCode(String divisionCode) {
+        this.divisionCode = divisionCode;
+    }
+
+    public String getSuffixCode() {
+        return suffixCode;
+    }
+
+    public void setSuffixCode(String suffixCode) {
+        this.suffixCode = suffixCode;
+    }
+
     public Integer getState() {
         return state;
     }
@@ -93,6 +124,14 @@ public class GoodsNo extends Model<GoodsNo> {
         this.goodsId = goodsId;
     }
 
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
     @Override
     protected Serializable pkVal() {
         return this.id;
@@ -103,9 +142,12 @@ public class GoodsNo extends Model<GoodsNo> {
         return "GoodsNo{" +
         "id=" + id +
         ", modelNo=" + modelNo +
+        ", divisionCode=" + divisionCode +
+        ", suffixCode=" + suffixCode +
         ", state=" + state +
         ", indate=" + indate +
         ", goodsId=" + goodsId +
+        ", userId=" + userId +
         "}";
     }
 }

pcbms/src/main/java/com/hssx/pcbms/service/GoodsService.java

@@ -2,6 +2,7 @@ package com.hssx.pcbms.service;
 
 import com.hssx.pcbms.entity.Goods;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.hssx.pcbms.entity.GoodsNo;
 import com.hssx.pcbms.entity.vo.GoodsVO;
 import com.hssx.pcbms.util.HttpRespMsg;
 import com.hssx.pcbms.util.PageUtil;
@@ -24,4 +25,6 @@ public interface GoodsService extends IService<Goods> {
     HttpRespMsg getList(PageUtil page,String keyName,Integer tagId);
 
     HttpRespMsg del(Goods goods);
+
+    HttpRespMsg delNo(GoodsNo goodsNo);
 }

pcbms/src/main/java/com/hssx/pcbms/service/impl/GoodsServiceImpl.java

@@ -1,5 +1,6 @@
 package com.hssx.pcbms.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.hssx.pcbms.entity.Goods;
@@ -51,11 +52,17 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
         BeanUtils.copyProperties(goodsVO,goods);
         List<GoodsNo> list = new ArrayList<>();
         goodsMapper.insert(goods);
+        String mouldNo = goodsVO.getDeptStr()+goodsVO.getGoodStr();
+        Integer count = goodsNoMapper.selectCount(new QueryWrapper<GoodsNo>().likeLeft("model_no", mouldNo).last("limit 1"));
+        if(count>0){
+            msg.setError("当前编号组合已存在，请更换编号组合后重试。");
+            return msg;
+        }
         if(0 != goodsVO.getNumber()){
             for(int i=0;i<goodsVO.getNumber();i++){
                 GoodsNo goodsNo = new GoodsNo();
                 goodsNo.setGoodsId(goods.getId());
-                goodsNo.setModelNo(goodsVO.getDeptStr()+goodsVO.getGoodStr()+String.format("%04d", i));
+                goodsNo.setModelNo(mouldNo+String.format("%04d", i));
                 list.add(goodsNo);
             }
             goodsNoService.saveBatch(list);
@@ -93,6 +100,18 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
         return msg;
     }
 
+    @Override
+    public HttpRespMsg delNo(GoodsNo goodsNo) {
+        HttpRespMsg msg = new HttpRespMsg();
+        GoodsNo no = goodsNoMapper.selectById(goodsNo.getId());
+        if(no != null && no.getState()==0){
+            goodsNoMapper.deleteById(goodsNo.getId());
+        }else{
+            msg.setError("操作失败，该id对应的资产不存在或者处于非空闲状态。");
+        }
+        return msg;
+    }
+
     public static void main(String[] args) {
         String format = String.format("%04d", 0);
         System.out.println(format);

pcbms/src/main/java/com/hssx/pcbms/service/impl/PermissionServiceImpl.java

@@ -38,7 +38,7 @@ public class PermissionServiceImpl extends ServiceImpl<PermissionMapper, Permiss
         HttpRespMsg msg = new HttpRespMsg();
         List<UserPermission> list = userPermissionMapper.selectList(new QueryWrapper<UserPermission>().eq("permission_id", permission.getId()).last("limit 1"));
         if(list.size()>0){
-            msg.setError("该权限已被使用到系统中，暂不支持删除操作");
+            msg.setError("该权限已被使用到系统中，暂不支持删除操作。");
         }
         permissionMapper.deleteById(permission.getId());
         return msg;

pcbms/src/main/resources/mapper/GoodsMapper.xml

@@ -8,7 +8,7 @@
         <result column="name" property="name" />
         <result column="tag_id" property="tagId" />
         <result column="model_number" property="modelNumber" />
-        <result column="company" property="company" />
+        <result column="unit" property="unit" />
         <result column="address" property="address" />
         <result column="factory" property="factory" />
         <result column="pic" property="pic" />
@@ -19,45 +19,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, name, tag_id, model_number, company, address, factory, pic, service_life, next_indate, is_delete
+        id, name, tag_id, model_number, unit, address, factory, pic, service_life, next_indate, is_delete
     </sql>
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMapVO" type="com.hssx.pcbms.entity.vo.GoodsVO">
-        <id column="id" property="id" />
-        <result column="name" property="name" />
-        <result column="tag_id" property="tagId" />
-        <result column="model_number" property="modelNumber" />
-        <result column="company" property="company" />
-        <result column="address" property="address" />
-        <result column="factory" property="factory" />
-        <result column="pic" property="pic" />
-        <result column="service_life" property="serviceLife" />
-        <result column="next_indate" property="nextIndate" />
-        <collection property="goodsNos" select="selectGoodsNoByGoodsId" column="{goodId = id}" ofType="com.hssx.pcbms.entity.GoodsNo">
-        </collection>
-    </resultMap>
 
-    <select id="getListBycondition" resultMap="BaseResultMapVO">
-        select
-            id, name, tag_id, model_number, company, address, factory, pic, service_life, next_indate
-        from
-            goods
-        <where>
-            is_delete = 0
-            <if test="keyName != null and keyName != ''">
-                and name like concat('%',#{keyName},'%')
-            </if>
-            <if test="tagId != null">
-                and tag_id = #{tagId}
-            </if>
-        </where>
-    </select>
-    <select id="selectGoodsNoByGoodsId" resultType="com.hssx.pcbms.entity.GoodsNo">
-        select
-            id, model_no, state, indate, goods_id
-        from
-            goods_no
-        where
-              goods_id = #{goodId}
-    </select>
 </mapper>

pcbms/src/main/resources/mapper/GoodsNoMapper.xml

@@ -6,14 +6,17 @@
     <resultMap id="BaseResultMap" type="com.hssx.pcbms.entity.GoodsNo">
         <id column="id" property="id" />
         <result column="model_no" property="modelNo" />
+        <result column="division_code" property="divisionCode" />
+        <result column="suffix_code" property="suffixCode" />
         <result column="state" property="state" />
         <result column="indate" property="indate" />
         <result column="goods_id" property="goodsId" />
+        <result column="user_id" property="userId" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, model_no, state, indate, goods_id
+        id, model_no, division_code, suffix_code, state, indate, goods_id, user_id
     </sql>
 
 </mapper>