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

winsea-haixin-plugin-yiliangyiyun/pom.xml

@@ -86,6 +86,12 @@
             <artifactId>spring-websocket</artifactId>
             <version>5.1.3.RELEASE</version>
         </dependency>
+
+        <dependency>
+            <groupId>com.winnerlook</groupId>
+            <artifactId>voice-sdk</artifactId>
+            <version>1.1.1</version>
+        </dependency>
     </dependencies>
 
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/CommonUserController.java

@@ -31,10 +31,7 @@ import com.yh.saas.plugin.yiliangyiyun.entity.view.UserDefinedBean;
 import com.yh.saas.plugin.yiliangyiyun.exception.ServiceException;
 import com.yh.saas.plugin.yiliangyiyun.service.ICommonUserService;
 import com.yh.saas.plugin.yiliangyiyun.service.INewWorkflowService;
-import com.yh.saas.plugin.yiliangyiyun.util.Base64Util;
-import com.yh.saas.plugin.yiliangyiyun.util.FileUtil;
-import com.yh.saas.plugin.yiliangyiyun.util.HttpUtil;
-import com.yh.saas.plugin.yiliangyiyun.util.WebSocket;
+import com.yh.saas.plugin.yiliangyiyun.util.*;
 import com.yh.saas.toolkit.workflow.service.IWorkflowHistoryService;
 import org.activiti.engine.impl.util.CollectionUtil;
 import org.springframework.beans.BeanUtils;
@@ -83,6 +80,8 @@ public class CommonUserController {
     private ICommonCompanyService companyService;
     @Autowired
     private WebSocket webSocket;
+    @Autowired
+    private GeTuiUtils geTuiUtils;
 
 
     /**
@@ -469,7 +468,9 @@ public class CommonUserController {
 
 
     @PostMapping("/test")
-    public void test() {
+    public void test() throws Exception {
+        String userId = "2dbbee49f86f47c9b2ef6f7bba34b441";
+        geTuiUtils.callPhone(userId);
 //        JSONObject jsonObject = new JSONObject();
 //        jsonObject.put("msg", "1234567");
 //        MessagePusherUtils.sendPrivateMessage(AuthSecurityUtils.getCurrentUserId(),JSONObject.toJSONString(jsonObject));

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/ContractManagementInfo.java

@@ -604,6 +604,11 @@ public class ContractManagementInfo extends BaseModel<ContractManagementInfo> {
      */
     @TableField(exist = false)
     private String creater;
+    /**
+     * 创建人
+     */
+    @TableField(exist = false)
+    private String creator;
     /**
      * 图表合同利润
      */

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/WarehousingOrder.java

@@ -370,6 +370,26 @@ public class WarehousingOrder extends BaseModel<WarehousingOrder> {
      */
     @TableField(exist = false)
     private String buyer;
+    /**
+     *客户姓名
+     */
+    @TableField(exist = false)
+    private String customerName;
+    /**
+     * 银行卡账号
+     */
+    @TableField(exist = false)
+    private String bankCard;
+    /**
+     * 开户行
+     */
+    @TableField(exist = false)
+    private String bankDeposit;
+    /**
+     * 开户支行
+     */
+    @TableField(exist = false)
+    private String bankDepositBranch;
 
     @Override
     protected Serializable pkVal() {

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/exception/YExceptionEnum.java

@@ -46,7 +46,6 @@ public enum YExceptionEnum {
 	IN_WEIGHT_STATUS_ERROR("ERROR", "入库检斤《已称皮重》状态不允许删除，请先退回！"),
 	OUT_WEIGHT_STATUS_ERROR("ERROR", "出库检斤《已称毛重》状态不允许删除，请先退回！"),
 	IN_OUT_STATUS_ERROR("ERROR", "出入库记录状态异常"),
-	AMOUNT_EXCEEDS__ERROR("ERROR", "合同请款金额不能超出总粮款！"),
 	;
 	@Getter
 	private String value;

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

@@ -208,6 +208,7 @@ public class ExpenseInfoServiceImpl extends ServiceImpl<ExpenseInfoMapper, Expen
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String addInfo(ExpenseInfo expenseInfo) {
+        Integer flag=0;
         expenseInfo.setId(IdGenerator.generateUUID());
         SimpleDateFormat df = new SimpleDateFormat("yyyyMMddHHmmss");
         Integer num = this.expenseCount(expenseInfo) + 1;
@@ -257,7 +258,6 @@ public class ExpenseInfoServiceImpl extends ServiceImpl<ExpenseInfoMapper, Expen
             if(!"1".equals(expenseInfo.getCostType())&&!"1".equals(expenseInfo.getExpensesPurpose())) {
                 expenseInfo.setUnallocatedAmount(expenseInfo.getAmountMoney());
             }
-            this.insert(expenseInfo);
             //合同粮款校验
             if("1".equals(expenseInfo.getCostType())&&"1".equals(expenseInfo.getExpensesPurpose())) {
                 ContractManagementInfo contractManagementInfo=contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
@@ -269,21 +269,24 @@ public class ExpenseInfoServiceImpl extends ServiceImpl<ExpenseInfoMapper, Expen
                         Double grainFund=contractManagementInfo.getUnitContractPrice()*contractManagementInfo.getWeight();
                         //合同已请粮款金额
                         Double money=0d;
+                        //合同保证金余额+预付款余额
+                        money=contractManagementInfo.getAccumulatedPrepayment()-contractManagementInfo.getAccumulatedRecovery()-contractManagementInfo.getPrepaidAssigned()+contractManagementInfo.getAccumulatedMargin()-contractManagementInfo.getWithdrawalOfMargin()-contractManagementInfo.getAllocatedMargin();
                         List<ExpenseInfo> expenseInfoList=this.selectList(new EntityWrapper<ExpenseInfo>()
                                 .eq("contract_no",expenseInfo.getContractNo())
                                 .ne("status","已驳回")
                                 .eq("comp_id",expenseInfo.getCompId()));
                         if (!CollectionUtils.isEmpty(expenseInfoList)){
-                            money = expenseInfoList.stream().mapToDouble(ExpenseInfo::getAmountMoney).sum();
+                            money = money+ expenseInfoList.stream().mapToDouble(ExpenseInfo::getAmountMoney).sum();
                         }
                         //本次金额加上已请款金额>总粮款时
-//                        if (money+expenseInfo.getAmountMoney()>grainFund){
-//                            throw new YException(YExceptionEnum.AMOUNT_EXCEEDS__ERROR);
-//                        }
+                        if (money+expenseInfo.getAmountMoney()>grainFund){
+                            flag=1;
+                        }
                     }
                 }
 
             }
+            this.insert(expenseInfo);
             //分配列表
             List<ExpenseAllocationInfo> expenseAllocationInfoList = expenseInfo.getExpenseAllocationInfoList();
             if (!CollectionUtils.isEmpty(expenseAllocationInfoList)) {
@@ -323,12 +326,16 @@ public class ExpenseInfoServiceImpl extends ServiceImpl<ExpenseInfoMapper, Expen
                 workflowService.activateInstance(expenseInfo.getWorkflowId(), expenseInfo.getId());
             }
         }
+        if (flag==1){
+            return "合同请款金额超出总粮款！";
+        }
         return "ok";
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String editInfo(ExpenseInfo expenseInfo) {
+        Integer flag=0;
         ExpenseInfo expenseInfo1=this.selectById(expenseInfo.getId());
         //确认收款
         if ("0".equals(expenseInfo.getFlag())) {
@@ -506,17 +513,19 @@ public class ExpenseInfoServiceImpl extends ServiceImpl<ExpenseInfoMapper, Expen
                         Double grainFund=contractManagementInfo.getUnitContractPrice()*contractManagementInfo.getWeight();
                         //合同已请粮款金额
                         Double money=0d;
+                        //合同保证金余额+预付款余额
+                        money=contractManagementInfo.getAccumulatedPrepayment()-contractManagementInfo.getAccumulatedRecovery()-contractManagementInfo.getPrepaidAssigned()+contractManagementInfo.getAccumulatedMargin()-contractManagementInfo.getWithdrawalOfMargin()-contractManagementInfo.getAllocatedMargin();
                         List<ExpenseInfo> expenseInfoList=this.selectList(new EntityWrapper<ExpenseInfo>()
                                 .eq("contract_no",expenseInfo1.getContractNo())
                                 .ne("status","已驳回")
                                 .eq("comp_id",expenseInfo1.getCompId()));
                         if (!CollectionUtils.isEmpty(expenseInfoList)){
-                            money = expenseInfoList.stream().mapToDouble(ExpenseInfo::getAmountMoney).sum();
+                            money = money+ expenseInfoList.stream().mapToDouble(ExpenseInfo::getAmountMoney).sum();
                         }
                         //本次金额加上已请款金额>总粮款时
-//                        if (money+expenseInfo.getAmountMoney()>grainFund){
-//                            throw new YException(YExceptionEnum.AMOUNT_EXCEEDS__ERROR);
-//                        }
+                        if (money+expenseInfo.getAmountMoney()>grainFund){
+                            flag=1;
+                        }
                     }
                 }
 
@@ -565,13 +574,11 @@ public class ExpenseInfoServiceImpl extends ServiceImpl<ExpenseInfoMapper, Expen
             expenseInfo.setStatus(StatusEnum.REJECTED.getName());
         }
         // 主表信息编辑
-        boolean one = this.updateById(expenseInfo);
-        // 假如成功返回ok
-        if (one) {
+        this.updateById(expenseInfo);
+        if (flag==1) {
             return "OK";
-        } else {
-            return "NG";
         }
+        return "OK";
     }
 
     /**

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

@@ -10,7 +10,9 @@ import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.toolkit.StringUtils;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
+import com.winsea.svc.base.base.entity.CommonStaff;
 import com.winsea.svc.base.base.entity.CommonStaffRole;
+import com.winsea.svc.base.base.mapper.CommonStaffMapper;
 import com.winsea.svc.base.base.service.ICommonStaffRoleService;
 import com.winsea.svc.base.base.service.ICommonStaffVesselService;
 import com.winsea.svc.base.base.util.MessagePusherUtils;
@@ -43,14 +45,18 @@ import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import com.yh.saas.plugin.yiliangyiyun.entity.CommonUser;
 import com.yh.saas.plugin.yiliangyiyun.mapper.NewNoticeTaskMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.INewNoticeTaskService;
 import com.yh.saas.plugin.yiliangyiyun.service.INewNoticeUtilService;
+import com.yh.saas.plugin.yiliangyiyun.util.GeTuiUtils;
 import org.apache.commons.collections.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.transaction.annotation.Transactional;
 
 @SofaService
 public class NewNoticeTaskServiceImpl extends ServiceImpl<NoticeTaskMapper, NoticeTaskInfo> implements INewNoticeTaskService {
@@ -69,6 +75,10 @@ public class NewNoticeTaskServiceImpl extends ServiceImpl<NoticeTaskMapper, Noti
     private NewNoticeTaskMapper newNoticeTaskMapper;
     @Autowired
     private INewNoticeUtilService noticeUtilService;
+    @Autowired
+    private GeTuiUtils geTuiUtils;
+    @Autowired
+    private CommonStaffMapper commonStaffMapper;
     private Set<String> businessCodes;
     @Value("${taskmsg.isPushed:true}")
     private boolean isTaskmsgPushed;
@@ -232,6 +242,31 @@ public class NewNoticeTaskServiceImpl extends ServiceImpl<NoticeTaskMapper, Noti
         return this.selectList(noticeTaskWrapper);
     }
 
+    /**
+     * 添加
+     * @return
+     */
+    /**
+     * 每天16.30点更新
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Scheduled(cron = "0 */5 * * * ?")
+    public void call() throws Exception {
+        Wrapper<NoticeTaskInfo> noticeTaskWrapper = new EntityWrapper();
+        noticeTaskWrapper.eq("delete_flag", 0);
+        noticeTaskWrapper.eq("accept_type","STAFF");
+        noticeTaskWrapper.notIn("accept_type","RETURN");
+        noticeTaskWrapper.groupBy("accept_id");
+        List<NoticeTaskInfo> noticeTaskInfos = this.selectList(noticeTaskWrapper);
+//        geTuiUtils.callPhone("111");
+        if(CollectionUtils.isNotEmpty(noticeTaskInfos)){
+            for(int i=0;i<noticeTaskInfos.size();i++){
+                geTuiUtils.callPhone(noticeTaskInfos.get(i).getAcceptId());
+            }
+
+        }
+    }
+
     @Override
     public List<NoticeBusinessTypeNumber> findBusinessTypeCount() {
         NoticeTaskInfo noticeTaskInfo = new NoticeTaskInfo();

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

@@ -343,23 +343,23 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
             warehouseInOutInfo.setInOutDate(new Date());
             warehouseInOutInfo.setStatus("已提交");
             warehouseInOutInfo.setPaymentId(paymentManagement.getId());
-            //更新出入库任务表已完成量
-            InOutWarehouseTask inOutWarehouseTask = inOutWarehouseTaskService.selectOne(new EntityWrapper<InOutWarehouseTask>()
-                    .eq("in_out_task_no", warehouseInOutInfo.getInOutTaskNo()));
-            if (inOutWarehouseTask != null) {
-                //可超出重量
-                Float overNeight = 0.0f;
-                ContractManagementInfo contractManagementInfo = ContractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
-                        .eq("comp_id", inOutWarehouseTask.getCompId())
-                        .eq("contract_no", inOutWarehouseTask.getContractNo()));
-                overNeight = inOutWarehouseTask.getWeight() * (contractManagementInfo.getOverShort() / 100);
-                inOutWarehouseTask.setCompletedQuantity(inOutWarehouseTask.getCompletedQuantity() + warehouseInOutInfo.getNetWeight());
-                if (inOutWarehouseTask.getCompletedQuantity() > inOutWarehouseTask.getWeight() + overNeight) {
-                    throw new YException(YExceptionEnum.TASK_WEIGHT_EXCEEDED_ERROR);
-                } else {
-                    inOutWarehouseTaskService.updateById(inOutWarehouseTask);
-                }
-            }
+//            //更新出入库任务表已完成量
+//            InOutWarehouseTask inOutWarehouseTask = inOutWarehouseTaskService.selectOne(new EntityWrapper<InOutWarehouseTask>()
+//                    .eq("in_out_task_no", warehouseInOutInfo.getInOutTaskNo()));
+//            if (inOutWarehouseTask != null) {
+//                //可超出重量
+//                Float overNeight = 0.0f;
+//                ContractManagementInfo contractManagementInfo = ContractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
+//                        .eq("comp_id", inOutWarehouseTask.getCompId())
+//                        .eq("contract_no", inOutWarehouseTask.getContractNo()));
+//                overNeight = inOutWarehouseTask.getWeight() * (contractManagementInfo.getOverShort() / 100);
+//                inOutWarehouseTask.setCompletedQuantity(inOutWarehouseTask.getCompletedQuantity() + warehouseInOutInfo.getNetWeight());
+//                if (inOutWarehouseTask.getCompletedQuantity() > inOutWarehouseTask.getWeight() + overNeight) {
+//                    throw new YException(YExceptionEnum.TASK_WEIGHT_EXCEEDED_ERROR);
+//                } else {
+//                    inOutWarehouseTaskService.updateById(inOutWarehouseTask);
+//                }
+//            }
             CommonSysParameter commonSysParameter = iCommonSysParameterService.selectOne(new EntityWrapper<CommonSysParameter>().eq("const_id", "CON2").eq("const_value", paymentManagement1.getGoodsName()));
             warehouseInOutInfo.setGoodsNameKey(commonSysParameter.getConstKey());
             warehouseInOutInfo.setInOutFlag("2");

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

@@ -224,14 +224,14 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
                     tranCarInfo.setCompId(tranTaskInfo.getCompId());
                     //船运集装箱
                     if (tranCarInfoList.get(0).getTranType().equals(NumberConstant.CONSTANT3)&&"集装箱".equals(tranCarInfoList.get(0).getShipType())) {
-                        for(int i=0;i<tranCarInfoList.get(0).getBoxNumber();i++){
+//                        for(int i=0;i<tranCarInfoList.get(0).getBoxNumber();i++){
                             tranCarInfo.setProcessId(tranProcessInfo.getId());
                             tranCarInfo.setInfoId(tranProcessInfo.getInfoId());
                             tranCarInfo.setId(IdGenerator.generateUUID());
                             tranCarInfo.setStatusFlag(StatusEnum.NOT_LOADED.getFlag());
                             tranCarInfo.setStatus(StatusEnum.NOT_LOADED.getName());
                             tranCarInfoService.insert(tranCarInfo);
-                        }
+//                        }
                     }
                     else {
                         tranCarInfo.setProcessId(tranProcessInfo.getId());

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

@@ -124,35 +124,35 @@ public class TranTaskInfoServiceImpl extends ServiceImpl<TranTaskInfoMapper, Tra
                 tranTaskInfo.getStatus(), null, "");
 
         //创建任务
-        if ("2710b21efc1e4393930c5dc800010dc4".equals(tranTaskInfo.getCompId())) {
-            List<CommonStaff> commonStaffList = staffService.selectList(new EntityWrapper<CommonStaff>()
-                    .eq("dept_id", "839073b95d9a4529ba55dba5104eba19")
-                    .eq("delete_flag","0"));
-            List<String> staffIds = commonStaffList.stream().map(CommonStaff::getStaffId).collect(Collectors.toList());
-        // 先删除任务
-        noticeService.removeNotice(BaseNotice.NoticeStatus.TASK, "TRANTASK-APPROVE",
-                tranTaskInfo.getId(), null);
-        String staffNames = "XXX";
-        CommonStaff commitUserInfo = staffService.getInfo(AuthSecurityUtils.getCurrentUserId());
-        if (commitUserInfo != null) {
-            staffNames = commitUserInfo.getMajorRole() != null
-                    ? commitUserInfo.getMajorRole().getRoleName() + " " + commitUserInfo.getStaffName()
-                    : commitUserInfo.getStaffName();
-        }
-        String taskContent = "";
-        // 向下一步操作人发送任务通知
-        taskContent = "运输任务" + staffNames + "内勤" + staffNames + "提交的" + tranTaskInfo.getTranType() + "运输任务待派发，请及时处理。";
-        NoticeTaskInfo taskInfo = new NoticeTaskInfo();
-        taskInfo.setCompId(commitUserInfo.getCompId());
-        taskInfo.setAcceptType(BaseNotice.AcceptStatus.STAFF);
-        taskInfo.setBusinessId(tranTaskInfo.getId());
-        taskInfo.setBusinessType("TRANSPORTATIONTASK");
-        taskInfo.setMessageContent(taskContent);
-        taskInfo.setBusinessCode("TRANTASK-APPROVE");
-//            taskInfo.setNoticeTaskStatus(NoticeTaskInfo.NoticeTaskStatus.RETURN);
-        noticeTaskService.createNoticeTask(staffIds,
-                null, taskInfo);
-        }
+//        if ("2710b21efc1e4393930c5dc800010dc4".equals(tranTaskInfo.getCompId())) {
+//            List<CommonStaff> commonStaffList = staffService.selectList(new EntityWrapper<CommonStaff>()
+//                    .eq("dept_id", "839073b95d9a4529ba55dba5104eba19")
+//                    .eq("delete_flag","0"));
+//            List<String> staffIds = commonStaffList.stream().map(CommonStaff::getStaffId).collect(Collectors.toList());
+//        // 先删除任务
+//        noticeService.removeNotice(BaseNotice.NoticeStatus.TASK, "TRANTASK-APPROVE",
+//                tranTaskInfo.getId(), null);
+//        String staffNames = "XXX";
+//        CommonStaff commitUserInfo = staffService.getInfo(AuthSecurityUtils.getCurrentUserId());
+//        if (commitUserInfo != null) {
+//            staffNames = commitUserInfo.getMajorRole() != null
+//                    ? commitUserInfo.getMajorRole().getRoleName() + " " + commitUserInfo.getStaffName()
+//                    : commitUserInfo.getStaffName();
+//        }
+//        String taskContent = "";
+//        // 向下一步操作人发送任务通知
+//        taskContent = "运输任务" + staffNames + "内勤" + staffNames + "提交的" + tranTaskInfo.getTranType() + "运输任务待派发，请及时处理。";
+//        NoticeTaskInfo taskInfo = new NoticeTaskInfo();
+//        taskInfo.setCompId(commitUserInfo.getCompId());
+//        taskInfo.setAcceptType(BaseNotice.AcceptStatus.STAFF);
+//        taskInfo.setBusinessId(tranTaskInfo.getId());
+//        taskInfo.setBusinessType("TRANSPORTATIONTASK");
+//        taskInfo.setMessageContent(taskContent);
+//        taskInfo.setBusinessCode("TRANTASK-APPROVE");
+////            taskInfo.setNoticeTaskStatus(NoticeTaskInfo.NoticeTaskStatus.RETURN);
+//        noticeTaskService.createNoticeTask(staffIds,
+//                null, taskInfo);
+//        }
         // 假如 都成功返回ok
         if (one && two ) {
             return "OK";

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

@@ -96,6 +96,10 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
     private IPaymentManagementService paymentManagementService;
     @Autowired
     private IContractInventoryDistributionService contractInventoryDistributionService;
+    @Autowired
+    private ICustomerInfoService customerInfoService;
+    @Autowired
+    private IIdentityAuthenticationInfoService identityAuthenticationInfoService;
     @Value("${file-root-path}")
     private String localPath;
     @Autowired
@@ -235,6 +239,35 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
                                 .eq("comp_id", warehousingOrder2.getCompId()));
                         if (contractManagementInfo != null) {
                             warehousingOrder2.setBuyer(contractManagementInfo.getBuyer());
+                            //采购入库客户信息
+                            if ("采购入库".equals(warehousingOrder2.getInType())){
+                                CustomerInfo customerInfo = customerInfoService.selectOne(new EntityWrapper<CustomerInfo>().eq("comp_id",warehousingOrder2.getCompId())
+                                        .andNew().eq("comp_name", contractManagementInfo.getSeller()).or()
+                                        .eq("customer_name", contractManagementInfo.getSeller()));
+                                if (customerInfo != null) {
+                                    if (customerInfo.getCompName() != null){
+                                        warehousingOrder2.setCustomerName(customerInfo.getCompName());
+                                    }else {
+                                        warehousingOrder2.setCustomerName(customerInfo.getCustomerName());
+                                    }
+                                    warehousingOrder2.setBankCard(customerInfo.getBankCard());
+                                    warehousingOrder2.setBankDeposit(customerInfo.getBankDeposit());
+                                    warehousingOrder2.setBankDepositBranch(customerInfo.getBankDepositBranch());
+                                }
+                            }
+                            //采购入库客户信息
+                            else if ("收购入库".equals(warehousingOrder2.getInType())){
+                                IdentityAuthenticationInfo identityAuthenticationInfo = identityAuthenticationInfoService.selectOne(new EntityWrapper<IdentityAuthenticationInfo>()
+                                        .eq("customer_name",warehousingOrder2.getCustomer())
+                                        .eq("authentication_status_key","7")
+                                        .eq("comp_id",warehousingOrder2.getCompId()));
+                                if (identityAuthenticationInfo != null){
+                                    warehousingOrder2.setCustomerName(identityAuthenticationInfo.getCustomerName());
+                                    warehousingOrder2.setBankCard(identityAuthenticationInfo.getBankCard());
+                                    warehousingOrder2.setBankDeposit(identityAuthenticationInfo.getBankDeposit());
+                                    warehousingOrder2.setBankDepositBranch(identityAuthenticationInfo.getBankDepositBranch());
+                                }
+                            }
                         }
                     }
                     List<ExpenseAllocationInfo> expenseAllocationInfos=expenseAllocationInfoService.selectList(new EntityWrapper<ExpenseAllocationInfo>()

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/util/GeTuiUtils.java

@@ -25,14 +25,22 @@ import com.gexin.rp.sdk.base.payload.APNPayload;
 import com.gexin.rp.sdk.exceptions.RequestException;
 import com.gexin.rp.sdk.http.IGtPush;
 import com.gexin.rp.sdk.template.TransmissionTemplate;
+import com.winnerlook.model.VoiceNotifyBody;
+import com.winnerlook.model.VoiceResponseResult;
+import com.winnerlook.service.VoiceSender;
+import com.winsea.svc.base.base.entity.CommonStaff;
+import com.winsea.svc.base.base.mapper.CommonStaffMapper;
 import com.yh.saas.plugin.yiliangyiyun.entity.CommonUser;
 import com.yh.saas.plugin.yiliangyiyun.mapper.CommonUserMapper;
+import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.http.HttpResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.*;
 
 /**
  * @Author:chengchangjiang
@@ -44,6 +52,8 @@ import java.util.Map;
 public class GeTuiUtils {
     @Autowired
     private CommonUserMapper commonUserMapper;
+    @Autowired
+    private CommonStaffMapper commonStaffMapper;
     private static String appId = "q2frjgRYqt7RuC9Vjj6Va9";
     private static String appKey = "L0gnzFQa2O8aFW15lPRzh2";
     private static String masterSecret = "NhuCKHZJhp877ofHWtlQWA";
@@ -175,6 +185,53 @@ public class GeTuiUtils {
             System.out.println("推送异常:" + e.getMessage());
         }
     }
+
+    public void callPhone(String userId) throws Exception {
+      // 电话信息
+
+        /*请修改为平台分配的accountId*/
+        String accountId="285481";
+        /*请修改为平台分配的token*/
+        String token="9e412526531a43f296d23bb29771c761";
+        VoiceNotifyBody message = new VoiceNotifyBody();
+        /*用户接收回执的服务器地址*/
+        message.setCallbackUrl("http://192.168.1.102:9780/voice/api/VoiceWeb/receiveRecord");
+        CommonStaff commonStaff= commonStaffMapper.selectById(userId);
+//        message.setCalleeNumber("18840825257");
+        if(commonStaff != null){
+        message.setCalleeNumber(commonStaff.getStaffMobilePhone());
+        }
+        message.setReplayTimes(3);
+        message.setDisplayNumber("");
+
+        /*设置平台分配的模板ID*/
+        message.setTemplateId("401045");
+
+        LinkedHashMap<String,String> params = new LinkedHashMap<String,String>();
+        /*设置模板参数*/
+//        params.put("{1}","八就二六五四三五一");
+        /*params.put("{2}","您好");
+        params.put("{3}","895621");*/
+        message.setTemplateArgs(params);
+
+        try {
+            VoiceResponseResult result = VoiceSender.httpsSendVoiceNotify(message, accountId, token);
+
+            System.out.println("result = " + result);
+
+        }catch (Exception e) {
+            //Log.e(this.getClass(), " e = " + e);
+            e.printStackTrace();
+        }
+
+    }
+
+
+
+
+
+
+
     private static TransmissionTemplate genTransmissionTemplate(String content, String title) throws Exception {
         TransmissionTemplate template = new TransmissionTemplate();
         template.setAppId(appId);

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

@@ -142,10 +142,12 @@
         WHERE t.delete_flag = '0'
         AND t.contract_no=m.contract_no
         AND t.comp_id = m.comp_id)
-        else '他运' end as amountEdPayable
+        else '他运' end as amountEdPayable,
+        c.staff_name as creator
         FROM contract_management_info m
         left join contract_goods_info g on m.id=g.contract_id
         left join contract_process_info p on m.id=p.contract_id
+        left join common_staff c on m.create_user_id=c.staff_id
         WHERE
         m.comp_id = #{compId}
         and m.goods_type= #{goodsType}