chenw 7 rokov pred
rodič
commit
f0d8a0f156

+ 3 - 3
applications/transfers/transfers-server/src/main/java/com/usoftchina/saas/transfers/task/SendPurchaseTask.java

@@ -65,7 +65,7 @@ public class SendPurchaseTask extends Executable {
             LOGGER.info("purchaseDTO={}, b2bPurchase={}", JsonUtils.toJsonString(purchaseDTO), JsonUtils.toJsonString(b2bPurchase));
             //采购单明细表数据
             List<PurchaseDetail> b2bPurchaseDetailList = BeanMapper.mapList(purchaseFormDTO.getItems(), PurchaseDetail.class);
-            convertPurchaseDetail(purchaseFormDTO.getItems(), b2bPurchaseDetailList, purchaseDTO.getPu_rate());
+            convertPurchaseDetail(purchaseFormDTO.getItems(), b2bPurchaseDetailList);
             LOGGER.info("PurchaseDetailDTO={}, b2bPurchaseDetailList={}", JsonUtils.toJsonString(purchaseFormDTO.getItems()), JsonUtils.toJsonString(b2bPurchaseDetailList));
 
             b2bPurchase.setPurchaseDetails(b2bPurchaseDetailList);
@@ -105,12 +105,12 @@ public class SendPurchaseTask extends Executable {
         b2bPurchase.setPu_id(purchaseDTO.getId());
     }
 
-    private void convertPurchaseDetail(List<PurchaseDetailDTO> items, List<PurchaseDetail> b2bPurchaseDetailList, Double rate){
+    private void convertPurchaseDetail(List<PurchaseDetailDTO> items, List<PurchaseDetail> b2bPurchaseDetailList){
         for (int i = 0; i < items.size(); i++) {
             PurchaseDetailDTO purchaseDetailDTO = items.get(i);
             PurchaseDetail b2bPurchaseDetail = b2bPurchaseDetailList.get(i);
             b2bPurchaseDetail.setPd_detno(new BigDecimal(purchaseDetailDTO.getPd_detno()).shortValue());
-            b2bPurchaseDetail.setPd_rate(new BigDecimal(rate).floatValue());
+            b2bPurchaseDetail.setPd_rate(new BigDecimal(purchaseDetailDTO.getPd_taxrate()).floatValue());
         }
     }