Merge remote-tracking branch 'origin/liusw-seekpurchase-v3.0.1.23' into liusw-seekpurchase-v3.0.1.23

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

@@ -103,7 +103,8 @@ public class SeekPurchaseBomController {
     public ResultMap confirmBom(@RequestBody String json) {
         JSONObject object = FastjsonUtils.parseObject(json);
         logger.log("求购", "确认发布bom求购，bomId:" + object.get("bomId"));
-        return seekPurchaseBomService.confirmBom(Long.valueOf(object.get("bomId").toString()), object.get("spIds") == null ? null : object.get("spIds").toString());
+        User user = SystemSession.getUser();
+        return seekPurchaseBomService.confirmBom(Long.valueOf(object.get("bomId").toString()), user);
     }
 
     /**

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

@@ -0,0 +1,131 @@
+package com.uas.platform.b2c.trade.seek.model;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.Set;
+
+public class PurcInquiry implements Serializable {
+
+    /**
+     * default serialVersionUID
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 询价单所属企业UU
+     */
+    private Long enUU;
+
+    /**
+     * 询价单所属用户UU
+     */
+    private Long recorderUU;
+
+    /**
+     * 流水号
+     */
+    private String code;
+
+    /**
+     * 单据归属日期
+     */
+    private Date date;
+
+    /**
+     * 报价截止日期
+     */
+    private Date endDate;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 询价明细
+     */
+    private Set<PurcInquiryItem> inquiryItems;
+
+    /**
+     * 应用来源
+     */
+    private String sourceapp;
+
+    /**
+     * 明细总数
+     */
+    private Integer amount;
+
+    public Long getEnUU() {
+        return enUU;
+    }
+
+    public void setEnUU(Long enUU) {
+        this.enUU = enUU;
+    }
+
+    public Long getRecorderUU() {
+        return recorderUU;
+    }
+
+    public void setRecorderUU(Long recorderUU) {
+        this.recorderUU = recorderUU;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public Date getDate() {
+        return date;
+    }
+
+    public void setDate(Date date) {
+        this.date = date;
+    }
+
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public Set<PurcInquiryItem> getInquiryItems() {
+        return inquiryItems;
+    }
+
+    public void setInquiryItems(
+            Set<PurcInquiryItem> inquiryItems) {
+        this.inquiryItems = inquiryItems;
+    }
+
+    public String getSourceapp() {
+        return sourceapp;
+    }
+
+    public void setSourceapp(String sourceapp) {
+        this.sourceapp = sourceapp;
+    }
+
+    public Integer getAmount() {
+        return amount;
+    }
+
+    public void setAmount(Integer amount) {
+        this.amount = amount;
+    }
+}

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

@@ -0,0 +1,208 @@
+package com.uas.platform.b2c.trade.seek.model;
+
+import java.util.Date;
+
+public class PurcInquiryItem {
+
+	/**
+	 * 买家采购员UU
+	 */
+	private Long userUU;
+
+	/**
+	 * 联系人姓名
+	 */
+	private String userName;
+
+	/**
+	 * 联系人电话
+	 */
+	private String userTel;
+
+	/**
+	 * ************* 上传的物料信息，因为可能是手动输入的，物料款不存在，需要先进行保存物料 *************
+	 */
+
+	/**
+	 * 名称
+	 */
+	private String prodTitle;
+
+	/**
+	 * 规格
+	 */
+	private String spec;
+
+	/**
+	 * 型号
+	 */
+	private String cmpCode;
+
+	/**
+	 * 品牌
+	 */
+	private String inbrand;
+	/**
+	 * ******end*******
+	 */
+
+	/**
+	 * 币种
+	 */
+	private String currency;
+
+	/**
+	 * 来源ERP或B2B
+	 */
+	private String source;
+
+	/**
+	 * 需求数量
+	 */
+	private Double needquantity;
+
+    /**
+     * 单据日期，索引过滤需要
+     */
+    private Date date;
+
+	/**
+	 * 单价预算
+	 */
+	private Double unitPrice;
+
+	/**
+	 * 产品生产日期
+	 */
+	private String produceDate;
+
+    /**
+     * 封装
+     */
+    private String encapsulation;
+
+    /**
+     * 截止日期
+     */
+    private Date endDate;
+
+	public Long getUserUU() {
+		return userUU;
+	}
+
+	public void setUserUU(Long userUU) {
+		this.userUU = userUU;
+	}
+
+	public String getUserName() {
+		return userName;
+	}
+
+	public void setUserName(String userName) {
+		this.userName = userName;
+	}
+
+	public String getUserTel() {
+		return userTel;
+	}
+
+	public void setUserTel(String userTel) {
+		this.userTel = userTel;
+	}
+
+	public String getProdTitle() {
+		return prodTitle;
+	}
+
+	public void setProdTitle(String prodTitle) {
+		this.prodTitle = prodTitle;
+	}
+
+	public String getSpec() {
+		return spec;
+	}
+
+	public void setSpec(String spec) {
+		this.spec = spec;
+	}
+
+	public String getCmpCode() {
+		return cmpCode;
+	}
+
+	public void setCmpCode(String cmpCode) {
+		this.cmpCode = cmpCode;
+	}
+
+	public String getInbrand() {
+		return inbrand;
+	}
+
+	public void setInbrand(String inbrand) {
+		this.inbrand = inbrand;
+	}
+
+	public String getCurrency() {
+		return currency;
+	}
+
+	public void setCurrency(String currency) {
+		this.currency = currency;
+	}
+
+	public String getSource() {
+		return source;
+	}
+
+	public void setSource(String source) {
+		this.source = source;
+	}
+
+	public Double getNeedquantity() {
+		return needquantity;
+	}
+
+	public void setNeedquantity(Double needquantity) {
+		this.needquantity = needquantity;
+	}
+
+	public Date getDate() {
+		return date;
+	}
+
+	public void setDate(Date date) {
+		this.date = date;
+	}
+
+	public Double getUnitPrice() {
+		return unitPrice;
+	}
+
+	public void setUnitPrice(Double unitPrice) {
+		this.unitPrice = unitPrice;
+	}
+
+	public String getProduceDate() {
+		return produceDate;
+	}
+
+	public void setProduceDate(String produceDate) {
+		this.produceDate = produceDate;
+	}
+
+	public String getEncapsulation() {
+		return encapsulation;
+	}
+
+	public void setEncapsulation(String encapsulation) {
+		this.encapsulation = encapsulation;
+	}
+
+	public Date getEndDate() {
+		return endDate;
+	}
+
+	public void setEndDate(Date endDate) {
+		this.endDate = endDate;
+	}
+}

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

@@ -65,7 +65,7 @@ public class SeekPurchaseByBatch {
      * 求购数量
      */
     @Column(name = "sp_amount")
-    private Integer amount;
+    private Double amount;
 
     /**
      * 求购单价预算
@@ -157,11 +157,11 @@ public class SeekPurchaseByBatch {
         this.encapsulation = encapsulation;
     }
 
-    public Integer getAmount() {
+    public Double getAmount() {
         return amount;
     }
 
-    public void setAmount(Integer amount) {
+    public void setAmount(Double amount) {
         this.amount = amount;
     }
 

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

@@ -39,7 +39,7 @@ public interface SeekPurchaseBomService {
      * @param spIds
      * @return
      */
-    ResultMap confirmBom(Long bomId, String spIds);
+    ResultMap confirmBom(Long bomId, User user);
 
     /**
      * 分页获取bom求购列表

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

@@ -13,18 +13,22 @@ import com.uas.platform.b2c.trade.seek.dao.SeekPurchaseByBatchDao;
 import com.uas.platform.b2c.trade.seek.dao.SeekPurchaseDao;
 import com.uas.platform.b2c.trade.seek.dao.SeekPurchaseGoodsDao;
 import com.uas.platform.b2c.trade.seek.dao.SeekPurchaseOfferDao;
+import com.uas.platform.b2c.trade.seek.model.PurcInquiry;
+import com.uas.platform.b2c.trade.seek.model.PurcInquiryItem;
 import com.uas.platform.b2c.trade.seek.model.SeekPurchase;
 import com.uas.platform.b2c.trade.seek.model.SeekPurchaseBom;
 import com.uas.platform.b2c.trade.seek.model.SeekPurchaseBomList;
 import com.uas.platform.b2c.trade.seek.model.SeekPurchaseByBatch;
 import com.uas.platform.b2c.trade.seek.service.SeekPurchaseBomService;
-import com.uas.platform.b2c.trade.seek.status.Status;
 import com.uas.platform.b2c.trade.seek.utils.DateUtils;
 import com.uas.platform.b2c.trade.support.CodeType;
 import com.uas.platform.b2c.trade.support.ResultMap;
 import com.uas.platform.core.exception.IllegalOperatorException;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.persistence.criteria.PredicateUtils;
+import com.uas.platform.core.util.HttpUtil;
+import com.uas.platform.core.util.OkHttpUtils;
+import com.uas.platform.core.util.serializer.FlexJsonUtils;
 import java.math.BigDecimal;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
@@ -33,14 +37,18 @@ import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
+import net.sf.json.JSONArray;
+import okhttp3.Response;
 import org.apache.poi.hssf.usermodel.HSSFCell;
 import org.apache.poi.hssf.usermodel.HSSFDateUtil;
 import org.apache.poi.ss.usermodel.Cell;
@@ -239,7 +247,7 @@ public class SeekPurchaseBomServiceImpl implements SeekPurchaseBomService{
                 rowNum, 3);
         if (!StringUtils.isEmpty(amountValue)) {
             try {
-                Integer amount = Integer.valueOf(StringUtilB2C.replaceLineBreak(StringUtilB2C.getStr(amountValue)));
+                Double amount = Double.valueOf(StringUtilB2C.replaceLineBreak(StringUtilB2C.getStr(amountValue)));
                 seekPurchaseByBatch.setAmount(amount);
             } catch (NumberFormatException e) {
                 seekPurchaseByBatch.setAmount(null);
@@ -385,22 +393,15 @@ public class SeekPurchaseBomServiceImpl implements SeekPurchaseBomService{
     }
 
     @Override
-    public ResultMap confirmBom(Long bomId, String spIds) {
+    public ResultMap confirmBom(Long bomId, User user) {
         SeekPurchaseBom seekPurchaseBom = seekPurchaseBomDao.findOne(bomId);
-        List<SeekPurchaseByBatch> seekPurchaseByBatchList = null;
-        if (!StringUtils.isEmpty(spIds)) {
-            // 保存选中
-            seekPurchaseByBatchList = seekPurchaseByBatchDao.findBySpids(Arrays.asList(spIds.split(",")));
-        } else {
-            // 保存所有
-            seekPurchaseByBatchList = seekPurchaseByBatchDao.findByBomId(bomId);
-        }
+        PurcInquiry inquiry = new PurcInquiry();
+        List<SeekPurchaseByBatch> seekPurchaseByBatchList = seekPurchaseByBatchDao.findByBomId(bomId);
         // 商城现货的数量
         int haveGoodsCount = 0;
-        // 将临时表转换成正式表数据
-        List<SeekPurchase> seekPurchaseList = new ArrayList<>();
-        // 发布到正式表的临时数据
+        Set<PurcInquiryItem> inquiryItems = new HashSet<>();
         List<SeekPurchaseByBatch> deleteBatchList = new ArrayList<>();
+        Date endDate = new Date();
         for (SeekPurchaseByBatch batch : seekPurchaseByBatchList) {
             SeekPurchase seekPurchase = new SeekPurchase();
             Calendar now = Calendar.getInstance();
@@ -408,35 +409,66 @@ public class SeekPurchaseBomServiceImpl implements SeekPurchaseBomService{
             //Date deadlineMax = DateUtils.addTime(new Date(System.currentTimeMillis()), 90, 23, 59 ,59);
             if (!StringUtils.isEmpty(batch.getCode()) && !StringUtils.isEmpty(batch.getBrand()) && !StringUtils.isEmpty(batch.getDeadline()) && batch.getDeadline().compareTo(now.getTime()) != 1) {
                 //seekPurchase = (SeekPurchase) batch;
-                seekPurchase.setDeadline(batch.getDeadline());
-                seekPurchase.setCurrency(batch.getCurrency());
-                seekPurchase.setReleaseDate(batch.getReleaseDate());
-                seekPurchase.setCode(batch.getCode());
-                seekPurchase.setBrand(batch.getBrand());
-                seekPurchase.setAmount(batch.getAmount());
-                seekPurchase.setEncapsulation(batch.getEncapsulation());
-                seekPurchase.setUnitPrice(batch.getUnitPrice());
-                seekPurchase.setProduceDate(batch.getProduceDate());
-                seekPurchase.setBomId(batch.getBomId());
-                seekPurchase.setEnUu(seekPurchaseBom.getEnuu());
-                seekPurchase.setUu(seekPurchaseBom.getUu());
-                seekPurchase.setStatus(Status.NO_OFFER.getValue());
+                PurcInquiryItem inquiryItem = new PurcInquiryItem();
+                inquiryItem.setProdTitle(batch.getCode());
+                inquiryItem.setUserUU(user.getUserUU());
+                inquiryItem.setSource("MALL");
+                inquiryItem.setUserName(user.getUserName());
+                inquiryItem.setUserTel(user.getUserTel());
+                inquiryItem.setNeedquantity(batch.getAmount());
+                inquiryItem.setInbrand(batch.getBrand());
+                inquiryItem.setCurrency(batch.getCurrency());
+                inquiryItem.setCmpCode(batch.getCode());
+                inquiryItem.setUnitPrice(batch.getUnitPrice());
+                inquiryItem.setProduceDate(batch.getProduceDate());
+                inquiryItem.setDate(new Date());
+                inquiryItem.setEndDate(batch.getDeadline());
+                if (StringUtils.isEmpty(endDate)) {
+                    endDate = batch.getDeadline();
+                } else {
+                    if (endDate.compareTo(batch.getDeadline()) == 1) {
+                        endDate = batch.getDeadline();
+                    }
+                }
+                inquiryItem.setEncapsulation(batch.getEncapsulation());
                 // 商城现货搜索
                 List<Goods> goods = goodsDao.getGoodsByCodeAndName(seekPurchase.getCode(), seekPurchase.getBrand());
                 if (goods != null && goods.size() > 0) {
                     haveGoodsCount++;
                 }
                 deleteBatchList.add(batch);
-                seekPurchaseList.add(seekPurchase);
+                inquiryItems.add(inquiryItem);
             }
         }
-        seekPurchaseList = seekPurchasedao.save(seekPurchaseList);
-        seekPurchaseBom.setAmount((seekPurchaseBom.getAmount() == null ? 0 : seekPurchaseBom.getAmount()) + seekPurchaseList.size());
-        seekPurchaseBom.setStatus(1);
-        seekPurchaseBomDao.save(seekPurchaseBom);
+//        seekPurchaseList = seekPurchasedao.save(seekPurchaseList);
+//        seekPurchaseBom.setAmount((seekPurchaseBom.getAmount() == null ? 0 : seekPurchaseBom.getAmount()) + seekPurchaseList.size());
+//        seekPurchaseBom.setStatus(1);
+//        seekPurchaseBomDao.save(seekPurchaseBom);
         seekPurchaseByBatchDao.delete(deleteBatchList);
+        // 询价单数据插入
+        inquiry.setAmount(deleteBatchList.size());
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddsss");
+        try {
+            inquiry.setCode("MALL" + sdf.parse(sdf.format(new Date())));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        inquiry.setDate(new Date(System.currentTimeMillis()));
+        inquiry.setEndDate(endDate);
+        inquiry.setInquiryItems(inquiryItems);
+        inquiry.setEnUU(user.getEnterprise().getUu());
+        inquiry.setRecorderUU(user.getUserUU());
+        inquiry.setSourceapp("MALL");
+        inquiry.setRemark(seekPurchaseBom.getName());
+        inquiry.setInquiryItems(inquiryItems);
+        String res = "";
+        try {
+            res = HttpUtil.doPost("http://10.1.51.88:8080/inquiry/buyer/save",  FlexJsonUtils.toJsonDeep(inquiry));
+        } catch (Exception e) {
+            throw new IllegalOperatorException("发布失败");
+        }
         Map<String, Object> result = new HashMap<>();
-        result.put("successAmount", seekPurchaseList.size());
+        result.put("successAmount", inquiryItems.size());
         result.put("goodsAmount", haveGoodsCount);
         return ResultMap.success(result);
     }

src/main/webapp/resources/js/common/query/seekPurchase.js

@@ -50,6 +50,10 @@ define([ 'ngResource' ], function() {
       saveBomName: {
           url: 'seek/updateSeekPurchaseBom',
           method: 'PUT'
+      },
+      getBomDetail: {
+          url: 'http://10.1.51.88:8080/inquiry/sale/publicInquiry/detail',
+          method: 'GET'
       }
 		});
 }])

src/main/webapp/resources/js/usercenter/controllers/forstore/bom_detail_ctrl.js

@@ -181,31 +181,6 @@ define(['app/app'], function (app) {
                         $scope.applyObj[attr] = attr === 'currency' ? 'RMB' : '';
                     }
                 }
-                // 发布求购
-                $scope.release = function () {
-                    // 校验
-                    if ($scope.checkAll()) {
-                        seekPurchase.saveOneSeekPurchase($scope.applyObj,
-                            function (data) {
-                                $scope.showUseFlag = false;
-                                $scope.seekPurchaseTableParams.reload();
-                                $scope.emptyForm();
-                                toaster.pop('success', '求购发布成功');
-                            }, function (res) {
-                                toaster.pop('error', res.data);
-                            });
-                    } else {
-                        if (!$scope.validObj.code) {
-                            toaster.pop('error', '型号不能为空');
-                        } else if (!$scope.validObj.brand) {
-                            toaster.pop('error', '品牌不能为空');
-                        } else if (!$scope.validObj.deadline) {
-                            toaster.pop('error', '截止日期不能为空');
-                        } else if (!$scope.validObj.amount || !$scope.validObj.unitPrice) {
-                            toaster.pop('error', '请输入正确的数值');
-                        }
-                    }
-                }
 
                 // 立即购买
                 $scope.purchase = function (go, index) {
@@ -246,21 +221,21 @@ define(['app/app'], function (app) {
                     total: 0,
                     getData: function ($defer, params) {
                         const param = BaseService.parseParams(params.url());
-                        param.isMallGoods = $scope.isMallGoods;
-                        param.deadline = $scope.deadline;
-                        param.keyWord = $scope.keyWord;
-                        param.status = $scope.searchStatus;
-                        param.bomId = $stateParams.id;
-                        param.minReleaseDate = $scope.startDate
-                            ? $scope.startDate.getTime() : null;
-                        param.maxReleaseDate = $scope.endDate ? $scope.endDate.getTime()
-                            : null;
+                        // param.isMallGoods = $scope.isMallGoods;
+                        // param.deadline = $scope.deadline;
+                        // param.keyWord = $scope.keyWord;
+                        // param.status = $scope.searchStatus;
+                        param.id = $stateParams.id;
+                        // param.minReleaseDate = $scope.startDate
+                        //     ? $scope.startDate.getTime() : null;
+                        // param.maxReleaseDate = $scope.endDate ? $scope.endDate.getTime()
+                        //     : null;
                       if ($scope.isSearch) {
                         param.page = 1;
                         params.page(1);
                         $scope.isSearch = false;
                       }
-                        seekPurchase.getUserSeekPageInfo(param, function (data) {
+                        seekPurchase.getBomDetail(param, function (data) {
                             params.total(data.totalElements);
                             $defer.resolve(data.content);
                             $scope.seekListData = data;

src/main/webapp/resources/js/usercenter/controllers/forstore/seek_purchase_ctrl.js

@@ -45,14 +45,15 @@ define(['app/app'], function (app) {
             total: 0,
             getData: function ($defer, params) {
               const param = BaseService.parseParams(params.url());
-              param.userUU = $scope.userInfo.userUU;
               if ($scope.userInfo.enterprise) {
                 param.enUU = $scope.userInfo.enterprise.uu;
+              } else {
+                param.recorderUU = $scope.userInfo.userUU;
               }
               // param.isMallGoods = $scope.isMallGoods;
               // param.deadline = $scope.deadline;
               param.keyword = $scope.keyWord;
-              param.state = $scope.searchStatus;
+              param._state = "agreed";
               param.overdue = $scope.overdue;
               param.fromDate = $scope.startDate
                   ? $scope.startDate.getTime() : null;
@@ -83,9 +84,10 @@ define(['app/app'], function (app) {
             total: 0,
             getData: function ($defer, params) {
               const param = BaseService.parseParams(params.url());
-              param.userUU = $scope.userInfo.userUU;
-              if ($scope.userInfo.enterprise.uu) {
+              if ($scope.userInfo.enterprise) {
                 param.enUU = $scope.userInfo.enterprise.uu;
+              } else {
+                param.recorderUU = $scope.userInfo.userUU;
               }
               // param.minReleaseDate = $scope.bomSearch.startDate
               //     ? $scope.bomSearch.startDate.getTime() : null;
@@ -270,9 +272,11 @@ define(['app/app'], function (app) {
             if ($scope.checkAll()) {
               var inquiry = {};
               var inquiryItem = {};
-              inquiry.recorderUU = $scope.userInfo.userUU;
+
               if ($scope.userInfo.enterprise) {
                 inquiry.enUU = $scope.userInfo.enterprise.uu;
+              } else {
+                inquiry.recorderUU = $scope.userInfo.userUU;
               }
               inquiry.code = "MALL" + $filter('date')(new Date, 'yyyyMMddsss');
               inquiry.date = new Date();

src/main/webapp/resources/view/usercenter/forstore/seekPurchase.html

@@ -961,7 +961,7 @@
                         <div>共 <span class="blue-text" ng-bind="bom.amount || 0"></span> 个产品<!--，<span class="red-text" ng-bind="bom.offerAmount || 0">10</span> 个有报价，<span class="red-text" ng-bind="bom.goodsAmount || 0">7</span> 个有现货--></div>
                         <div ng-bind="bom.releaseDate | date:'yyyy-MM-dd HH:mm:ss'"></div>
                     </div>
-                    <a href="user#/bomDetail/{{bom.bomId}}" class="fr">查看详情</a>
+                    <a href="user#/bomDetail/{{bom.id}}" class="fr">查看详情</a>
                 </td>
             </tr>
             </tbody>