资产录入修改

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

@@ -46,6 +46,7 @@ public class GoodsNoServiceImpl extends ServiceImpl<GoodsNoMapper, GoodsNo> impl
             goodsNo.setGroundingTime(LocalDateTime.now());
             goodsNo.setFirstUseTime(LocalDateTime.now());
             goodsNo.setIsRack(1);
+            goodsNo.setUpdateIndate(LocalDateTime.now());
             goodsNoMapper.updateById(goodsNo);
         }else{
             //下架
@@ -53,6 +54,7 @@ public class GoodsNoServiceImpl extends ServiceImpl<GoodsNoMapper, GoodsNo> impl
             GoodsNo goodsNo = goodsNoMapper.selectOne(new QueryWrapper<GoodsNo>().eq("goods_id", goods.getId()));
             goodsNo.setGroundingTime(LocalDateTime.now());
             goodsNo.setIsRack(0);
+            goodsNo.setUpdateIndate(LocalDateTime.now());
             goodsNoMapper.updateById(goodsNo);
         }
         return msg;

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

@@ -25,6 +25,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -93,7 +94,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
                 for (int i = 1; i <= goodsVO.getNumber(); i++) {
                     GoodsNo goodsNo = new GoodsNo();
                     goodsNo.setGoodsId(goods.getId());
-                    goodsNo.setModelNo(goodsPrefix.getPrefixStr() + String.format("%07d", start+1));
+                    goodsNo.setModelNo(goodsPrefix.getPrefixStr() + String.format("%07d", start + 1));
                     list.add(goodsNo);
                 }
                 goodsNoService.saveBatch(list);
@@ -213,6 +214,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
         User user = userMapper.selectById(currentUserId);
         GoodsNo no = goodsNoMapper.selectById(goodsNo.getId());
         goodsNo.setGoodsId(no.getGoodsId());
+        goodsNo.setUpdateIndate(LocalDateTime.now());
         goodsNoMapper.updateById(goodsNo);
         //添加处置记录
         OperateRecord operateRecord = new OperateRecord();
@@ -273,41 +275,39 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
     @Override
     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"));
         Goods goods = goodsMapper.selectById(goodsNo.getGoodsId());
-        Integer start = 0;
-        String prefix = goods.getDivisionCode() + "-" + goods.getSuffixCode();
+        List<GoodsNo> goodsNoList = new ArrayList<>();
         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);
+            if (count > 0) {
+                GoodsNo lastGoodsNo = goodsNoMapper.selectOne(new QueryWrapper<GoodsNo>().orderByDesc("id").last("limit 1"));
+                GoodsPrefix goodsPrefix = goodsPrefixMapper.selectOne(new QueryWrapper<GoodsPrefix>().orderByDesc("id").last("limit 1"));
+                if (lastGoodsNo == null) {
+                    for (int i = 1; i <= count; i++) {
+                        goodsNo.setGoodsId(goods.getId());
+                        goodsNo.setModelNo(goodsPrefix.getPrefixStr() + String.format("%07d", i));
+                        goodsNoList.add(goodsNo);
+                    }
+                    if (!CollectionUtils.isEmpty(goodsNoList)) {
+                        goodsNoService.saveBatch(goodsNoList);
+                    }
+                } else {
+                    Integer start = Integer.parseInt(lastGoodsNo.getModelNo().substring(goodsPrefix.getPrefixStr().length()));
+                    for (int i = 1; i <= count; i++) {
+                        goodsNo.setGoodsId(goods.getId());
+                        goodsNo.setModelNo(goodsPrefix.getPrefixStr() + String.format("%07d", start + 1));
+                        goodsNoList.add(goodsNo);
+                    }
+                    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);
-                }
-
+                msg.setError("输入的数量必须大于零");
+                return msg;
             }
+        } else {
+            msg.setError("当前商品不存在");
+            return msg;
         }
         return msg;
     }

pcbms/src/main/resources/mapper/GoodsMapper.xml

@@ -50,6 +50,12 @@
         <result column="pic" property="pic"/>
         <result column="service_life" property="serviceLife"/>
         <result column="next_indate" property="nextIndate"/>
+        <result column="project_no" property="projectNo" />
+        <result column="project_name" property="projectName" />
+        <result column="purchase_date" property="purchaseDate" />
+        <result column="warranty_period" property="warrantyPeriod" />
+        <result column="price" property="price" />
+        <result column="content" property="content" />
         <collection property="goodsNos" select="selectGoodsNoByGoodsId" javaType="java.util.List" column="{goodId = id}"
                     ofType="com.hssx.pcbms.entity.GoodsNo">
         </collection>
@@ -68,6 +74,12 @@
         <result column="next_indate" property="nextIndate"/>
         <result column="divisioncode" property="divisionCode"/>
         <result column="suffixcode" property="suffixCode"/>
+        <result column="project_no" property="projectNo" />
+        <result column="project_name" property="projectName" />
+        <result column="purchase_date" property="purchaseDate" />
+        <result column="warranty_period" property="warrantyPeriod" />
+        <result column="price" property="price" />
+        <result column="content" property="content" />
         <collection property="goodsNos" ofType="com.hssx.pcbms.entity.GoodsNo">
             <id column="nid" property="id"/>
             <result column="model_no" property="modelNo"/>
@@ -101,6 +113,12 @@
         <result column="good_type" property="goodType" />
         <result column="rack_id" property="rackId" />
         <result column="tag_name" property="tagName" />
+        <result column="project_no" property="projectNo" />
+        <result column="project_name" property="projectName" />
+        <result column="purchase_date" property="purchaseDate" />
+        <result column="warranty_period" property="warrantyPeriod" />
+        <result column="price" property="price" />
+        <result column="content" property="content" />
         <collection property="goodsNosVO" ofType="com.hssx.pcbms.entity.vo.GoodsNoVO">
             <id column="nid" property="id"/>
             <result column="model_no" property="modelNo" />
@@ -153,7 +171,7 @@
     <select id="getListBycondition" resultMap="BaseResultMapVO">
         select
         id, name, tag_id, model_number, unit, address,
-        factory, pic, service_life, next_indate
+        factory, pic, service_life, next_indate,project_no, project_name, purchase_date, warranty_period, price
         from
         goods
         <where>
@@ -228,7 +246,7 @@
     <select id="getDetail" resultMap="BaseResultMapDetail">
         select
         g.id, g.name, g.tag_id,gt.name tag_name, g.model_number, g.unit,g.address, g.factory, g.pic, g.service_life, g.next_indate,g.division_code divisioncode,g.suffix_code suffixcode,
-        g.is_delete,gn.id nid,g.good_type,rd.hum,rd.door_status,rd.temp,
+        g.is_delete,gn.id nid,g.good_type,rd.hum,rd.door_status,rd.temp,g.project_no, g.project_name, g.purchase_date, g.warranty_period, g.price,g.content,
         gn.model_no, gn.division_code, gn.suffix_code, gn.state, gn.indate, gn.goods_id, gn.user_id,u.name username,gn.is_maintain,u.phone
         from
         goods g
@@ -270,7 +288,7 @@
 
     <select id="selectMyList" resultMap="BaseResultMapMyList">
         select
-        g.id, g.name, g.tag_id, g.model_number, g.unit,g.address,
+        g.id, g.name, g.tag_id, g.model_number, g.unit,g.address,g.project_no, g.project_name, g.purchase_date, g.warranty_period, g.price,
         g.factory, g.pic, g.service_life, g.next_indate,g.division_code divisioncode,
         g.suffix_code suffixcode,g.is_delete,gn.id nid,g.indate,gn.model_no,
         gn.division_code, gn.suffix_code, gn.state, gn.indate, gn.goods_id,