1

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/controller/PlanController.java

@@ -36,6 +36,7 @@ public class PlanController {
     }
 
     @RequestMapping("/addOrUpdatePlan")
+    @Transactional
     public HttpRespMsg addOrUpdatePlan(Plan plan){
         return planService.addOrUpdatePlan(plan);
     }
@@ -76,6 +77,11 @@ public class PlanController {
     public HttpRespMsg exportData(String date,Integer planType,String steelStampNumber){
         return planService.exportData(date,planType,steelStampNumber);
     }
+    /*计划下产品工序组员分配*/
+    @RequestMapping("/teamAllocation")
+    public HttpRespMsg teamAllocation(Integer procedureId,String teamIds){
+        return planService.teamAllocation(procedureId,teamIds);
+    }
 
 }
 

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/controller/PlanProcedureTotalController.java

@@ -0,0 +1,21 @@
+package com.management.platform.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author Seyason
+ * @since 2023-07-28
+ */
+@RestController
+@RequestMapping("/plan-procedure-total")
+public class PlanProcedureTotalController {
+
+}
+

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/controller/ProdProcedureTeamController.java

@@ -0,0 +1,21 @@
+package com.management.platform.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author Seyason
+ * @since 2023-07-28
+ */
+@RestController
+@RequestMapping("/prod-procedure-team")
+public class ProdProcedureTeamController {
+
+}
+

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/controller/SubProjectController.java

@@ -8,7 +8,6 @@ import com.management.platform.entity.ProjectTimer;
 import com.management.platform.entity.SubProject;
 import com.management.platform.mapper.ProjectTimerMapper;
 import com.management.platform.mapper.UserMapper;
-import com.management.platform.service.ProjectService;
 import com.management.platform.service.SubProjectService;
 import com.management.platform.util.HttpRespMsg;
 import org.springframework.beans.factory.annotation.Autowired;

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/entity/PlanProcedureTotal.java

@@ -0,0 +1,57 @@
+package com.management.platform.entity;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author Seyason
+ * @since 2023-07-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class PlanProcedureTotal extends Model<PlanProcedureTotal> {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 计划id
+     */
+    @TableField("plan_id")
+    private Integer planId;
+
+    /**
+     * 相关工序id
+     */
+    @TableField("prod_procedure_id")
+    private Integer prodProcedureId;
+
+    /**
+     * 总工价
+     */
+    @TableField("total_wages")
+    private Double totalWages;
+
+    /**
+     * 总工时
+     */
+    @TableField("total_working_hours")
+    private Double totalWorkingHours;
+
+    @TableField(exist = false)
+    private ProdProcedure prodProcedure;
+
+    @Override
+    protected Serializable pkVal() {
+        return null;
+    }
+
+}

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/entity/ProdProcedureTeam.java

@@ -0,0 +1,45 @@
+package com.management.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author Seyason
+ * @since 2023-07-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class ProdProcedureTeam extends Model<ProdProcedureTeam> {
+
+    private static final long serialVersionUID=1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @TableField("company_id")
+    private Integer companyId;
+
+    @TableField("user_id")
+    private String userId;
+
+    @TableField("prod_procedure_id")
+    private Integer prodProcedureId;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/mapper/PlanProcedureTotalMapper.java

@@ -0,0 +1,16 @@
+package com.management.platform.mapper;
+
+import com.management.platform.entity.PlanProcedureTotal;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author Seyason
+ * @since 2023-07-28
+ */
+public interface PlanProcedureTotalMapper extends BaseMapper<PlanProcedureTotal> {
+
+}

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/mapper/ProdProcedureTeamMapper.java

@@ -0,0 +1,16 @@
+package com.management.platform.mapper;
+
+import com.management.platform.entity.ProdProcedureTeam;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author Seyason
+ * @since 2023-07-28
+ */
+public interface ProdProcedureTeamMapper extends BaseMapper<ProdProcedureTeam> {
+
+}

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/service/PlanProcedureTotalService.java

@@ -0,0 +1,16 @@
+package com.management.platform.service;
+
+import com.management.platform.entity.PlanProcedureTotal;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author Seyason
+ * @since 2023-07-28
+ */
+public interface PlanProcedureTotalService extends IService<PlanProcedureTotal> {
+
+}

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/service/PlanService.java

@@ -32,4 +32,6 @@ public interface PlanService extends IService<Plan> {
     HttpRespMsg planDetail(Integer id, Integer type);
 
     HttpRespMsg hasSetDeptDetail();
+
+    HttpRespMsg teamAllocation(Integer procedureId,String teamIds);
 }

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/service/ProdProcedureTeamService.java

@@ -0,0 +1,16 @@
+package com.management.platform.service;
+
+import com.management.platform.entity.ProdProcedureTeam;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author Seyason
+ * @since 2023-07-28
+ */
+public interface ProdProcedureTeamService extends IService<ProdProcedureTeam> {
+
+}

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/service/impl/PlanProcedureTotalServiceImpl.java

@@ -0,0 +1,20 @@
+package com.management.platform.service.impl;
+
+import com.management.platform.entity.PlanProcedureTotal;
+import com.management.platform.mapper.PlanProcedureTotalMapper;
+import com.management.platform.service.PlanProcedureTotalService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author Seyason
+ * @since 2023-07-28
+ */
+@Service
+public class PlanProcedureTotalServiceImpl extends ServiceImpl<PlanProcedureTotalMapper, PlanProcedureTotal> implements PlanProcedureTotalService {
+
+}

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/service/impl/PlanServiceImpl.java

@@ -8,10 +8,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.management.platform.entity.*;
 import com.management.platform.entity.vo.SysRichFunction;
 import com.management.platform.mapper.*;
-import com.management.platform.service.PlanDeptService;
-import com.management.platform.service.PlanService;
+import com.management.platform.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.management.platform.service.WxCorpInfoService;
 import com.management.platform.util.ExcelUtil;
 import com.management.platform.util.HttpRespMsg;
 import com.management.platform.util.MessageUtils;
@@ -79,6 +77,10 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
     private PlanMaterialMapper planMaterialMapper;
     @Resource
     private TaskTypeMapper taskTypeMapper;
+    @Resource
+    private ProdProcedureTeamService prodProcedureTeamService;
+    @Resource
+    private PlanProcedureTotalService planProcedureTotalService;
 
     @Value(value = "${upload.path}")
     private String path;
@@ -108,8 +110,7 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
             }
         }
         if(!StringUtils.isEmpty(steelStampNumber)){
-            queryWrapper.gt("steel_stamp_number_start",steelStampNumber);
-            queryWrapper.lt("steel_stamp_number_end",steelStampNumber);
+            queryWrapper.apply("'"+steelStampNumber+"'"+" between steel_stamp_number_start AND steel_stamp_number_end");
         }
         IPage<Plan> planIPage = planMapper.selectPage(new Page<>(pageIndex, pageSize), queryWrapper);
         Map map=new HashMap();
@@ -129,10 +130,14 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
             plan.setStationName(department.getDepartmentName());
         }
         if(plan.getProductId()!=null){
-                Product product = productMapper.selectById(plan.getProductId());
-                plan.setProductName(product.getName());
+            Product product = productMapper.selectById(plan.getProductId());
+            plan.setProductName(product.getName());
         }
+        List<ProdProcedure> procedureList = prodProcedureMapper.selectList(new QueryWrapper<ProdProcedure>().eq("company_id", companyId).eq("product_id",plan.getProductId()).orderByDesc("id"));
+        List<PlanProcedureTotal> planProcedureTotals=new ArrayList<>();
+        List<ProdProcedure> list;
         if(plan.getId()==null){
+            list = procedureList.stream().filter(pl -> pl.getVersionNumber().equals(procedureList.get(0).getVersionNumber())).collect(Collectors.toList());
             if(plan.getProductSchedulingNum()!=null){
                 if(count(new QueryWrapper<Plan>().eq("product_scheduling_num",plan.getProductSchedulingNum()))>0){
                     msg.setError("当前排产工单号已存在");
@@ -152,6 +157,10 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
             }else {
                 plan.setPlanType(1);
             }
+            if(procedureList!=null&&procedureList.size()>0){
+                String versionNumber = procedureList.get(0).getVersionNumber();
+                plan.setVersionNumber(versionNumber);
+            }
             if(planMapper.insert(plan)<0){
                 msg.setError("验证失败");
                 return msg;
@@ -166,7 +175,23 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
                 msg.setError("验证失败");
                 return msg;
             }
+            list = procedureList.stream().filter(pl -> pl.getVersionNumber().equals(plan.getVersionNumber())).collect(Collectors.toList());
+            planProcedureTotalService.remove(new QueryWrapper<PlanProcedureTotal>().eq("plan_id",plan.getId()));
         }
+        list=list.stream().sorted(Comparator.comparing(ProdProcedure::getId)).collect(Collectors.toList());
+        list.forEach(ps->{
+            PlanProcedureTotal p=new PlanProcedureTotal();
+            p.setPlanId(plan.getId());
+            p.setProdProcedureId(ps.getId());
+            BigDecimal totalWages=new BigDecimal(String.valueOf(ps.getUnitPrice()));
+            totalWages=totalWages.multiply(new BigDecimal(plan.getNum()));
+            p.setTotalWages(totalWages.doubleValue());
+            BigDecimal totalWorkingHours=new BigDecimal(String.valueOf(ps.getWorkingTime()));
+            totalWorkingHours=totalWorkingHours.multiply(new BigDecimal(plan.getNum()));
+            p.setTotalWorkingHours(totalWorkingHours.doubleValue());
+            planProcedureTotals.add(p);
+        });
+        planProcedureTotalService.saveBatch(planProcedureTotals);
         return msg;
     }
 
@@ -186,9 +211,9 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
                 if(first.isPresent()){
                     //todo:推送到企业微信
                     StringBuilder stringBuilder=new StringBuilder();
-                    stringBuilder.append(planType==0?"今日计划":planType==1?"明日计划":"插单计划"+": ");
-                    stringBuilder.append(planType==2?"任务名称"+plan.getTaskName()+"\n"+"任务变更通知号"+plan.getTaskChangeNoticeNum():"产品名称"+plan.getProductName()+"\n"+"排产工单号"+plan.getProductSchedulingNum());
-                    wxCorpInfoService.sendWXCorpMsg(wxCorpInfo,first.get().getCorpwxUserid(),stringBuilder.toString(),planType==0?"plan/today":planType==1?"plan/tomorrow":"plan/orderInsert",null);
+                    stringBuilder.append((planType==0?"今日计划":planType==1?"明日计划":"插单计划")+"\n");
+                    stringBuilder.append(planType==2?"任务名称: "+plan.getTaskName()+"\n"+"任务变更通知号: "+plan.getTaskChangeNoticeNum():"产品名称: "+plan.getProductName()+"\n"+"排产工单号: "+plan.getProductSchedulingNum());
+                    wxCorpInfoService.sendWXCorpMsg(wxCorpInfo,first.get().getCorpwxRealUserid(),stringBuilder.toString(),planType==0?"plan/today":planType==1?"plan/tomorrow":"plan/orderInsert",null);
                 }else msg.setError("验证失败");
             }
         }
@@ -573,6 +598,27 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
         return httpRespMsg;
     }
 
+    @Override
+    public HttpRespMsg teamAllocation(Integer procedureId,String teamIds) {
+        HttpRespMsg msg=new HttpRespMsg();
+        Integer companyId = userMapper.selectById(request.getHeader("token")).getCompanyId();
+        List<ProdProcedureTeam> list=new ArrayList<>();
+        if(StringUtils.isEmpty(teamIds)){
+            String[] team = teamIds.split(",");
+            for (String s : team) {
+                ProdProcedureTeam prodProcedureTeam=new ProdProcedureTeam();
+                prodProcedureTeam.setCompanyId(companyId);
+                prodProcedureTeam.setProdProcedureId(procedureId);
+                prodProcedureTeam.setUserId(s);
+                list.add(prodProcedureTeam);
+            }
+        }
+        if(!prodProcedureTeamService.saveBatch(list)){
+            msg.setError("验证失败");
+        }
+        return msg;
+    }
+
     @Override
     public HttpRespMsg planDetail(Integer id, Integer type) {
         HttpRespMsg msg=new HttpRespMsg();
@@ -580,8 +626,15 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
         if(plan!=null){
             switch (type){
                 case 0:
+                    List<PlanProcedureTotal> procedureTotals = planProcedureTotalService.list(new QueryWrapper<PlanProcedureTotal>().eq("plan_id", plan.getId()));
                     List<ProdProcedure> prodProcedureList = prodProcedureMapper.selectList(new QueryWrapper<ProdProcedure>().eq("product_id", plan.getProductId()).eq("version_number",plan.getVersionNumber()));
-                    msg.setData(prodProcedureList);
+                    procedureTotals.forEach(ps->{
+                        Optional<ProdProcedure> first = prodProcedureList.stream().filter(pl -> pl.getId().equals(ps.getProdProcedureId())).findFirst();
+                        if(first.isPresent()){
+                            ps.setProdProcedure(first.get());
+                        }
+                    });
+                    msg.setData(procedureTotals);
                     break;
 //                case 1:
 //                    Map map=new HashMap();

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/service/impl/ProdProcedureTeamServiceImpl.java

@@ -0,0 +1,20 @@
+package com.management.platform.service.impl;
+
+import com.management.platform.entity.ProdProcedureTeam;
+import com.management.platform.mapper.ProdProcedureTeamMapper;
+import com.management.platform.service.ProdProcedureTeamService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author Seyason
+ * @since 2023-07-28
+ */
+@Service
+public class ProdProcedureTeamServiceImpl extends ServiceImpl<ProdProcedureTeamMapper, ProdProcedureTeam> implements ProdProcedureTeamService {
+
+}

fhKeeper/formulahousekeeper/management-workshop/src/main/resources/mapper/PlanProcedureTotalMapper.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.management.platform.mapper.PlanProcedureTotalMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.management.platform.entity.PlanProcedureTotal">
+        <result column="plan_id" property="planId" />
+        <result column="prod_procedure_id" property="prodProcedureId" />
+        <result column="total_wages" property="totalWages" />
+        <result column="total_working_hours" property="totalWorkingHours" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        plan_id, prod_procedure_id, total_wages, total_working_hours
+    </sql>
+
+</mapper>

fhKeeper/formulahousekeeper/management-workshop/src/main/resources/mapper/ProdProcedureTeamMapper.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.management.platform.mapper.ProdProcedureTeamMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.management.platform.entity.ProdProcedureTeam">
+        <id column="id" property="id" />
+        <result column="company_id" property="companyId" />
+        <result column="user_id" property="userId" />
+        <result column="prod_procedure_id" property="prodProcedureId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, company_id, user_id, prod_procedure_id
+    </sql>
+
+</mapper>

fhKeeper/formulahousekeeper/timesheet-workshop/src/views/plan/planComponent.vue

@@ -26,6 +26,7 @@
               size="small"
               @change="getTableData(hasChooseDept)"
               placeholder="请输入内容"
+              clearable="true"
             ></el-input>
           </div>
         </div>
@@ -320,6 +321,7 @@ export default {
         startDate: "",
         endDate: "",
         describtion: "",
+        versionNumber:"",
       },
       todayTabIndex: 0,
       tableDataLoading: false,

fhKeeper/formulahousekeeper/timesheet-workshop/src/views/plan/planComponentDetil.vue

@@ -17,15 +17,25 @@
                 :key="tableKey"
                 style="width: 100%;height: 80vh;"
                 v-loading="tableDataLoading">
-                    <el-table-column prop="name" label="工序名称"></el-table-column>
-                    <el-table-column prop="workingTime" label="单件工时"></el-table-column>
-                    <el-table-column prop="productName" label="总工时" width="180"></el-table-column>
-                    <el-table-column prop="unitPrice" label="单件工价" width="180"></el-table-column>
-                    <el-table-column prop="productName" label="总工价" width="180"></el-table-column>
+                    <el-table-column label="工序名称">
+                        <template slot-scope="scope">{{ scope.row.prodProcedure.name }}</template>
+                    </el-table-column>
+                    <el-table-column label="单件工时">
+                        <template slot-scope="scope">{{ scope.row.prodProcedure.workingTime }}</template>
+                    </el-table-column>
+                    <el-table-column label="总工时" width="180">
+                        <template slot-scope="scope">{{ scope.row.totalWorkingHours }}</template>
+                    </el-table-column>
+                    <el-table-column label="单件工价" width="180">
+                        <template slot-scope="scope">{{ scope.row.prodProcedure.unitPrice }}</template>
+                    </el-table-column>
+                    <el-table-column label="总工价" width="180">
+                        <template slot-scope="scope">{{ scope.row.totalWages }}</template>
+                    </el-table-column>
                     <el-table-column label="质检类型" width="180">
-                        <template slot-scope="scope">{{ scope.row.checkType==0?"自检": scope.row.checkType==1?"互检":"专检"}}</template>
+                        <template slot-scope="scope">{{ scope.row.prodProcedure.checkType==0?"自检": scope.row.prodProcedure.checkType==1?"互检":"专检"}}</template>
                     </el-table-column>
-                    <el-table-column prop="productName" label="组员" width="180"></el-table-column>
+                    <el-table-column label="组员" width="180"></el-table-column>
                 </el-table>
             </div>
             <!-- <div v-if="TabIndex == 1"  v-loading="tableDataLoading">