Merge remote-tracking branch 'origin/feature-material-wangcz' into feature-material-wangcz

src/main/java/com/uas/platform/b2c/core/constant/EncodingRulesConstant.java

@@ -204,5 +204,5 @@ public class EncodingRulesConstant {
 	/**
 	 * 出入库记录 编号 + 8位时间戳 + 8位编码
 	 */
-	public static final String INOUTBOUND_NUM = "IOB_NUMBER";
+	public static final String INOUTBOUND_NUM = "IOB_TIMESTAP_NUMBER";
 }

src/main/java/com/uas/platform/b2c/logistics/controller/InvoiceFPurchaseController.java

@@ -1,25 +1,7 @@
 package com.uas.platform.b2c.logistics.controller;
 
-import com.alibaba.fastjson.JSONObject;
-import com.uas.platform.b2c.logistics.model.InvoiceFPurchase;
-import com.uas.platform.b2c.logistics.service.InvoiceFPurchaseService;
-import com.uas.platform.b2c.core.support.SystemSession;
-import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
-import com.uas.platform.b2c.core.utils.FastjsonUtils;
-import com.uas.platform.b2c.core.utils.StringUtilB2C;
-import com.uas.platform.b2c.trade.support.ResultMap;
-import com.uas.platform.core.logging.BufferedLoggerManager;
-import com.uas.platform.core.model.PageInfo;
-import com.uas.platform.core.model.PageParams;
-import com.uas.platform.core.model.Status;
-import com.wordnik.swagger.annotations.ApiOperation;
-import com.wordnik.swagger.annotations.ApiParam;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.*;
 
-import javax.management.OperationsException;
-import java.util.List;
 
 /**
  * The type InvoiceFPurchase controller.
@@ -27,10 +9,4 @@ import java.util.List;
 @RestController
 @RequestMapping("/trade")
 public class InvoiceFPurchaseController {
-
-	@Autowired
-	private InvoiceFPurchaseService inFpuService;
-	
-	private static final UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
-
 }

src/main/java/com/uas/platform/b2c/logistics/model/Invoice.java

@@ -782,6 +782,9 @@ public class Invoice extends Document implements Serializable {
         this.jsonSpAddress = fPurchase.getJsonSpAddress();
         this.jsonSdAddress = fPurchase.getJsonSdAddress();
         this.logistics = fPurchase.getLogistics();
+        if (this.logistics != null) {
+            this.logistics.setId(null);
+        }
         this.createtime = fPurchase.getCreattime();
         this.status = fPurchase.getStatus();
         this.currency = fPurchase.getCurrencyName();
@@ -815,6 +818,9 @@ public class Invoice extends Document implements Serializable {
         this.jsonSpAddress = iOrder.getJsonSpAddress();
         this.jsonSdAddress = iOrder.getJsonSdAddress();
         this.logistics = iOrder.getLogistics();
+        if (this.logistics != null) {
+            this.logistics.setId(null);
+        }
         this.createtime = iOrder.getCreattime();
         this.status = iOrder.getStatus();
         this.currency = iOrder.getCurrency();

src/main/java/com/uas/platform/b2c/logistics/service/InvoiceFOrderDetailService.java

@@ -6,13 +6,4 @@ import com.uas.platform.b2c.logistics.model.InvoiceFOrderDetail;
  * The interface InvoiceFOrderDetail service.
  */
 public interface InvoiceFOrderDetailService {
-
-	/**
-	 * 保存出货单明细信息
-	 *
-	 * @param inForD 要保存的InvoiceFOrderDetail对象
-	 * @return InvoiceFOrderDetail 返回保存后的对象
-	 */
-	public InvoiceFOrderDetail save(InvoiceFOrderDetail inForD);
-	
 }

src/main/java/com/uas/platform/b2c/logistics/service/InvoiceFPurchaseDetailService.java

@@ -6,22 +6,5 @@ import com.uas.platform.b2c.logistics.model.InvoiceFPurchaseDetail;
  * The interface InvoiceFPurchaseDetail service.
  */
 public interface InvoiceFPurchaseDetailService {
-
-	/**
-	 * 保存发货单明细信息
-	 *
-	 * @param inFpuD the inFpuD 要保存的对象
-	 * @return InvoiceFPurchaseDetail 返回保存后的对象
-	 */
-	public InvoiceFPurchaseDetail save(InvoiceFPurchaseDetail inFpuD);
-
-	/**
-	 * 2016年11月11日 上午11:26:36
-	 * @author yujia  取消发货单的明细
-	 *
-	 * @param inFpuD the inFpuD 要取消的InvoiceFPurchaseDetail对象
-	 *
-	 */
-	public void cancleInvoiceFPurchaseDetail(InvoiceFPurchaseDetail inFpuD) ;
 	
 }

src/main/java/com/uas/platform/b2c/logistics/service/impl/InvoiceFOrderDetailServiceImpl.java

@@ -9,13 +9,4 @@ import com.uas.platform.b2c.logistics.service.InvoiceFOrderDetailService;
 
 @Service
 public class InvoiceFOrderDetailServiceImpl implements InvoiceFOrderDetailService {
-
-	@Autowired
-	private InvoiceFOrderDetailDao inForDDao;
-	
-	@Override
-	public InvoiceFOrderDetail save(InvoiceFOrderDetail inForD) {
-		return inForDDao.save(inForD);
-	}
-
 }

src/main/java/com/uas/platform/b2c/logistics/service/impl/InvoiceFOrderServiceImpl.java

@@ -6,5 +6,4 @@ import org.springframework.stereotype.Service;
 
 @Service
 public class InvoiceFOrderServiceImpl implements InvoiceFOrderService {
-
 }

src/main/java/com/uas/platform/b2c/logistics/service/impl/InvoiceFPurchaseDetailServiceImpl.java

@@ -12,39 +12,4 @@ import org.springframework.stereotype.Service;
 
 @Service
 public class InvoiceFPurchaseDetailServiceImpl implements InvoiceFPurchaseDetailService {
-
-	@Autowired
-	private InvoiceFPurchaseDetailDao inFpuDDao;
-	
-	@Override
-	public InvoiceFPurchaseDetail save(InvoiceFPurchaseDetail inFpuD) {
-		return inFpuDDao.save(inFpuD);
-	}
-
-	@Override
-	public void cancleInvoiceFPurchaseDetail(InvoiceFPurchaseDetail inFpuD) {
-		if(inFpuD == null) {
-			return ;
-		}
-		Long userUU = SystemSession.getUser().getUserUU();
-		inFpuD.setStatus(Status.UNAVAILABLE_PERSONAL.value());
-		InvoiceFPurchase invoiceFPurchase = inFpuD.getInvoiceFPurchase();
-		invoiceFPurchase.setNumber(NumberUtil.sub(invoiceFPurchase.getNumber(), inFpuD.getNumber()));
-		invoiceFPurchase.setPrice(NumberUtil.sub(invoiceFPurchase.getPrice(), inFpuD.getPrice()));
-		invoiceFPurchase.setEnsurePrice(NumberUtil.sub(invoiceFPurchase.getEnsurePrice(), inFpuD.getEnsurePrice()));
-		invoiceFPurchase.setTaxes(NumberUtil.sub(invoiceFPurchase.getTaxes(), inFpuD.getTaxes()));
-		boolean isAllCancle = true;
-		for (InvoiceFPurchaseDetail detail : invoiceFPurchase.getInvoiceFPurchaseDetails()) {
-			if(Status.UNAVAILABLE_PERSONAL.value() != detail.getStatus().intValue()
-					&& Status.UNAVAILABLE_PERSONAL.value() != detail.getStatus().intValue()) {
-				isAllCancle = false;
-				break;
-			}
-		}
-		if(isAllCancle) {
-			invoiceFPurchase.setStatusUnAvailablePersonal(userUU);
-		}
-		inFpuDDao.save(inFpuD);	
-	}
-
 }

src/main/java/com/uas/platform/b2c/logistics/service/impl/InvoiceServiceImpl.java

@@ -660,7 +660,12 @@ public class InvoiceServiceImpl implements InvoiceService {
             }
             // 采购入库
             Set<InOutboundDetail> outboundDetails = inOutboundDetailService.produceInOutboundDetailByInvoiceDetail(invoiceDetails);
-            commodityInOutboundService.saveCommodityInOutbound(outboundDetails, InOutBoundType.PURCHASE_INBOUND, order);
+            CommodityInOutbound commodityInOutbound = commodityInOutboundService.saveCommodityInOutbound(outboundDetails, InOutBoundType.PURCHASE_INBOUND, order);
+            if (commodityInOutbound != null) {
+                commodityInOutbound.setAssociateInvoiceId(invoice.getId());
+                commodityInOutbound.setAssociateInvoiceid(invoice.getInvoiceid());
+                commodityInOutboundService.save(commodityInOutbound);
+            }
             invoiceDao.save(invoice);
 
             return ResultMap.success(null);
@@ -862,9 +867,7 @@ public class InvoiceServiceImpl implements InvoiceService {
             orderid = order.getOrderid();
             orderId = order.getId();
         }
-        String purchaseid = purchase.getPurchaseid();
-        Long purchaseId = purchase.getId();
-        CommodityInOutbound commodityInOutbound = commodityInOutboundService.sellOutBound(inFpu, orderid, orderId, purchaseid, purchaseId);
+        CommodityInOutbound commodityInOutbound = commodityInOutboundService.sellOutBound(inFpu, orderid, orderId, purchase);
         if (commodityInOutbound != null) {
             commodityInOutboundService.save(commodityInOutbound);
         }

src/main/java/com/uas/platform/b2c/prod/commodity/model/InOutboundDetail.java

@@ -105,6 +105,12 @@ public class InOutboundDetail implements Serializable {
     @Column(name = "iobc_productid")
     private Long productId;
 
+    /**
+     * 批次号
+     */
+    @Column(name = "iobc_batchcode")
+    private String bathcCode;
+
     /**
      * 来源id的主键 对应出货单的id
      */
@@ -258,6 +264,14 @@ public class InOutboundDetail implements Serializable {
         return this;
     }
 
+    public String getBathcCode() {
+        return bathcCode;
+    }
+
+    public void setBathcCode(String bathcCode) {
+        this.bathcCode = bathcCode;
+    }
+
     public InOutboundDetail() {
     }
 
@@ -275,6 +289,9 @@ public class InOutboundDetail implements Serializable {
         this.price = detail.getPrice();
         this.productId = detail.getProductid();
         this.sourceid = detail.getId();
+        this.currency = detail.getCurrency();
+        this.productId = detail.getProductid();
+        this.bathcCode = detail.getBatchCode();
     }
 
     public InOutboundDetail(Product product, PurchaseDetail detail, Double qty) {
@@ -290,6 +307,8 @@ public class InOutboundDetail implements Serializable {
         this.qty = qty;
         this.price = detail.getTaxUnitPrice();
         this.productId = product.getId();
+        this.bathcCode = detail.getBatchCode();
+        this.currency = detail.getCurrencyName();
     }
 
     public InOutboundDetail(Product product) {

src/main/java/com/uas/platform/b2c/prod/commodity/service/CommodityInOutboundService.java

@@ -5,6 +5,7 @@ import com.uas.platform.b2c.logistics.model.InvoiceFPurchase;
 import com.uas.platform.b2c.prod.commodity.model.CommodityInOutbound;
 import com.uas.platform.b2c.prod.commodity.model.InOutboundDetail;
 import com.uas.platform.b2c.trade.order.model.Order;
+import com.uas.platform.b2c.trade.order.model.Purchase;
 import com.uas.platform.b2c.trade.support.ResultMap;
 import com.uas.platform.core.model.PageParams;
 import org.springframework.data.domain.Page;
@@ -86,9 +87,8 @@ public interface CommodityInOutboundService {
      * @param invoice 发货单
      * @param orderid 出货的采购单号
      * @param orderId 出货的采购id
-     * @param purchaseid 出货的销售单单号
-     * @param purchaseId 出货的销售单id
+     * @param purchase 出货的销售单
      * @return CommodityInOutbound
      */
-    CommodityInOutbound sellOutBound(Invoice invoice, String orderid, Long orderId, String purchaseid, Long purchaseId);
+    CommodityInOutbound sellOutBound(Invoice invoice, String orderid, Long orderId, Purchase purchase);
 }

src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/CommodityInOutboundServiceImpl.java

@@ -5,9 +5,6 @@ import com.uas.platform.b2c.core.utils.NumberUtil;
 import com.uas.platform.b2c.core.utils.StringUtilB2C;
 import com.uas.platform.b2c.logistics.model.Invoice;
 import com.uas.platform.b2c.logistics.model.InvoiceDetail;
-import com.uas.platform.b2c.logistics.model.InvoiceFPurchase;
-import com.uas.platform.b2c.logistics.model.InvoiceFPurchaseDetail;
-import com.uas.platform.b2c.logistics.service.InvoiceFPurchaseService;
 import com.uas.platform.b2c.logistics.service.InvoiceService;
 import com.uas.platform.b2c.prod.commodity.constant.DoubleConstant;
 import com.uas.platform.b2c.prod.commodity.dao.CommodityInOutboundDao;
@@ -19,6 +16,7 @@ import com.uas.platform.b2c.prod.commodity.service.ProductService;
 import com.uas.platform.b2c.prod.commodity.type.InOutBoundType;
 import com.uas.platform.b2c.prod.product.common.service.CreateNumberService;
 import com.uas.platform.b2c.trade.order.model.Order;
+import com.uas.platform.b2c.trade.order.model.Purchase;
 import com.uas.platform.b2c.trade.support.CodeType;
 import com.uas.platform.b2c.trade.support.ResultMap;
 import com.uas.platform.core.exception.IllegalOperatorException;
@@ -56,9 +54,6 @@ public class CommodityInOutboundServiceImpl implements CommodityInOutboundServic
 
     private final ProductService productService;
 
-    @Autowired
-    private InvoiceFPurchaseService invoiceFPurchaseService;
-
     @Autowired
     private InvoiceService invoiceService;
 
@@ -144,6 +139,12 @@ public class CommodityInOutboundServiceImpl implements CommodityInOutboundServic
         }
         inOutbound.setAssociateOrderid(order.getOrderid());
         inOutbound.setAssociateOrderId(order.getId());
+        inOutbound.setAffiliatedEnterprise(order.getBuyerentername());
+        inOutbound.setAffiliatedEnuu(order.getBuyerenuu());
+        if (inOutbound.getAffiliatedEnuu() == null) {
+            inOutbound.setAffiliatedEnterprise(order.getBuyername());
+            inOutbound.setAffiliatedEnuu(order.getBuyeruu());
+        }
         CommodityInOutbound commodityInOutbound = save(inOutbound);
         return commodityInOutbound;
     }
@@ -308,12 +309,11 @@ public class CommodityInOutboundServiceImpl implements CommodityInOutboundServic
      * @param invoice 发货单
      * @param orderid          出货的采购单号
      * @param orderId          出货的采购id
-     * @param purchaseid       出货的销售单单号
-     * @param purchaseId       出货的销售单id
+     * @param purchase    出货的销售单
      * @return CommodityInOutbound
      */
     @Override
-    public CommodityInOutbound sellOutBound(Invoice invoice, String orderid, Long orderId, String purchaseid, Long purchaseId) {
+    public CommodityInOutbound sellOutBound(Invoice invoice, String orderid, Long orderId, Purchase purchase) {
         if (invoice == null) {
             return null;
         }
@@ -329,10 +329,16 @@ public class CommodityInOutboundServiceImpl implements CommodityInOutboundServic
             CommodityInOutbound commodityInOutbound = produceCommodityInOutbound(inOutSet, InOutBoundType.SELL_OUTBOUND);
             commodityInOutbound.setAssociateOrderid(orderid);
             commodityInOutbound.setAssociateOrderId(orderId);
-            commodityInOutbound.setAssociatePurchaseid(purchaseid);
-            commodityInOutbound.setAssociatePurchaseId(purchaseId);
+            commodityInOutbound.setAssociatePurchaseid(purchase.getPurchaseid());
+            commodityInOutbound.setAssociatePurchaseId(purchase.getId());
             commodityInOutbound.setAssociateInvoiceId(invoice.getId());
             commodityInOutbound.setAssociateInvoiceid(invoice.getInvoiceid());
+            commodityInOutbound.setAffiliatedEnterprise(purchase.getBuyentername());
+            commodityInOutbound.setAffiliatedEnuu(purchase.getBuyerenuu());
+            if (commodityInOutbound.getAffiliatedEnuu() == null){
+                commodityInOutbound.setAffiliatedEnuu(purchase.getBuyeruu());
+                commodityInOutbound.setAffiliatedEnterprise(purchase.getBuyername());
+            }
             return commodityInOutbound;
         } else {
             return null;

src/main/java/com/uas/platform/b2c/trade/order/service/impl/OrderServiceImpl.java

@@ -41,8 +41,6 @@ import com.uas.platform.b2c.logistics.dao.InvoiceFOrderDao;
 import com.uas.platform.b2c.logistics.dao.InvoiceFPurchaseDao;
 import com.uas.platform.b2c.logistics.dao.PickUpAddressDao;
 import com.uas.platform.b2c.logistics.model.*;
-import com.uas.platform.b2c.logistics.service.InvoiceFOrderService;
-import com.uas.platform.b2c.logistics.service.InvoiceFPurchaseService;
 import com.uas.platform.b2c.logistics.service.InvoiceService;
 import com.uas.platform.b2c.prod.commodity.dao.GoodsDao;
 import com.uas.platform.b2c.prod.commodity.dao.GoodsHistoryDao;

src/main/java/com/uas/platform/b2c/trade/order/service/impl/PurchaseServiceImpl.java

@@ -27,7 +27,6 @@ import com.uas.platform.b2c.fa.settlement.model.BillInfo;
 import com.uas.platform.b2c.fa.settlement.service.BillSubmitService;
 import com.uas.platform.b2c.logistics.dao.*;
 import com.uas.platform.b2c.logistics.model.*;
-import com.uas.platform.b2c.logistics.service.InvoiceFPurchaseService;
 import com.uas.platform.b2c.logistics.service.InvoiceService;
 import com.uas.platform.b2c.logistics.service.ReceiptService;
 import com.uas.platform.b2c.prod.commodity.dao.GoodsDao;
@@ -101,8 +100,6 @@ public class PurchaseServiceImpl implements PurchaseService {
 	@Autowired
 	private PurchaseDetailService purchaseDetailService;
 	@Autowired
-	private InvoiceFPurchaseService inFpuService;
-	@Autowired
 	private ReceiptService receiptService;
 	@Autowired
 	private OrderService orderService;

src/main/webapp/resources/js/admin/controllers/trade/InvoicefromOrderCtrl.js

@@ -52,7 +52,7 @@ define([ 'app/app' ], function(app) {
 			page : 1,
 			count : 5,
 			sorting : {
-				creattime: 'DESC'
+                createtime: 'DESC'
 			}
 		}, {
 			total : 0,

src/main/webapp/resources/js/admin/controllers/trade/InvoicefromPurcCtrl.js

@@ -46,7 +46,7 @@ define([ 'app/app' ], function(app) {
 			page : 1,
 			count : 5,
 			sorting : {
-				creattime: 'DESC'
+				createtime: 'DESC'
 			}
 		}, {
 			total : 0,

src/main/webapp/resources/js/admin/controllers/trade/InvoicefromPurcDetailCtrl.js

@@ -45,7 +45,7 @@ define([ 'app/app' ], function(app) {
 					// getComponent();
 
 					//根据来源采购单id获取采购单信息
-					var puid = $scope.invoiceFPur.puid;
+					var puid = $scope.invoiceFPur.purchaseid;
 					var getPurchase = function(){
 						Purchase.getPurchaseById({id: puid}, {}, function(data){
 							$scope.purc = data;

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

@@ -49,7 +49,7 @@ define([ 'ngResource' ], function() {
 			},
 			//根据出货单号获取出货单
 			getInvoiceFPurc : {
-				url : 'trade/inFpu/:invoiceid/find',
+				url : 'trade/invoice/:invoiceid/code',
 				method : 'GET'
 			},
 			//根据批次号获取标准元器件信息 

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

@@ -245,7 +245,7 @@ define([ 'ngResource' ], function() {
             },
            // 获取当个发货单的信息
             getSendOrderInfo: {
-                url: '/trade/order/invoiceid',
+                url: 'trade/order/invoiceid',
               method : 'GET'
             },
             /**

src/main/webapp/resources/view/admin/trade/trade_invoicefromorder_detail.html

@@ -193,7 +193,7 @@
 				</tr>
 			</thead>
 			<tbody>
-				<tr ng-repeat="detail in invoiceFOrder.invoiceFOrderDetails">
+				<tr ng-repeat="detail in invoiceFOrder.invoiceDetails">
 					<td class="center" rowspan="1" colspan="1"><span
 						ng-bind="$index + 1"></span></td>
 					<td class="center" rowspan="1" colspan="1"><a

src/main/webapp/resources/view/admin/trade/trade_invoicefrompurc_detail.html

@@ -203,7 +203,7 @@
 				</tr>
 			</thead>
 			<tbody>
-				<tr ng-repeat="detail in invoiceFPur.invoiceFPurchaseDetails">
+				<tr ng-repeat="detail in invoiceFPur.invoiceDetails">
 					<td class="center" rowspan="1" colspan="1"><span ng-bind = "$index + 1"></span></td>
 					<td class="center" rowspan="1" colspan="1"><a ng-href="product/component/{{detail.uuid}}/"><span ng-bind ="detail.cmpCode"></span></a></td>
 					<td class="center" rowspan="1" colspan="2"><a ng-href="product/component/{{detail.uuid}}/"><img alt="" ng-src="{{detail.img || 'static/img/store/common/default.png'}}" height="100px;"></a></td>

src/main/webapp/resources/view/vendor/invoice_detail.html

@@ -299,7 +299,7 @@ tbody tr td {
 				</tr>
 			</thead>
 			<tbody>
-				<tr ng-repeat="detail in invoiceFPur.invoiceFPurchaseDetails">
+				<tr ng-repeat="detail in invoiceFPur.invoiceDetails">
 					<td><span ng-bind="$index + 1"></span></td>
 					<td><a ng-href="product#/component/{{detail.uuid}}/"><span
 							ng-bind="detail.cmpCode"></span></a></td>