资产详情

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;
 
 /**
@@ -15,7 +13,7 @@ import java.io.Serializable;
  * </p>
  *
  * @author 吴涛涛
- * @since 2019-10-28
+ * @since 2019-10-30
  */
 public class GoodsNo extends Model<GoodsNo> {
 
@@ -55,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;
 
     /**
@@ -70,6 +67,12 @@ public class GoodsNo extends Model<GoodsNo> {
     @TableField("user_id")
     private Integer userId;
 
+    /**
+     * 最后更新日期
+     */
+    @TableField("update_indate")
+    private LocalDateTime updateIndate;
+
 
     public Integer getId() {
         return id;
@@ -135,6 +138,14 @@ public class GoodsNo extends Model<GoodsNo> {
         this.userId = userId;
     }
 
+    public LocalDateTime getUpdateIndate() {
+        return updateIndate;
+    }
+
+    public void setUpdateIndate(LocalDateTime updateIndate) {
+        this.updateIndate = updateIndate;
+    }
+
     @Override
     protected Serializable pkVal() {
         return this.id;
@@ -151,6 +162,7 @@ public class GoodsNo extends Model<GoodsNo> {
         ", indate=" + indate +
         ", goodsId=" + goodsId +
         ", userId=" + userId +
+        ", updateIndate=" + updateIndate +
         "}";
     }
 }

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

@@ -13,9 +13,9 @@ import java.io.Serializable;
  * </p>
  *
  * @author 吴涛涛
- * @since 2019-10-29
+ * @since 2019-10-30
  */
-public class OperaterRecord extends Model<OperaterRecord> {
+public class OperateRecord extends Model<OperateRecord> {
 
     private static final long serialVersionUID=1L;
 
@@ -139,7 +139,7 @@ public class OperaterRecord extends Model<OperaterRecord> {
 
     @Override
     public String toString() {
-        return "OperaterRecord{" +
+        return "OperateRecord{" +
         "id=" + id +
         ", userId=" + userId +
         ", userName=" + userName +

pcbms/src/main/java/com/hssx/pcbms/mapper/OperaterRecordMapper.java

@@ -1,6 +1,6 @@
 package com.hssx.pcbms.mapper;
 
-import com.hssx.pcbms.entity.OperaterRecord;
+import com.hssx.pcbms.entity.OperateRecord;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
@@ -9,8 +9,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * </p>
  *
  * @author 吴涛涛
- * @since 2019-10-25
+ * @since 2019-10-30
  */
-public interface OperaterRecordMapper extends BaseMapper<OperaterRecord> {
+public interface OperateRecordMapper extends BaseMapper<OperateRecord> {
 
 }

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

@@ -1,6 +1,6 @@
 package com.hssx.pcbms.service;
 
-import com.hssx.pcbms.entity.OperaterRecord;
+import com.hssx.pcbms.entity.OperateRecord;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -9,8 +9,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author 吴涛涛
- * @since 2019-10-25
+ * @since 2019-10-30
  */
-public interface OperaterRecordService extends IService<OperaterRecord> {
+public interface OperateRecordService extends IService<OperateRecord> {
 
 }

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

@@ -3,15 +3,14 @@ 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.constant.Constant;
 import com.hssx.pcbms.entity.Goods;
 import com.hssx.pcbms.entity.GoodsNo;
-import com.hssx.pcbms.entity.OperaterRecord;
+import com.hssx.pcbms.entity.OperateRecord;
 import com.hssx.pcbms.entity.User;
 import com.hssx.pcbms.entity.vo.GoodsVO;
 import com.hssx.pcbms.mapper.GoodsMapper;
 import com.hssx.pcbms.mapper.GoodsNoMapper;
-import com.hssx.pcbms.mapper.OperaterRecordMapper;
+import com.hssx.pcbms.mapper.OperateRecordMapper;
 import com.hssx.pcbms.mapper.UserMapper;
 import com.hssx.pcbms.service.GoodsNoService;
 import com.hssx.pcbms.service.GoodsService;
@@ -25,7 +24,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
-import java.net.ConnectException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -48,7 +46,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
     @Value("${upload.path}")
     private String path;
     @Resource
-    private OperaterRecordMapper operaterRecordMapper;
+    private OperateRecordMapper operateRecordMapper;
     @Resource
     private UserMapper userMapper;
 
@@ -70,7 +68,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
             return msg;
         }
         if (0 != goodsVO.getNumber()) {
-            for (int i = 0; i < goodsVO.getNumber(); i++) {
+            for (int i = 1; i <= goodsVO.getNumber(); i++) {
                 GoodsNo goodsNo = new GoodsNo();
                 goodsNo.setGoodsId(goods.getId());
                 goodsNo.setModelNo(mouldNo + String.format("%04d", i));
@@ -140,7 +138,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
         GoodsNo no = goodsNoMapper.selectById(goodsNo.getId());
         goodsNoMapper.updateById(goodsNo);
         //添加处置记录
-        OperaterRecord operaterRecord = new OperaterRecord();
+        OperateRecord operateRecord = new OperateRecord();
 //        if(1==goodsNo.getState()){
 //
 //        }else if(){
@@ -148,11 +146,11 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
 //        }
 //        String content = Constant.HANDLE_CONTENT.replace("oldState",)
 //        operaterRecord.setContent();
-        operaterRecord.setGoodId(no.getGoodsId());
-        operaterRecord.setGoodNo(no.getModelNo());
-        operaterRecord.setGoodState(goodsNo.getState());
-        operaterRecord.setUserId(currentUserId);
-        operaterRecord.setUserName(user.getName());
+        operateRecord.setGoodId(no.getGoodsId());
+        operateRecord.setGoodNo(no.getModelNo());
+        operateRecord.setGoodState(goodsNo.getState());
+        operateRecord.setUserId(currentUserId);
+        operateRecord.setUserName(user.getName());
         return null;
     }
 

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

@@ -0,0 +1,20 @@
+package com.hssx.pcbms.service.impl;
+
+import com.hssx.pcbms.entity.OperateRecord;
+import com.hssx.pcbms.mapper.OperateRecordMapper;
+import com.hssx.pcbms.service.OperateRecordService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-10-30
+ */
+@Service
+public class OperateRecordServiceImpl extends ServiceImpl<OperateRecordMapper, OperateRecord> implements OperateRecordService {
+
+}

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

@@ -1,20 +0,0 @@
-package com.hssx.pcbms.service.impl;
-
-import com.hssx.pcbms.entity.OperaterRecord;
-import com.hssx.pcbms.mapper.OperaterRecordMapper;
-import com.hssx.pcbms.service.OperaterRecordService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author 吴涛涛
- * @since 2019-10-25
- */
-@Service
-public class OperaterRecordServiceImpl extends ServiceImpl<OperaterRecordMapper, OperaterRecord> implements OperaterRecordService {
-
-}

pcbms/src/main/java/com/hssx/pcbms/util/CodeGenerator.java

@@ -204,7 +204,7 @@ public class CodeGenerator {
         //若想要生成的实体类继承某个Controller，则可打开下面注释。写上需要继承的Controller的位置即可
 //        strategy.setSuperControllerClass("com.baomidou.ant.common.BaseController");
         //此处user是表名，多个英文逗号分割
-        strategy.setInclude("operater_record");
+        strategy.setInclude("operate_record");
 //        strategy.setExclude();//数据库表全生成
 //        strategy.setInclude(scanner("user").split(","));//表名，多个英文逗号分割
         strategy.setControllerMappingHyphenStyle(true);

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

@@ -12,11 +12,12 @@
         <result column="indate" property="indate" />
         <result column="goods_id" property="goodsId" />
         <result column="user_id" property="userId" />
+        <result column="update_indate" property="updateIndate" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, model_no, division_code, suffix_code, state, indate, goods_id, user_id
+        id, model_no, division_code, suffix_code, state, indate, goods_id, user_id, update_indate
     </sql>
 
 </mapper>

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

@@ -1,9 +1,9 @@
 <?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.hssx.pcbms.mapper.OperaterRecordMapper">
+<mapper namespace="com.hssx.pcbms.mapper.OperateRecordMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.hssx.pcbms.entity.OperaterRecord">
+    <resultMap id="BaseResultMap" type="com.hssx.pcbms.entity.OperateRecord">
         <id column="id" property="id" />
         <result column="user_id" property="userId" />
         <result column="user_name" property="userName" />