完善

platform-rest/src/main/java/com/platform/rest/controller/sqarepartmanage/SparePartInfoController.java

@@ -30,6 +30,7 @@ import com.platform.common.bean.AbstractPageResultBean;
 import com.platform.rest.log.annotation.SysLog;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.Arrays;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
@@ -61,6 +62,18 @@ public class SparePartInfoController {
         return new R<>(sparePartInfoService.getModelById(id));
     }
 
+    /**
+     * 批量查询记录
+     *
+     * @param ids
+     * @return R
+     */
+    @SysLog("批量查询设备基础信息")
+    @PostMapping("/code/batch")
+    public R getByIds(@RequestBody String[] ids) {
+        return new R<>(sparePartInfoService.getByIds(Arrays.asList(ids)));
+    }
+
     /**
      * 新增记录
      *

platform-rest/src/main/java/com/platform/rest/controller/upms/SysCodeController.java

@@ -115,4 +115,15 @@ public class SysCodeController {
         return R.success("生成成功");
     }
 
+    /**
+     * 重新生成所有备件的二维码
+     *
+     * @return R
+     */
+    @PostMapping("/spare/all")
+    public R generaeSpareCodeAll() {
+        sparePartInfoService.generateQrCodeAll();
+        return R.success("生成成功");
+    }
+
 }

platform-service/src/main/java/com/platform/service/sqarepartmanage/SparePartInfoService.java

@@ -4,6 +4,7 @@ import com.platform.common.bean.AbstractPageResultBean;
 import com.platform.dao.dto.sqarepartmanage.SparePartInfoDTO;
 import com.platform.dao.entity.sqarepartmanage.SparePartInfo;
 import com.platform.dao.vo.query.sparepartmanage.SparePartInfoVO;
+import com.platform.dao.vo.sb.SbInfoVO;
 import com.platform.service.base.IBaseService;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
@@ -72,4 +73,8 @@ public interface SparePartInfoService extends IBaseService<SparePartInfo, SpareP
     void genMinStockWarn();
 
     void genCheckStockWarn();
+
+    List<SparePartInfo> getByIds(List<String> asList);
+
+    void generateQrCodeAll();
 }

platform-service/src/main/java/com/platform/service/sqarepartmanage/impl/SparePartInfoServiceImpl.java

@@ -224,6 +224,47 @@ public class SparePartInfoServiceImpl extends BaseServiceImpl<SparePartInfoMappe
         }
     }
 
+    @Override
+    public List<SparePartInfo> getByIds(List<String> ids) {
+        Weekend<SparePartInfo> weekend = new Weekend<>(SparePartInfo.class);
+        weekend.weekendCriteria().andIn(SparePartInfo::getId, ids);
+        List<SparePartInfo> list = mapper.selectByExample(weekend);
+        List<SpareType> spareTypes = spareTypeMapper.selectAll();
+        for (SparePartInfo vo : list) {
+            if (StringUtils.isBlank(vo.getQrCode())) {
+                // 保存二维码
+                String path = CommonConstants.RESOURCE_PREFIX + "/png/" + DateUtil.formatDate(new Date()) + "/" + IdGeneratorUtils.getObjectId() + "/";
+                String rootPath = environment.getProperty("upload.root-dir");
+                String filePath = rootPath + path;
+                String codePath = path + vo.getId() + ".png";
+                CodeFileUtils.uploadFileECode(vo.getId(), rootPath, filePath, vo.getId() + ".png");
+                // 修改二维码
+                SparePartInfoDTO sbInfoDTO = new SparePartInfoDTO();
+                sbInfoDTO.setId(vo.getId());
+                sbInfoDTO.setQrCode(codePath);
+                vo.setQrCode(codePath);
+                this.updateQrCode(sbInfoDTO);
+
+            }
+
+            if (vo.getTypeId() != null) {
+                spareTypes.forEach(spareType -> {
+                    if (spareType.getId().equals(vo.getTypeId())) {
+                        vo.setTypeName(spareType.getName());
+                        return;
+                    }
+                });
+            }
+        }
+        Collections.sort(list, new Comparator<SparePartInfo>() {
+            @Override
+            public int compare(SparePartInfo o1, SparePartInfo o2) {
+                return o1.getNo().compareTo(o2.getNo());
+            }
+        });
+        return list;
+    }
+
     public static void main(String[] args) {
         String ss = "TYPJ-CC-00002";
         String newStr = ss.substring(ss.length() - 5);
@@ -373,7 +414,7 @@ public class SparePartInfoServiceImpl extends BaseServiceImpl<SparePartInfoMappe
                 model.setChildNo(type.getNo());
             }
         }
-        Weekend<SysFile> weekendFile = new Weekend<>(SysFile.class);
+       /* Weekend<SysFile> weekendFile = new Weekend<>(SysFile.class);
         weekendFile.weekendCriteria().andEqualTo(SysFile::getTargetId, model.getId());
         List<SysFile> sysFiles = sysFileMapper.selectByExample(weekendFile);
         List<SysFile> s = ListUtils.newArrayList();
@@ -383,7 +424,7 @@ public class SparePartInfoServiceImpl extends BaseServiceImpl<SparePartInfoMappe
                 applicationFileList.add(item);
             }
         });
-        model.setApplicationFileList(applicationFileList);
+        model.setApplicationFileList(applicationFileList);*/
 
         return model;
     }
@@ -465,7 +506,7 @@ public class SparePartInfoServiceImpl extends BaseServiceImpl<SparePartInfoMappe
             bom.setUpdateUserId(userInfo.getUserId());
             sbModelSpareBomMapper.insert(bom);
         }
-        this.saveFile(model);
+        //this.saveFile(model);
 
         // 如果初始化数量有了，就需要更新库存
         if (model.getInitStock() == null) {
@@ -631,7 +672,7 @@ public class SparePartInfoServiceImpl extends BaseServiceImpl<SparePartInfoMappe
                 sbModelSpareBomMapper.updateBatchAll(BeanConverterUtil.copyListProperties(updateList, SbModelSpareBom.class));
             }
         }
-        this.saveFile(model);
+        // this.saveFile(model);
         super.modModelByDTO(model);
     }
 
@@ -1095,4 +1136,23 @@ public class SparePartInfoServiceImpl extends BaseServiceImpl<SparePartInfoMappe
         sbInfo.setQrCode(model.getQrCode());
         mapper.updateByPrimaryKeySelective(sbInfo);
     }
+
+    @Override
+    public void generateQrCodeAll() {
+        List<SparePartInfo> list = mapper.selectAll();
+        for (SparePartInfo vo : list) {
+            // 保存二维码
+            String path = CommonConstants.RESOURCE_PREFIX + "/png/" + DateUtil.formatDate(new Date()) + "/" + vo.getId() + "/";
+            String rootPath = environment.getProperty("upload.root-dir");
+            String filePath = rootPath + path;
+            String codePath = path + vo.getId() + ".png";
+            CodeFileUtils.uploadFileECode(vo.getId(), rootPath, filePath, vo.getId() + ".png");
+            // 修改二维码
+            SparePartInfoDTO sbInfoDTO = new SparePartInfoDTO();
+            sbInfoDTO.setId(vo.getId());
+            sbInfoDTO.setQrCode(codePath);
+            vo.setQrCode(codePath);
+            this.updateQrCode(sbInfoDTO);
+        }
+    }
 }

platform-service/src/main/java/com/platform/service/store/impl/InStoreFormServiceImpl.java

@@ -173,6 +173,11 @@ public class InStoreFormServiceImpl extends BaseServiceImpl<InStoreFormMapper, I
         return new MyPage(mapper.selectList(model));
     }
 
+    /**
+     * 入库，只记录不更新
+     * @param model
+     * @return
+     */
     @Override
     public InStoreForm saveModelByDTO(InStoreFormDTO model) {
         Store store = storeService.getModelById(model.getStoreId());
@@ -205,7 +210,7 @@ public class InStoreFormServiceImpl extends BaseServiceImpl<InStoreFormMapper, I
             BeanConverterUtil.copyObjectProperties(detail, storeDetail);
             InStoreDetail result = detailMapper.selectByPrimaryKey(detail.getId());
             if (ObjectUtil.isNull(result)) {
-                detail.setId(IdGeneratorUtils.getObjectId());
+                storeDetail.setId(IdGeneratorUtils.getObjectId());
                 detailMapper.insertSelective(storeDetail);
             } else {
                 storeDetail.setUpdateTime(LocalDateTime.now());
@@ -241,7 +246,7 @@ public class InStoreFormServiceImpl extends BaseServiceImpl<InStoreFormMapper, I
             BeanConverterUtil.copyObjectProperties(detail, storeDetail);
             InStoreDetail result = detailMapper.selectByPrimaryKey(detail.getId());
             if (ObjectUtil.isNull(result)) {
-                detail.setId(IdGeneratorUtils.getObjectId());
+                storeDetail.setId(IdGeneratorUtils.getObjectId());
                 detailMapper.insertSelective(storeDetail);
             } else {
                 storeDetail.setUpdateTime(LocalDateTime.now());