|
|
@@ -126,7 +126,13 @@ public class PurchaseProdInOutServiceImpl implements PurchaseProdInOutService {
|
|
|
item.setAccept(existAccept);
|
|
|
item.setErpDate(new Date(System.currentTimeMillis()));
|
|
|
ProductInfo productInfo = products.get(item.getProdcode());
|
|
|
- item.setProduct(productInfo);
|
|
|
+ // 如果物料库存在该物料
|
|
|
+ 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)) {
|