pom.xml

@@ -4,7 +4,7 @@
    <modelVersion>4.0.0</modelVersion>



    <groupId>com.ruoyi</groupId>

    <artifactId>ruoyi-mis</artifactId>

    <artifactId>ruoyi-nhglxt</artifactId>

    <version>3.8.9</version>

    <packaging>jar</packaging>




 src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java

@@ -34,8 +34,8 @@
    {
        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
        // ç§Ÿæˆ·æ’件
//        TenantLineInnerInterceptor tenantLineInnerInterceptor = new TenantLineInnerInterceptor(new CustomTenantLineHandler());
//        interceptor.addInnerInterceptor(tenantLineInnerInterceptor);
        TenantLineInnerInterceptor tenantLineInnerInterceptor = new TenantLineInnerInterceptor(new CustomTenantLineHandler());
        interceptor.addInnerInterceptor(tenantLineInnerInterceptor);
        // åˆ†é¡µæ’件
        interceptor.addInnerInterceptor(paginationInnerInterceptor());
        // ä¹è§‚锁插件

 src/main/java/com/ruoyi/inspectiontask/service/impl/QuartzConfig.java

@@ -13,13 +13,13 @@

import javax.sql.DataSource;

@Configuration
//@Configuration
public class QuartzConfig {
    @Autowired
//    @Autowired
    private ApplicationContext applicationContext;

    // å‡è®¾å·²é…ç½®åä¸ºdataSource的数据源Bean
    @Autowired
//    @Autowired
    private DataSource dataSource;

    @Bean

 src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordOutController.java

@@ -66,20 +66,6 @@
        return AjaxResult.success(result);
    }

    @GetMapping("/listPageByProduct")
    @Log(title = "生产出库-出库台账-出库查询", businessType = BusinessType.OTHER)
    public AjaxResult listPageByProduct(Page page, ProcurementRecordOutPageDto procurementDto) {
        IPage<ProcurementRecordOutPageDto> result = procurementRecordOutService.listPageByProduct(page, procurementDto);
        return AjaxResult.success(result);
    }

    @GetMapping("/listPageByCustom")
    @Log(title = "自定义出库-出库台账-出库查询", businessType = BusinessType.OTHER)
    public AjaxResult listPageByCustom(Page page, ProcurementRecordOutPageDto procurementDto) {
        IPage<ProcurementRecordOutPageDto> result = procurementRecordOutService.listPageByCustom(page, procurementDto);
        return AjaxResult.success(result);
    }

    @PostMapping("/del")
    @Log(title = "采购出库-出库台账-删除出库", businessType = BusinessType.DELETE)
    public AjaxResult deletePro(@RequestBody ProcurementUpdateDto procurementDto) {

 src/main/java/com/ruoyi/procurementrecord/dto/ProcurementRecordOutAdd.java

@@ -26,9 +26,4 @@

    private Long productModelId;// åŸºç¡€äº§å“ID

    /**
     * å‡ºåº“类型 1-采购出库 2-销售出库 3-自定义
     */
    private Integer type;

}

 src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java

@@ -33,13 +33,11 @@

import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;

/**
@@ -277,53 +275,6 @@
            dto.setInboundNum0(dto.getInboundNum().subtract(totalInboundNum));
        }
        ExcelUtil<ProcurementPageDtoCopy> util = new ExcelUtil<ProcurementPageDtoCopy>(ProcurementPageDtoCopy.class);
        util.exportExcel(response, list, "库存管理");
    }

    @Override
    public void exportCopyTwo(HttpServletResponse response,Integer type) {
        LambdaQueryWrapper<CustomStorage> customStorageLambdaQueryWrapper = new LambdaQueryWrapper<>();
        customStorageLambdaQueryWrapper.groupBy(CustomStorage::getSupplierName, CustomStorage::getProductCategory, CustomStorage::getSpecificationModel);
        List<CustomStorage> list = customStorageMapper.selectList(customStorageLambdaQueryWrapper);
        // è®¡ç®—待入库数量
        // æŸ¥è¯¢é‡‡è´­è®°å½•å·²å…¥åº“数量
        List<Integer> collect = list.stream().map(CustomStorage::getId).collect(Collectors.toList());
        if(CollectionUtils.isEmpty( collect)){
            ExcelUtil<CustomStorage> util = new ExcelUtil<CustomStorage>(CustomStorage.class);
            util.exportExcel(response, list, "库存管理");
            return;
        }
        LambdaQueryWrapper<ProcurementRecordOut> procurementRecordLambdaQueryWrapper = new LambdaQueryWrapper<>();
        procurementRecordLambdaQueryWrapper.in(ProcurementRecordOut::getProcurementRecordStorageId, collect);
        procurementRecordLambdaQueryWrapper.eq(ProcurementRecordOut::getType, type);
        procurementRecordLambdaQueryWrapper.eq(ProcurementRecordOut::getType, type);
        List<ProcurementRecordOut> procurementRecords = procurementRecordOutMapper.selectList(procurementRecordLambdaQueryWrapper);
        if(CollectionUtils.isEmpty( procurementRecords)){
            ExcelUtil<CustomStorage> util = new ExcelUtil<CustomStorage>(CustomStorage.class);
            util.exportExcel(response, list, "库存管理");
            return;
        }
        for (CustomStorage dto : list) {
            // æ ¹æ®é‡‡è´­å°è´¦ID筛选对应的出库记录
            List<ProcurementRecordOut> collect1 = procurementRecords.stream()
                    .filter(ProcurementRecordOut -> ProcurementRecordOut.getProcurementRecordStorageId().equals(dto.getId()))
                    .collect(Collectors.toList());

            // å¦‚果没有相关的出库记录，跳过该条数据
            if(CollectionUtils.isEmpty(collect1)){
                dto.setInboundNum0(dto.getInboundNum());
                continue;
            }

            // è®¡ç®—已出库数量总和，并设置待出库数量
            BigDecimal totalInboundNum = collect1.stream()
                    .map(ProcurementRecordOut::getInboundNum)
                    .reduce(BigDecimal.ZERO, BigDecimal::add);

            // å¾…出库数量 = æ€»æ•°é‡ - å·²å‡ºåº“数量
            dto.setInboundNum0(dto.getInboundNum().subtract(totalInboundNum));
        }
        ExcelUtil<CustomStorage> util = new ExcelUtil<CustomStorage>(CustomStorage.class);
        util.exportExcel(response, list, "库存管理");
    }


 src/main/java/com/ruoyi/production/controller/SalesLedgerSchedulingController.java

@@ -128,15 +128,15 @@
    }


    /**
     * å¯¼å‡º
     * @param response
     */
    @PostMapping("/exportOne")
    @ApiOperation("生产管理-生产派工-导出")
    public void exportOne(HttpServletResponse response) {
        salesLedgerSchedulingService.exportOne(response);
    }
//    /**
//     * å¯¼å‡º
//     * @param response
//     */
//    @PostMapping("/exportOne")
//    @ApiOperation("生产管理-生产派工-导出")
//    public void exportOne(HttpServletResponse response) {
//        salesLedgerSchedulingService.exportOne(response);
//    }

    @PostMapping("/productionDispatch")
    @Log(title = "生产管理-生产订单-生产派工", businessType = BusinessType.INSERT)

 src/main/java/com/ruoyi/production/dto/ProcessSchedulingDto.java

@@ -14,26 +14,6 @@
@ApiModel
public class ProcessSchedulingDto {

    /**
     * å£å‘³åˆ†ç±»
     */
    private String type;

    /**
     * å¤‡æ³¨
     */
    private String remark;

    /**
     * æŸè€—
     */
    private String loss;

    /**
     * é¢†ç”¨
     */
    private String receive;

    private Long id;

    /**

 src/main/java/com/ruoyi/production/service/impl/SalesLedgerSchedulingServiceImpl.java

@@ -370,21 +370,21 @@
        return 0;
    }

    @Override
    public void exportOne(HttpServletResponse response) {
        List<SalesLedgerSchedulingDto> list = salesLedgerSchedulingMapper.list();
        if(CollectionUtils.isEmpty(list)){
            throw new RuntimeException("无导出数据");
        }
        List<DaiDto> dais = new ArrayList<>();
        list.forEach(i -> {
            DaiDto daiDto = new DaiDto();
            BeanUtils.copyProperties(i, daiDto);
            // èŽ·å–待排产数量
            daiDto.setDaiNum(daiDto.getQuantity().subtract(i.getSchedulingNum()));
            dais.add(daiDto);
        });
        ExcelUtil<DaiDto> util = new ExcelUtil<>(DaiDto.class);
        util.exportExcel(response, dais, "生产派工");
    }
//    @Override
//    public void exportOne(HttpServletResponse response) {
//        List<SalesLedgerSchedulingDto> list = salesLedgerSchedulingMapper.list();
//        if(CollectionUtils.isEmpty(list)){
//            throw new RuntimeException("无导出数据");
//        }
//        List<DaiDto> dais = new ArrayList<>();
//        list.forEach(i -> {
//            DaiDto daiDto = new DaiDto();
//            BeanUtils.copyProperties(i, daiDto);
//            // èŽ·å–待排产数量
//            daiDto.setDaiNum(daiDto.getQuantity().subtract(i.getSchedulingNum()));
//            dais.add(daiDto);
//        });
//        ExcelUtil<DaiDto> util = new ExcelUtil<>(DaiDto.class);
//        util.exportExcel(response, dais, "生产派工");
//    }
}

 src/main/java/com/ruoyi/project/monitor/service/impl/SysJobServiceImpl.java

@@ -38,11 +38,11 @@
    public void init() throws SchedulerException, TaskException

    {

//        scheduler.clear();

        List<SysJob> jobList = jobMapper.selectJobAll();

        for (SysJob job : jobList)

        {

            ScheduleUtils.createScheduleJob(scheduler, job);

        }

//        List<SysJob> jobList = jobMapper.selectJobAll();

//        for (SysJob job : jobList)

//        {

//            ScheduleUtils.createScheduleJob(scheduler, job);

//        }

    }



    /**


 src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java

@@ -1,12 +1,16 @@
package com.ruoyi.quality.controller;

import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.quality.pojo.QualityTestStandard;
import com.ruoyi.quality.pojo.QualityTestStandardParam;
import com.ruoyi.quality.service.IQualityTestStandardService;
import com.ruoyi.quality.service.QualityTestStandardParamService;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Nonnull;
import javax.annotation.Resource;
import java.util.List;

@@ -25,6 +29,8 @@
    @Resource
    private IQualityTestStandardService qualityTestStandardService;

    @Resource
    private QualityTestStandardParamService qualityTestStandardParamService;

    /**
     * æ–°å¢žæ£€æµ‹æ ‡å‡†ä¸»è¡¨
@@ -90,4 +96,22 @@
        return AjaxResult.success(qualityTestStandardService.updateBatchById(qualityTestStandards));
    }

    /**
     * æ ¹æ®äº§å“id查询相关的检验标准
     * @return
     */
    @GetMapping("/getQualityTestStandardByProductId")
    public AjaxResult getQualityTestStandardByProductId(@Nonnull Long productId, @Nonnull Integer inspectType, String process) {
        return AjaxResult.success(qualityTestStandardService.getQualityTestStandardByProductId(productId,inspectType,process));
    }

    /**
     * æ ¹æ®æ£€æµ‹æ ‡å‡†id查询相关的检验标准参数
     * @return
     */
    @GetMapping("/getQualityTestStandardParamByTestStandardId")
    public AjaxResult getQualityTestStandardParamByTestStandardId(Long testStandardId) {
        return AjaxResult.success(qualityTestStandardParamService.list(Wrappers.<QualityTestStandardParam>lambdaQuery().eq(QualityTestStandardParam::getTestStandardId, testStandardId)));
    }

}

 src/main/java/com/ruoyi/quality/mapper/QualityTestStandardMapper.java

@@ -7,6 +7,8 @@
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * <p>
 * æ£€æµ‹æ ‡å‡†ä¸»è¡¨ Mapper æŽ¥å£
@@ -19,4 +21,8 @@
public interface QualityTestStandardMapper extends BaseMapper<QualityTestStandard> {

    IPage<QualityTestStandard> qualityTestStandardListPage(Page page, @Param("c") QualityTestStandard qualityTestStandard);

    List<QualityTestStandard> getQualityTestStandardByProductId(@Param("productId") Long productId, @Param("inspectType") Integer inspectType, @Param("process") String process);


}

 src/main/java/com/ruoyi/quality/pojo/QualityInspect.java

@@ -149,4 +149,6 @@
    //不合格现象
    private String defectivePhenomena;

    private Integer testStandardId;

}

 src/main/java/com/ruoyi/quality/service/IQualityTestStandardService.java

@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.quality.pojo.QualityTestStandard;

import java.util.List;

/**
 * <p>
 * æ£€æµ‹æ ‡å‡†ä¸»è¡¨ æœåŠ¡ç±»
@@ -19,4 +21,6 @@

    int copyParam(QualityTestStandard qualityTestStandard);

    List<QualityTestStandard> getQualityTestStandardByProductId(Long productId, Integer inspectType, String process);

}

 src/main/java/com/ruoyi/quality/service/impl/QualityTestStandardServiceImpl.java

@@ -13,6 +13,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;

@@ -58,5 +59,10 @@
        return 0;
    }

    @Override
    public List<QualityTestStandard> getQualityTestStandardByProductId(Long productId, Integer inspectType, String process) {
        return qualityTestStandardMapper.getQualityTestStandardByProductId(productId, inspectType, process);
    }


}

 src/main/resources/application-cgglxt.yml

ÎļþÒÑɾ³ý

 src/main/resources/application-cwglxt.yml

ÎļþÒÑɾ³ý

 src/main/resources/application-hbmjxt.yml

ÎļþÒÑɾ³ý

 src/main/resources/application-hckxTest.yml

ÎļþÒÑɾ³ý

 src/main/resources/application-jtwy.yml

ÎļþÒÑɾ³ý

 src/main/resources/application-native.yml

ÎļþÒÑɾ³ý

 src/main/resources/application-new.yml

ÎļþÒÑɾ³ý

 src/main/resources/application-rlzyxt.yml

ÎļþÒÑɾ³ý

 src/main/resources/application-sbglxt.yml

ÎļþÒÑɾ³ý

 src/main/resources/application-scgkxt.yml

ÎļþÒÑɾ³ý

 src/main/resources/application-tide.yml

ÎļþÃû´Ó src/main/resources/application-ccwlxt.yml ÐÞ¸Ä
@@ -1,7 +1,7 @@
# èŠ¯å¯¼-仓储物流系统项目相关配置
inspur:
  appId: 1205971611543404544
  appSecret: VkyDMDYwMTIwMjYxNzQxNDM2OTItrv
  appId: 1211006803538608128
  appSecret: x6NaMjAwMTIwMjYxNTA5NDcwMTMXsS
ruoyi:
  # åç§°
  name: RuoYi
@@ -20,7 +20,7 @@
# å¼€å‘环境配置
server:
  # æœåŠ¡å™¨çš„HTTP端口，默认为8080
  port: 7003
  port: 8036
  servlet:
    # åº”用的访问路径
    context-path: /
@@ -65,7 +65,7 @@
    druid:
      # ä¸»åº“数据源
      master:
        url: jdbc:mysql://172.17.0.1:3306/mis-ruoyi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        url: jdbc:mysql://10.136.12.71:3306/nhglxt-ruoyi-xinlan?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        username: root
        password: zttZTT123!
      # ä»Žåº“数据源
@@ -138,7 +138,7 @@
  redis:
    # åœ°å€
#    host: 127.0.0.1
    host: 172.17.0.1
    host: 10.136.12.71
    # ç«¯å£ï¼Œé»˜è®¤ä¸º6379
    port: 6379
    # æ•°æ®åº“索引

 src/main/resources/application-xtbgxt.yml

ÎļþÒÑɾ³ý

 src/main/resources/application-yxglxt.yml

ÎļþÒÑɾ³ý

 src/main/resources/application.yml

@@ -1,13 +1,4 @@
# Spring配置
spring:
  profiles:
    active: yxglxt
#10.136.58.65    è´¢åŠ¡ç®¡ç†ç³»ç»Ÿ    cwglxt
#10.136.58.66    è®¾å¤‡ç®¡ç†ç³»ç»Ÿ    sbglxt
#10.136.58.67    ç”Ÿäº§ç®¡æŽ§ç³»ç»Ÿ    scgkxt
#10.136.58.68    ååŒåŠžå…¬ç³»ç»Ÿ    xtbgxt
#10.136.58.69    é‡‡è´­ç®¡ç†ç³»ç»Ÿ    cgglxt
#10.136.58.70    ä»“储物流系统    ccwlxt
#10.136.58.71    è¥é”€ç®¡ç†ç³»ç»Ÿ    yxglxt
#10.136.58.72    äººåŠ›èµ„源系统    rlzyxt
#10.136.58.73    çŽ¯ä¿é—¨ç¦ç³»ç»Ÿ    hbmjxt
    active: tide

 src/main/resources/mapper/quality/QualityTestStandardMapper.xml

@@ -20,4 +20,16 @@
            AND inspect_type = #{c.inspectType}
        </if>
    </select>
    <select id="getQualityTestStandardByProductId" resultType="com.ruoyi.quality.pojo.QualityTestStandard">
        SELECT qts.*
        FROM quality_test_standard qts
        left join quality_test_standard_binding qtsb on qtsb.test_standard_id = qts.id
        left join product_process pp on qts.process_id = pp.id
        WHERE qtsb.product_id = #{productId}
        AND qts.inspect_type = #{inspectType}
        <if test="process!='' and process!=null">
            and pp.name = #{process}
        </if>
        order by qts.id desc
    </select>
</mapper>