Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper into master

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

@@ -68,7 +68,7 @@ public class ProdCategoryController {
      */
     @RequestMapping("delete")
     public HttpRespMsg delete(@RequestParam Integer id){
-        return prodCategoryService.delete(id);
+        return prodCategoryService.delete(id,request);
     }
 
 }

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

@@ -18,5 +18,5 @@ public interface ProdCategoryService extends IService<ProdCategory> {
 
     HttpRespMsg saveOrUpdateInfo(ProdCategory prodCategory, HttpServletRequest request);
 
-    HttpRespMsg delete(Integer id);
+    HttpRespMsg delete(Integer id, HttpServletRequest request);
 }

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

@@ -106,7 +106,12 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
             queryWrapper.eq("plan_type",1);
         }
         if(deptId!=null){
-            queryWrapper.eq("station_id",deptId);
+            //获取获取下级部门列表
+            List<Department> departmentList = departmentMapper.selectList(new QueryWrapper<Department>().eq("superior_id", deptId));
+            List<Integer> ids = departmentList.stream().map(Department::getDepartmentId).distinct().collect(Collectors.toList());
+            ids.add(-1);
+            //同时可以查看下级部门的数据
+            queryWrapper.and(wrapper->wrapper.eq("station_id",deptId).or().in("station_id",ids));
         }
         if(!StringUtils.isEmpty(date)){
             LocalDate parse = LocalDate.parse(date,df);
@@ -184,6 +189,11 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
                     rs.setPlanProcedureTotals(totals);
                 }
             }
+            if(rs.getPlanType()==1){
+                BigDecimal bigDecimal=new BigDecimal(String.valueOf(rs.getMoneyOfJob()));
+                bigDecimal=bigDecimal.multiply(new BigDecimal(String.valueOf(rs.getPlanWorkHour())));
+                rs.setTotalMoney(bigDecimal.doubleValue());
+            }
         });
         Map map=new HashMap();
         map.put("total",planIPage.getTotal());
@@ -223,6 +233,12 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
                     return msg;
                 }
             }
+            if(plan.getTaskChangeNoticeNum()!=null){
+                if(count(new QueryWrapper<Plan>().eq("task_change_notice_num",plan.getTaskChangeNoticeNum()))>0){
+                    msg.setError("当前任务变更通知号已存在");
+                    return msg;
+                }
+            }
             if(!StringUtils.isEmpty(plan.getSteelStampNumberStart())&&!StringUtils.isEmpty(plan.getSteelStampNumberEnd()!=null)){
                 QueryWrapper<Plan> cutQueryWrapper=new QueryWrapper();
             }
@@ -292,6 +308,10 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
         }else {
             PlanProcedureTotal p=new PlanProcedureTotal();
             p.setPlanId(plan.getId());
+            BigDecimal bigDecimal=new BigDecimal(String.valueOf(plan.getMoneyOfJob()));
+            bigDecimal=bigDecimal.multiply(new BigDecimal(String.valueOf(plan.getPlanWorkHour())));
+            p.setTotalWages(bigDecimal.doubleValue());
+            p.setTotalWorkingHours(plan.getPlanWorkHour());
             boolean b = oldPlanProcedureTotals.stream().anyMatch(fs -> fs.getPlanId().equals(plan.getId()));
             if(!b){
                 planProcedureTotals.add(p);

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

@@ -59,17 +59,28 @@ public class ProdCategoryServiceImpl extends ServiceImpl<ProdCategoryMapper, Pro
     }
 
     @Override
-    public HttpRespMsg delete(Integer id) {
+    public HttpRespMsg delete(Integer id, HttpServletRequest request) {
         HttpRespMsg msg=new HttpRespMsg();
+        String token = request.getHeader("Token");
+        User user = userMapper.selectById(token);
 
         Integer count = productMapper.selectCount(
                 new LambdaQueryWrapper<Product>()
                         .eq(id != null, Product::getCategoryId, id)
+                .eq(user.getCompanyId()!=null,Product::getCompanyId,user.getCompanyId())
         );
+
+
         if(count==0){
-            prodCategoryMapper.deleteById(id);
+
+             if(prodCategoryMapper.selectCount(new LambdaQueryWrapper<ProdCategory>().eq(user.getCompanyId()!=null,ProdCategory::getCompanyId,user.getCompanyId()))==1){
+                 msg.setError("产品分类数量不能低于1");
+             }else{
+                 prodCategoryMapper.deleteById(id);
+             }
+
         }else{
-            msg.setError("category is used");
+            msg.setError("已有产品为此分类，无法删除");
         }
 
         return msg;

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

@@ -2,11 +2,14 @@ package com.management.platform.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.management.platform.entity.PlanProcedureTotal;
 import com.management.platform.entity.ProdProcedure;
 import com.management.platform.entity.User;
+import com.management.platform.mapper.PlanProcedureTotalMapper;
 import com.management.platform.mapper.ProdProcedureMapper;
 import com.management.platform.mapper.ProductMapper;
 import com.management.platform.mapper.UserMapper;
+import com.management.platform.service.PlanProcedureTotalService;
 import com.management.platform.service.ProdProcedureService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.management.platform.util.HttpRespMsg;
@@ -38,7 +41,8 @@ public class ProdProcedureServiceImpl extends ServiceImpl<ProdProcedureMapper, P
     private UserMapper userMapper;
     @Resource
     private ProductMapper productMapper;
-
+    @Resource
+    private PlanProcedureTotalMapper planProcedureTotalMapper;
 
     @Override
     public HttpRespMsg changeProdProcedure(HttpServletRequest request, List<ProdProcedure> prodProcedureList, Integer productId, String productName, String version) {
@@ -113,11 +117,21 @@ public class ProdProcedureServiceImpl extends ServiceImpl<ProdProcedureMapper, P
 
     @Override
     public HttpRespMsg isDelete(HttpServletRequest request, Integer deleteId) {
-        HttpRespMsg msg = new HttpRespMsg();
-        //TODO: 检查工序是否已经被使用，被使用的不能删除
+        HttpRespMsg httpRespMsg=new HttpRespMsg();
         boolean flag=true;
-        msg.setData(flag);
-        return msg;
+
+
+        Integer count = planProcedureTotalMapper.selectCount(
+                new LambdaQueryWrapper<PlanProcedureTotal>()
+                        .eq(deleteId != null, PlanProcedureTotal::getProdProcedureId, deleteId)
+        );
+
+        if(count>0){
+            flag=false;
+        }
+
+        httpRespMsg.setData(flag);
+        return httpRespMsg;
     }
 
     @Override

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

@@ -1326,7 +1326,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                         .setRoleId(roleId)
                         .setRoleName(sysRoleMapper.selectById(roleId).getRolename())
                         .setWorkTypeId(workTypeId)
-                        .setWorkType(workTypeMapper.selectById(workTypeId).getName())
+                        .setWorkType(workTypeId!=null?workTypeMapper.selectById(workTypeId).getName():null)
                         .setMonthCost(monthCostValue)
                         .setCost(costValue)
                         .setPosition(position)
@@ -1923,24 +1923,24 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
             //headCell.setCellValue("部门");
             headCell.setCellValue(MessageUtils.message("excel.department"));
             headCell.setCellStyle(headStyle);
+//            headCell = headRow.createCell(6);
+//            //headCell.setCellValue("月薪");
+//            headCell.setCellValue(MessageUtils.message("excel.MonSalary"));
+//            headCell.setCellStyle(headStyle);
+//            headCell = headRow.createCell(7);
+//            //headCell.setCellValue("时薪");
+//            headCell.setCellValue(MessageUtils.message("excel.hourlyWage"));
+//            headCell.setCellStyle(headStyle);
             headCell = headRow.createCell(6);
-            //headCell.setCellValue("月薪");
-            headCell.setCellValue(MessageUtils.message("excel.MonSalary"));
-            headCell.setCellStyle(headStyle);
-            headCell = headRow.createCell(7);
-            //headCell.setCellValue("时薪");
-            headCell.setCellValue(MessageUtils.message("excel.hourlyWage"));
-            headCell.setCellStyle(headStyle);
-            headCell = headRow.createCell(8);
             //headCell.setCellValue("证书");
             headCell.setCellValue(MessageUtils.message("excel.certificate"));
             headCell.setCellStyle(headStyle);
             for (int i = 0; i < userCustomList.size(); i++) {
-                headCell = headRow.createCell(8+i);
+                headCell = headRow.createCell(6+i);
                 headCell.setCellValue(userCustomList.get(i).getName());
                 headCell.setCellStyle(headStyle);
             }
-            headCell = headRow.createCell(8+userCustomList.size());
+            headCell = headRow.createCell(6+userCustomList.size());
             //headCell.setCellValue("状态");
             headCell.setCellValue(MessageUtils.message("leave.status"));
             headCell.setCellStyle(headStyle);
@@ -1985,8 +1985,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                 }else {
                     row.createCell(5).setCellValue(item.getDepartmentName());
                 }
-                row.createCell(6).setCellValue(item.getMonthCost()==null? 0 : item.getMonthCost().intValue());
-                row.createCell(7).setCellValue(item.getCost() == null?0.0 : item.getCost().doubleValue());
+//                row.createCell(6).setCellValue(item.getMonthCost()==null? 0 : item.getMonthCost().intValue());
+//                row.createCell(7).setCellValue(item.getCost() == null?0.0 : item.getCost().doubleValue());
                 List<UserCert> certList = userCertList.stream().distinct().filter(uc -> uc.getUserId().equals(item.getId())).collect(Collectors.toList());
                 if(certList.size()>0){
                     String s="";
@@ -1997,9 +1997,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                             s+=certList.get(i).getCertName()+" "+certList.get(i).getCertDate();
                         }
                     }
-                    row.createCell(8).setCellValue(s);
+                    row.createCell(6).setCellValue(s);
                 }else {
-                    row.createCell(8).setCellValue("");
+                    row.createCell(6).setCellValue("");
                 }
                 for (int i = 0; i < userCustomList.size(); i++) {
                     String value="";
@@ -2015,9 +2015,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                         case 4:value=item.getPlate5()==null?"":item.getPlate5();
                             break;
                     }
-                    row.createCell(8+i).setCellValue(value);
+                    row.createCell(6+i).setCellValue(value);
                 }
-                row.createCell(8+userCustomList.size()).setCellValue(item.getIsActive()==1?MessageUtils.message("excel.normal"):MessageUtils.message("access.deactivated"));
+                row.createCell(6+userCustomList.size()).setCellValue(item.getIsActive()==1?MessageUtils.message("excel.normal"):MessageUtils.message("access.deactivated"));
                 rowNum++;
             }
             //生成Excel文件

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

@@ -49,7 +49,7 @@
         <el-table-column prop="planManNum" label="计划人数" width="180"> </el-table-column>
         <el-table-column prop="num" label="数量" width="180"></el-table-column>
         <el-table-column prop="planWorkHour" label="计划工时" width="180"></el-table-column>
-        <el-table-column prop="moneyOfJob" label="工钱" width="180"></el-table-column>
+        <el-table-column prop="totalMoney" label="工钱" width="180"></el-table-column>
         <el-table-column prop="foremanName" label="工长" width="180"></el-table-column>
         <el-table-column prop="startDate" label="开工时间" width="180"></el-table-column>
         <el-table-column prop="endDate" label="完工时间" width="180"></el-table-column>

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

@@ -92,13 +92,13 @@
             <el-input v-model="todayPlanForm.productSchedulingNum" maxlength="50"></el-input>
           </el-form-item>
           <el-form-item label="产品名称" style="width: 100%" prop="productId">
-            <el-select v-model="todayPlanForm.productId" placeholder="请选择" class="w100">
+            <el-select v-model="todayPlanForm.productId" placeholder="请选择" class="w100" @change="setProductCode">
               <el-option v-for="item in productList" :key="item.id" :label="item.name" :value="item.id">
               </el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="项目代码" style="width: 100%" prop="projectCode">
-            <el-input v-model="todayPlanForm.projectCode" maxlength="50"></el-input>
+            <el-input v-model="todayPlanForm.projectCode" maxlength="50" readonly></el-input>
           </el-form-item>
           <el-form-item label="钢印号" style="width: 100%" prop="steelStampNumberStart">
             <el-input class="w45" v-model="todayPlanForm.steelStampNumberStart" maxlength="20"></el-input>
@@ -115,7 +115,7 @@
             <el-input v-model="todayPlanForm.num" maxlength="10"></el-input>
           </el-form-item>
           <el-form-item label="主工序" prop="mainProcess">
-            <el-input v-model="todayPlanForm.mainProcess" maxlength="50"></el-input>
+            <el-input v-model="todayPlanForm.mainProcess" maxlength="20"></el-input>
           </el-form-item>
           <el-form-item label="工位" prop="stationId">
             <!-- <el-select v-model="todayPlanForm.stationId" placeholder="请选择" class="w100" @change="getIncharger()">
@@ -279,6 +279,11 @@ export default {
       this.getProductList();
   },
   methods: {
+    setProductCode() {
+      let arrList = this.productList.filter(item => item.id == this.todayPlanForm.productId) 
+      console.log('====>', arrList)
+      this.todayPlanForm.projectCode = arrList[0].code
+    },
     today() {
       let date = new Date();
       let year = date.getFullYear();

fhKeeper/formulahousekeeper/timesheet-workshop/src/views/product/list.vue

@@ -47,37 +47,38 @@
 
             <el-table-column type="expand">
                 <template slot-scope="props">
-                    <el-form label-position="left" inline class="demo-table-expand">
-                        <el-form-item label="派工单">
-                            <span>版本号:</span>
-                            <el-select v-model="props.row.tableProdProcedure.version" placeholder="请选择版本号"
-                                @change="changeProcedureVersion(props.row)">
-                                <el-option v-for="item in props.row.tableProdProcedure.versions" :key="item" :label="item"
-                                    :value="item">
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-                        <el-form-item>
-                            <el-table :data="props.row.tableProdProcedure.procedureList" border style="width: 100%">
-                                <el-table-column prop="name" label="工序名称" width="180">
-                                </el-table-column>
-                                <el-table-column prop="workingTime" label="单件工时" width="180">
-                                </el-table-column>
-                                <el-table-column prop="unitPrice" label="单件工价" width="180">
-                                </el-table-column>
-                                <el-table-column label="质检类型" width="180">
-                                    <template slot-scope="scope">
-                                        <span v-if="scope.row.checkType == 0">自检</span>
-                                        <span v-if="scope.row.checkType == 1">互检</span>
-                                        <span v-if="scope.row.checkType == 2">专检</span>
-                                    </template>
-                                    <!--   -->
-                                </el-table-column>
-                            </el-table>
-
-                        </el-form-item>
-
-                        <!--       <el-form-item label="物料单">
+                    <div style="max-height: 400px;overflow-y: auto; box-sizing: border-box;padding-left: 40px;">
+                         <el-form label-position="left" inline class="demo-table-expand">
+                            <el-form-item label="派工单">
+                                <span>版本号:</span>
+                                <el-select v-model="props.row.tableProdProcedure.version" placeholder="请选择版本号"
+                                    @change="changeProcedureVersion(props.row)">
+                                    <el-option v-for="item in props.row.tableProdProcedure.versions" :key="item" :label="item"
+                                        :value="item">
+                                    </el-option>
+                                </el-select>
+                            </el-form-item>
+                            <el-form-item>
+                                <el-table :data="props.row.tableProdProcedure.procedureList" border style="width: 100%">
+                                    <el-table-column prop="name" label="工序名称" width="180">
+                                    </el-table-column>
+                                    <el-table-column prop="workingTime" label="单件工时" width="180">
+                                    </el-table-column>
+                                    <el-table-column prop="unitPrice" label="单件工价" width="180">
+                                    </el-table-column>
+                                    <el-table-column label="质检类型" width="180">
+                                        <template slot-scope="scope">
+                                            <span v-if="scope.row.checkType == 0">自检</span>
+                                            <span v-if="scope.row.checkType == 1">互检</span>
+                                            <span v-if="scope.row.checkType == 2">专检</span>
+                                        </template>
+                                        <!--   -->
+                                    </el-table-column>
+                                </el-table>
+
+                            </el-form-item>
+
+                            <!--       <el-form-item label="物料单">
                             <span>版本号：</span>
                             <el-select v-model="prodMaterialVersion" placeholder="请选择版本号"
                                 @change="changeMaterialVersion(props.row)">
@@ -105,7 +106,8 @@
                             </el-table>
 
                         </el-form-item> -->
-                    </el-form>
+                        </el-form>
+                    </div>
                 </template>
             </el-table-column>
 
@@ -223,22 +225,22 @@
 
                 <el-input placeholder="请输入工序版本号" v-model="procedureVersion" clearable maxlength="50" class="input-pM"></el-input>
                 <el-table :data="procedureLit" style="width: 100%">
-                    <el-table-column prop="name" label="工序名称"  width="180">
+                    <el-table-column prop="name" label="工序名称"  width="350">
                         <template slot-scope="scope">
                             <el-input v-model="scope.row.name" clearable placeholder="请输入"  maxlength="30"></el-input>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="workingTime" label="单件工时(分)"  width="180">
+                    <el-table-column prop="workingTime" label="单件工时(分)"  width="140">
                         <template slot-scope="scope">
                             <el-input v-model="scope.row.workingTime"   clearable maxlength="11" placeholder="请输入"></el-input>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="unitPrice" label="单件工价(元)"  width="180">
+                    <el-table-column prop="unitPrice" label="单件工价(元)"  width="140">
                         <template slot-scope="scope">
                             <el-input v-model="scope.row.unitPrice"   clearable maxlength="9"  placeholder="请输入"></el-input>
                         </template>
                     </el-table-column>
-                    <el-table-column label="质检类型" width="180">
+                    <el-table-column label="质检类型" width="150">
                         <template slot-scope="scope">
                             <el-select v-model="scope.row.checkType" placeholder="请选择">
                                 <el-option v-for="item in checkTypeOptions" :key="item.value" :label="item.label"
@@ -1022,27 +1024,36 @@ export default {
         updateCategory(row) {
             this.isganttshowCa = true
             this.title = "编辑"
-            this.category = row
+            
+            console.log(row);
+            this.category ={...row}
         },
         deleteCategory(row) {
-            this.http.post("/prod-category/delete", { id: row.id },
-                res => {
-                    console.log("=======", res.code)
-                    if (res.code === 'ok') {
-                        this.getCategoryList()
-                        this.$message({
-                            showClose: true,
-                            message: '删除成功',
-                            type: 'success'
-                        });
-                    } else {
-                        this.$message({
-                            showClose: true,
-                            message: '已有产品为此分类，无法删除',
-                            type: 'warning'
-                        });
-                    }
-                })
+             this.$confirm("确定要删除产品分类[" + row.name + "]" + this.$t('ma'), '删除产品分类', {
+                confirmButtonText: this.$t('btn.determine'),
+                cancelButtonText: this.$t('btn.cancel'),
+                type: "warning"
+            }).then(() => {
+                 this.http.post("/prod-category/delete", { id: row.id },
+                    res => {
+                        console.log("=======", res.code)
+                        if (res.code === 'ok') {
+                            this.getCategoryList()
+                            this.$message({
+                                showClose: true,
+                                message: '删除成功',
+                                type: 'success'
+                            });
+                        } else {
+                            this.$message({
+                                showClose: true,
+                                message: res.msg,
+                                type: 'warning'
+                            });
+                        }
+                    })
+            })
+           
         },
         saveCategory() {
             if (this.category.name == null) {
@@ -3579,6 +3590,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+* {
+    box-sizing: border-box;
+}
 .demo-table-expand .el-form-item {
     width: 100%;
 }

fhKeeper/formulahousekeeper/timesheet-workshop/src/views/team/index.vue

@@ -169,7 +169,7 @@
             
             <el-table ref="handleSelectTable" :data="list" highlight-current-row v-loading="listLoading" :height="tableHeight" style="width: 100%;" @selection-change="handleSelectionZzjg">
                 <el-table-column type="selection" width="50"></el-table-column>
-                <el-table-column type="index" width="50">
+                <el-table-column type="index" width="50" label="序号">
                     <template slot-scope="scope" >
                         {{scope.$index+1+(page-1)*size}}
                     </template>
@@ -236,7 +236,7 @@
                     
                 <el-button size="small" type="primary" @click="handleSelectionZzjgbtn3" v-if="user.userNameNeedTranslate != 1">{{ $t('modifyingDepartments') }}</el-button>
                 <el-button size="small" type="primary" @click="handJue">{{ $t('modifyingRoles') }}</el-button>
-                <el-button size="small" type="primary" @click="workingHoursDialogClick()">修正工时所属部门</el-button>
+                <!-- <el-button size="small" type="primary" @click="workingHoursDialogClick()">修正工时所属部门</el-button> -->
                
                 
                 
@@ -459,10 +459,10 @@
                   <el-form-item label="离职日期" prop="inactiveDate" v-if="insertForm.isActive == 0">
                       <el-date-picker v-model="insertForm.inactiveDate" value-format="yyyy-MM-dd"></el-date-picker>
                   </el-form-item>
-                  <el-form-item :label="$t('postrank')" prop="phone">
+                  <!-- <el-form-item :label="$t('postrank')" prop="phone">
                       <el-input v-model="insertForm.position" :placeholder="$t('joblevel')" clearable></el-input>
-                  </el-form-item>
-
+                  </el-form-item> -->
+<!-- 
                   <div class="zhaunye"><p>{{ $t('professionalcertificate') }}</p><p><el-link type="primary" @click="addCertificateList()">{{ $t('addprofessionalcertificate') }}</el-link><el-link v-if="permissions.structureCertificate" type="primary" @click="managementDiolog = true" style="margin-left: 20px">{{ $t('professionalCertificate inManagement') }}</el-link></p></div>
                   <div class="certificateList">
                       <div class="moreList">
@@ -476,7 +476,7 @@
                               <div style="color: red;margin-left: 15px;cursor:pointer;" @click="deteFrames(index)"><i class="el-icon-delete"></i></div>
                           </div>
                       </div>
-                  </div>
+                  </div> -->
 
               </el-form>
             </div>
@@ -2600,7 +2600,7 @@ export default {
     updateWorkType(row) {
       this.isganttshowWk = true
       this.title = "编辑工种"
-      this.workType = row
+      this.workType = {...row}
     },
     deleteWorkType(row) {
       this.http.post("/user-work-type/delete", { id: row.id },