feat(accept):验收单

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

@@ -188,6 +188,7 @@ public class PurchaseProdInOutServiceImpl implements PurchaseProdInOutService {
                     List<PurchaseOrderItem> purchaseOrderItems = purchaseOrderItemDao
                             .findByEnUUAndOrderCodeAndNumber(enUU, item.getOrderItem().getOrder().getCode(),
                                     item.getOrderItem().getNumber());
+					ProductInfo productInfo = products.get(item.getProdcode());
                     // 对应的采购单存在
                     if (purchaseOrderItems.size() > 0) {
                         // 对应的采购单明细set进去
@@ -196,7 +197,13 @@ public class PurchaseProdInOutServiceImpl implements PurchaseProdInOutService {
                         // 设置主记录
                         item.setAccept(accept);
                         item.setErpDate(new Date());
-                        item.setProduct(purchaseOrderItems.get(0).getProduct());
+                        // 如果物料库存在该物料
+						if (!org.springframework.util.StringUtils.isEmpty(productInfo)) {
+							item.setProduct(productInfo);
+							item.setProdId(productInfo.getId());
+						} else {
+							item.setProduct(purchaseOrderItems.get(0).getProduct());
+						}
                         acceptItems.add(item);
                     } else {
                         if (StringUtils.isEmpty(uuid)) {

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

@@ -219,20 +219,20 @@
 			<tr class="order-bd" ng-repeat="item in accept.acceptItems">
 				<td class="product">
 					<div class="text-num text-bold">
-						<span ng-bind="item.orderItem.product.code"
-							ng-if="item.orderItem.product.code != null"></span> <span
-							ng-bind="item.product.code"
-							ng-if="item.orderItem.product.code == null"></span>
+						<span ng-bind="item.product.code"
+							  ng-if="item.product.code != null"></span> <span
+							ng-bind="item.orderItem.product.code"
+							ng-if="item.product.code == null"></span>
 					</div>
 					<div>
 						<span ng-bind="item.orderItem.product.title"
-							ng-if="item.orderItem.product.title != null"></span> <span
+							  ng-if="item.product.title == null"></span> <span
 							ng-bind="item.product.title"
-							ng-if="item.orderItem.product.title == null"></span>
+							ng-if="item.product.title != null"></span>
 					</div>
-					<div class="text-muted" title="{{item.orderItem.product.spec}}"
-						ng-bind="item.orderItem.product.spec"
-						ng-if="item.orderItem.product.spec != null"></div>
+					<div class="text-muted" title="{{item.product.spec}}"
+						ng-bind="item.product.spec"
+						ng-if="item.product.spec != null"></div>
 					<div class="text-muted" title="{{item.product.spec}}"
 						ng-bind="item.product.spec"
 						ng-if="item.orderItem.product.spec == null"></div>