chenx/qhmes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

快检标准新增

Browse Source
This commit is contained in:
jiangxh
2026-06-16 15:35:54 +08:00
parent be215d604d
commit 7f0f8a3a2f
15 changed files with 684 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslRubberQuickTestRecordController.java
View File

@@ -16,8 +16,12 @@ import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.common.system.vo.LoginUser;
import org.apache.shiro.SecurityUtils;
import org.jeecg.modules.mes.material.entity.MesMaterial;
import org.jeecg.modules.mes.material.service.IMesMaterialService;
import org.jeecg.modules.system.entity.SysUser;
import org.jeecg.modules.system.service.ISysUserService;
import org.jeecg.modules.xslmes.entity.MesXslRubberQuickTestRecord;
import org.jeecg.modules.xslmes.entity.MesXslRubberQuickTestRecordLine;
import org.jeecg.modules.xslmes.entity.MesXslRubberQuickTestType;
@@ -49,6 +53,9 @@ public class MesXslRubberQuickTestRecordController
@Autowired
private IMesXslRubberQuickTestTypeService mesXslRubberQuickTestTypeService;
@Autowired
private ISysUserService sysUserService;
@Operation(summary = "MES胶料快检记录-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<MesXslRubberQuickTestRecord>> queryPageList(
@@ -110,6 +117,9 @@ public class MesXslRubberQuickTestRecordController
@PostMapping(value = "/batchFromMaterial")
public Result<List<String>> batchFromMaterial(@RequestBody MesXslRubberQuickTestRecordBatchFromMaterialVO vo) {
try {
//update-begin---author:jiangxh ---date:20260616 for：【MES】胶料快检记录批量生成默认带出当前登录检验人-----------
fillInspectorIfEmpty(vo);
//update-end---author:jiangxh ---date:20260616 for：【MES】胶料快检记录批量生成默认带出当前登录检验人-----------
List<String> ids = mesXslRubberQuickTestRecordService.batchFromMaterial(vo);
return Result.OK("成功生成 " + ids.size() + " 条快检记录", ids);
} catch (Exception e) {
@@ -186,6 +196,10 @@ public class MesXslRubberQuickTestRecordController
main.setQuickTestTypeName(type.getTypeName());
}
//update-begin---author:jiangxh ---date:20260616 for：【MES】胶料快检记录保存时补全检验人姓名冗余-----------
resolveInspector(main);
//update-end---author:jiangxh ---date:20260616 for：【MES】胶料快检记录保存时补全检验人姓名冗余-----------
if (lineList == null || lineList.isEmpty()) {
return "请维护检验明细";
}
@@ -197,4 +211,35 @@ public class MesXslRubberQuickTestRecordController
}
return null;
}
//update-begin---author:jiangxh ---date:20260616 for：【MES】胶料快检记录检验人冗余字段补全-----------
private void resolveInspector(MesXslRubberQuickTestRecord main) {
if (main == null || oConvertUtils.isEmpty(main.getInspectorUserId())) {
return;
}
if (oConvertUtils.isNotEmpty(main.getInspectorRealname())) {
return;
}
SysUser user = sysUserService.getById(main.getInspectorUserId().trim());
if (user != null) {
main.setInspectorUsername(user.getUsername());
main.setInspectorRealname(user.getRealname());
}
}
private void fillInspectorIfEmpty(MesXslRubberQuickTestRecordBatchFromMaterialVO vo) {
if (vo == null || oConvertUtils.isNotEmpty(vo.getInspectorUserId())) {
return;
}
if (SecurityUtils.getSubject() == null || SecurityUtils.getSubject().getPrincipal() == null) {
return;
}
if (!(SecurityUtils.getSubject().getPrincipal() instanceof LoginUser user)) {
return;
}
vo.setInspectorUserId(user.getId());
vo.setInspectorUsername(user.getUsername());
vo.setInspectorRealname(user.getRealname());
}
//update-end---author:jiangxh ---date:20260616 for：【MES】胶料快检记录检验人冗余字段补全-----------
}

28
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslRubberQuickTestStdController.java
View File

@@ -238,13 +238,6 @@ public class MesXslRubberQuickTestStdController
if (main == null) {
return "参数不能为空";
}
if (oConvertUtils.isEmpty(main.getStdName())) {
return "实验标准名称不能为空";
}
main.setStdName(main.getStdName().trim());
if (mesXslRubberQuickTestStdService.isStdNameDuplicated(main.getStdName(), excludeId, main)) {
return "实验标准名称已存在";
}
if (oConvertUtils.isEmpty(main.getTestMethodId())) {
return "请选择实验方法";
}
@@ -254,13 +247,22 @@ public class MesXslRubberQuickTestStdController
}
main.setTestMethodName(method.getMethodName());
if (oConvertUtils.isNotEmpty(main.getRubberMaterialId())) {
MesMaterial material = mesMaterialService.getById(main.getRubberMaterialId());
if (material == null) {
return "所选胶料不存在";
}
main.setRubberMaterialName(material.getMaterialName());
if (oConvertUtils.isEmpty(main.getRubberMaterialId())) {
return "请选择胶料信息";
}
MesMaterial material = mesMaterialService.getById(main.getRubberMaterialId());
if (material == null) {
return "所选胶料不存在";
}
main.setRubberMaterialName(material.getMaterialName());
//update-begin---author:jiangxh ---date:20260616 for：【MES】胶料快检实验标准名称自动生成（实验方法名称_胶料名称）-----------
String stdName = main.getTestMethodName().trim() + "_" + main.getRubberMaterialName().trim();
main.setStdName(stdName);
if (mesXslRubberQuickTestStdService.isStdNameDuplicated(stdName, excludeId, main)) {
return "实验标准名称已存在";
}
//update-end---author:jiangxh ---date:20260616 for：【MES】胶料快检实验标准名称自动生成（实验方法名称_胶料名称）-----------
if (oConvertUtils.isNotEmpty(main.getPsCompileId())) {
MesXslMixerPsCompile ps = mesXslMixerPsCompileService.getById(main.getPsCompileId());

1
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslRubberQuickTestRecord.java
View File

@@ -78,6 +78,7 @@ public class MesXslRubberQuickTestRecord implements Serializable {
private Date inspectTime;
@Schema(description = "检验人用户ID")
@Dict(dictTable = "sys_user", dicText = "realname", dicCode = "id")
private String inspectorUserId;
private String inspectorUsername;

29
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslRubberQuickTestRecordServiceImpl.java
View File

@@ -200,7 +200,7 @@ public class MesXslRubberQuickTestRecordServiceImpl
if (CollectionUtils.isEmpty(stdLines)) {
throw new JeecgBootException("胶料【" + material.getMaterialName() + "】关联的实验标准无明细数据");
}
MesXslRubberQuickTestRecord main = buildMainFromMaterial(material, std);
MesXslRubberQuickTestRecord main = buildMainFromMaterial(material, std, vo);
List<MesXslRubberQuickTestRecordLine> recordLines = new ArrayList<>();
for (MesXslRubberQuickTestStdLine stdLine : stdLines) {
MesXslRubberQuickTestRecordLine rl = new MesXslRubberQuickTestRecordLine();
@@ -230,7 +230,8 @@ public class MesXslRubberQuickTestRecordServiceImpl
return mesXslRubberQuickTestStdService.getOne(w, false);
}
private MesXslRubberQuickTestRecord buildMainFromMaterial(MesMaterial material, MesXslRubberQuickTestStd std) {
private MesXslRubberQuickTestRecord buildMainFromMaterial(
MesMaterial material, MesXslRubberQuickTestStd std, MesXslRubberQuickTestRecordBatchFromMaterialVO vo) {
MesXslRubberQuickTestRecord main = new MesXslRubberQuickTestRecord();
main.setRubberMaterialId(material.getId());
main.setRubberMaterialName(material.getMaterialName());
@@ -241,6 +242,30 @@ public class MesXslRubberQuickTestRecordServiceImpl
fillQuickTestType(main, method.getQuickTestTypeId());
}
}
//update-begin---author:jiangxh ---date:20260616 for：【MES】胶料快检记录批量生成写入检验人等共用字段-----------
if (vo != null) {
main.setProdEquipmentLedgerId(vo.getProdEquipmentLedgerId());
main.setProdEquipmentName(vo.getProdEquipmentName());
main.setProductionDate(vo.getProductionDate());
main.setTrainNo(vo.getTrainNo());
main.setWorkShift(vo.getWorkShift());
main.setWorkTeam(vo.getWorkTeam());
main.setInspectTimes(vo.getInspectTimes());
main.setInspectTime(vo.getInspectTime());
main.setInspectorUserId(vo.getInspectorUserId());
main.setInspectorUsername(vo.getInspectorUsername());
main.setInspectorRealname(vo.getInspectorRealname());
if (oConvertUtils.isNotEmpty(vo.getQuickTestTypeId())) {
fillQuickTestType(main, vo.getQuickTestTypeId());
}
main.setInspectResult(vo.getInspectResult());
main.setProductionPlanNo(vo.getProductionPlanNo());
main.setInspectEquipmentLedgerId(vo.getInspectEquipmentLedgerId());
main.setInspectEquipmentName(vo.getInspectEquipmentName());
main.setRubberCardNo(vo.getRubberCardNo());
main.setRubberBatchNo(vo.getRubberBatchNo());
}
//update-end---author:jiangxh ---date:20260616 for：【MES】胶料快检记录批量生成写入检验人等共用字段-----------
return main;
}

12
jeecg-boot/jeecg-module-system/jeecg-system-biz/docs/代码修改日志
View File

@@ -589,3 +589,15 @@ jeecgboot-vue3/src/views/xslmes/mesXslDowntimeRecord/components/MesXslDowntimeRe
jeecgboot-vue3/src/views/xslmes/mesXslDowntimeRecord/components/MesXslDowntimeRecordMaintenanceModal.vue
jeecgboot-vue3/src/views/xslmes/mesXslDowntimeRecord/components/MesXslDowntimeTypeSelectModal.vue
jeecgboot-vue3/src/views/xslmes/mesXslDowntimeRecord/components/MesXslInspectMaintainItemSelectModal.vue
-- author:jiangxh---date:20260616--for: 【MES】胶料快检实验标准名称自动生成（实验方法名称_胶料名称） ---
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslRubberQuickTestStdController.java
jeecgboot-vue3/src/views/xslmes/mesXslRubberQuickTestStd/MesXslRubberQuickTestStd.data.ts
jeecgboot-vue3/src/views/xslmes/mesXslRubberQuickTestStd/components/MesXslRubberQuickTestStdModal.vue
-- author:jiangxh---date:20260616--for: 【MES】胶料快检记录列表检验人不显示 ---
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslRubberQuickTestRecordController.java
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslRubberQuickTestRecordServiceImpl.java
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslRubberQuickTestRecord.java
jeecgboot-vue3/src/views/xslmes/mesXslRubberQuickTestRecord/MesXslRubberQuickTestRecord.data.ts
jeecgboot-vue3/src/views/xslmes/mesXslRubberQuickTestRecord/components/MesXslRubberQuickTestRecordModal.vue

8
jeecgboot-vue3/src/views/xslmes/mesXslRubberQuickTestRecord/MesXslRubberQuickTestRecord.data.ts
View File

@@ -13,7 +13,13 @@ export const columns: BasicColumn[] = [
{ title: '班组', align: 'center', dataIndex: 'workTeam_dictText', width: 80 },
{ title: '检验次数', align: 'center', dataIndex: 'inspectTimes', width: 90 },
{ title: '检验时间', align: 'center', dataIndex: 'inspectTime', width: 165 },
{ title: '检验人', align: 'center', dataIndex: 'inspectorRealname', width: 100 },
{
title: '检验人',
align: 'center',
dataIndex: 'inspectorRealname',
width: 100,
customRender: ({ record }) => record?.inspectorRealname || record?.inspectorUserId_dictText || '',
},
{ title: '检验类型', align: 'center', dataIndex: 'quickTestTypeName', width: 120 },
{ title: '检验结果', align: 'center', dataIndex: 'inspectResult_dictText', width: 90 },
{ title: '生产计划号', align: 'center', dataIndex: 'productionPlanNo', width: 120 },

11
jeecgboot-vue3/src/views/xslmes/mesXslRubberQuickTestRecord/components/MesXslRubberQuickTestRecordModal.vue
View File

@@ -48,12 +48,14 @@
import { BasicForm, useForm } from '/@/components/Form/index';
import type { JVxeTableInstance } from '/@/components/jeecg/JVxeTable/types';
import { useMessage } from '/@/hooks/web/useMessage';
import { useUserStore } from '/@/store/modules/user';
import { formSchema, lineJVxeColumns } from '../MesXslRubberQuickTestRecord.data';
import { saveOrUpdate, queryById, queryLineListByRecordId } from '../MesXslRubberQuickTestRecord.api';
import MesXslEquipmentLedgerSelectModal from '/@/views/xslmes/mesXslEquipInspectConfig/components/MesXslEquipmentLedgerSelectModal.vue';
const emit = defineEmits(['register', 'success']);
const { createMessage } = useMessage();
const userStore = useUserStore();
const isDetail = ref(false);
const tableReady = ref(false);
@@ -86,7 +88,14 @@
const m = (mainRaw as any)?.id != null ? mainRaw : (mainRaw as any)?.result ?? mainRaw;
const linesRaw = await queryLineListByRecordId({ id: data.record.id });
const list = Array.isArray(linesRaw) ? linesRaw : (linesRaw as any)?.result ?? [];
await setFieldsValue({ ...m });
const patch: Recordable = { ...m };
if (data?.showFooter && !patch.inspectorRealname && !patch.inspectorUserId) {
const user = userStore.getUserInfo || {};
patch.inspectorUserId = user.id;
patch.inspectorUsername = user.username;
patch.inspectorRealname = user.realname;
}
await setFieldsValue(patch);
lineDataSource.value = list || [];
} finally {
lineLoading.value = false;

24
jeecgboot-vue3/src/views/xslmes/mesXslRubberQuickTestStd/MesXslRubberQuickTestStd.data.ts
View File

@@ -1,6 +1,5 @@
import { BasicColumn, FormSchema } from '/@/components/Table';
import { JVxeColumn, JVxeTypes } from '/@/components/jeecg/JVxeTable/types';
import { checkStdName } from './MesXslRubberQuickTestStd.api';
const numProps = { style: { width: '100%' }, precision: 6 };
@@ -72,27 +71,8 @@ export const formSchema: FormSchema[] = [
label: '实验标准名称',
field: 'stdName',
component: 'Input',
required: true,
componentProps: { placeholder: '同租户内不可重复' },
dynamicRules: ({ model }) => [
{ required: true, message: '请输入实验标准名称' },
{
validator: async (_rule, value) => {
const v = value == null ? '' : String(value).trim();
if (!v) {
return Promise.resolve();
}
try {
await checkStdName({ stdName: v, dataId: model?.id });
return Promise.resolve();
} catch (e: any) {
const msg = e?.response?.data?.message || e?.message || '实验标准名称已存在';
return Promise.reject(msg);
}
},
trigger: ['blur', 'change'],
},
],
slot: 'stdNameDisplay',
dynamicDisabled: true,
},
{
label: '实验方法',

22
jeecgboot-vue3/src/views/xslmes/mesXslRubberQuickTestStd/components/MesXslRubberQuickTestStdModal.vue
View File

@@ -8,6 +8,9 @@
@ok="handleSubmit"
>
<BasicForm @register="registerForm">
<template #stdNameDisplay="{ model }">
<a-input :value="formatStdName(model)" disabled placeholder="选择实验方法和胶料后自动生成" />
</template>
<template #testMethodPicker="{ model, field }">
<a-input-group compact style="display: flex; width: 100%">
<a-input v-model:value="model[field]" read-only placeholder="请选择实验方法" style="flex: 1" />
@@ -129,6 +132,13 @@
!unref(isUpdate) ? '新增胶料快检实验标准' : unref(isDetail) ? '实验标准详情' : '编辑胶料快检实验标准',
);
/** 标准名称 = 实验方法名称 + _ + 胶料名称 */
function formatStdName(model?: Recordable) {
const methodName = String(model?.testMethodName ?? '').trim();
const materialName = String(model?.rubberMaterialName ?? '').trim();
return methodName && materialName ? `${methodName}_${materialName}` : '';
}
function methodLineToStdRow(ml: Recordable, existing?: Recordable): Recordable {
return {
dataPointId: ml.dataPointId,
@@ -257,11 +267,17 @@
async function handleSubmit() {
try {
const values = await validate();
if (!values?.testMethodId) {
const formVals = getFieldsValue();
const stdName = formatStdName(formVals);
if (!formVals?.testMethodId) {
createMessage.warning('请选择实验方法');
return;
}
if (!stdName) {
createMessage.warning('请先选择实验方法和胶料以生成实验标准名称');
return;
}
const values = await validate();
const lineRef = lineTableRef.value as any;
const tableData = (lineRef?.getTableData?.() || lineDataSource.value || []) as Recordable[];
const lineList = tableData
@@ -280,7 +296,7 @@
return;
}
setModalProps({ confirmLoading: true });
await saveOrUpdate({ ...values, lineList }, unref(isUpdate));
await saveOrUpdate({ ...values, stdName, lineList }, unref(isUpdate));
closeModal();
emit('success');
} finally {

190
qhmes.code-workspace
View File

@@ -2,18 +2,19 @@
"folders": [
{
"path": "jeecg-boot",
"name": "后端 (jeecg-boot)"
"name": "后端"
},
{
"path": "jeecgboot-vue3",
"name": "前端 (jeecgboot-vue3)"
"name": "前端"
},
{
"path": "yy-admin-master",
"name": "桌面端 (yy-admin-master)"
"name": "桌面端"
},
{
"path": "XSLPrintDot"
"path": "XSLPrintDot",
"name": "打印调节器"
}
],
"settings": {
@@ -23,6 +24,9 @@
"java.configuration.updateBuildConfiguration": "automatic",
"java.autobuild.enabled": true,
"java.import.maven.offline.enabled": false,
"java.configuration.maven.notCoveredPluginExecutionSeverity": "ignore",
"java.jdt.ls.java.home": "C:\\Program Files\\Java\\jdk-17",
"java.jdt.ls.vmargs": "-XX:+UseParallelGC -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -Dsun.zip.disableMemoryMapping=true -Xmx4G -Xms100m -Xlog:disable",
"java.configuration.runtimes": [
{
"name": "JavaSE-17",
@@ -30,13 +34,183 @@
"default": true
}
],
"java.configuration.maven.notCoveredPluginExecutionSeverity": "ignore",
"java.jdt.ls.java.home": "C:\\Program Files\\Java\\jdk-17",
"java.jdt.ls.vmargs": "-XX:+UseParallelGC -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -Dsun.zip.disableMemoryMapping=true -Xmx4G -Xms100m -Xlog:disable",
"java.maven.downloadSources": true,
"java.eclipse.downloadSources": true,
"java.project.importOnFirstTimeStartup": "automatic",
"java.configuration.checkProjectSettingsExclusions": false,
"java.import.exclusions": [
"**/jeecg-server-cloud/**",
"**/jeecg-boot-platform/**",
"**/node_modules/**"
"**/node_modules/**",
"**/.metadata/**",
"**/archetype-resources/**",
"**/META-INF/maven/**"
],
"java.project.resourceFilters": [
"node_modules",
".git",
"jeecg-server-cloud",
"jeecg-boot-platform"
],
"java.debug.settings.console": "integratedTerminal",
"java.debug.settings.vmArgs": "-Dfile.encoding=UTF-8 -Dspring.main.banner-mode=log -Dspring.banner.charset=UTF-8 -Dlogging.charset.console=GBK",
"terminal.integrated.defaultProfile.windows": "PowerShell",
"terminal.integrated.profiles.windows": {
"PowerShell": {
"source": "PowerShell",
"args": ["-NoExit", "-Command", "chcp 936 | Out-Null"]
}
},
"files.exclude": {
"**/target": true,
"**/node_modules": true,
"**/_tmp_build_out": true,
"**/_build_verify_out": true
}
},
"launch": {
"version": "0.2.0",
"configurations": [
{
"type": "java",
"name": "后端: JeecgSystemApplication",
"request": "launch",
"mainClass": "org.jeecg.JeecgSystemApplication",
"projectName": "jeecg-system-start",
"cwd": "${workspaceFolder:后端}/jeecg-module-system/jeecg-system-start",
"vmArgs": "-Dfile.encoding=UTF-8 -Dspring.main.banner-mode=log -Dspring.banner.charset=UTF-8 -Dlogging.charset.console=GBK"
},
{
"type": "chrome",
"request": "launch",
"name": "前端: 调试 (Chrome)",
"url": "http://localhost:3100",
"webRoot": "${workspaceFolder:前端}",
"preLaunchTask": "前端: dev"
},
{
"type": "node",
"request": "launch",
"name": "前端: dev",
"runtimeExecutable": "pnpm",
"runtimeArgs": ["run", "dev"],
"cwd": "${workspaceFolder:前端}",
"console": "integratedTerminal",
"skipFiles": ["<node_internals>/**", "**/node_modules/**"]
},
{
"name": "桌面端: YY.Admin",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "桌面端: build",
"program": "${workspaceFolder:桌面端}/YY.Admin/bin/Debug/net8.0-windows10.0.19041/win-x64/YY.Admin.exe",
"cwd": "${workspaceFolder:桌面端}/YY.Admin/bin/Debug/net8.0-windows10.0.19041/win-x64",
"console": "internalConsole",
"stopAtEntry": false
},
{
"name": "打印调节器: wails dev",
"type": "node",
"request": "launch",
"runtimeExecutable": "wails",
"runtimeArgs": ["dev"],
"cwd": "${workspaceFolder:打印调节器}",
"console": "integratedTerminal"
}
]
},
"tasks": {
"version": "2.0.0",
"tasks": [
{
"label": "后端: compile",
"type": "shell",
"command": "mvn",
"args": [
"compile",
"-pl",
"jeecg-module-system/jeecg-system-start",
"-am",
"-DskipTests",
"-q"
],
"options": {
"cwd": "${workspaceFolder:后端}",
"env": {
"JAVA_HOME": "C:\\Program Files\\Java\\jdk-17"
}
},
"problemMatcher": "$javac",
"group": "build"
},
{
"label": "前端: dev",
"type": "shell",
"command": "pnpm run dev",
"options": {
"cwd": "${workspaceFolder:前端}"
},
"isBackground": true,
"problemMatcher": {
"owner": "vite",
"pattern": { "regexp": "^$" },
"background": {
"activeOnStart": true,
"beginsPattern": ".",
"endsPattern": "(Local:|ready in|http://localhost)"
}
}
},
{
"label": "桌面端: restore",
"type": "process",
"command": "C:\\Program Files\\dotnet\\dotnet.exe",
"args": ["restore", "YY.Admin.Entry.sln"],
"options": {
"cwd": "${workspaceFolder:桌面端}"
},
"problemMatcher": "$msCompile"
},
{
"label": "桌面端: build",
"type": "process",
"command": "C:\\Program Files\\dotnet\\dotnet.exe",
"args": ["build", "YY.Admin.Entry.sln", "-c", "Debug"],
"options": {
"cwd": "${workspaceFolder:桌面端}"
},
"dependsOn": "桌面端: restore",
"problemMatcher": "$msCompile",
"group": "build"
},
{
"label": "打印调节器: wails dev",
"type": "shell",
"command": "wails dev",
"options": {
"cwd": "${workspaceFolder:打印调节器}"
},
"isBackground": true,
"problemMatcher": {
"owner": "wails",
"pattern": { "regexp": "^$" },
"background": {
"activeOnStart": true,
"beginsPattern": ".",
"endsPattern": "(Listening|DevServer|Frontend Dev Server)"
}
}
}
]
},
"extensions": {
"recommendations": [
"vscjava.vscode-java-pack",
"Vue.volar",
"dbaeumer.vscode-eslint",
"esbenp.prettier-vscode",
"ms-dotnettools.csharp",
"golang.go"
]
}
}

113
workspaces/qhmes-backend.code-workspace Normal file
View File

@@ -0,0 +1,113 @@
{
"folders": [
{
"path": "../jeecg-boot",
"name": "后端 (jeecg-boot)"
}
],
"settings": {
"java.compile.nullAnalysis.mode": "automatic",
"java.import.maven.enabled": true,
"java.import.maven.recursive": true,
"java.configuration.updateBuildConfiguration": "automatic",
"java.autobuild.enabled": true,
"java.import.maven.offline.enabled": false,
"java.configuration.maven.notCoveredPluginExecutionSeverity": "ignore",
"java.jdt.ls.java.home": "C:\\Program Files\\Java\\jdk-17",
"java.jdt.ls.vmargs": "-XX:+UseParallelGC -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -Dsun.zip.disableMemoryMapping=true -Xmx4G -Xms100m -Xlog:disable",
"java.configuration.runtimes": [
{
"name": "JavaSE-17",
"path": "C:\\Program Files\\Java\\jdk-17",
"default": true
}
],
"java.maven.downloadSources": true,
"java.eclipse.downloadSources": true,
"java.project.importOnFirstTimeStartup": "automatic",
"java.configuration.checkProjectSettingsExclusions": false,
"java.import.exclusions": [
"**/jeecg-server-cloud/**",
"**/jeecg-boot-platform/**",
"**/node_modules/**"
],
"java.project.resourceFilters": [
"node_modules",
".git",
"jeecg-server-cloud",
"jeecg-boot-platform"
],
"java.debug.settings.console": "integratedTerminal",
"java.debug.settings.vmArgs": "-Dfile.encoding=UTF-8 -Dspring.main.banner-mode=log -Dspring.banner.charset=UTF-8 -Dlogging.charset.console=GBK",
"files.exclude": {
"**/target": true
}
},
"launch": {
"version": "0.2.0",
"configurations": [
{
"type": "java",
"name": "JeecgSystemApplication (单体)",
"request": "launch",
"mainClass": "org.jeecg.JeecgSystemApplication",
"projectName": "jeecg-system-start",
"cwd": "${workspaceFolder}/jeecg-module-system/jeecg-system-start",
"vmArgs": "-Dfile.encoding=UTF-8 -Dspring.main.banner-mode=log -Dspring.banner.charset=UTF-8 -Dlogging.charset.console=GBK"
}
]
},
"tasks": {
"version": "2.0.0",
"tasks": [
{
"label": "Maven: compile",
"type": "shell",
"command": "mvn",
"args": [
"compile",
"-pl",
"jeecg-module-system/jeecg-system-start",
"-am",
"-DskipTests",
"-q"
],
"options": {
"cwd": "${workspaceFolder}",
"env": {
"JAVA_HOME": "C:\\Program Files\\Java\\jdk-17"
}
},
"problemMatcher": "$javac",
"group": {
"kind": "build",
"isDefault": true
}
},
{
"label": "Maven: clean compile",
"type": "shell",
"command": "mvn",
"args": [
"clean",
"compile",
"-pl",
"jeecg-module-system/jeecg-system-start",
"-am",
"-DskipTests"
],
"options": {
"cwd": "${workspaceFolder}",
"env": {
"JAVA_HOME": "C:\\Program Files\\Java\\jdk-17"
}
},
"problemMatcher": "$javac",
"group": "build"
}
]
},
"extensions": {
"recommendations": ["vscjava.vscode-java-pack"]
}
}

81
workspaces/qhmes-desktop.code-workspace Normal file
View File

@@ -0,0 +1,81 @@
{
"folders": [
{
"path": "../yy-admin-master",
"name": "桌面端 (yy-admin-master)"
}
],
"settings": {
"dotnet.defaultSolution": "YY.Admin.Entry.sln",
"files.exclude": {
"**/_tmp_build_out": true,
"**/_build_verify_out": true,
"**/bin": true,
"**/obj": true
}
},
"launch": {
"version": "0.2.0",
"configurations": [
{
"name": "YY.Admin 一键启动",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "YY.Admin: build",
"program": "${workspaceFolder}/YY.Admin/bin/Debug/net8.0-windows10.0.19041/win-x64/YY.Admin.exe",
"cwd": "${workspaceFolder}/YY.Admin/bin/Debug/net8.0-windows10.0.19041/win-x64",
"console": "internalConsole",
"stopAtEntry": false
}
]
},
"tasks": {
"version": "2.0.0",
"tasks": [
{
"label": "YY.Admin: restore",
"type": "process",
"command": "C:\\Program Files\\dotnet\\dotnet.exe",
"args": ["restore", "YY.Admin.Entry.sln"],
"options": {
"cwd": "${workspaceFolder}"
},
"problemMatcher": "$msCompile"
},
{
"label": "YY.Admin: build",
"type": "process",
"command": "C:\\Program Files\\dotnet\\dotnet.exe",
"args": ["build", "YY.Admin.Entry.sln", "-c", "Debug"],
"options": {
"cwd": "${workspaceFolder}"
},
"dependsOn": "YY.Admin: restore",
"problemMatcher": "$msCompile",
"group": {
"kind": "build",
"isDefault": true
}
},
{
"label": "YY.Admin: run (script)",
"type": "process",
"command": "C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe",
"args": [
"-NoProfile",
"-ExecutionPolicy",
"Bypass",
"-File",
"${workspaceFolder}\\.vscode\\run-yyadmin.ps1"
],
"options": {
"cwd": "${workspaceFolder}"
},
"problemMatcher": "$msCompile"
}
]
},
"extensions": {
"recommendations": ["ms-dotnettools.csharp", "ms-dotnettools.csdevkit"]
}
}

88
workspaces/qhmes-frontend.code-workspace Normal file
View File

@@ -0,0 +1,88 @@
{
"folders": [
{
"path": "../jeecgboot-vue3",
"name": "前端 (jeecgboot-vue3)"
}
],
"settings": {
"editor.formatOnSave": false,
"editor.codeActionsOnSave": {
"source.fixAll.eslint": "explicit"
},
"eslint.validate": ["javascript", "javascriptreact", "typescript", "typescriptreact", "vue"],
"typescript.tsdk": "node_modules/typescript/lib",
"files.exclude": {
"**/node_modules": true,
"**/dist": true
}
},
"launch": {
"version": "0.2.0",
"configurations": [
{
"type": "chrome",
"request": "launch",
"name": "调试前端 (Chrome)",
"url": "http://localhost:3100",
"webRoot": "${workspaceFolder}",
"preLaunchTask": "pnpm dev"
},
{
"type": "node",
"request": "launch",
"name": "pnpm dev",
"runtimeExecutable": "pnpm",
"runtimeArgs": ["run", "dev"],
"cwd": "${workspaceFolder}",
"console": "integratedTerminal",
"skipFiles": ["<node_internals>/**", "**/node_modules/**"]
}
]
},
"tasks": {
"version": "2.0.0",
"tasks": [
{
"label": "pnpm dev",
"type": "shell",
"command": "pnpm run dev",
"options": {
"cwd": "${workspaceFolder}"
},
"isBackground": true,
"problemMatcher": {
"owner": "vite",
"pattern": { "regexp": "^$" },
"background": {
"activeOnStart": true,
"beginsPattern": ".",
"endsPattern": "(Local:|ready in|http://localhost)"
}
},
"group": {
"kind": "build",
"isDefault": true
}
},
{
"label": "pnpm build",
"type": "shell",
"command": "pnpm run build",
"options": {
"cwd": "${workspaceFolder}"
},
"problemMatcher": [],
"group": "build"
}
]
},
"extensions": {
"recommendations": [
"Vue.volar",
"dbaeumer.vscode-eslint",
"esbenp.prettier-vscode",
"stylelint.vscode-stylelint"
]
}
}

82
workspaces/qhmes-print.code-workspace Normal file
View File

@@ -0,0 +1,82 @@
{
"folders": [
{
"path": "../XSLPrintDot",
"name": "打印调节器 (XSLPrintDot)"
}
],
"settings": {
"go.useLanguageServer": true,
"go.toolsManagement.autoUpdate": true,
"files.exclude": {
"**/build/windows/installer/resources": true
}
},
"launch": {
"version": "0.2.0",
"configurations": [
{
"name": "wails dev",
"type": "node",
"request": "launch",
"runtimeExecutable": "wails",
"runtimeArgs": ["dev"],
"cwd": "${workspaceFolder}",
"console": "integratedTerminal"
}
]
},
"tasks": {
"version": "2.0.0",
"tasks": [
{
"label": "wails dev",
"type": "shell",
"command": "wails dev",
"options": {
"cwd": "${workspaceFolder}"
},
"isBackground": true,
"problemMatcher": {
"owner": "wails",
"pattern": { "regexp": "^$" },
"background": {
"activeOnStart": true,
"beginsPattern": ".",
"endsPattern": "(Listening|DevServer|Frontend Dev Server)"
}
},
"group": {
"kind": "build",
"isDefault": true
}
},
{
"label": "wails build",
"type": "shell",
"command": "wails build",
"options": {
"cwd": "${workspaceFolder}"
},
"problemMatcher": [],
"group": "build"
},
{
"label": "frontend: npm install",
"type": "shell",
"command": "npm install",
"options": {
"cwd": "${workspaceFolder}/frontend"
},
"problemMatcher": []
}
]
},
"extensions": {
"recommendations": [
"golang.go",
"Vue.volar",
"wailsapp.wails-vscode"
]
}
}

BIN
yy-admin-master/_tmp_build_out/Admin.NET.db Normal file
View File

Binary file not shown.