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/InOutWarehouseTaskServiceImpl.java

@@ -21,6 +21,7 @@ import com.yh.saas.plugin.yiliangyiyun.exception.YExceptionEnum;
 import com.yh.saas.plugin.yiliangyiyun.mapper.InOutWarehouseTaskMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.IInOutWarehouseTaskService;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.yh.saas.plugin.yiliangyiyun.service.INewWorkflowService;
 import com.yh.saas.toolkit.workflow.service.IWorkflowService;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -46,7 +47,7 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
     @Autowired
     private ICommonBillOperateHisService billOperateHisService;
     @Autowired
-    private IWorkflowService workflowService;
+    private INewWorkflowService workflowService;
 
     /**
      * 出入库任务新增 编辑
@@ -114,30 +115,30 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
             inOutWarehouseTask.setTaskStatus(StatusEnum.TASK_REVIEWED.getName());
             // 操作主表数据
             this.updateById(inOutWarehouseTask);
-            boolean isStartWorkflow = StringUtils.isBlank(inOutWarehouseTask.getWorkflowId());
-            // 不是退回的单子
-            if (isStartWorkflow) {
-                Workflow workflow = workflowService
-                        .findLatestWorkflowByBusinessCode("INOUTTASK-TASK-APPROVE");
-                // 没配置审核流程，直接结束并处理信息
-                if (workflow == null) {
-                    throw new YException(YExceptionEnum.INTERVER_WORKFLOW_ERROR);
-                }
-                // 开启审核流
-                else {
-
-                    // 设置状态 已提交审核
-                    inOutWarehouseTask.setWorkflowId(workflow.getId());
-                    this.updateById(inOutWarehouseTask);
-                    workflowService.startInstance(workflow.getId(), inOutWarehouseTask.getId());
-                }
-            }
-            // 退回的单子 再启用
-            else {
-
-                this.updateById(inOutWarehouseTask);
-                workflowService.activateInstance(inOutWarehouseTask.getWorkflowId(), inOutWarehouseTask.getId());
-            }
+//            boolean isStartWorkflow = StringUtils.isBlank(inOutWarehouseTask.getWorkflowId());
+//            // 不是退回的单子
+//            if (isStartWorkflow) {
+//                Workflow workflow = workflowService
+//                        .findLatestWorkflowByBusinessCode("INOUTTASK-TASK-APPROVE");
+//                // 没配置审核流程，直接结束并处理信息
+//                if (workflow == null) {
+//                    throw new YException(YExceptionEnum.INTERVER_WORKFLOW_ERROR);
+//                }
+//                // 开启审核流
+//                else {
+//
+//                    // 设置状态 已提交审核
+//                    inOutWarehouseTask.setWorkflowId(workflow.getId());
+//                    this.updateById(inOutWarehouseTask);
+//                    workflowService.startInstance(workflow.getId(), inOutWarehouseTask.getId());
+//                }
+//            }
+//            // 退回的单子 再启用
+//            else {
+//
+//                this.updateById(inOutWarehouseTask);
+//                workflowService.activateInstance(inOutWarehouseTask.getWorkflowId(), inOutWarehouseTask.getId());
+//            }
         }
         return inOutWarehouseTask.getId();
     }

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

@@ -71,6 +71,8 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
     private ITranTaskInfoService tranTaskInfoService;
     @Autowired
     private ITranProcessInfoService tranProcessInfoService;
+    @Autowired
+    private ICostManagementInfoService costManagementInfoService;
 
     /**
      * 仓库管理页面列表
@@ -815,7 +817,16 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                         //只有一个汽运的运输阶段
                         if (tranProcessInfoList.size()==1&&tranProcessInfoList.get(0).getTranTypeKey()=="1"){
                             //成本为所选车辆出库时所在库的加权成本
-
+                            WarehouseBaseInfo warehouseBaseInfo=warehouseBaseInfoService.selectOne(new EntityWrapper<WarehouseBaseInfo>()
+                                    .eq("comp_id", inOutWarehouseTask.getCompId())
+                                    .eq("warehouse_name", inOutWarehouseTask.getWarehouseName()));
+                            if (warehouseBaseInfo!=null){
+                                CostManagementInfo costManagementInfo=costManagementInfoService.selectOne(new EntityWrapper<CostManagementInfo>()
+                                        .eq("warehouse_id", warehouseBaseInfo.getId()));
+                                if (costManagementInfo!=null){
+                                    contractManagementInfo.setUnitContractPrice(Double.valueOf(String.valueOf(costManagementInfo.getCost())));
+                                }
+                            }
                         }
                         else{
                             contractManagementInfo.setUnitContractPrice(null);