#产出计算

jiaosong

2023-08-18 b07d4b83387e670ad2d1fc921037fb24fe4e836b

#产出计算

 server/src/main/java/doumeemes/api/ext/CategoryExtController.java

@@ -8,9 +8,11 @@
import doumeemes.core.model.PageWrap;
import doumeemes.core.utils.Constants;
import doumeemes.dao.business.model.Category;
import doumeemes.dao.business.model.CategoryUnion;
import doumeemes.dao.ext.dto.QueryCategoryExtDTO;
import doumeemes.dao.ext.vo.CategoryExtListVO;
import doumeemes.service.business.CategoryService;
import doumeemes.service.business.CategoryUnionService;
import doumeemes.service.ext.CategoryExtService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -45,6 +47,9 @@
    @Autowired
    private CategoryService categoryService;

    @Autowired
    private CategoryUnionService categoryUnionService;


    @PreventRepeat
    @ApiOperation("新建")
@@ -74,7 +79,17 @@
        category.setCreateTime(new Date());
        category.setCreateUser(getLoginUser().getId());
        category.setRootDepartId(getLoginUser().getRootDepartment().getId());
       int r =  categoryService.create(category);
        int r =  categoryService.create(category);
        CategoryUnion categoryUnion = new CategoryUnion();
        categoryUnion.setDeleted(Constants.ZERO);
        categoryUnion.setCreateUser(getLoginUser().getId());
        categoryUnion.setCreateTime(new Date());
        categoryUnion.setUpdateUser(getLoginUser().getId());
        categoryUnion.setUpdateTime(new Date());
        categoryUnion.setRemark("");
        categoryUnion.setRootDepartId(getLoginUser().getRootDepartment().getId());
        categoryUnion.setCateBigId(category.getId());
        categoryUnionService.create(categoryUnion);
        categoryExtService.loadCom(getLoginUser().getCompany());
        return ApiResponse.success(r );
    }
@@ -84,9 +99,8 @@
    @GetMapping("/delete/{id}")
    @RequiresPermissions("ext:categoryext:delete")
    public ApiResponse deleteById(@PathVariable Integer id) {
        Category category = categoryService.findById(Integer.valueOf(id));
        category.setDeleted(Constants.ONE);
        categoryService.updateById(category);

        categoryService.deleteCategory(id);
        return ApiResponse.success(null);
    }


 server/src/main/java/doumeemes/dao/ext/vo/SalaryStatisticsListVO.java

@@ -28,20 +28,20 @@
    @ExcelColumn(name="生产人员姓名")
    private String userName;
    @ApiModelProperty(value = "所属部门编码", example = "1",hidden = true)
    @ExcelColumn(name="所属部门编码")
//    @ExcelColumn(name="所属部门编码")
    private Integer departId;

    @ApiModelProperty(value = "所属部门名称",hidden = true)
    @ExcelColumn(name="所属部门名称")
    private String departName;
    @ApiModelProperty(value = "计件工资（分）", example = "1")
    @ExcelColumn(name="计件工资（分）")
    @ApiModelProperty(value = "计件工资（元）", example = "1")
    @ExcelColumn(name="计件工资（元）")
    private BigDecimal jijianSalary;
    @ApiModelProperty(value = "计时工资（分）", example = "1")
    @ExcelColumn(name="计时工资（分）")
    @ApiModelProperty(value = "计时工资（元）", example = "1")
    @ExcelColumn(name="计时工资（元）")
    private BigDecimal jishiSalary;
    @ApiModelProperty(value = "小计工资（分）", example = "1")
    @ExcelColumn(name="小计工资（分）")
    @ApiModelProperty(value = "小计工资（元）", example = "1")
    @ExcelColumn(name="小计工资（元）")
    private BigDecimal totalSalary;
    @ApiModelProperty(value = "报工总单数,不包含工资为0的", example = "1")
    @ExcelColumn(name="报工总单数")

 server/src/main/java/doumeemes/dao/ext/vo/UserSalaryListVO.java

@@ -26,7 +26,7 @@
    @ExcelColumn(name="生产人员姓名")
    private String userName;
    @ApiModelProperty(value = "所属部门编码", example = "1",hidden = true)
    @ExcelColumn(name="所属部门编码")
//    @ExcelColumn(name="所属部门编码")
    private Integer departId;

    @ApiModelProperty(value = "所属部门名称",hidden = true)
@@ -39,7 +39,7 @@
    @ExcelColumn(name="物料名称")
    private String materialName;
    @ApiModelProperty(value = "物料主键", example = "1")
    @ExcelColumn(name="物料主键")
//    @ExcelColumn(name="物料主键")
    private Integer materialId;
    @ApiModelProperty(value = "工单编码", example = "1")
    @ExcelColumn(name="工单编码")

 server/src/main/java/doumeemes/service/business/CategoryService.java

@@ -20,7 +20,7 @@

    /**
     * 创建
     * 
     *
     * @param category 实体对象
     * @return Integer
     */
@@ -39,6 +39,14 @@
     * @param category 实体对象
     */
    void delete(Category category);


    /**
     * 删除
     *
     * @param id 实体对象
     */
    void deleteCategory(Integer id);

    /**
     * 批量主键删除
@@ -84,7 +92,7 @@
     * @return List<Category>
     */
    List<Category> findList(Category category);
  

    /**
     * 分页查询
     *

 server/src/main/java/doumeemes/service/business/impl/CategoryServiceImpl.java

@@ -15,7 +15,9 @@
import doumeemes.core.utils.excel.EasyExcelUtil;
import doumeemes.core.utils.redis.RedisUtil;
import doumeemes.dao.business.CategoryMapper;
import doumeemes.dao.business.CategoryUnionMapper;
import doumeemes.dao.business.model.Category;
import doumeemes.dao.business.model.CategoryUnion;
import doumeemes.service.business.CategoryService;
import doumeemes.service.ext.CategoryExtService;
import org.apache.commons.lang3.StringUtils;
@@ -48,6 +50,9 @@
    @Autowired
    private RedisTemplate<String, Object> redisTemplate;

    @Autowired
    private CategoryUnionMapper categoryUnionMapper;

    @Override
    public synchronized String  getNextCode(Integer comId ){
        String prefix =  "FL-" + DateUtil.getDate(new Date(),"yyyyMMdd") +"-";
@@ -75,6 +80,23 @@
        UpdateWrapper<Category> deleteWrapper = new UpdateWrapper<>(category);
        categoryMapper.delete(deleteWrapper);
    }

    @Transactional(rollbackFor = {Exception.class,BusinessException.class})
    @Override
    public void deleteCategory(Integer id) {
        Category category = this.findById(Integer.valueOf(id));
        category.setDeleted(Constants.ONE);
        updateById(category);

        UpdateWrapper<CategoryUnion> wrapper = new UpdateWrapper<>();
        wrapper.lambda()
                .eq(CategoryUnion::getCateBigId,id)
                .isNull(CategoryUnion::getCateMiddleId)
                .isNull(CategoryUnion::getCateSmallId)
                .set(CategoryUnion::getDeleted,Constants.ONE);
        categoryUnionMapper.update(null,wrapper);
    }


    @Override
    public void deleteByIdInBatch(List<Integer> ids) {
@@ -119,7 +141,7 @@
        QueryWrapper<Category> wrapper = new QueryWrapper<>(category);
        return categoryMapper.selectList(wrapper);
    }
  

    @Override
    public PageData<Category> findPage(PageWrap<Category> pageWrap) {
        IPage<Category> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());

 server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java

@@ -227,7 +227,7 @@
            proceduresWrapper.lambda()
                    .eq(Procedures::getName,salaryParamImportDTO.getProcedureName())
                    .eq(Procedures::getRootDepartId,department.getRootId())
                    .eq(Procedures::getOrgId,department.getId())
//                    .eq(Procedures::getOrgId,department.getId())
                    .last("limit 1");
            Procedures procedures = proceduresMapper.selectOne(proceduresWrapper);
            if (Objects.isNull(procedures)){

 server/src/main/java/doumeemes/service/ext/impl/PlansExtServiceImpl.java

@@ -37,10 +37,7 @@

import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.*;

/**
 * 生产计划Service实现
@@ -167,6 +164,7 @@
        initPlanStatisticInfo(t);
        PlansExtListH5VO plan = new PlansExtListH5VO();
        BeanUtils.copyProperties(t,plan);
//        plan.setDoneNum();
        plan.setWorkorderList(workorderExtService.findByPlanId(plan,true));
        return plan;
    }

 server/src/main/java/doumeemes/service/ext/impl/WorkorderExtServiceImpl.java

@@ -370,7 +370,7 @@
        rParam.setPlanId(pageWrap.getId());
        rParam.setDeleted(Constants.ZERO);
        //已完工数量
        plan.setDoneNum(0);
//        plan.setDoneNum(0);
        //已分配数量
        plan.setDistributNum(0);
        //查询全部投料和产出
@@ -413,6 +413,7 @@
                    tModle.setProUserName(w.getProUserName());
                    tModle.setProUserName(w.getProUserName());
                    tModle.setCreateUser(w.getCreateUser());
                    tModle.setCreateUserName(w.getCreateUserName());
                    if(w.getProUserId()!=null){
                        //查询班组信息
                        QueryCompanyUserExtDTO queryCompanyUserExtDTO = new QueryCompanyUserExtDTO();

 server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java

@@ -157,6 +157,9 @@
                //查询生产人员姓名
//                model.setUserName(initProUser(user,model.getUserId(),allDepartList));
                    model.setUserInfo(initProUser(user,model.getUserId(),allDepartList));
                    model.setJijianSalary(model.getJijianSalary().divide(new BigDecimal("100"),2,BigDecimal.ROUND_HALF_UP));
                    model.setJishiSalary(model.getJishiSalary().divide(new BigDecimal("100"),2,BigDecimal.ROUND_HALF_UP));
                    model.setTotalSalary(model.getTotalSalary().divide(new BigDecimal("100"),2,BigDecimal.ROUND_HALF_UP));
            }
        }
        return PageData.from(new PageInfo<>(result));

 server/src/main/resources/mappers/WorkorderExtMapper.xml

@@ -243,7 +243,7 @@
  </select>
  <!-- 管理页面查询 -->
  <select id="sumOrderNum" parameterType="doumeemes.dao.ext.dto.QueryWorkorderExtDTO" resultType="java.lang.Integer">
    SELECT sum(`a`.num)
    SELECT sum(`a`.id)
    FROM `workorder` `a`
    <where>
    <if test="id != null">
@@ -469,7 +469,8 @@
    `pgmodel`.`GROUP_ID` AS PGMODEL_GROUP_ID,
    `pgmodel`.`SERIAL_NUM` AS PGMODEL_SERIAL_NUM,
     p.name as procedureName,
        u.realname as proUserName,
     u.realname as proUserName,
     uc.realname as createUserName,
    (select sum(ifnull(num,0)) from workorder_record r where r.deleted=0 and r.type=1 and r.workorder_id=a.id) as proNum
    <if test="checkTouliao!=null and checkTouliao==1">
      ,(select r.id from workorder_record r where r.deleted=0 and r.type=0 and r.workorder_id=a.id limit 1) as touliaoId
@@ -487,6 +488,7 @@
    LEFT JOIN `device` `pgmodel` ON a.PRO_GROUP_ID=pgmodel.ID
    LEFT JOIN `procedures` `p` ON a.`PROCEDURE_ID`=p.ID
    LEFT JOIN `system_user` `u` ON `a`.`PRO_USER_ID`=u.ID
    LEFT JOIN `system_user` `uc` ON `a`.`CREATE_USER`=uc.ID
        <where>
      <if test="id != null">
        AND `a`.`ID` = #{id}