Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/ContractManagementInfoServiceImpl.java

@@ -115,8 +115,8 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                 throw new YException(YExceptionEnum.CONTRACT_NO_ERROR);
             }
         }
-        //自运采购合同添加临时仓库
-        if (NumberConstant.CONSTANT2.equals(contractManagementInfo.getContractType()) && NumberConstant.CONSTANT1.equals(contractManagementInfo.getDeliverType())) {
+        //现货自运采购合同添加临时仓库
+        if (NumberConstant.CONSTANT1.equals(contractManagementInfo.getGoodsType())&&NumberConstant.CONSTANT2.equals(contractManagementInfo.getContractType()) && NumberConstant.CONSTANT1.equals(contractManagementInfo.getDeliverType())) {
             WarehouseBaseInfo warehouseBaseInfo = new WarehouseBaseInfo();
             warehouseBaseInfo.setId(IdGenerator.generateUUID());
             warehouseBaseInfo.setWarehouseName(contractManagementInfo.getContractNo());

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/PurchasePriceServiceImpl.java

@@ -202,8 +202,8 @@ public class PurchasePriceServiceImpl extends ServiceImpl<PurchasePriceMapper, P
                 tmp.setId(IdGenerator.generateUUID());
                 tmp.setCompId(purchasePrice.getCompId());
                 tmp.setMainId(purchasePrice.getId());
-                this.purchasePriceDetailService.insert(tmp);
             }
+            this.purchasePriceDetailService.insertBatch(purchasePrice.getDetails());
         }
         // 操作打印表数据
         if(purchasePrice.getDetailPrints()!=null) {
@@ -211,8 +211,8 @@ public class PurchasePriceServiceImpl extends ServiceImpl<PurchasePriceMapper, P
                 tmp.setId(IdGenerator.generateUUID());
                 tmp.setCompId(purchasePrice.getCompId());
                 tmp.setMainId(purchasePrice.getId());
-                this.purchasePriceDetailPrintService.insert(tmp);
             }
+            this.purchasePriceDetailPrintService.insertBatch(purchasePrice.getDetailPrints());
         }
         boolean isStartWorkflow = StringUtils.isBlank(purchasePrice.getWorkflowId());
         if(StatusEnum.PURCHASE_FAILED.getFlag().equals(purchasePrice.getStatusFlag())) {

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/TranProcessInfoMapper.xml

@@ -71,8 +71,8 @@
         p.process_no AS processNo,
         p.goods_name AS goodsName,
         p.weight,
-        concat(p.send_private,p.send_city,IFNULL(p.send_area,''),p.send_detailed_address,p.sender,p.sender_phone) AS send,
-        concat(p.receive_private,p.receive_city,IFNULL(p.receive_area,''),p.receive_detailed_address,p.receiver,p.receiver_phone) AS receive,
+        concat(p.send_private,p.send_city,IFNULL(p.send_area,''),p.send_detailed_address,'\n',p.sender,p.sender_phone) AS send,
+        concat(p.receive_private,p.receive_city,IFNULL(p.receive_area,''),p.receive_detailed_address,'\n',p.receiver,p.receiver_phone) AS receive,
         p.delivery_date_start AS deliveryDateStart,
         p.delivery_date_end AS deliveryDateEnd,
         p.process_status AS processStatus,