工序外协报价带出单价和运输费

topsun/src/main/java/com/huigou/topsun/sap/processQuotedPrice/application/ProcessQuotedPriceItemApplication.java

 package com.huigou.topsun.sap.processQuotedPrice.application;
 
 import com.huigou.topsun.sap.processQuotedPrice.domain.ProcessQuotedPriceItem;
+import com.huigou.topsun.sap.processQuotedPrice.domain.ProcessQuotedPriceItemNumber;
 import com.huigou.topsun.sap.processQuotedPrice.domain.query.ProcessQuotedPriceQueryRequest;
 
 import java.math.BigDecimal;
@@ -34,4 +35,6 @@ public interface ProcessQuotedPriceItemApplication {
      * @return
      */
     BigDecimal findPriceByProductAndProcess(String productCode, String outProcess, BigDecimal number,String lifnr);
+
+    ProcessQuotedPriceItemNumber findQuotedPriceByProductAndProcess(String productCode, String outProcess, BigDecimal number, String lifnr);
 }

topsun/src/main/java/com/huigou/topsun/sap/processQuotedPrice/application/impl/ProcessQuotedPriceItemApplicationImpl.java

@@ -159,4 +159,30 @@ public class ProcessQuotedPriceItemApplicationImpl extends BaseApplication imple
         }
         return price;
     }
+
+    @Override
+    public ProcessQuotedPriceItemNumber findQuotedPriceByProductAndProcess(String productCode, String outProcess, BigDecimal number,String lifnr) {
+        List<ProcessQuotedPriceItem> quotedPriceItemList = processQuotedPriceItemRepository.findByProductCodeAndOutProcess(productCode, outProcess);
+        ProcessQuotedPriceItemNumber quotedPriceItemNumber = new ProcessQuotedPriceItemNumber();
+        if (!CollectionUtils.isEmpty(quotedPriceItemList)){
+            for (ProcessQuotedPriceItem quotedPriceItem : quotedPriceItemList) {
+                ProcessQuotedPrice quotedPrice = processQuotedPriceRepository.findOne(quotedPriceItem.getProcessQuotedPriceId());
+                //审批完成的；已启用的；对应供应商
+                if (quotedPrice.getStatusId() == BizBillStatus.COMPLETED.getId() && lifnr.equals(quotedPrice.getSupplier()) && "1".equals(quotedPriceItem.getStatus())){
+                    List<ProcessQuotedPriceItemNumber> numberList = processQuotedPriceItemNumberApplication.findByProcessQuotedPriceItemId(quotedPriceItem.getId());
+                    numberList = numberList
+                            .stream()
+                            .filter(processQuotedPriceItemNumber ->
+                                    (processQuotedPriceItemNumber.getNumberFrom().compareTo(number) < 0
+                                            && processQuotedPriceItemNumber.getNumberTo().compareTo(number) >= 0))
+                            .collect(Collectors.toList());
+                    if (!CollectionUtils.isEmpty(numberList)){
+                        quotedPriceItemNumber = numberList.get(0);
+                    };
+
+                }
+            }
+        }
+        return quotedPriceItemNumber;
+    }
 }

topsun/src/main/resources/config/topsun/sap/sapPurchaseInfoRecord/sapPurchaseInfoRecordItem.xml

@@ -15,7 +15,7 @@
             t.ZYY,
             t.LIFNR,
             t.MATNR,
-            t.INFNR,
+            '' as INFNR,
             t.ESOKZ,
             t.VERKF,
             t.TELF1,