添加文件上传通用接口

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

@@ -66,7 +66,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
         List<GoodsNo> list = new ArrayList<>();
         goods.setCreatorId(goodsVO.getUserId());
         goodsMapper.insert(goods);
-        String mouldNo = goodsVO.getDeptStr() + goodsVO.getGoodStr();
+        String mouldNo = goodsVO.getDeptStr() +"-"+ goodsVO.getGoodStr();
         Integer count = goodsNoMapper.selectCount(new QueryWrapper<GoodsNo>().eq("division_code", goodsVO.getDeptStr()).eq("suffix_code", goodsVO.getGoodStr()).last("limit 1"));
         if (count > 0) {
             msg.setError("当前编号组合已存在，请更换编号组合后重试。");
@@ -236,9 +236,9 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
             return msg;
         }
         List<GoodsNo> goodsNoList = goodsNoMapper.selectList(new QueryWrapper<GoodsNo>().eq("goods_id", goodsNo.getGoodsId()));
-        String suffixModelNo = goodsNo.getDivisionCode() + goodsNo.getSuffixCode();
+        String suffixModelNo = goodsNo.getDivisionCode() +"-"+ goodsNo.getSuffixCode();
         for (GoodsNo no : goodsNoList) {
-            no.setModelNo(suffixModelNo+goodsNo.getDivisionCode()+no.getModelNo().substring(no.getModelNo().length()-4));
+            no.setModelNo(suffixModelNo+no.getModelNo().substring(no.getModelNo().length()-4));
         }
         if(!CollectionUtils.isEmpty(goodsNoList)){
             goodsNoService.updateBatchById(goodsNoList);