添加资产编号

pcbms/src/main/java/com/hssx/pcbms/controller/GoodsController.java

@@ -213,7 +213,7 @@ public class GoodsController {
     /**
      * 资产编号添加
      * 参数：
-     * id:资产的goodId，count:数量
+     * goodsId:资产的goodsId，count:数量
      *
      * @return
      */

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

@@ -68,7 +68,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("当前编号组合已存在，请更换编号组合后重试。");
@@ -98,11 +98,11 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
     }
 
     @Override
-    public HttpRespMsg getList(PageUtil page, String keyName, Integer tagId,Integer uid) {
+    public HttpRespMsg getList(PageUtil page, String keyName, Integer tagId, Integer uid) {
         System.out.println("页数：" + page.getPageNum());
         HttpRespMsg msg = new HttpRespMsg();
         PageHelper.startPage(page.getPageNum(), page.getPageSize());
-        List<GoodsVO> list = goodsMapper.getListBycondition(keyName, tagId,uid);
+        List<GoodsVO> list = goodsMapper.getListBycondition(keyName, tagId, uid);
         PageInfo<GoodsVO> info = new PageInfo<>(list);
         msg.data = info;
         return msg;
@@ -149,16 +149,17 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
         if (no.getState() == 0) {
             oldState = "未用";
         } else if (no.getState() == 1)
-            oldState = "在用";{
+            oldState = "在用";
+        {
             User usering = userMapper.selectById(no.getUserId());
-            oldState = oldState + ("("+usering.getName() + "/" + usering.getPhone()+")");
+            oldState = oldState + ("(" + usering.getName() + "/" + usering.getPhone() + ")");
         }
         if (goodsNo.getState() == 0) {
             nowState = "未用";
         } else if (goodsNo.getState() == 1) {
             nowState = "在用";
             User usering = userMapper.selectById(goodsNo.getUserId());
-            nowState = nowState + ("("+usering.getName() + "/" + usering.getPhone()+")");
+            nowState = nowState + ("(" + usering.getName() + "/" + usering.getPhone() + ")");
         } else if (goodsNo.getState() == 3) {
             nowState = "报废";
         }
@@ -174,9 +175,9 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
     }
 
     @Override
-    public HttpRespMsg operateList(Goods goods,PageUtil page) {
+    public HttpRespMsg operateList(Goods goods, PageUtil page) {
         HttpRespMsg msg = new HttpRespMsg();
-        PageHelper.startPage(page.getPageNum(),page.getPageSize());
+        PageHelper.startPage(page.getPageNum(), page.getPageSize());
         List<OperateRecordVO> list = operateRecordMapper.selectCondition(goods);
         PageInfo<OperateRecordVO> info = new PageInfo<>(list);
         msg.data = info;
@@ -198,21 +199,43 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
     }
 
     @Override
-    public HttpRespMsg goodsNoAdd(GoodsNo goodsNo,Integer count) {
+    public HttpRespMsg goodsNoAdd(GoodsNo goodsNo, Integer count) {
         HttpRespMsg msg = new HttpRespMsg();
         GoodsNo oldGoodsNo = goodsNoMapper.selectOne(new QueryWrapper<GoodsNo>().eq("goods_id", goodsNo.getGoodsId()).orderByDesc("id").last("limit 1"));
-        String prefix = oldGoodsNo.getModelNo().substring(0,oldGoodsNo.getModelNo().length()-4);
-        Integer start = Integer.parseInt(oldGoodsNo.getModelNo().substring(oldGoodsNo.getModelNo().length()-4));
-        List<GoodsNo> goodsNoList = new ArrayList<>();
-        for(int i=1;i<=count;i++){
-            String format = String.format("%04d", start+i);
-            BeanUtils.copyProperties(oldGoodsNo,goodsNo);
-            goodsNo.setModelNo(prefix+format);
-            goodsNo.setId(null);
-            goodsNoList.add(goodsNo);
-        }
-        if(!CollectionUtils.isEmpty(goodsNoList)){
-            goodsNoService.saveBatch(goodsNoList);
+        Goods goods = goodsMapper.selectById(goodsNo.getGoodsId());
+        Integer start = 0;
+        String prefix = goods.getDivisionCode()+"-"+goods.getSuffixCode();
+        if(goods != null){
+            if (oldGoodsNo != null) {
+                start = Integer.parseInt(oldGoodsNo.getModelNo().substring(oldGoodsNo.getModelNo().length() - 4));
+                List<GoodsNo> goodsNoList = new ArrayList<>();
+                for (int i = 1; i <= count; i++) {
+                    GoodsNo no = new GoodsNo();
+                    String format = String.format("%04d", start + i);
+                    BeanUtils.copyProperties(oldGoodsNo, no);
+                    no.setModelNo(prefix + format);
+                    no.setId(null);
+                    goodsNoList.add(no);
+                }
+                if (!CollectionUtils.isEmpty(goodsNoList)) {
+                    goodsNoService.saveBatch(goodsNoList);
+                }
+            } else {
+                List<GoodsNo> goodsNoList = new ArrayList<>();
+                for (int i = 1; i <= count; i++) {
+                    GoodsNo no = new GoodsNo();
+                    String format = String.format("%04d", start + i);
+                    no.setModelNo(prefix + format);
+                    no.setGoodsId(goodsNo.getGoodsId());
+                    no.setDivisionCode(goods.getDivisionCode());
+                    no.setSuffixCode(goods.getSuffixCode());
+                    goodsNoList.add(no);
+                }
+                if (!CollectionUtils.isEmpty(goodsNoList)) {
+                    goodsNoService.saveBatch(goodsNoList);
+                }
+
+            }
         }
         return msg;
     }
@@ -225,14 +248,19 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
             msg.setError("当前编号组合已存在，请更换编号组合后重试。");
             return msg;
         }
+        Goods goods = new Goods();
+        goods.setDivisionCode(goodsNo.getDivisionCode());
+        goods.setSuffixCode(goodsNo.getSuffixCode());
+        goods.setId(goodsNo.getGoodsId());
+        goodsMapper.updateById(goods);
         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+no.getModelNo().substring(no.getModelNo().length()-4));
+            no.setModelNo(suffixModelNo + no.getModelNo().substring(no.getModelNo().length() - 4));
             no.setSuffixCode(goodsNo.getSuffixCode());
             no.setDivisionCode(goodsNo.getDivisionCode());
         }
-        if(!CollectionUtils.isEmpty(goodsNoList)){
+        if (!CollectionUtils.isEmpty(goodsNoList)) {
             goodsNoService.updateBatchById(goodsNoList);
         }
         return msg;
@@ -242,11 +270,11 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
     public HttpRespMsg maintain(MaintainRecordVO operateRecordVO) {
         HttpRespMsg msg = new HttpRespMsg();
         List<MaintainRecord> operateRecords = new ArrayList<>();
-        if(null != operateRecordVO.getIds()){
+        if (null != operateRecordVO.getIds()) {
             List<Integer> idList = ListUtil.convertIntegerIdsArrayToList(operateRecordVO.getIds());
             for (Integer id : idList) {
                 MaintainRecord operateRecord = new MaintainRecord();
-                BeanUtils.copyProperties(operateRecordVO,operateRecord);
+                BeanUtils.copyProperties(operateRecordVO, operateRecord);
                 operateRecord.setGoodsNoId(id);
                 operateRecords.add(operateRecord);
             }
@@ -254,8 +282,8 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
             //将原来待维护的状态更新为正常
             GoodsNo goodsNo = new GoodsNo();
             goodsNo.setIsMaintain(0);
-            goodsNoMapper.update(goodsNo,new QueryWrapper<GoodsNo>().in("id",idList));
-        }else{
+            goodsNoMapper.update(goodsNo, new QueryWrapper<GoodsNo>().in("id", idList));
+        } else {
             msg.setError("资产对应的编号id不存在");
         }
         return msg;
@@ -270,9 +298,9 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
     }
 
     @Override
-    public HttpRespMsg isMaintainRecord(Goods goods,PageUtil page) {
+    public HttpRespMsg isMaintainRecord(Goods goods, PageUtil page) {
         HttpRespMsg msg = new HttpRespMsg();
-        PageHelper.startPage(page.getPageNum(),page.getPageSize());
+        PageHelper.startPage(page.getPageNum(), page.getPageSize());
         List<MaintainRecordVO> list = maintainRecordMapper.getRecordList(goods);
         PageInfo<MaintainRecordVO> info = new PageInfo<>(list);
         msg.data = info;
@@ -282,9 +310,9 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
     @Override
     public HttpRespMsg myList(PageUtil page, String keyName, Integer uid) {
         HttpRespMsg msg = new HttpRespMsg();
-        Integer start = (page.getPageNum()-1)*page.getPageSize();
-        List<GoodsVO> list = goodsMapper.selectMyList(start,page.getPageSize(),uid);
-        Integer total = goodsMapper.selectMyList(null,null,uid).size();
+        Integer start = (page.getPageNum() - 1) * page.getPageSize();
+        List<GoodsVO> list = goodsMapper.selectMyList(start, page.getPageSize(), uid);
+        Integer total = goodsMapper.selectMyList(null, null, uid).size();
         PageUtil<GoodsVO> pageInfo = new PageUtil<>();
         pageInfo.setList(list);
         pageInfo.setTotal(total);
@@ -341,8 +369,8 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
     public static void main(String[] args) {
 //        String format = String.format("%04d", 0);
 //        System.out.println(format);
-        System.out.println("QWE-ASDF0001".substring(0,"QWE-ASDF0001".length()-4));
-        System.out.println("QWE-ASDF0001".substring("QWE-ASDF0001".length()-4));
+        System.out.println("QWE-ASDF0001".substring(0, "QWE-ASDF0001".length() - 4));
+        System.out.println("QWE-ASDF0001".substring("QWE-ASDF0001".length() - 4));
         System.out.println(Integer.parseInt("0001"));
     }
 }