Merge remote-tracking branch 'origin/master'

src/main/java/com/uas/platform/b2b/erp/service/impl/PurchaseProdInOutServiceImpl.java

@@ -74,9 +74,9 @@ public class PurchaseProdInOutServiceImpl implements PurchaseProdInOutService {
 			Enterprise vendor = enterpriseDao.findEnterpriseByUu(accept.getVendUU());
 			// 采购验收单不存在，供应商UU号存在对应供应商
 			if (existAccepts.size() == 0 && vendor != null) {
-                acceptItems = notExistAccept(accept, products, enUU);
+                acceptItems.addAll(notExistAccept(accept, products, enUU));
 			} else if (existAccepts.size() > 0 && vendor != null) {
-				acceptItems = existAccept(accept, existAccepts.get(0), products, enUU);
+				acceptItems.addAll(existAccept(accept, existAccepts.get(0), products, enUU));
 			}
 		}
 		return acceptItems;
@@ -106,7 +106,7 @@ public class PurchaseProdInOutServiceImpl implements PurchaseProdInOutService {
         for (Iterator<PurchaseAcceptItem> it = accept.getAcceptItems().iterator(); it.hasNext();) {
             PurchaseAcceptItem item = it.next();
             if (hadItemsBatchCode.contains(item.getBatchCode())) {
-                //已上传的明细不要
+                // 已上传的明细不要
                 it.remove();
             } else {
                 if (item.getOrderItem() != null) {
@@ -121,10 +121,8 @@ public class PurchaseProdInOutServiceImpl implements PurchaseProdInOutService {
                         // 设置主记录
                         item.setAccept(existAccept);
                         item.setErpDate(new Date(System.currentTimeMillis()));
-                        item.setProdcode(purchaseOrderItems.get(0).getProduct().getCode());
                         ProductInfo productInfo = products.get(item.getProdcode());
                         item.setProduct(productInfo);
-                        item.setProdId(purchaseOrderItems.get(0).getProductId());
                         acceptItems.add(item);
                     } else {
                         if (StringUtils.isEmpty(uuid)) {
@@ -186,8 +184,7 @@ public class PurchaseProdInOutServiceImpl implements PurchaseProdInOutService {
                     // 设置主记录
                     item.setAccept(accept);
                     item.setErpDate(new Date());
-                    item.setProdcode(purchaseOrderItems.get(0).getProduct().getCode());
-                    item.setProdId(purchaseOrderItems.get(0).getProductId());
+                    item.setProduct(purchaseOrderItems.get(0).getProduct());
                     acceptItems.add(item);
                 } else {
                     if (StringUtils.isEmpty(uuid)) {

src/main/webapp/resources/lib/treeview/js/angular.treeview.js

@@ -52,9 +52,9 @@
 							'<i class="expanded" data-ng-show="node.' + nodeChildren + '.length && !node.collapsed" data-ng-click="' + treeId + '.selectNodeHead(node)"></i>' +
 							'<i class="normal" data-ng-hide="node.' + nodeChildren + '.length"></i> ' +
 							'<span data-ng-class="node.selected" data-ng-click="' + treeId + '.selectNodeLabel(node)">{{node.' + nodeLabel + '}}</span>' +
-                    		'<b data-ng-show="node.' + nodeChildren + '.length && node.collapsed"><i class="fa fa-angle-right"></i></b>' +
-                    		'<b data-ng-show="node.' + nodeChildren + '.length && !node.collapsed"><i class="fa fa-angle-down"></i></b>' +
-                    		'<b data-ng-hide="node.' + nodeChildren + '.length"><i class="fa fa-angle-right"></i></b> ' +
+							'<b data-ng-show="node.' + nodeChildren + '.length && node.collapsed" data-ng-click="' + treeId + '.selectNodeHead(node)"><i class="fa fa-angle-right"></i></b>' +
+							'<b data-ng-show="node.' + nodeChildren + '.length && !node.collapsed" data-ng-click="' + treeId + '.selectNodeHead(node)"><i class="fa fa-angle-down"></i></b>' +
+							'<b data-ng-hide="node.' + nodeChildren + '.length"><i class="fa fa-angle-right"></i></b> ' +
 							'<div data-ng-hide="node.collapsed" data-tree-id="' + treeId + '" data-tree-model="node.' + nodeChildren + '" data-node-id=' + nodeId + ' data-node-label=' + nodeLabel + ' data-node-children=' + nodeChildren + '></div>' +
 						'</li>' +
 					'</ul>';

src/main/webapp/resources/tpl/index/fa/apCheck.html

@@ -304,7 +304,6 @@
 						 target="_blank">查看详情</a>	 -->		 
 				</td>
 			</tr>
-			<tr></tr>
 		</tbody>
 		<tbody ng-if="tableParams.total() == 0">
 		<tr>

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

@@ -103,13 +103,14 @@
 							</div>
 						</td>
 						<td width="180">
-							<a ng-bind="::acceptitem.orderItem.order.code" ui-sref="sale.order_detail({id:acceptitem.orderItem.order.id})"></a>
+							<a ng-if="acceptitem.orderItem" ng-bind="::acceptitem.orderItem.order.code" ui-sref="sale.order_detail({id:acceptitem.orderItem.order.id})"></a>
+							<span ng-if="!acceptitem.orderItem">无关联的采购单</span>
 						</td>
 						<td class="text-center" width="180">
 							<div>
 								<span ng-bind="::acceptitem.product.code"></span>
 								<span ng-bind="::acceptitem.product.title"></span>
-								<span ng-bind="::acceptitem.product.cmpCode"></span>
+								<span ng-bind="::acceptitem.product.spec"></span>
 							</div>
 						</td>
 						<td class="text-center" width="100">

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

@@ -99,9 +99,16 @@
                 <tr ng-repeat="returnitem in returns.returnItems| orderBy:'number'" ng-class="{'scoroll':order.orderItems.length>10}">
                     <td width="50"><span ng-bind="::returnitem.number"></span></td>
                     <td width="180">
-                        <a ng-bind="returnitem.orderItem.order.code" ui-sref="sale.order_detail({id:returnitem.orderItem.order.id})" target="_blank"></a>
+                        <a ng-if="returnitem.orderItem" ng-bind="returnitem.orderItem.order.code" ui-sref="sale.order_detail({id:returnitem.orderItem.order.id})" target="_blank"></a>
+                        <span ng-if="!returnitem.orderItem">无关联的采购单</span>
+                    </td>
+                    <td width="180" class="text-center">
+                        <div>
+                            <span ng-bind="::returnitem.product.code"></span>
+                            <span ng-bind="::returnitem.product.title"></span>
+                            <span ng-bind="::returnitem.product.spec"></span>
+                        </div>
                     </td>
-                    <td width="180" class="text-center"><span ng-bind="::returnitem.product.title"></span></td>
                     <td width="100" class="text-center"><span ng-bind="::returnitem.product.brand"></span></td>
                     <td width="50" class="text-center"><span ng-bind="::returnitem.product.unit"></span></td>
                     <td width="60" class="text-center"><span ng-if="!isUser" ng-bind="::returnitem.orderPrice"></span></td>

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

@@ -234,8 +234,8 @@
 					<div>
 						<span ng-bind="::item.product.title"></span>
 					</div>
-					<div class="text-muted" title="{{::item.orderItem.product.spec}}"
-						ng-bind="::item.orderItem.product.spec"></div>
+					<div class="text-muted" title="{{::item.product.title}}"
+						ng-bind="::item.product.title"></div>
 					<div class="text-bold text-inverse" title="送货工厂"
 						ng-if="item.orderItem.factory">
 						送货工厂：<span ng-bind="::item.orderItem.factory"></span>