Merge remote-tracking branch 'origin/feature-wanlida-0115' into release-201903-wangcz

# Conflicts:
#	src/main/resources/ptest/sys.properties

db/ddl.sql

@@ -218,4 +218,10 @@ alter table purc$apcheckitem add column pai_payment double COMMENT '付款金额
 alter table purc$apcheckitem
   add column pai_send_id BIGINT COMMENT '送货单明细id',
   add column pai_send_qty DOUBLE COMMENT '送货数量',
-  add column pai_send_price DOUBLE COMMENT '送货单价';
+  add column pai_send_price DOUBLE COMMENT '送货单价';
+
+-- date: 2019-01-15 16:51
+-- author: huj
+-- content: 漳州万利达需求新增物料承认状态
+alter table `purc$orderitems`
+  add column pd_prmaterial VARCHAR(255)  comment '物料承认状态';

src/main/java/com/uas/platform/b2b/controller/SaleOrderController.java

@@ -569,6 +569,7 @@ public class SaleOrderController {
 		if (distribute != null && !CollectionUtils.isEmpty(distribute.getDistribute())) {
 			filter.setDistribute(distribute.getDistribute());
 		}
+		purchaseOrderService.findEndOrders(pageInfo, filter);
 		return purchaseOrderService.findEndOrders(pageInfo, filter);
 	}
 

src/main/java/com/uas/platform/b2b/erp/model/PurchaseDetail.java

@@ -72,6 +72,17 @@ public class PurchaseDetail {
 	//旧料规格
 	private String pr_oldspec;
 
+	//物料承认状态
+	private String pd_prmaterial;
+
+	public String getPd_prmaterial() {
+		return pd_prmaterial;
+	}
+
+	public void setPd_prmaterial(String pd_prmaterial) {
+		this.pd_prmaterial = pd_prmaterial;
+	}
+
 	public String getPr_oldcode() {
 		return pr_oldcode;
 	}
@@ -366,6 +377,7 @@ public class PurchaseDetail {
 		item.setProdOldCode(this.pr_oldcode);
 		item.setProdOldTitle(this.pr_oldname);
 		item.setProdOldSpec(this.pr_oldspec);
+		item.setPrmaterial(this.pd_prmaterial);
 		if (!CollectionUtils.isEmpty(this.attaches)) {
 			Set<com.uas.platform.b2b.model.Attach> b2bAttaches = new HashSet<com.uas.platform.b2b.model.Attach>();
 			for(Attach attach : this.attaches) {

src/main/java/com/uas/platform/b2b/model/PurcOrderInfoItem.java

@@ -296,6 +296,20 @@ public class PurcOrderInfoItem extends AbstractRedDotKey {
 	@Column(name = "pd_prodoldspec")
 	private String prodOldSpec;
 
+	/**
+	 * 物料承认状态(漳州万利达需求)
+	 */
+	@Column(name = "pd_prmaterial")
+	private String prmaterial;
+
+	public String getPrmaterial() {
+		return prmaterial;
+	}
+
+	public void setPrmaterial(String prmaterial) {
+		this.prmaterial = prmaterial;
+	}
+
 	public String getProdOldCode() {
 		return prodOldCode;
 	}

src/main/java/com/uas/platform/b2b/model/PurchaseOrderAllItem.java

@@ -299,6 +299,12 @@ public class PurchaseOrderAllItem extends AbstractRedDotKey {
 	@Column(name = "pd_prodoldspec")
 	private String prodOldSpec;
 
+	/**
+	 * 物料承认状态(漳州万利达需求)
+	 */
+	@Column(name = "pd_prmaterial")
+	private String prmaterial;
+
 	/**
 	 * 是否在变更中
 	 */
@@ -311,6 +317,14 @@ public class PurchaseOrderAllItem extends AbstractRedDotKey {
 	@Transient
 	private Double latestReplyQty;
 
+	public String getPrmaterial() {
+		return prmaterial;
+	}
+
+	public void setPrmaterial(String prmaterial) {
+		this.prmaterial = prmaterial;
+	}
+
 	public String getProdOldCode() {
 		return prodOldCode;
 	}

src/main/java/com/uas/platform/b2b/model/PurchaseOrderDoneItem.java

@@ -222,6 +222,11 @@ public class PurchaseOrderDoneItem extends AbstractOrderProduct {
 	@Column(name = "pd_prodoldspec")
 	private String prodOldSpec;
 
+	/**
+	 * 物料承认状态(漳州万利达需求)
+	 */
+	@Column(name = "pd_prmaterial")
+	private String prmaterial;
 
 	/**
 	 * 最后一次回复数量
@@ -229,6 +234,14 @@ public class PurchaseOrderDoneItem extends AbstractOrderProduct {
 	@Transient
 	private Double latestReplyQty;
 
+	public String getPrmaterial() {
+		return prmaterial;
+	}
+
+	public void setPrmaterial(String prmaterial) {
+		this.prmaterial = prmaterial;
+	}
+
 	public String getProdOldCode() {
 		return prodOldCode;
 	}

src/main/java/com/uas/platform/b2b/model/PurchaseOrderEnd.java

@@ -215,48 +215,6 @@ public class PurchaseOrderEnd {
 	@Column(name = "pu_custname")
 	private String custName; // 客户名称。
 
-	/**
-	 * 替代料号
-	 */
-	@Column(name = "pd_repprodcode")
-	private String repProdCode;
-
-	/**
-	 * 替代料名称
-	 */
-	@Column(name = "pd_repprodtitle")
-	private String repProdTitle;
-
-	/**
-	 * 替代料规格
-	 */
-	@Column(name = "pd_repprodspec")
-	private String repProdSpec;
-
-	public String getRepProdCode() {
-		return repProdCode;
-	}
-
-	public void setRepProdCode(String repProdCode) {
-		this.repProdCode = repProdCode;
-	}
-
-	public String getRepProdTitle() {
-		return repProdTitle;
-	}
-
-	public void setRepProdTitle(String repProdTitle) {
-		this.repProdTitle = repProdTitle;
-	}
-
-	public String getRepProdSpec() {
-		return repProdSpec;
-	}
-
-	public void setRepProdSpec(String repProdSpec) {
-		this.repProdSpec = repProdSpec;
-	}
-
 	public String getPurpose() {
 		return purpose;
 	}

src/main/java/com/uas/platform/b2b/model/PurchaseOrderEndItem.java

@@ -151,6 +151,31 @@ public class PurchaseOrderEndItem extends AbstractOrderProduct {
 	@Column(name = "pd_returnqty")
 	private Double returnQty;
 
+	/**
+	 * 替代料号
+	 */
+	@Column(name = "pd_repprodcode")
+	private String repProdCode;
+
+	/**
+	 * 替代料名称
+	 */
+	@Column(name = "pd_repprodtitle")
+	private String repProdTitle;
+
+	/**
+	 * 替代料规格
+	 */
+	@Column(name = "pd_repprodspec")
+	private String repProdSpec;
+
+
+	/**
+	 * 物料承认状态(漳州万利达需求)
+	 */
+	@Column(name = "pd_prmaterial")
+	private String prmaterial;
+
 	/**
 	 * 关键词查询相关
 	 */
@@ -163,6 +188,14 @@ public class PurchaseOrderEndItem extends AbstractOrderProduct {
 	@Transient
 	private Double latestReplyQty;
 
+	public String getPrmaterial() {
+		return prmaterial;
+	}
+
+	public void setPrmaterial(String prmaterial) {
+		this.prmaterial = prmaterial;
+	}
+
 	public Long getId() {
 		return id;
 	}
@@ -179,6 +212,30 @@ public class PurchaseOrderEndItem extends AbstractOrderProduct {
 		this.number = number;
 	}
 
+	public String getRepProdCode() {
+		return repProdCode;
+	}
+
+	public void setRepProdCode(String repProdCode) {
+		this.repProdCode = repProdCode;
+	}
+
+	public String getRepProdTitle() {
+		return repProdTitle;
+	}
+
+	public void setRepProdTitle(String repProdTitle) {
+		this.repProdTitle = repProdTitle;
+	}
+
+	public String getRepProdSpec() {
+		return repProdSpec;
+	}
+
+	public void setRepProdSpec(String repProdSpec) {
+		this.repProdSpec = repProdSpec;
+	}
+
 	@Override
 	public Long getProductId() {
 		return productId;

src/main/java/com/uas/platform/b2b/model/PurchaseOrderReceivedItem.java

@@ -144,6 +144,12 @@ public class PurchaseOrderReceivedItem extends AbstractOrderProduct {
 	@Column(name = "pd_returnqty")
 	private Double returnQty;
 
+	/**
+	 * 物料承认状态(漳州万利达需求)
+	 */
+	@Column(name = "pd_prmaterial")
+	private String prmaterial;
+
 	/**
 	 * 关键词查询相关
 	 */
@@ -156,6 +162,14 @@ public class PurchaseOrderReceivedItem extends AbstractOrderProduct {
 	@Transient
 	private Double latestReplyQty;
 
+	public String getPrmaterial() {
+		return prmaterial;
+	}
+
+	public void setPrmaterial(String prmaterial) {
+		this.prmaterial = prmaterial;
+	}
+
 	public Long getId() {
 		return id;
 	}

src/main/java/com/uas/platform/b2b/model/PurchaseOrderTodoItem.java

@@ -212,12 +212,26 @@ public class PurchaseOrderTodoItem extends AbstractOrderProduct {
 	@Column(name = "pd_prodoldspec")
 	private String prodOldSpec;
 
+	/**
+	 * 物料承认状态(漳州万利达需求)
+	 */
+	@Column(name = "pd_prmaterial")
+	private String prmaterial;
+
     /**
      * 最后一次回复数量
      */
 	@Transient
 	private Double latestReplyQty;
 
+	public String getPrmaterial() {
+		return prmaterial;
+	}
+
+	public void setPrmaterial(String prmaterial) {
+		this.prmaterial = prmaterial;
+	}
+
 	public String getProdOldCode() {
 		return prodOldCode;
 	}

src/main/java/com/uas/platform/b2b/openapi/controller/UsoftController.java

@@ -1,5 +1,6 @@
 package com.uas.platform.b2b.openapi.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.uas.platform.b2b.openapi.model.*;
 import com.uas.platform.b2b.openapi.service.UsoftService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,9 +41,11 @@ public class UsoftController {
      *      订单id
      * @return
      */
-    @RequestMapping(value = "/order/item/batch", method = RequestMethod.GET)
-    public List<UsoftOrderItem> getUsoftOrderItemsBatch(String orderIds) {
-        return usoftService.getUsoftOrderItemsBatch(orderIds);
+    @RequestMapping(value = "/order/item/batch", method = RequestMethod.POST)
+    public List<UsoftOrderItemBatch> getUsoftOrderItemsBatch(@RequestBody String orderIds) {
+        String ids = JSON.parseObject(orderIds).getString("orderIds");
+
+        return usoftService.getUsoftOrderItemsBatch(ids);
     }
 
     /**
@@ -88,9 +91,10 @@ public class UsoftController {
      *      验收单id字符串
      * @return
      */
-    @RequestMapping(value = "/accept/item/batch", method = RequestMethod.GET)
-    public List<UsoftAcceptItem> getUsoftAcceptItemsBatch(String acceptIds) {
-        return usoftService.getUsoftAcceptItemsBatch(acceptIds);
+    @RequestMapping(value = "/accept/item/batch", method = RequestMethod.POST)
+    public List<UsoftAcceptItemBatch> getUsoftAcceptItemsBatch(@RequestBody String acceptIds) {
+        String ids = JSON.parseObject(acceptIds).getString("acceptIds");
+        return usoftService.getUsoftAcceptItemsBatch(ids);
     }
 
     /**

src/main/java/com/uas/platform/b2b/openapi/dao/UsoftOrderItemBatchDao.java

@@ -0,0 +1,22 @@
+package com.uas.platform.b2b.openapi.dao;
+
+import com.uas.platform.b2b.openapi.model.UsoftOrderItemBatch;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+
+/**
+ * @Author: huj
+ * @Date: Created in 18:07 2019/01/09.
+ */
+@Repository
+public interface UsoftOrderItemBatchDao extends JpaSpecificationExecutor<UsoftOrderItemBatch>, JpaRepository<UsoftOrderItemBatch, Long> {
+
+    @Query(value = "select u from UsoftOrderItemBatch u where u.orderId in :orderIds")
+    List<UsoftOrderItemBatch> findByIds(@Param("orderIds") List<Long> orderIds);
+}

src/main/java/com/uas/platform/b2b/openapi/model/UsoftAcceptItemBatch.java

@@ -0,0 +1,137 @@
+package com.uas.platform.b2b.openapi.model;
+
+/**
+ * @Author: huj
+ * @Date: Created in 10:30 2019/01/10.
+ */
+public class UsoftAcceptItemBatch {
+    private Long id;
+
+    private String orderCode;
+
+    private String title;
+
+    private String code;
+
+    private String cmpcode;
+
+    private String spec;
+
+    private String brand;
+
+    private Double price;
+
+    private String unit;
+
+    private Double checkqty;
+
+    private Double amount;
+
+    private String batchCode;
+
+    private Long acceptId;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getOrderCode() {
+        return orderCode;
+    }
+
+    public void setOrderCode(String orderCode) {
+        this.orderCode = orderCode;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getCmpcode() {
+        return cmpcode;
+    }
+
+    public void setCmpcode(String cmpcode) {
+        this.cmpcode = cmpcode;
+    }
+
+    public String getSpec() {
+        return spec;
+    }
+
+    public void setSpec(String spec) {
+        this.spec = spec;
+    }
+
+    public String getBrand() {
+        return brand;
+    }
+
+    public void setBrand(String brand) {
+        this.brand = brand;
+    }
+
+    public Double getPrice() {
+        return price;
+    }
+
+    public void setPrice(Double price) {
+        this.price = price;
+    }
+
+    public String getUnit() {
+        return unit;
+    }
+
+    public void setUnit(String unit) {
+        this.unit = unit;
+    }
+
+    public Double getCheckqty() {
+        return checkqty;
+    }
+
+    public void setCheckqty(Double checkqty) {
+        this.checkqty = checkqty;
+    }
+
+    public Double getAmount() {
+        return amount;
+    }
+
+    public void setAmount(Double amount) {
+        this.amount = amount;
+    }
+
+    public String getBatchCode() {
+        return batchCode;
+    }
+
+    public void setBatchCode(String batchCode) {
+        this.batchCode = batchCode;
+    }
+
+    public Long getAcceptId() {
+        return acceptId;
+    }
+
+    public void setAcceptId(Long acceptId) {
+        this.acceptId = acceptId;
+    }
+}

src/main/java/com/uas/platform/b2b/openapi/model/UsoftOrderItemBatch.java

@@ -0,0 +1,138 @@
+package com.uas.platform.b2b.openapi.model;
+
+import com.alibaba.fastjson.annotation.JSONField;
+
+import javax.persistence.*;
+
+/**
+ * @Author: huj
+ * @Date: Created in 18:03 2019/01/09.
+ */
+@Table(name = "purc$orderitems")
+@Entity
+public class UsoftOrderItemBatch {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "pd_id")
+    private Long id;
+
+    @Column(name = "pr_code")
+    private String code;
+
+    @Column(name = "pr_title")
+    private String title;
+
+    @Column(name = "pr_cmpcode")
+    private String cmpcode;
+
+    @Column(name = "pr_spec", length = 1000)
+    private String spec;
+
+    @Column(name = "pd_price")
+    private Double price;
+
+    @Column(name = "pd_taxrate")
+    private Float rate;
+
+    @Column(name = "pd_qty")
+    private Double quantity;
+
+    @Column(name = "pr_unit")
+    private String unit;
+
+    @Column(name = "pd_delivery")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private String delivery;
+
+    @Column(name = "pd_puid")
+    private Long orderId;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getCmpcode() {
+        return cmpcode;
+    }
+
+    public void setCmpcode(String cmpcode) {
+        this.cmpcode = cmpcode;
+    }
+
+    public String getSpec() {
+        return spec;
+    }
+
+    public void setSpec(String spec) {
+        this.spec = spec;
+    }
+
+    public Double getPrice() {
+        return price;
+    }
+
+    public void setPrice(Double price) {
+        this.price = price;
+    }
+
+    public Float getRate() {
+        return rate;
+    }
+
+    public void setRate(Float rate) {
+        this.rate = rate;
+    }
+
+    public Double getQuantity() {
+        return quantity;
+    }
+
+    public void setQuantity(Double quantity) {
+        this.quantity = quantity;
+    }
+
+    public String getUnit() {
+        return unit;
+    }
+
+    public void setUnit(String unit) {
+        this.unit = unit;
+    }
+
+    public String getDelivery() {
+        return delivery;
+    }
+
+    public void setDelivery(String delivery) {
+        this.delivery = delivery;
+    }
+
+    public Long getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(Long orderId) {
+        this.orderId = orderId;
+    }
+}

src/main/java/com/uas/platform/b2b/openapi/service/UsoftService.java

@@ -36,7 +36,7 @@ public interface UsoftService {
      *      订单id
      * @return
      */
-    List<UsoftOrderItem> getUsoftOrderItemsBatch(String orderIds);
+    List<UsoftOrderItemBatch> getUsoftOrderItemsBatch(String orderIds);
 
     /**
      * 根据卖方uu获取验收单数据
@@ -64,7 +64,7 @@ public interface UsoftService {
      *      验收单id字符串
      * @return
      */
-    List<UsoftAcceptItem> getUsoftAcceptItemsBatch(String acceptIds);
+    List<UsoftAcceptItemBatch> getUsoftAcceptItemsBatch(String acceptIds);
 
     /**
      * 获取白名单用户数据

src/main/java/com/uas/platform/b2b/openapi/service/impl/UsoftServiceImpl.java

@@ -3,6 +3,7 @@ package com.uas.platform.b2b.openapi.service.impl;
 import com.uas.platform.b2b.dao.CommonDao;
 import com.uas.platform.b2b.dao.EnterpriseDao;
 import com.uas.platform.b2b.model.Enterprise;
+import com.uas.platform.b2b.openapi.dao.UsoftOrderItemBatchDao;
 import com.uas.platform.b2b.openapi.dao.UsoftWhitelistDao;
 import com.uas.platform.b2b.openapi.model.*;
 import com.uas.platform.b2b.openapi.service.TradingDataService;
@@ -16,10 +17,7 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 import java.sql.Date;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 /**
  * @Author: huj
@@ -40,6 +38,9 @@ public class UsoftServiceImpl implements UsoftService {
     @Autowired
     EnterpriseDao enterpriseDao;
 
+    @Autowired
+    UsoftOrderItemBatchDao usoftOrderItemBatchDao;
+
     /**
      * 根据卖方uu获取订单数据
      *
@@ -89,18 +90,18 @@ public class UsoftServiceImpl implements UsoftService {
      * @return
      */
     @Override
-    public List<UsoftOrderItem> getUsoftOrderItemsBatch(String orderIds) {
-        String sql = "SELECT pd_id id,pd_price price,pd_taxrate rate,pd_qty quantity,pr_unit unit,pd_puid orderId,"
-                + "pd_delivery  delivery from purc$orderitems WHERE pd_puid in (" + orderIds + ")";
-        List<UsoftOrderItem> orderItems = commonDao.query(sql, UsoftOrderItem.class);
-        if (!CollectionUtils.isEmpty(orderItems)) {
-            orderItems.forEach( orderItem -> {
-                Product product = commonDao.queryBean("select pr_code code,pr_title title,pr_cmpcode cmpcode,"
-                        + "pr_spec spec from purc$orderitems WHERE pd_id = " + orderItem.getId(), Product.class);
-                orderItem.setProduct(product);
-            });
+    public List<UsoftOrderItemBatch> getUsoftOrderItemsBatch(String orderIds) {
+        if (!StringUtils.isEmpty(orderIds)) {
+            String[] split = orderIds.split(",");
+            List<Long> ids = new ArrayList<>();
+            if (split != null) {
+                for (String id : split) {
+                    ids.add(Long.parseLong(id));
+                }
+            }
+            return usoftOrderItemBatchDao.findByIds(ids);
         }
-        return orderItems;
+        return null;
     }
 
     /**
@@ -154,21 +155,15 @@ public class UsoftServiceImpl implements UsoftService {
      * @return
      */
     @Override
-    public List<UsoftAcceptItem> getUsoftAcceptItemsBatch(String acceptIds) {
-        String sql = "SELECT pai_id id,pu_code orderCode,a.pr_brand brand,a.pr_unit unit,pai_orderprice price, pai_paid acceptId,"
+    public List<UsoftAcceptItemBatch> getUsoftAcceptItemsBatch(String acceptIds) {
+        String sql = "SELECT a.pr_code code,a.pr_title title,a.pr_cmpcode cmpcode,a.pr_spec spec,pai_id id,pu_code orderCode,a.pr_brand brand,a.pr_unit unit,pai_orderprice price, pai_paid acceptId,"
                 + "(case pa_currency when 'RMB' then pai_qty * pai_orderprice when 'USD' then pai_qty * pai_orderprice * "
                 + ErpRate.USD_RATE + " when 'HKD' then pai_qty * pai_orderprice * " + ErpRate.HKD_RATE
                 + " end) amount,pai_qty checkqty,pai_batchcode batchCode from purc$acceptitem a "
                 + "LEFT JOIN purc$orderitems on pai_pdid = pd_id LEFT JOIN purc$orders on pd_puid = pu_id LEFT JOIN purc$accept"
                 + " on pai_paid = pa_id where pai_paid in (" + acceptIds + ")";
-        List<UsoftAcceptItem> acceptItems = commonDao.query(sql, UsoftAcceptItem.class);
-        if (!CollectionUtils.isEmpty(acceptItems)) {
-            acceptItems.forEach( acceptItem -> {
-                Product product = commonDao.queryBean("select pr_code code,pr_title title,pr_cmpcode cmpcode,"
-                        + "pr_spec spec from purc$acceptitem WHERE pai_id = " + acceptItem.getId(), Product.class);
-                acceptItem.setProduct(product);
-            });
-        }
+        List<UsoftAcceptItemBatch> acceptItems = commonDao.query(sql, UsoftAcceptItemBatch.class);
+
         return acceptItems;
     }
 

src/main/webapp/resources/tpl/index/sale/order_detail.html

@@ -146,6 +146,7 @@
 							<div class="text-overflow" title="{{::item.product.title}}">
 								<span ng-bind="::item.product.title"></span> </div>
 							<div class="text-muted text-over" ng-bind="::item.product.spec" title="{{::item.product.spec}}"></div>
+							<div class="text-bole text-inverse text-flow" ng-if="item.prmaterial" ><b>承认状态：</b><span ng-bind="::item.prmaterial"></span></div>
 							<div class="text-bole text-inverse text-flow" ng-if="item.prodOldCode" ><b>旧料编号：</b><span ng-bind="::item.prodOldCode"></span></div>
 							<div class="text-bold text-inverse text-flow" ng-if="item.prodOldTitle" ><b>旧料名称：</b><span ng-bind="::item.prodOldTitle"></span></div>
 							<div class="text-bold text-inverse text-flow" ng-if="item.prodOldSpec" ><b>旧料规格：</b><span ng-bind="::item.prodOldSpec"></span></div>