加工成本

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/projectorder/ProjectOrderController.java

@@ -14,12 +14,14 @@ import com.chanko.yunxi.mes.module.heli.dal.dataobject.deliverorder.DeliverOrder
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.orderys.OrderYsDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderSubDO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatch.TaskDispatchDO;
 import com.chanko.yunxi.mes.module.heli.dal.mysql.orderys.OrderYsMapper;
 import com.chanko.yunxi.mes.module.heli.enums.BusinesTypeEnum;
 import com.chanko.yunxi.mes.module.heli.manager.CrossOrderManager;
 import com.chanko.yunxi.mes.module.heli.service.deliverorder.DeliverOrderService;
 import com.chanko.yunxi.mes.module.heli.service.orderys.OrderYsService;
 import com.chanko.yunxi.mes.module.heli.service.projectorder.ProjectOrderService;
+import com.chanko.yunxi.mes.module.heli.service.taskdispatch.TaskDispatchService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -61,6 +63,8 @@ public class ProjectOrderController {
     private OrderYsService orderYsService;
     @Resource
     private DeliverOrderService deliverOrderService;
+    @Resource
+    private TaskDispatchService taskDispatchService;
     @PostMapping("/create")
     @Operation(summary = "创建项目订单")
     @PreAuthorize("@ss.hasPermission('heli:project-order:create')")
@@ -150,6 +154,13 @@ public class ProjectOrderController {
                         .reduce(BigDecimal.ZERO, BigDecimal::add);
                 projectOrderDO.setYunFeiCost(totalAmount);
             }
+            List<TaskDispatchDO> list=  taskDispatchService.getListJg(projectOrderDO.getId(),projectOrderDO.getProjectSubId());
+            if (list!=null&&list.size()>0){
+                BigDecimal totalAmount = list.stream()
+                        .map(TaskDispatchDO -> TaskDispatchDO.getZanGuMoney() != null ?new BigDecimal(TaskDispatchDO.getZanGuMoney()) : BigDecimal.ZERO)
+                        .reduce(BigDecimal.ZERO, BigDecimal::add);
+                projectOrderDO.setJiaGongShiCost(totalAmount);
+            }
         }
         return success(BeanUtils.toBean(pageResult, ProjectOrderCostRespVO.class));
     }

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/taskdispatch/TaskDispatchController.java

@@ -12,6 +12,7 @@ import com.chanko.yunxi.mes.module.heli.controller.admin.taskdispatch.vo.*;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.fpuser.FpUserDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatch.TaskDispatchDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatch.TaskDispatchDetailDO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskreport.TaskReportDO;
 import com.chanko.yunxi.mes.module.heli.dal.mysql.fpuserdetail.FpUserDetailMapper;
 import com.chanko.yunxi.mes.module.heli.enums.BusinesTypeEnum;
 import com.chanko.yunxi.mes.module.heli.service.taskdispatch.TaskDispatchService;
@@ -209,4 +210,11 @@ public class TaskDispatchController {
         List<HashMap<String, String>> owner = taskDispatchService.getOwner(id, type);
         return success(owner);
     }
+    @GetMapping("/getListJg")
+    @Operation(summary = "获得加工工时成本")
+    @PreAuthorize("@ss.hasPermission('heli:deliver-order:query')")
+    public CommonResult<List<TaskDispatchDO>> getListJg(@RequestParam("id") Long id, @RequestParam("projectSubId") Long projectSubId ) {
+        List<TaskDispatchDO> list=  taskDispatchService.getListJg(id,projectSubId);
+        return success( list);
+    }
 }

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/taskreport/TaskReportController.java

@@ -9,6 +9,7 @@ import com.chanko.yunxi.mes.framework.operatelog.core.annotations.OperateLog;
 import com.chanko.yunxi.mes.module.heli.controller.admin.taskreport.vo.TaskReportPageReqVO;
 import com.chanko.yunxi.mes.module.heli.controller.admin.taskreport.vo.TaskReportRespVO;
 import com.chanko.yunxi.mes.module.heli.controller.admin.taskreport.vo.TaskReportSaveReqVO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.deliverorder.DeliverOrderDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskreport.TaskReportDO;
 import com.chanko.yunxi.mes.module.heli.service.taskreport.TaskReportService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -90,4 +91,5 @@ public class TaskReportController {
                         BeanUtils.toBean(list, TaskReportRespVO.class));
     }
 
+
 }

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/projectorder/ProjectOrderDO.java

@@ -281,6 +281,8 @@ public class ProjectOrderDO extends BaseDO {
     * */
     @TableField(exist = false)
     private BigDecimal yunFeiCost;
+    @TableField(exist = false)
+    private BigDecimal jiaGongShiCost;
     /**
      * 变更的字段列表
      * */

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/taskdispatch/TaskDispatchDO.java

@@ -9,6 +9,7 @@ import com.chanko.yunxi.mes.framework.operatelog.core.enums.OperateTypeEnum;
 import com.chanko.yunxi.mes.module.heli.enums.TaskDispatchStatusEnum;
 import lombok.*;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 /**
@@ -104,6 +105,16 @@ public class TaskDispatchDO extends BaseDO {
     @TableField(exist = false)
     private String materialName;
 
+    @TableField(exist = false)
+    private String materialType;
+
+
+    @TableField(exist = false)
+    private String shiJiMoney;
+
+    @TableField(exist = false)
+    private String zanGuMoney;
+
     @TableField(exist = false)
     private Long compositionId;
 

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/projectorder/ProjectOrderMapper.java

@@ -49,7 +49,8 @@ public interface ProjectOrderMapper extends BaseMapperX<ProjectOrderDO> {
              .like(!StringUtils.isEmpty(reqVO.getCustomerName()),"b.name",reqVO.getCustomerName())
              .like(!StringUtils.isEmpty(reqVO.getProjectSubName()),"a.name",reqVO.getProjectSubName())
              .eq(ProjectOrderDO::getOrderStatus,32)
-             .in(ProjectOrderDO::getIsSnapshot,0);
+             .in(ProjectOrderDO::getIsSnapshot,0)
+             .orderByDesc(ProjectOrderDO::getCreateTime);
         ;
         return selectPage(reqVO, query);
     }

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchMapper.java

@@ -8,12 +8,17 @@ import com.chanko.yunxi.mes.module.heli.dal.dataobject.customer.CustomerDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.plan.PlanDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.plantask.PlanTaskDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.plantaskbom.PlanTaskBomDO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.procedure.ProcedureDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.processbom.ProcessBomDetailDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.processdesign.ProcessDesignDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderSubDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatch.TaskDispatchDO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatch.TaskDispatchDetailDO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskreport.TaskReportDO;
 import com.chanko.yunxi.mes.module.heli.enums.TaskDispatchTypeEnum;
+import com.chanko.yunxi.mes.module.system.dal.dataobject.dept.PostDO;
+import com.chanko.yunxi.mes.module.system.dal.dataobject.dept.UserPostDO;
 import com.chanko.yunxi.mes.module.system.dal.dataobject.user.AdminUserDO;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import org.apache.ibatis.annotations.Mapper;
@@ -152,4 +157,24 @@ public interface TaskDispatchMapper extends BaseMapperX<TaskDispatchDO> {
         return selectOne(query);
     }
 
+    default List<TaskDispatchDO> getListJg(Long id, Long projectSubId){
+        MPJLambdaWrapper<TaskDispatchDO> query = new MPJLambdaWrapper<>();
+        query.selectAll(TaskDispatchDO.class)
+                .select("z.name as materialName", "z.procedure_type as materialType", "SUM(COALESCE(d.work_time, 0)) as amount")
+                .select("p.grade_cost as shiJiMoney")
+                .select(" ROUND(SUM(COALESCE(d.work_time, 0)) * p.grade_cost, 2) as zanGuMoney")
+                .leftJoin(TaskDispatchDetailDO.class, "x", TaskDispatchDetailDO::getDispatchId,TaskDispatchDO::getId)
+                .leftJoin(ProcedureDO.class, "z", ProcedureDO::getId, TaskDispatchDetailDO::getProcedureId)
+                .leftJoin(TaskReportDO.class, "d", TaskReportDO::getDispatchDetailId,TaskDispatchDetailDO::getId)
+                .leftJoin(UserPostDO.class, "c", UserPostDO::getUserId, TaskReportDO::getOwner)
+                .leftJoin(PostDO.class,"p", PostDO::getId,UserPostDO::getPostId)
+                .groupBy(TaskDispatchDetailDO::getId)
+                .orderByDesc(TaskDispatchDO::getCreateTime)
+                .disableSubLogicDel();
+        query.eq( TaskDispatchDO::getProjectId, id)
+                .eq(TaskDispatchDO::getProjectSubId,projectSubId)
+                .eq(TaskReportDO::getHasReport, 1);
+        return selectList(query);
+    }
+
 }

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskreport/TaskReportMapper.java

@@ -10,6 +10,8 @@ import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrder
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatch.TaskDispatchDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatch.TaskDispatchDetailDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskreport.TaskReportDO;
+import com.chanko.yunxi.mes.module.system.dal.dataobject.dept.PostDO;
+import com.chanko.yunxi.mes.module.system.dal.dataobject.dept.UserPostDO;
 import com.chanko.yunxi.mes.module.system.dal.dataobject.user.AdminUserDO;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import org.apache.ibatis.annotations.Mapper;
@@ -27,6 +29,7 @@ import java.util.List;
 @Mapper
 public interface TaskReportMapper extends BaseMapperX<TaskReportDO> {
 
+
     default PageResult<TaskReportDO> selectPage(TaskReportPageReqVO reqVO) {
         MPJLambdaWrapper<TaskReportDO> query = new MPJLambdaWrapper<>();
         query.selectAll(TaskReportDO.class)
@@ -68,4 +71,6 @@ public interface TaskReportMapper extends BaseMapperX<TaskReportDO> {
         query1.eq(TaskReportDO::getDispatchDetailId,dispatchDetailId);
         return selectCount(query1);
     }
+
+
 }

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskdispatch/TaskDispatchService.java

@@ -5,6 +5,7 @@ import com.chanko.yunxi.mes.module.heli.controller.admin.taskdispatch.vo.*;
 import com.chanko.yunxi.mes.module.heli.controller.admin.ygjx.vo.YgjxPageReqVO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatch.TaskDispatchDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatch.TaskDispatchDetailDO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskreport.TaskReportDO;
 
 import javax.validation.Valid;
 import java.util.HashMap;
@@ -90,4 +91,6 @@ public interface TaskDispatchService {
 
     List<HashMap<String,String>> getOwner(Long id,Long type);
     boolean judgeHasOver(Long id);
+
+    List<TaskDispatchDO> getListJg(Long id, Long projectSubId);
 }

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskdispatch/TaskDispatchServiceImpl.java

@@ -633,6 +633,12 @@ public class TaskDispatchServiceImpl implements TaskDispatchService {
     public     boolean judgeHasOver(Long id){
       return   taskDispatchDetailMapper.judgeHasOver(id);
     }
+
+    @Override
+    public List<TaskDispatchDO> getListJg(Long id, Long projectSubId) {
+        return taskDispatchMapper.getListJg(id,projectSubId);
+    }
+
     private void createTaskDispatchDetailList(Long dispatchId, List<TaskDispatchDetailDO> list) {
         list.forEach(o -> o.setDispatchId(dispatchId));
         // 分组更新与插入

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskreport/TaskReportServiceImpl.java

@@ -71,4 +71,6 @@ public class TaskReportServiceImpl implements TaskReportService {
         return taskReportMapper.selectPage(pageReqVO);
     }
 
+
+
 }

mes-ui/mes-ui-admin-vue3/src/api/heli/saleordercost/index.ts

@@ -27,3 +27,7 @@ export const getPlanCost = async (id: number,projectSubId: number) => {
 export const getListYf = async (id: number,projectSubId: number) => {
   return await request.get({ url: `/heli/deliver-order/getListYf?id=`+id+`&projectSubId=`+projectSubId })
 }
+//查询加工工时成本
+export const getListJg = async (id: number,projectSubId: number) => {
+  return await request.get({ url: `/heli/task-dispatch/getListJg?id=`+id+`&projectSubId=`+projectSubId })
+}

mes-ui/mes-ui-admin-vue3/src/views/heli/saleordercost/edit.vue

@@ -200,13 +200,13 @@
 			  <el-table-column type="index" min-width="60" fixed label="序号" align="center" />
 			  <el-table-column v-if="false" label="ID" align="center" prop="id" width="240px" />
 			  <el-table-column label="工序名称" align="center" prop="materialName" width="240px"/>
-			  <el-table-column label="工序类型" align="center" prop="materialType" />
+        <el-table-column label="工序类型" align="center" prop="materialType" >
-			  <el-table-column label="总加工工时" align="center" prop="amount" />
+          <template #default="scope">
-			  <el-table-column label="工时单价" align="center"  >
+            <dict-tag :type="DICT_TYPE.HELI_PROCEDURE_TYPE" :value="scope.row.materialType" />
-				  <template v-slot="scope">
-					  <el-input v-model="scope.row.shiJiMoney" />
           </template>
         </el-table-column>
+			  <el-table-column label="总加工工时" align="center" prop="amount" />
+			  <el-table-column label="工时单价" align="center"  prop="shiJiMoney"/>
 			  <el-table-column label="加工费用" align="center" prop="zanGuMoney" />
 
 
@@ -260,6 +260,8 @@
 
 	import * as SaleeOrderCost from '@/api/heli/saleordercost'
   import {dateFormatter2} from "@/utils/formatTime";
+  import {DICT_TYPE} from "@/utils/dict";
+  import {number} from "vue-types";
 	const { t } = useI18n() // 国际化
 	const message = useMessage() // 消息弹窗
 	const { query } = useRoute()
@@ -306,11 +308,22 @@
 		//查询运费成本
     const listYfData =  await SaleeOrderCost.getListYf(query.id,query.projectSubId)
     listYf.value=listYfData
+    const listJgData =  await SaleeOrderCost.getListJg(query.id,query.projectSubId)
+    listJg.value=listJgData
     formData.value.yunFeiCost=0
+    formData.value.jiaGongShiCost=0
+    if (listYf.value!=null){
       listYf.value.map((item)=>{
         formData.value.yunFeiCost+=item.yunFeiMoney
       })
+    }
+   if (listJg.value!=null){
+     listJg.value.map((item)=>{
+       formData.value.jiaGongShiCost+=Number(item.zanGuMoney)
      })
+   }
+	})
+
 
 
 </script>