1.工时管理：辅助工时编辑后录入人姓名变成编辑人问题修复 2.外购下单：标签打印功能调整 3.人员：培训计划导入导出添加【培训大类】字段 4.业务管理...

zouyu

4 小时以前 675af262e4e511c9a240d9c1fa3332d1dc8d0c42

1.工时管理：辅助工时编辑后录入人姓名变成编辑人问题修复
2.外购下单：标签打印功能调整
3.人员：培训计划导入导出添加【培训大类】字段
4.业务管理：报检新增【物料属性】字段选择，其余页面添加【物料属性】查询条件以及数据回显

 basic-server/src/main/java/com/ruoyi/basic/dto/InventoryDetailDTO.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,52 @@
package com.ruoyi.basic.dto;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;

@Data
public class InventoryDetailDTO {
    // æ¥è‡ª ifs_inventory_quantity
    @ApiModelProperty(value = "ifs_inventory_quantityID")
    private Integer id;

    @ApiModelProperty(value = "零件描述")
    private String partDesc;

    @ApiModelProperty(value = "SN号")
    private String lotBatchNo;

    @ApiModelProperty(value = "零件号")
    private String partNo;

    // æ¥è‡ª ifs_part_props_record

    @ApiModelProperty(value = "绝缘颜色")
    private String insulationColor;

    @ApiModelProperty(value = "护套颜色")
    private String outerColor;

    @ApiModelProperty(value = "载具编号")
    private String drumNo;

    @ApiModelProperty(value = "起始米标")
    private String startMeterMark;

    @ApiModelProperty(value = "截止米标")
    private String endMeterMark;

    // æ¥è‡ª ins_order

    @ApiModelProperty(value = "入库时间")
    private Date updateTime;

    @ApiModelProperty(value = "检测结论")
    private Integer insState;

    // é€»è¾‘计算字段：检验人 (COALESCE åŽçš„结果)

    @ApiModelProperty(value = "检测人员")
    private String inspectorName;
}

 basic-server/src/main/java/com/ruoyi/basic/pojo/IfsInventoryQuantity.java

@@ -40,6 +40,9 @@
    @ApiModelProperty("订单类型(01raw:原材料，02wg:外购成品)")
    private String orderType;

    @ApiModelProperty("物料属性，用于区分铜、铝导体等零件")
    private String materialProp;

    @ExcelProperty(index = 3, value = "零件号")
    @ApiModelProperty("零件号")
    private String partNo;

 cnas-personnel/src/main/java/com/ruoyi/personnel/excel/PersonTrainingDetailedUpload.java

@@ -6,6 +6,9 @@
@Data
public class PersonTrainingDetailedUpload {

    @ExcelProperty("培训大类")
    private String trainingCategory;

    @ExcelProperty("培训目标")
    private String trainingObjectives;


 cnas-personnel/src/main/java/com/ruoyi/personnel/pojo/PersonTrainingDetailed.java

@@ -30,6 +30,9 @@
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;

    @ApiModelProperty("培训大类")
    private String trainingCategory;

    @ApiModelProperty("培训目标")
    private String trainingObjectives;


 cnas-personnel/src/main/resources/static/person-training.docx

Binary files differ

 inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.basic.dto.InventoryDetailDTO;
import com.ruoyi.basic.mapper.IfsInventoryQuantityMapper;
import com.ruoyi.basic.pojo.IfsInventoryQuantity;
import com.ruoyi.basic.pojo.StandardProductList;
@@ -56,6 +57,13 @@
        return Result.success(insOrderService.selectInsOrderParameter(page, sampleOrderDto));
    }

    @ApiOperation(value = "外购下单成品标签打印")
    @PostMapping("/labelOutsideOrderPrinting")
    public Result<List<InventoryDetailDTO>> labelOutsideOrderPrinting(@RequestBody Map<String, Object> param) {
        List<Integer> ids = (List<Integer>) param.get("ids");
        return Result.success(insOrderService.labelOutsideOrderPrinting(ids));
    }

    //用于检验下单区别查看所有订单和只查看同一个委托单位的订单
    @ApiOperation(value = "查询所有检验单")
    @GetMapping("/selectAllInsOrderParameter")

 inspect-server/src/main/java/com/ruoyi/inspect/controller/RawMaterialOrderController.java

@@ -106,10 +106,11 @@
    public Result<?> inspectionReport(@RequestBody Map<String, Object> param) {
        List<Long> ids = (List<Long>) param.get("ids");
        String orderType = Objects.nonNull(param.get("orderType"))?param.get("orderType").toString():"";
        String materialProp = Objects.nonNull(param.get("materialProp"))?param.get("materialProp").toString():"";
        if(!OrderType.validateValue(orderType)){
            throw new ErrorException("批量报检失败,非法的销售订单分类枚举");
        }
        return Result.success(rawMaterialOrderService.inspectionReport(ids,orderType));
        return Result.success(rawMaterialOrderService.inspectionReport(ids,orderType,materialProp));
    }

    /**

 inspect-server/src/main/java/com/ruoyi/inspect/dto/InsOrderPlanDTO.java

@@ -1,12 +1,13 @@
package com.ruoyi.inspect.dto;

import com.ruoyi.basic.pojo.IfsInventoryQuantity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.io.Serializable;

@Data
public class InsOrderPlanDTO implements Serializable {
public class InsOrderPlanDTO extends IfsInventoryQuantity implements Serializable {

    @ApiModelProperty("检验任务主键id")
    private Long insSampleId;

 inspect-server/src/main/java/com/ruoyi/inspect/dto/OrderSplitDTO.java

@@ -31,4 +31,8 @@
    @ApiModelProperty("是否同步到MES")
    private Boolean pushToMes;

    @ApiModelProperty("物料属性，用于区分铜、铝导体等材料")
    private String materialProp;


}

 inspect-server/src/main/java/com/ruoyi/inspect/dto/ReportPageDto.java

@@ -24,6 +24,9 @@
    @ApiModelProperty(value = "下单类别")
    private Integer typeSource;

    @ApiModelProperty(value = "物料属性")
    private String materialProp;

    @ApiModelProperty(value = "检验类别")
    private String orderType;


 inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderMapper.java

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.basic.dto.InventoryDetailDTO;
import com.ruoyi.basic.pojo.StructureTestObject;
import com.ruoyi.inspect.dto.SampleOrderDto;
import com.ruoyi.inspect.dto.SampleProductDto2;
@@ -113,6 +114,13 @@
    List<InsOrderPrintingVo> labelOrderPrinting(@Param("ids") List<Integer> ids);

    /**
     * å¤–购产品标签打印
     * @param ids
     * @return
     */
    List<InventoryDetailDTO> labelOutsideOrderPrinting(@Param("ids") List<Integer> ids);

    /**
     * æŸ¥è¯¢å¯¼å‡ºä¿¡æ¯
     * @return
     */

 inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderService.java

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.basic.dto.InventoryDetailDTO;
import com.ruoyi.basic.pojo.IfsInventoryQuantity;
import com.ruoyi.basic.pojo.StandardProductList;
import com.ruoyi.common.core.domain.Result;
@@ -91,6 +92,13 @@
    List<InsOrderPrintingVo> labelOrderPrinting(List<Integer> ids);

    /**
     * å¤–购产品标签打印
     * @param ids
     * @return
     */
    List<InventoryDetailDTO> labelOutsideOrderPrinting(List<Integer> ids);

    /**
     * æ ¹æ®æ ·å“id查询检验项树
     * @param insSampleId
     * @return

 inspect-server/src/main/java/com/ruoyi/inspect/service/RawMaterialOrderService.java

@@ -43,7 +43,7 @@
     */
    IPage<IfsInventoryQuantityDto> getIfsByStateOne(IPage<IfsInventoryQuantityDto> page, IfsInventoryQuantityDto ifsInventoryQuantityDto);

    int inspectionReport(List<Long> ids,String orderType);
    int inspectionReport(List<Long> ids,String orderType,String materialProp);

    int revokeInspectionReport(Long id);


 inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java

@@ -16,6 +16,7 @@
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.basic.dto.InventoryDetailDTO;
import com.ruoyi.basic.mapper.IfsInventoryQuantityMapper;
import com.ruoyi.basic.mapper.StandardProductListMapper;
import com.ruoyi.basic.mapper.StructureItemParameterMapper;
@@ -906,6 +907,11 @@
        return insOrderMapper.labelOrderPrinting(ids);
    }

    @Override
    public List<InventoryDetailDTO> labelOutsideOrderPrinting(List<Integer> ids) {
        return insOrderMapper.labelOutsideOrderPrinting(ids);
    }

    /**
     * æ ¹æ®æ ·å“id查询检验项树
     * @param insSampleId

 inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java

@@ -175,7 +175,7 @@
     * @return
     */
    @Override
    public int inspectionReport(List<Long> ids,String orderType) {
    public int inspectionReport(List<Long> ids,String orderType,String materialProp) {
        Integer userId = SecurityUtils.getUserId().intValue();
        ifsInventoryQuantityMapper.update(null, Wrappers.<IfsInventoryQuantity>lambdaUpdate()
                .in(IfsInventoryQuantity::getId, ids)
@@ -183,6 +183,7 @@
                .set(IfsInventoryQuantity::getDeclareUserId, userId)
                .set(IfsInventoryQuantity::getIsInspect, 1)
                .set(IfsInventoryQuantity::getOrderType,orderType)
                .set(IfsInventoryQuantity::getMaterialProp,materialProp)
                .set(IfsInventoryQuantity::getDeclareDate, LocalDateTime.now())
        );
        threadPoolTaskExecutor.execute(() -> {
@@ -265,6 +266,7 @@
                .set(IfsInventoryQuantity::getDeclareDate, LocalDateTime.now())
                .set(IfsInventoryQuantity::getUpdateBatchNo, ifsInventoryQuantity.getUpdateBatchNo())
                .set(IfsInventoryQuantity::getOrderType,ifsInventoryQuantity.getOrderType())
                .set(IfsInventoryQuantity::getMaterialProp,ifsInventoryQuantity.getMaterialProp())
        );

        threadPoolTaskExecutor.execute(() -> {
@@ -972,7 +974,7 @@
        if(Objects.nonNull(splitOrderList) && !splitOrderList.isEmpty()){
            List<Long> ids = splitOrderList.stream().map(IfsInventoryQuantity::getId).collect(Collectors.toList());
            ids.add(ifsInventoryQuantity.getId());
            this.inspectionReport(ids,OrderType.RAW.getValue());
            this.inspectionReport(ids,OrderType.RAW.getValue(),orderSplitDTO.getMaterialProp());
        }
        //勾选同步到MES，保存订单拆分记录
        if(orderSplitDTO.getPushToMes()){

 inspect-server/src/main/java/com/ruoyi/inspect/vo/InsOrderPlanVO.java

@@ -15,6 +15,9 @@
    @ApiModelProperty("样品名称")
    private String sample;

    @ApiModelProperty("物料属性")
    private String materialProp;

    @ApiModelProperty("样品型号")
    private String sampleModel;


 inspect-server/src/main/resources/mapper/InsOrderMapper.xml

@@ -335,7 +335,7 @@
          AND isa.id = #{id}
          and ip.cable_tag is not null
        GROUP BY ip.cable_tag
        order by ip.cable_tag
        order by MIN(ip.id)
    </select>
    <select id="selectSampleItemS" resultType="java.lang.Integer">
        select count(*)
@@ -507,4 +507,41 @@
          AND io.id = #{id}
        LIMIT 1
    </select>

    <!-- å¤–购下单成品标签打印 -->
    <select id="labelOutsideOrderPrinting" resultType="com.ruoyi.basic.dto.InventoryDetailDTO">
        SELECT
        iiq.id,
        iiq.part_desc,
        iiq.lot_batch_no,
        iiq.part_no,
        ippr.insulation_color,
        ippr.outer_color,
        ippr.drum_no,
        ippr.start_meter_mark,
        ippr.end_meter_mark,
        io.update_time,
        io.ins_state,
        -- æ£€éªŒäººæŸ¥è¯¢ï¼šä¼˜å…ˆå–指派的负责人，如果没有则取订单创建人
        COALESCE(isu.userName, u.name) AS inspector_name
        FROM ifs_inventory_quantity iiq
        LEFT JOIN ifs_part_props_record ippr ON ippr.ifs_inventory_id = iiq.id
        LEFT JOIN ins_order io ON io.ifs_inventory_id = iiq.id AND io.state != -1
        -- å…³è”用户表，用于获取订单创建人姓名
        LEFT JOIN user u ON io.create_user = u.id
        -- å…³è”子查询，用于获取 ins_sample_user è¡¨ä¸­æŒ‡æ´¾çš„检验负责人
        LEFT JOIN (
        SELECT
        ins_sample_id,
        GROUP_CONCAT(DISTINCT uu.name SEPARATOR ',') AS userName
        FROM ins_sample_user isu_inner
        LEFT JOIN user uu ON isu_inner.user_id = uu.id
        WHERE isu_inner.state = 0
        GROUP BY ins_sample_id
        ) isu ON isu.ins_sample_id = io.id
        WHERE iiq.id IN
        <foreach collection="ids" index="index" open="(" separator="," close=")" item="val">
            #{val}
        </foreach>
    </select>
</mapper>

 inspect-server/src/main/resources/mapper/InsReportMapper.xml

@@ -18,6 +18,7 @@
        io.laboratory,
        io.ifs_inventory_id,
        iiq.is_copper,
        iiq.material_prop,
        ip.son_laboratory
        from ins_report ir
        left join ins_order io on io.id = ir.ins_order_id

 inspect-server/src/main/resources/mapper/InsSampleMapper.xml

@@ -193,7 +193,8 @@
        ira.url_s,
        ira.temp_url_pdf,
        iiq.is_copper,
        iiq.is_split_order
        iiq.is_split_order,
        iiq.material_prop AS material_prop
        FROM
        ins_order io
        LEFT JOIN ins_sample isa ON isa.ins_order_id = io.id

 performance-server/src/main/java/com/ruoyi/performance/service/impl/AuxiliaryWorkingHoursDayServiceImpl.java

@@ -151,8 +151,8 @@
    //编辑
    @Override
    public int updateAuxiliaryWorkingHoursDay(AuxiliaryWorkingHoursDay auxiliaryWorkingHoursDay) {
        Integer userId = SecurityUtils.getUserId().intValue();
        auxiliaryWorkingHoursDay.setNameUser(userId);//姓名id
//        Integer userId = SecurityUtils.getUserId().intValue();
//        auxiliaryWorkingHoursDay.setNameUser(userId);//姓名id
        return auxiliaryWorkingHoursDayMapper.updateById(auxiliaryWorkingHoursDay);
    }