licq/heli-mes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

入出库单据生成下拉框结果集去掉规格条件

Browse Source
This commit is contained in:
z 2026-04-07 15:24:59 +08:00
parent 626e4286ef
commit 4d685b0509
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/dataacquisition/DataAcquisitionController.java
View File

@ -14,6 +14,7 @@ import com.chanko.yunxi.mes.module.heli.service.dataacquisition.DataAcquisitionS
import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@ -91,7 +92,7 @@ public class DataAcquisitionController {
BeanUtils.toBean(list, DataAcquisitionRespVO.class)); BeanUtils.toBean(list, DataAcquisitionRespVO.class));
} }
// @Scheduled(cron = "0/5 * * * * ?") @Scheduled(cron = "0/5 * * * * ?")
public void updateDataCollection(){ public void updateDataCollection(){
dataAcquisitionService.updateDataCollection(); dataAcquisitionService.updateDataCollection();
} }

2
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagelog/StorageLogServiceImpl.java
View File

@ -158,7 +158,7 @@ public class StorageLogServiceImpl implements StorageLogService {
LambdaQueryWrapper<MaterialDO> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<MaterialDO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(MaterialDO::getStatus, 1); queryWrapper.eq(MaterialDO::getStatus, 1);
queryWrapper.like(logDO.getMatName() != null, MaterialDO::getName, logDO.getMatName()); queryWrapper.like(logDO.getMatName() != null, MaterialDO::getName, logDO.getMatName());
queryWrapper.like(logDO.getMatSpec() != null, MaterialDO::getSpec, logDO.getMatSpec()); // queryWrapper.like(logDO.getMatSpec() != null, MaterialDO::getSpec, logDO.getMatSpec());
List<MaterialDO> materialDOS = materialMapper.selectList(queryWrapper); List<MaterialDO> materialDOS = materialMapper.selectList(queryWrapper);
logDO.setMaterialDOList(materialDOS); logDO.setMaterialDOList(materialDOS);
if (idSet.contains(logDO.getId()) && materialDOS.size() == 1) { if (idSet.contains(logDO.getId()) && materialDOS.size() == 1) {

2
mes-ui/mes-echarts/src/utils/requestConfig.js
View File

@ -10,6 +10,6 @@ const devBaseURL = 'http://218.75.46.166:8889'
// const proBaseURL = 'http://192.168.0.169:9002/' // const proBaseURL = 'http://192.168.0.169:9002/'
// const devBaseURL = 'http://218.75.46.166:8889/' // const devBaseURL = 'http://218.75.46.166:8889/'
const proBaseURL = 'http://218.75.46.166:8889/' const proBaseURL = 'http://218.75.46.166:8889/'
export const BASE_URL = process.env.NODE_ENV === 'development' ? devBaseURL : proBaseURL export const BASE_URL = process.env.NODE_ENV === 'development' ? devBaseURL : devBaseURL
export const TIMEOUT = 5000 export const TIMEOUT = 5000