Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/impl/PurchaseServiceImpl.java

@@ -169,6 +169,8 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
                 purchasedetailMapper.batchInsert(insertDetails);
             }
             baseDTO = getBaseDTOById(pu_id);
+            //明细需求日期为空时==主表交货日期
+            getMapper().updateDelivery(pu_id);
             //计算金额，未税单价，未税金额等
             calcPurchase(pu_id);
             //日志记录
@@ -466,6 +468,9 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         prodInOut.setPi_buyerid(purchase.getPu_buyerid());
         prodInOut.setPi_buyercode(purchase.getPu_buyercode());
         prodInOut.setPi_buyername(purchase.getPu_buyername());
+        //币别
+        prodInOut.setPi_currency(purchase.getPu_currency());
+        prodInOut.setPi_rate(purchase.getPu_rate());
         prodInOutMapper.insertSelective(prodInOut);
         //插入验收单从表
         long pi_id = prodInOut.getId();