新增bom清单保存及修改方法

src/main/java/com/uas/platform/b2c/trade/seek/controller/SeekPurchaseBomController.java

@@ -17,9 +17,6 @@ import com.uas.platform.core.exception.IllegalOperatorException;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Map;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -33,6 +30,10 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Map;
+
 /**
  * @author liusw
  * @version 2018/1/19 14:33
@@ -200,4 +201,58 @@ public class SeekPurchaseBomController {
     private ModelMap getAccessUrl() {
         return new ModelMap("url", inquiryServiceUrl);
     }
+
+    /* ===============================2018年9月4日 14:27:27======================================= */
+    /**
+     * 通过分页信息和过滤条件查询bom列表
+     *
+     * @param pageInfo 分页参数
+     * @param keyword   关键词 -- bom名称搜索
+     * @return bom列表分页
+     */
+    @RequestMapping(value = "/bom/list", method = RequestMethod.GET)
+    public Page<SeekPurchaseBom> getBomListByPageInfo(PageInfo pageInfo, String keyword) {
+        logger.log("bom列表","查询本企业所有bom列表信息");
+        return seekPurchaseBomService.findAllByPageInfo(pageInfo, keyword);
+    }
+
+    /**
+     * 获取单个bom的信息
+     * @param bomId bom id
+     * @return bom的详情信息
+     */
+    @RequestMapping(value = "/bom/detail", method = RequestMethod.GET)
+    public SeekPurchaseBom getBomDetailById(Long bomId) {
+        return seekPurchaseBomService.findOne(bomId);
+    }
+
+    /**
+     * 编辑bom信息
+     * @param bom 编辑完的bom信息
+     * @return 处理结果
+     */
+    @RequestMapping(value = "/bom/edit", method = RequestMethod.POST)
+    public ModelMap editBom(SeekPurchaseBom bom) {
+        return seekPurchaseBomService.editBom(bom);
+    }
+
+    /**
+     * 删除bom信息
+     * @param bomId bomId
+     * @return 处理结果
+     */
+    @RequestMapping(value = "/bom/delete", method = RequestMethod.DELETE)
+    public ModelMap deleteBom(Long bomId) {
+        return seekPurchaseBomService.deleteBom(bomId);
+    }
+
+    /**
+     * 删除bom中的物料明细信息
+     * @param detailIds detail id串   1,2,3,4...
+     * @return 处理结果
+     */
+    @RequestMapping(value = "/bom/detail/delete", method = RequestMethod.DELETE)
+    public ModelMap deleteBomProducts(String detailIds) {
+        return seekPurchaseBomService.deleteBomProducts(detailIds);
+    }
 }

src/main/java/com/uas/platform/b2c/trade/seek/model/SeekPurchaseBom.java

@@ -1,11 +1,8 @@
 package com.uas.platform.b2c.trade.seek.model;
 
+import javax.persistence.*;
 import java.util.Date;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import java.util.List;
 
 /**
  * Bom求购
@@ -57,11 +54,23 @@ public class SeekPurchaseBom {
     private Long enuu;
 
     /**
-     * 状态
+     * 状态 初始为0
      */
     @Column(name = "bom_status")
     private Integer status;
 
+    /**
+     * 规格
+     */
+    @Column(name = "bom_spec", columnDefinition = "TEXT", length = 1000)
+    private String spec;
+
+    /**
+     * bom明细，不做数据库关联，减少查询负担。需要时查询完set进去
+     */
+    @Transient
+    private List<SeekPurchaseByBatch> seekPurchaseByBatchs;
+
     public Long getId() {
         return id;
     }
@@ -117,4 +126,20 @@ public class SeekPurchaseBom {
     public void setStatus(Integer status) {
         this.status = status;
     }
+
+    public String getSpec() {
+        return spec;
+    }
+
+    public void setSpec(String spec) {
+        this.spec = spec;
+    }
+
+    public List<SeekPurchaseByBatch> getSeekPurchaseByBatchs() {
+        return seekPurchaseByBatchs;
+    }
+
+    public void setSeekPurchaseByBatchs(List<SeekPurchaseByBatch> seekPurchaseByBatchs) {
+        this.seekPurchaseByBatchs = seekPurchaseByBatchs;
+    }
 }

src/main/java/com/uas/platform/b2c/trade/seek/service/SeekPurchaseBomService.java

@@ -9,6 +9,7 @@ import com.uas.platform.core.model.PageInfo;
 import java.util.Map;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.data.domain.Page;
+import org.springframework.ui.ModelMap;
 
 /**
  * @author liusw
@@ -83,4 +84,41 @@ public interface SeekPurchaseBomService {
      * @return
      */
     SeekPurchaseBomList findOneBom(Long bomId);
+
+    /**
+     * 通过分页信息和过滤条件查询bom列表
+     *
+     * @param pageInfo 分页参数
+     * @param keyword   关键词
+     * @return bom列表分页
+     */
+    Page<SeekPurchaseBom> findAllByPageInfo(PageInfo pageInfo, String keyword);
+
+    /**
+     * 获取单个bom的信息
+     * @param bomId bom id
+     * @return bom的详情信息
+     */
+    SeekPurchaseBom findOne(Long bomId);
+
+    /**
+     * 编辑bom信息
+     * @param bom 编辑完的bom信息
+     * @return 处理结果
+     */
+    ModelMap editBom(SeekPurchaseBom bom);
+
+    /**
+     * 删除bom信息
+     * @param bomId bomId
+     * @return 处理结果
+     */
+    ModelMap deleteBom(Long bomId);
+
+    /**
+     * 删除bom中的物料明细信息
+     * @param detailIds detail id串   1,2,3,4...
+     * @return 处理结果
+     */
+    ModelMap deleteBomProducts(String detailIds);
 }

src/main/java/com/uas/platform/b2c/trade/seek/service/impl/SeekPurchaseBomServiceImpl.java

@@ -2,6 +2,7 @@ package com.uas.platform.b2c.trade.seek.service.impl;
 
 import com.uas.platform.b2c.common.account.model.User;
 import com.uas.platform.b2c.common.search.service.SearcherService;
+import com.uas.platform.b2c.core.support.SystemSession;
 import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
 import com.uas.platform.b2c.core.utils.StringUtilB2C;
 import com.uas.platform.b2c.prod.commodity.dao.GoodsDao;
@@ -32,11 +33,13 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DataAccessException;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
 import org.springframework.stereotype.Service;
+import org.springframework.ui.ModelMap;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
@@ -154,6 +157,8 @@ public class SeekPurchaseBomServiceImpl implements SeekPurchaseBomService {
         seekPurchaseBom.setReleaseDate(new Date(System.currentTimeMillis()));
         seekPurchaseBom.setName(bomName);
         seekPurchaseBom.setStatus(0);
+        seekPurchaseBom.setUu(SystemSession.getUser().getUserUU());
+        seekPurchaseBom.setEnuu(SystemSession.getUser().getEnterprise().getUu());
         seekPurchaseBom = seekPurchaseBomDao.save(seekPurchaseBom);
         // 获取第一行的信息
         Row headerRow = sheet.getRow(0);
@@ -184,6 +189,8 @@ public class SeekPurchaseBomServiceImpl implements SeekPurchaseBomService {
                 seekPurchaseBomDao.delete(seekPurchaseBom.getId());
                 return new ResultMap(CodeType.PARAMETER_ERROR, "上传的excel内容为空，请填写完整后上传");
             } else {
+                seekPurchaseBom.setAmount(seekPurchaseByBatchList.size());
+                seekPurchaseBomDao.save(seekPurchaseBom);
                 seekPurchaseByBatchDao.save(seekPurchaseByBatchList);
             }
         }
@@ -488,6 +495,7 @@ public class SeekPurchaseBomServiceImpl implements SeekPurchaseBomService {
         return new PageImpl<SeekPurchaseByBatch>(seekPurchaseByBatchList, pageInfo, pageSeeks.getTotalElements());
     }
 
+
     @Override
     public ResultMap confirmBom(Long bomId, User user, String url) {
         SeekPurchaseBom seekPurchaseBom = seekPurchaseBomDao.findOne(bomId);
@@ -499,7 +507,7 @@ public class SeekPurchaseBomServiceImpl implements SeekPurchaseBomService {
         // 商城现货的数量
         int haveGoodsCount = 0;
         Set<PurcInquiryItem> inquiryItems = new HashSet<>();
-        List<SeekPurchaseByBatch> deleteBatchList = new ArrayList<>();
+//        List<SeekPurchaseByBatch> deleteBatchList = new ArrayList<>();
         Date endDate = null;
         for (SeekPurchaseByBatch batch : seekPurchaseByBatchList) {
             SeekPurchase seekPurchase = new SeekPurchase();
@@ -538,13 +546,13 @@ public class SeekPurchaseBomServiceImpl implements SeekPurchaseBomService {
                 if (goods != null && goods.size() > 0) {
                     haveGoodsCount++;
                 }
-                deleteBatchList.add(batch);
+//                deleteBatchList.add(batch);
                 inquiryItems.add(inquiryItem);
             }
         }
-        seekPurchaseByBatchDao.delete(deleteBatchList);
+//        seekPurchaseByBatchDao.delete(deleteBatchList);
         // 询价单数据插入
-        inquiry.setAmount(deleteBatchList.size());
+        inquiry.setAmount(inquiryItems.size());
         SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddsss");
         try {
             inquiry.setCode("MALL" + sdf.parse(sdf.format(new Date())).getTime());
@@ -571,8 +579,8 @@ public class SeekPurchaseBomServiceImpl implements SeekPurchaseBomService {
             throw new IllegalOperatorException("发布失败");
         }
         // 删除bom的临时数据
-        seekPurchaseBomDao.delete(seekPurchaseBom.getId());
-        seekPurchaseBomListDao.deleteByBomId(seekPurchaseBom.getId());
+//        seekPurchaseBomDao.delete(seekPurchaseBom.getId());
+//        seekPurchaseBomListDao.deleteByBomId(seekPurchaseBom.getId());
         Map<String, Object> result = new HashMap<>();
         result.put("successAmount", inquiryItems.size());
         result.put("goodsAmount", haveGoodsCount);
@@ -686,4 +694,123 @@ public class SeekPurchaseBomServiceImpl implements SeekPurchaseBomService {
         return seekPurchaseBomListDao.findOne(bomId);
     }
 
+    /**
+     * 通过分页信息和过滤条件查询bom列表
+     *
+     * @param pageInfo 分页参数
+     * @param keyword  关键词
+     * @return bom列表分页
+     */
+    @Override
+    public Page<SeekPurchaseBom> findAllByPageInfo(PageInfo pageInfo, String keyword) {
+        Sort sort = new Sort(Sort.Direction.DESC, "id");
+        pageInfo.setSort(sort);
+        if (!StringUtils.isEmpty(keyword)) {
+            pageInfo.expression(PredicateUtils.like("name", keyword, false));
+        }
+        return seekPurchaseBomDao.findAll(new Specification<SeekPurchaseBom>() {
+            @Override
+            public Predicate toPredicate(Root<SeekPurchaseBom> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
+                query.where(pageInfo.getPredicates(root, query, cb));
+                return null;
+            }
+        }, pageInfo);
+    }
+
+    /**
+     * 获取单个bom的信息
+     *
+     * @param bomId bom id
+     * @return bom的详情信息
+     */
+    @Override
+    public SeekPurchaseBom findOne(Long bomId) {
+        List<SeekPurchaseByBatch> seekPurchaseByBatches = seekPurchaseByBatchDao.findByBomId(bomId);
+        SeekPurchaseBom bom = seekPurchaseBomDao.findOne(bomId);
+        bom.setSeekPurchaseByBatchs(seekPurchaseByBatches);
+        return bom;
+    }
+
+    /**
+     * 编辑bom信息
+     *
+     * @param bom 编辑完的bom信息
+     * @return 处理结果
+     */
+    @Override
+    public ModelMap editBom(SeekPurchaseBom bom) {
+        ModelMap map = new ModelMap();
+        try {
+            List<SeekPurchaseByBatch> seekPurchaseByBatches = bom.getSeekPurchaseByBatchs();
+            if (!CollectionUtils.isEmpty(seekPurchaseByBatches)) {
+                seekPurchaseByBatchDao.save(seekPurchaseByBatches);
+            }
+            seekPurchaseBomDao.save(bom);
+            map.put("success", true);
+        } catch (Exception e) {
+            map.put("success", false);
+            map.put("message", e.getMessage());
+        }
+        return map;
+    }
+
+    /**
+     * 删除bom信息
+     *
+     * @param bomId bomId
+     * @return 处理结果
+     */
+    @Override
+    public ModelMap deleteBom(Long bomId) {
+        ModelMap map = new ModelMap();
+        try {
+            SeekPurchaseBom bom = seekPurchaseBomDao.findOne(bomId);
+            if (null != bom) {
+                List<SeekPurchaseByBatch> seekPurchaseByBatches = seekPurchaseByBatchDao.findByBomId(bomId);
+                if (!CollectionUtils.isEmpty(seekPurchaseByBatches)) {
+                    seekPurchaseByBatchDao.delete(seekPurchaseByBatches);
+                }
+                seekPurchaseBomDao.delete(bom);
+                map.put("success", true);
+            } else {
+                map.put("success", false);
+                map.put("message", "未查找到对应bom记录");
+            }
+        } catch (Exception e) {
+            map.put("success", false);
+            map.put("message", e.getMessage());
+        }
+        return map;
+    }
+
+    /**
+     * 删除bom中的物料明细信息
+     *
+     * @param detailIds detail id串   1,2,3,4...
+     * @return 处理结果
+     */
+    @Override
+    public ModelMap deleteBomProducts(String detailIds) {
+        ModelMap map = new ModelMap();
+        try {
+            List<Long> ids = new ArrayList<>();
+            String[] idArray = detailIds.split(",");
+            for (String idString : idArray) {
+                ids.add(Long.valueOf(idString));
+            }
+            List<SeekPurchaseByBatch> batches = seekPurchaseByBatchDao.findAll(ids);
+            if (!CollectionUtils.isEmpty(batches)) {
+                seekPurchaseByBatchDao.delete(batches);
+                map.put("success", true);
+            } else {
+                map.put("success", false);
+                map.put("message", "未找到对应bom明细产品记录");
+            }
+        } catch (Exception e) {
+            map.put("success", false);
+            map.put("message", e.getMessage());
+        }
+        return map;
+    }
+
 }