“物资出库入库字段映射”

snws-monitor/snws-monitor-api/src/main/java/com/tofly/pojo/TfStocksInstockInfo.java

@@ -49,7 +49,7 @@ public class TfStocksInstockInfo extends Model<TfStocksInstockInfo> {
      * 入库类型 1 物料，2 设备，3药品
      */
             @ApiModelProperty(value = "入库类型 1 物料，2 设备，3药品")
-                private BigDecimal instockCategory;
+                private Long instockCategory;
     @ApiModelProperty(hidden = true)
     @TableField(exist = false)
     private String instockCategoryName;

snws-monitor/snws-monitor-api/src/main/java/com/tofly/pojo/TfStocksOutstockInfo.java

@@ -136,7 +136,7 @@ public class TfStocksOutstockInfo extends Model<TfStocksOutstockInfo> {
      * 出库类型 1 物料，2 设备，3药品
      */
             @ApiModelProperty(value = "出库类型 1 物料，2 设备，3药品")
-                private BigDecimal outstockCategory;
+                private Long outstockCategory;
     @ApiModelProperty(hidden = true)
     @TableField(exist = false)
     private String outstockCategoryName;

snws-monitor/snws-monitor-boot/src/main/java/com/tofly/monitor/controller/TfStocksInstockInfoController.java

@@ -17,8 +17,11 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.Arrays;
+import java.util.List;
+
 /**
  * 库存入库信息表
  *
@@ -68,8 +71,8 @@ public class TfStocksInstockInfoController {
     @ToFlyAppLog(title="新增库存入库信息表" )
     @ApiOperation(value = "新增库存入库信息表")
     @PostMapping
-    public ResultRespone save(@RequestBody TfStocksInstockInfo tfStocksInstockInfo) {
-      return ResultRespone.success(tfStocksInstockInfoService.save(tfStocksInstockInfo));
+    public ResultRespone save(TfStocksInstockInfo tfStocksInstockInfo, @RequestParam(value = "fileIds", required = false) List<MultipartFile> fileIds) {
+      return ResultRespone.success(tfStocksInstockInfoService.saveStocksInstockInfo(tfStocksInstockInfo,fileIds));
     }
 
     /**
@@ -80,24 +83,24 @@ public class TfStocksInstockInfoController {
     @ToFlyAppLog(title="修改库存入库信息表" )
     @ApiOperation(value = "修改库存入库信息表")
     @PutMapping
-    public ResultRespone updateById(@RequestBody TfStocksInstockInfo tfStocksInstockInfo) {
-      return ResultRespone.success(tfStocksInstockInfoService.updateById(tfStocksInstockInfo));
+    public ResultRespone updateById(TfStocksInstockInfo tfStocksInstockInfo, @RequestParam(value = "fileIds", required = false) List<MultipartFile> fileIds) {
+      return ResultRespone.success(tfStocksInstockInfoService.updateStocksInstockInfoById(tfStocksInstockInfo,fileIds));
     }
 
-    /**
-     * 通过id删除库存入库信息表
-     * @param id id
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title="通过id删除库存入库信息表" )
-    @ApiOperation(value = "通过ID删除库存入库信息表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Long")
-    })
-    @DeleteMapping("/{id}" )
-    public ResultRespone removeById(@PathVariable Long id) {
-      return ResultRespone.success(tfStocksInstockInfoService.removeById(id));
-    }
+//    /**
+//     * 通过id删除库存入库信息表
+//     * @param id id
+//     * @return ResultRespone
+//     */
+//    @ToFlyAppLog(title="通过id删除库存入库信息表" )
+//    @ApiOperation(value = "通过ID删除库存入库信息表")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Long")
+//    })
+//    @DeleteMapping("/{id}" )
+//    public ResultRespone removeById(@PathVariable Long id) {
+//      return ResultRespone.success(tfStocksInstockInfoService.removeById(id));
+//    }
 
     /**
      * 通过id批量删除库存入库信息表
@@ -111,6 +114,6 @@ public class TfStocksInstockInfoController {
     })
     @DeleteMapping("/deleteByIds" )
     public ResultRespone removeById(String ids) {
-        return ResultRespone.success(tfStocksInstockInfoService.removeByIds(Arrays.asList(ids.split(","))));
+        return ResultRespone.success(tfStocksInstockInfoService.deleteStocksInstockInfo(ids));
     }
 }

snws-monitor/snws-monitor-boot/src/main/java/com/tofly/monitor/controller/TfStocksOutstockInfoController.java

@@ -17,8 +17,11 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.Arrays;
+import java.util.List;
+
 /**
  * 库存出库信息表
  *
@@ -68,8 +71,8 @@ public class TfStocksOutstockInfoController {
     @ToFlyAppLog(title="新增库存出库信息表" )
     @ApiOperation(value = "新增库存出库信息表")
     @PostMapping
-    public ResultRespone save(@RequestBody TfStocksOutstockInfo tfStocksOutstockInfo) {
-      return ResultRespone.success(tfStocksOutstockInfoService.save(tfStocksOutstockInfo));
+    public ResultRespone save(TfStocksOutstockInfo tfStocksOutstockInfo, @RequestParam(value = "fileIds", required = false) List<MultipartFile> fileIds) {
+      return ResultRespone.success(tfStocksOutstockInfoService.saveStocksOutstockInfo(tfStocksOutstockInfo,fileIds));
     }
 
     /**
@@ -80,24 +83,24 @@ public class TfStocksOutstockInfoController {
     @ToFlyAppLog(title="修改库存出库信息表" )
     @ApiOperation(value = "修改库存出库信息表")
     @PutMapping
-    public ResultRespone updateById(@RequestBody TfStocksOutstockInfo tfStocksOutstockInfo) {
-      return ResultRespone.success(tfStocksOutstockInfoService.updateById(tfStocksOutstockInfo));
+    public ResultRespone updateById(TfStocksOutstockInfo tfStocksOutstockInfo, @RequestParam(value = "fileIds", required = false) List<MultipartFile> fileIds) {
+      return ResultRespone.success(tfStocksOutstockInfoService.updateStocksOutstockInfoById(tfStocksOutstockInfo,fileIds));
     }
 
-    /**
-     * 通过id删除库存出库信息表
-     * @param id id
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title="通过id删除库存出库信息表" )
-    @ApiOperation(value = "通过ID删除库存出库信息表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Long")
-    })
-    @DeleteMapping("/{id}" )
-    public ResultRespone removeById(@PathVariable Long id) {
-      return ResultRespone.success(tfStocksOutstockInfoService.removeById(id));
-    }
+//    /**
+//     * 通过id删除库存出库信息表
+//     * @param id id
+//     * @return ResultRespone
+//     */
+//    @ToFlyAppLog(title="通过id删除库存出库信息表" )
+//    @ApiOperation(value = "通过ID删除库存出库信息表")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Long")
+//    })
+//    @DeleteMapping("/{id}" )
+//    public ResultRespone removeById(@PathVariable Long id) {
+//      return ResultRespone.success(tfStocksOutstockInfoService.removeById(id));
+//    }
 
     /**
      * 通过id批量删除库存出库信息表
@@ -111,6 +114,6 @@ public class TfStocksOutstockInfoController {
     })
     @DeleteMapping("/deleteByIds" )
     public ResultRespone removeById(String ids) {
-        return ResultRespone.success(tfStocksOutstockInfoService.removeByIds(Arrays.asList(ids.split(","))));
+        return ResultRespone.success(tfStocksOutstockInfoService.deleteStocksOutstockInfo(ids));
     }
 }

snws-monitor/snws-monitor-boot/src/main/java/com/tofly/monitor/service/TfStocksInstockInfoService.java

@@ -6,7 +6,11 @@ package com.tofly.monitor.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.tofly.pojo.Device;
 import com.tofly.pojo.TfStocksInstockInfo;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
 
 /**
  * 库存入库信息表
@@ -16,4 +20,9 @@ import com.tofly.pojo.TfStocksInstockInfo;
  */
 public interface TfStocksInstockInfoService extends IService<TfStocksInstockInfo> {
 
+    boolean saveStocksInstockInfo(TfStocksInstockInfo stocksInstockInfo, List<MultipartFile> fileIds);
+
+    boolean updateStocksInstockInfoById(TfStocksInstockInfo stocksInstockInfo, List<MultipartFile> fileIds);
+
+    boolean deleteStocksInstockInfo(String ids);
 }

snws-monitor/snws-monitor-boot/src/main/java/com/tofly/monitor/service/TfStocksOutstockInfoService.java

@@ -6,7 +6,11 @@ package com.tofly.monitor.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.tofly.pojo.TfStocksInstockInfo;
 import com.tofly.pojo.TfStocksOutstockInfo;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
 
 /**
  * 库存出库信息表
@@ -16,4 +20,9 @@ import com.tofly.pojo.TfStocksOutstockInfo;
  */
 public interface TfStocksOutstockInfoService extends IService<TfStocksOutstockInfo> {
 
+    boolean saveStocksOutstockInfo(TfStocksOutstockInfo stocksOutstockInfo, List<MultipartFile> fileIds);
+
+    boolean updateStocksOutstockInfoById(TfStocksOutstockInfo stocksOutstockInfo, List<MultipartFile> fileIds);
+
+    boolean deleteStocksOutstockInfo(String ids);
 }

snws-monitor/snws-monitor-boot/src/main/java/com/tofly/monitor/service/impl/TfStocksInstockInfoServiceImpl.java

@@ -5,11 +5,28 @@
 package com.tofly.monitor.service.impl;
 
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.tofly.monitor.common.Constant;
+import com.tofly.monitor.common.em.FileTableEnum;
+import com.tofly.monitor.common.entity.vo.FileInfo;
+import com.tofly.monitor.common.service.IFileInfoService;
+import com.tofly.monitor.service.QrcodeService;
 import com.tofly.monitor.service.TfStocksInstockInfoService;
+import com.tofly.monitor.service.export.ExportCommonCodeService;
+import com.tofly.pojo.Device;
 import com.tofly.pojo.TfStocksInstockInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import com.tofly.monitor.mapper.TfStocksInstockInfoMapper;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.text.SimpleDateFormat;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 库存入库信息表
@@ -20,4 +37,42 @@ import com.tofly.monitor.mapper.TfStocksInstockInfoMapper;
 @Service("tfStocksInstockInfoService")
 public class TfStocksInstockInfoServiceImpl extends ServiceImpl<TfStocksInstockInfoMapper, TfStocksInstockInfo> implements TfStocksInstockInfoService {
 
+    @Autowired
+    private IFileInfoService iFileInfoService;
+
+    @Value("${snws.ftp.stocksInstockInfo}")
+    private String path;
+
+    @Override
+    public boolean saveStocksInstockInfo(TfStocksInstockInfo entity, List<MultipartFile> fileIds) {
+        List<FileInfo> fileInfos = iFileInfoService.saveFileList(fileIds, path, FileTableEnum.tf_ywpn_monitor_device_w.getTableName());
+        entity.setAnnex(JSON.toJSONString(fileInfos));
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
+        entity.setInstockNo("RK" + sdf.format(new Date()) + "0001");
+        // 对象入库
+        this.save(entity);
+        return true;
+    }
+
+    @Override
+    public boolean updateStocksInstockInfoById(TfStocksInstockInfo entity, List<MultipartFile> fileIds) {
+        TfStocksInstockInfo entityQuery = this.getById(entity.getId());
+        // 获取表名
+        String tableName = FileTableEnum.tf_ywpn_monitor_device_w.getTableName();
+        // 获取最新的文件集合并填入实体
+        entity.setAnnex(iFileInfoService.getNewAnnex(entity.getAnnex(),fileIds,entityQuery.getAnnex(),path,tableName));
+        this.updateById(entity);
+        return true;
+    }
+
+    @Override
+    public boolean deleteStocksInstockInfo(String ids) {
+        List<Long> idList = Arrays.stream(ids.split(Constant.CSV)).map(s -> Long.parseLong(s.trim())).collect(Collectors.toList());
+        idList.forEach(info ->{
+            TfStocksInstockInfo entity = this.getById(info);
+            iFileInfoService.removeFileList(JSON.parseArray(entity.getAnnex(),FileInfo.class));
+        });
+        this.removeByIds(idList);
+        return true;
+    }
 }

snws-monitor/snws-monitor-boot/src/main/java/com/tofly/monitor/service/impl/TfStocksOutstockInfoServiceImpl.java

@@ -5,11 +5,26 @@
 package com.tofly.monitor.service.impl;
 
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.tofly.monitor.common.Constant;
+import com.tofly.monitor.common.em.FileTableEnum;
+import com.tofly.monitor.common.entity.vo.FileInfo;
+import com.tofly.monitor.common.service.IFileInfoService;
 import com.tofly.monitor.service.TfStocksOutstockInfoService;
+import com.tofly.pojo.TfStocksInstockInfo;
 import com.tofly.pojo.TfStocksOutstockInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import com.tofly.monitor.mapper.TfStocksOutstockInfoMapper;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.text.SimpleDateFormat;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 库存出库信息表
@@ -20,4 +35,42 @@ import com.tofly.monitor.mapper.TfStocksOutstockInfoMapper;
 @Service("tfStocksOutstockInfoService")
 public class TfStocksOutstockInfoServiceImpl extends ServiceImpl<TfStocksOutstockInfoMapper, TfStocksOutstockInfo> implements TfStocksOutstockInfoService {
 
+    @Autowired
+    private IFileInfoService iFileInfoService;
+
+    @Value("${snws.ftp.stocksOutstockInfo}")
+    private String path;
+
+    @Override
+    public boolean saveStocksOutstockInfo(TfStocksOutstockInfo entity, List<MultipartFile> fileIds) {
+        List<FileInfo> fileInfos = iFileInfoService.saveFileList(fileIds, path, FileTableEnum.tf_ywpn_monitor_device_w.getTableName());
+        entity.setAnnex(JSON.toJSONString(fileInfos));
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
+        entity.setOutstockNo("CK" + sdf.format(new Date()) + "0001");
+        // 对象入库
+        this.save(entity);
+        return true;
+    }
+
+    @Override
+    public boolean updateStocksOutstockInfoById(TfStocksOutstockInfo entity, List<MultipartFile> fileIds) {
+        TfStocksOutstockInfo entityQuery = this.getById(entity.getId());
+        // 获取表名
+        String tableName = FileTableEnum.tf_ywpn_monitor_device_w.getTableName();
+        // 获取最新的文件集合并填入实体
+        entity.setAnnex(iFileInfoService.getNewAnnex(entity.getAnnex(),fileIds,entityQuery.getAnnex(),path,tableName));
+        this.updateById(entity);
+        return true;
+    }
+
+    @Override
+    public boolean deleteStocksOutstockInfo(String ids) {
+        List<Long> idList = Arrays.stream(ids.split(Constant.CSV)).map(s -> Long.parseLong(s.trim())).collect(Collectors.toList());
+        idList.forEach(info ->{
+            TfStocksOutstockInfo entity = this.getById(info);
+            iFileInfoService.removeFileList(JSON.parseArray(entity.getAnnex(),FileInfo.class));
+        });
+        this.removeByIds(idList);
+        return true;
+    }
 }

snws-monitor/snws-monitor-boot/src/main/resources/mapper/TfStocksInstockInfoMapper.xml

@@ -57,20 +57,20 @@
     </select>
 
     <select id="selectBuinessTypeName" resultType="String">
-        select CNAME buinessTypeName
-        from TF_YWPN_SYSCHILDCODE_D
+        select NOTES buinessTypeName
+        from tf_smpn_code_x
         where ID = #{buinessType}
     </select>
 
     <select id="selectInstockTypeName" resultType="String">
-        select CNAME instockTypeName
-        from TF_YWPN_SYSCHILDCODE_D
+        select NOTES instockTypeName
+        from tf_smpn_code_x
         where ID = #{instockType}
     </select>
 
     <select id="selectPurchaseTypeName" resultType="String">
-        select CNAME purchaseTypeName
-        from TF_YWPN_SYSCHILDCODE_D
+        select NOTES purchaseTypeName
+        from tf_smpn_code_x
         where ID = #{purchaseType}
     </select>
 

snws-monitor/snws-monitor-boot/src/main/resources/mapper/TfStocksOutstockInfoMapper.xml

@@ -58,14 +58,14 @@
     </select>
 
     <select id="selectOutstockTypeName" resultType="String">
-        select materialTypeName outstockTypeName
-        from TF_STOCKS_MATERIAL_TYPE
+        select NOTES outstockTypeName
+        from tf_smpn_code_x
         where ID = #{outstockTypeId}
     </select>
 
     <select id="selectBuninessTypeName" resultType="String">
-        select CNAME buninessTypeName
-        from TF_YWPN_SYSCHILDCODE_D
+        select NOTES buninessTypeName
+        from tf_smpn_code_x
         where ID = #{buninessType}
     </select>
 </mapper>