diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslMixingSpecServiceImpl.java b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslMixingSpecServiceImpl.java index 7381198..3a4ca5b 100644 --- a/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslMixingSpecServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslMixingSpecServiceImpl.java @@ -41,6 +41,7 @@ import org.jeecg.modules.xslmes.mapper.MesXslMixingSpecTcuMapper; import org.jeecg.modules.xslmes.service.IMesXslFormulaSpecEditLogService; import org.jeecg.modules.xslmes.service.IMesXslMixingSpecService; import org.jeecg.modules.xslmes.vo.MesXslMixingSpecPage; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; @@ -98,10 +99,9 @@ public class MesXslMixingSpecServiceImpl extends ServiceImpl materialList, + List stepList, + List downStepList, + List tcuList) { + MesXslMixingSpecPage page = new MesXslMixingSpecPage(); + BeanUtils.copyProperties(main, page); + page.setMaterialList(materialList != null ? materialList : new ArrayList<>()); + page.setStepList(stepList != null ? stepList : new ArrayList<>()); + page.setDownStepList(downStepList != null ? downStepList : new ArrayList<>()); + page.setTcuList(tcuList != null ? tcuList : new ArrayList<>()); + return page; + } + //update-end---author:cursor ---date:20260527 for：【配方日志查询】从入参直接构建快照，避免二次查库----------- } diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml index 3018956..3f7ebd7 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml +++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml @@ -157,6 +157,7 @@ spring: datasource: master: url: jdbc:mysql://xsl.qdxsl.top:50768/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai + # url: jdbc:mysql://localhost:3307/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai username: root password: 123456 driver-class-name: com.mysql.cj.jdbc.Driver diff --git a/jeecgboot-vue3/src/views/xslmes/mesXslMixerPsCompile/MesXslMixerPsCompile.data.ts b/jeecgboot-vue3/src/views/xslmes/mesXslMixerPsCompile/MesXslMixerPsCompile.data.ts index 753a1f3..7b3e2b3 100644 --- a/jeecgboot-vue3/src/views/xslmes/mesXslMixerPsCompile/MesXslMixerPsCompile.data.ts +++ b/jeecgboot-vue3/src/views/xslmes/mesXslMixerPsCompile/MesXslMixerPsCompile.data.ts @@ -103,6 +103,14 @@ export const formSchema: FormSchema[] = [ { label: '', field: 'id', component: 'Input', show: false }, sectionDivider('基本信息', 'dividerBasic'), + { + label: '标题', + field: 'title', + component: 'Input', + colProps: { span: 24 }, + componentProps: { placeholder: '请输入标题', allowClear: true }, + dynamicRules: () => [{ required: true, message: '请输入标题' }], + }, { label: 'PS编码', field: 'psCode', @@ -136,6 +144,7 @@ export const formSchema: FormSchema[] = [ field: 'status', component: 'JDictSelectTag', defaultValue: 'compile', + show: false, componentProps: { dictCode: 'xslmes_mixer_ps_status', disabled: true }, colProps: colHalf, }, @@ -143,6 +152,7 @@ export const formSchema: FormSchema[] = [ label: '编制人', field: 'compileBy', component: 'Input', + show: false, componentProps: { disabled: true, bordered: false, placeholder: '保存后按创建人显示' }, colProps: colHalf, }, @@ -153,14 +163,6 @@ export const formSchema: FormSchema[] = [ colProps: colHalf, componentProps: { placeholder: '请输入担当', allowClear: true }, }, - { - label: '标题', - field: 'title', - component: 'Input', - colProps: { span: 24 }, - componentProps: { placeholder: '请输入标题', allowClear: true }, - dynamicRules: () => [{ required: true, message: '请输入标题' }], - }, sectionDivider('组织与部门', 'dividerDept'), { diff --git a/jeecgboot-vue3/src/views/xslmes/mesXslMixerPsCompile/components/MesXslMixerPsCompileModal.vue b/jeecgboot-vue3/src/views/xslmes/mesXslMixerPsCompile/components/MesXslMixerPsCompileModal.vue index 534409e..e61523a 100644 --- a/jeecgboot-vue3/src/views/xslmes/mesXslMixerPsCompile/components/MesXslMixerPsCompileModal.vue +++ b/jeecgboot-vue3/src/views/xslmes/mesXslMixerPsCompile/components/MesXslMixerPsCompileModal.vue @@ -32,7 +32,7 @@ const statusDictCode = ref('xslmes_mixer_ps_status'); const [registerForm, { setProps, resetFields, setFieldsValue, validate, scrollToField, updateSchema }] = useForm({ - labelWidth: 96, + labelWidth: 88, schemas: formSchema, showActionButtonGroup: false, baseColProps: { span: 24 }, @@ -166,7 +166,25 @@ margin-bottom: 14px; } - :deep(#MesXslMixerPsCompileForm_compileBy), + :deep(.ant-form-item-label) { + flex: 0 0 88px !important; + min-width: 88px !important; + max-width: 88px !important; + width: 88px !important; + padding-right: 8px !important; + box-sizing: border-box !important; + text-align: right; + overflow: hidden; + white-space: nowrap; + } + + :deep(.ant-form-item-control) { + flex: 1 1 0% !important; + min-width: 0 !important; + max-width: 100% !important; + width: auto !important; + } + :deep(#MesXslMixerPsCompileForm_proofreadBy), :deep(#MesXslMixerPsCompileForm_proofreadTime), :deep(#MesXslMixerPsCompileForm_auditBy), diff --git a/jeecgboot-vue3/src/views/xslmes/mesXslMixingSpec/components/MesXslMixingSpecModal.vue b/jeecgboot-vue3/src/views/xslmes/mesXslMixingSpec/components/MesXslMixingSpecModal.vue index 6b8c87a..186faa2 100644 --- a/jeecgboot-vue3/src/views/xslmes/mesXslMixingSpec/components/MesXslMixingSpecModal.vue +++ b/jeecgboot-vue3/src/views/xslmes/mesXslMixingSpec/components/MesXslMixingSpecModal.vue @@ -1039,8 +1039,7 @@ async function applyMixingSpecPageData(row: Recordable, mode: 'edit' | 'referenc } else { refreshSignDisplay(pageData || {}); } - await loadMachineEffectiveVolume(sheetForm.machineId); - await loadMixerStepOptions(sheetForm.machineId); + await Promise.all([loadMachineEffectiveVolume(sheetForm.machineId), loadMixerStepOptions(sheetForm.machineId)]); await syncSheetToForm(); materialData.value = ensureMixingDetailRows(pageData?.materialList || [], DEFAULT_MIXING_MATERIAL_ROW_COUNT); convertFactorApplying.value = true;