增加批号

sql/asset_manage.sql

@@ -70,6 +70,7 @@ create table am_material_log(
 	user_id int NOT NULL,
 	description varchar(200),
 	operate int NOT NULL, -- 0:in,1:out
+	batch varchar(100),
 	create_time datetime default CURRENT_TIMESTAMP
 );
 

src/main/java/cn/redrock/assetmanage/controller/MaterialController.java

@@ -15,6 +15,7 @@ import cn.redrock.assetmanage.utils.DateUtil;
 import cn.redrock.assetmanage.utils.ExcelUtils;
 import cn.redrock.assetmanage.utils.StringUtil;
 import com.github.pagehelper.PageInfo;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.*;
@@ -51,22 +52,29 @@ public class MaterialController {
             materialLog.setStatus(status.getStatus());
             materialLog.setDescription(material.getDescription());
             materialLog.setUserId(userId);
+            materialLog.setBatch(material.getCode()+"_"+material.getNum()+"_"+DateUtil.dateToStr(new Date(),"yyyyMMddHHmmss"));
             return materialLog;
         }
         return null;
     }
 
-    private List<AmMaterialLog> buildBatchLog(Integer userId,Constants.Operate operate, Constants.Status status,List<Material> materials){
+    private List<AmMaterialLog> buildBatchLog(Integer userId,Constants.Operate operate, Constants.Status status,List<Material> materials,String batch){
         List<AmMaterialLog> materialLogs = new ArrayList<>();
         for(Material material : materials){
             AmMaterialLog log = buildLog(userId,operate,status,material);
             if(log != null){
+                log.setBatch(batch);
                 materialLogs.add(log);
             }
         }
         return materialLogs;
     }
 
+    private String getBatch(MultipartFile file){
+        String fileName = file.getOriginalFilename();
+        return StringUtils.substringBeforeLast(fileName,".");
+    }
+
     @Admin
     @PostMapping("/add")
     public Result addMaterial(@CurrentUser AmUser user,@Valid @RequestBody Material material) {
@@ -92,10 +100,10 @@ public class MaterialController {
             ret = materialService.batchAdd(list,false);
         }
         if(!ret){
-            materialLogService.batchWriteLog(buildBatchLog(user.getId(),Constants.Operate.IN, Constants.Status.FAILED,list));
+            materialLogService.batchWriteLog(buildBatchLog(user.getId(),Constants.Operate.IN, Constants.Status.FAILED,list,getBatch(file)));
             return Result.error(ResponseCode.ASSET_BATCH_ADD_FAIL);
         }
-        materialLogService.batchWriteLog(buildBatchLog(user.getId(),Constants.Operate.IN,Constants.Status.NO_AUDIT,list));
+        materialLogService.batchWriteLog(buildBatchLog(user.getId(),Constants.Operate.IN,Constants.Status.NO_AUDIT,list,getBatch(file)));
         return Result.ok();
     }
 
@@ -125,14 +133,14 @@ public class MaterialController {
         if(user.getIsAdmin() == 1){
             materialService.batchSub(list,successMaterial,failMaterial);
             if(!successMaterial.isEmpty() && failMaterial.isEmpty()){
-                materialLogService.batchWriteLog(buildBatchLog(user.getId(),Constants.Operate.OUT, Constants.Status.SUCCESS,list));
+                materialLogService.batchWriteLog(buildBatchLog(user.getId(),Constants.Operate.OUT, Constants.Status.SUCCESS,list,getBatch(file)));
             }else{
-                materialLogService.batchWriteLog(buildBatchLog(user.getId(),Constants.Operate.OUT, Constants.Status.FAILED,failMaterial));
-                materialLogService.batchWriteLog(buildBatchLog(user.getId(),Constants.Operate.OUT, Constants.Status.SUCCESS,successMaterial));
+                materialLogService.batchWriteLog(buildBatchLog(user.getId(),Constants.Operate.OUT, Constants.Status.FAILED,failMaterial,getBatch(file)));
+                materialLogService.batchWriteLog(buildBatchLog(user.getId(),Constants.Operate.OUT, Constants.Status.SUCCESS,successMaterial,getBatch(file)));
                 return Result.ok(failMaterial);
             }
         }else{
-            materialLogService.batchWriteLog(buildBatchLog(user.getId(),Constants.Operate.OUT, Constants.Status.NO_AUDIT,list));
+            materialLogService.batchWriteLog(buildBatchLog(user.getId(),Constants.Operate.OUT, Constants.Status.NO_AUDIT,list,getBatch(file)));
         }
         return Result.ok();
     }
@@ -192,13 +200,18 @@ public class MaterialController {
     }
 
     @GetMapping("/log")
-    public Result queryMaterialLog(@RequestParam Integer operate,@RequestParam Integer status,
+    public Result queryMaterialLog(@CurrentUser AmUser user,
+                                   @RequestParam Integer operate,@RequestParam Integer status,
                                    @RequestParam(required = false) String field,
                                    @RequestParam(required = false) String content,
                                    @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") Date startTm,
                                    @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTm,
                                    Integer pageNum, Integer pageSize) {
-        return Result.ok(materialLogService.queryLog(operate,status,field,content,startTm,endTm,pageNum,pageSize));
+        Integer userId = null;
+        if(user.getIsAdmin() == 0){
+            userId = user.getId();
+        }
+        return Result.ok(materialLogService.queryLog(userId,operate,status,field,content,startTm,endTm,pageNum,pageSize));
     }
 
     @GetMapping("/warn")

src/main/java/cn/redrock/assetmanage/dto/Material.java

@@ -15,7 +15,7 @@ import javax.validation.constraints.NotNull;
  */
 @Data
 public class Material {
-    private Integer id;
+    private Integer id; //日志ID
 
     @ExcelColumn(value = "物料编号", col = 1)
     @NotBlank

src/main/java/cn/redrock/assetmanage/entity/AmMaterialLog.java

@@ -31,6 +31,7 @@ public class AmMaterialLog {
 
     private Integer operate;
 
+    private String batch;
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     @Column(name = "create_time",updatable=false)
     private Date createTime;

src/main/java/cn/redrock/assetmanage/entity/MaterialInfo.java

@@ -38,6 +38,7 @@ public class MaterialInfo {
 
     private Integer status;
 
+    private String batch;
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     @Column(name = "create_time",updatable=false)
     private Date createTime;

src/main/java/cn/redrock/assetmanage/mapper/AmMaterialLogMapper.java

@@ -10,7 +10,8 @@ import java.util.List;
 
 @org.apache.ibatis.annotations.Mapper
 public interface AmMaterialLogMapper extends Mapper<AmMaterialLog> {
-    List<MaterialInfo> queryLog(@Param("operate") Integer operate,
+    List<MaterialInfo> queryLog(@Param("userId") Integer userId,
+                                @Param("operate") Integer operate,
                                 @Param("status") Integer status,
                                 @Param("field") String field,
                                 @Param("content") String content,

src/main/java/cn/redrock/assetmanage/service/MaterialLogService.java

@@ -19,5 +19,5 @@ public interface MaterialLogService {
     void writeLog(AmMaterialLog materialLog);
     void batchWriteLog(List<AmMaterialLog> materialLogs);
     void updateLog(List<Material> materials,Integer status);
-    PageInfo<MaterialInfo> queryLog(Integer operate, Integer status,String field,String content, Date startTm, Date endTm,Integer pageNum, Integer pageSize);
+    PageInfo<MaterialInfo> queryLog(Integer userId,Integer operate, Integer status,String field,String content, Date startTm, Date endTm,Integer pageNum, Integer pageSize);
 }

src/main/java/cn/redrock/assetmanage/service/impl/MaterialLogServiceImpl.java

@@ -55,10 +55,10 @@ public class MaterialLogServiceImpl implements MaterialLogService {
     }
 
     @Override
-    public PageInfo<MaterialInfo> queryLog(Integer operate, Integer status,String field,String content,Date startTm, Date endTm, Integer pageNum, Integer pageSize) {
+    public PageInfo<MaterialInfo> queryLog(Integer userId,Integer operate, Integer status,String field,String content,Date startTm, Date endTm, Integer pageNum, Integer pageSize) {
         if(pageNum != null && pageSize != null){
             PageHelper.startPage(pageNum, pageSize);
         }
-        return PageInfo.of(materialLogMapper.queryLog(operate,status,field,content,startTm,endTm));
+        return PageInfo.of(materialLogMapper.queryLog(userId,operate,status,field,content,startTm,endTm));
     }
 }

src/main/java/cn/redrock/assetmanage/service/impl/MaterialServiceImpl.java

@@ -134,9 +134,11 @@ public class MaterialServiceImpl implements MaterialService {
                         }
                     }else{
                         BeanUtils.copyProperties(oldMaterial,errorMaterial);
+                        errorMaterial.setId(material.getId());
                         failMaterials.add(errorMaterial);
                     }
                 }else{
+                    errorMaterial.setId(material.getId());
                     errorMaterial.setCode(material.getCode());
                     errorMaterial.setNum(-1);
                     failMaterials.add(errorMaterial);

src/main/resources/mapper/AmMaterialLogMapper.xml

@@ -9,6 +9,7 @@
     <result column="user_id" jdbcType="INTEGER" property="userId" />
     <result column="description" jdbcType="VARCHAR" property="description" />
     <result column="operate" jdbcType="INTEGER" property="operate" />
+    <result column="batch" jdbcType="VARCHAR" property="batch" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
   </resultMap>
   <resultMap id="MaterialInfo" type="cn.redrock.assetmanage.entity.MaterialInfo">
@@ -22,6 +23,7 @@
     <result column="position" jdbcType="VARCHAR" property="position" />
     <result column="description" jdbcType="VARCHAR" property="description" />
     <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="batch" jdbcType="VARCHAR" property="batch" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
   </resultMap>
   <select id="queryLog" resultMap="MaterialInfo">
@@ -34,6 +36,9 @@
     <if test="startTm != null and endTm != null ">
       and a.create_time between #{startTm} and #{endTm}
     </if>
+    <if test="userId != null ">
+      and a.user_id = #{userId}
+    </if>
     ) t
     where 1 = 1
     <if test="field != null and field != '' and content != null and content != '' ">