From 21725fef0f7621d7655e0615ed2f09911922d062 Mon Sep 17 00:00:00 2001 From: zengchenxi Date: Thu, 18 Jan 2024 16:57:46 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E3=80=91=E8=AE=A2=E5=8D=95=E4=BF=A1=E6=81=AF=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectorder/ProjectOrderServiceImpl.java | 3 +++ .../serialnumber/SerialNumberService.java | 7 +++++++ .../serialnumber/SerialNumberServiceImpl.java | 5 +++++ .../src/views/heli/projectorder/detail.vue | 18 ++++++++++-------- sql/v1.1.0/heli.sql | 4 ++-- 5 files changed, 27 insertions(+), 10 deletions(-) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectorder/ProjectOrderServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectorder/ProjectOrderServiceImpl.java index 9541ca17..563844b0 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectorder/ProjectOrderServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectorder/ProjectOrderServiceImpl.java @@ -65,6 +65,9 @@ public class ProjectOrderServiceImpl implements ProjectOrderService { // 插入子表 createProjectOrderSubList(projectOrder.getId(), createReqVO.getProjectOrderSubs()); createReqVO.setId(projectOrder.getId()); + + // 回写序列记录 + serialNumberService.updateSerialNumber(serialNumberDO); // 返回 return projectOrder.getId(); } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/serialnumber/SerialNumberService.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/serialnumber/SerialNumberService.java index ae39ac96..01bd55a0 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/serialnumber/SerialNumberService.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/serialnumber/SerialNumberService.java @@ -30,6 +30,13 @@ public interface SerialNumberService { */ void updateSerialNumber(@Valid SerialNumberSaveReqVO updateReqVO); + /** + * 更新序列号记录 + * + * @param serialNumberDO 更新信息 + */ + void updateSerialNumber(SerialNumberDO serialNumberDO); + /** * 删除序列号记录 * diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/serialnumber/SerialNumberServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/serialnumber/SerialNumberServiceImpl.java index 6c864361..eed81ac9 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/serialnumber/SerialNumberServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/serialnumber/SerialNumberServiceImpl.java @@ -50,6 +50,11 @@ public class SerialNumberServiceImpl implements SerialNumberService { serialNumberMapper.updateById(updateObj); } + @Override + public void updateSerialNumber(SerialNumberDO serialNumberDO) { + serialNumberMapper.updateById(serialNumberDO); + } + @Override public void deleteSerialNumber(Long id) { // 校验存在 diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue index 769d1f8d..7e7eaff6 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue @@ -74,7 +74,7 @@ - + @@ -476,7 +476,6 @@ 删除 下载 - 查看 @@ -575,7 +574,7 @@ const formData = ref({ blueprintNo: undefined, hasPrice: 1, price: undefined, - currency: 1, + currency: "1", projectStartTime: undefined, projectEndTime: undefined, isUrgency: 0, @@ -777,11 +776,11 @@ const submitForm = async (active) => { message.success(t('common.operationSuccess')) // 上传附件 if(contractUploadFiles.value.length > 0){ - contractUploadData.value = {'businessType': 'PROJECT_ORDER', 'businessId': orderId, 'businessFileType': 'CONTRACT'}; + contractUploadData.value.businessId = orderId contractUploadRef.value!.submit(); } if(protocolUploadFiles.value.length > 0){ - protocolUploadData.value = {'businessType': 'PROJECT_ORDER', 'businessId': orderId, 'businessFileType': 'TECHNOLOGY_PROTOCOL'}; + protocolUploadData.value.businessId = orderId protocolUploadRef.value!.submit(); } // 成功后刷新 @@ -816,11 +815,11 @@ const onDeleteItem = (index) => { const uploadUrl = ref(import.meta.env.VITE_UPLOAD_BATCH_URL) const contractUploadRef = ref(); const contractUploadFiles = ref([]); -const contractUploadData = ref({}); +const contractUploadData = ref({'businessType': 'PROJECT_ORDER', 'businessId': formData.value.id, 'businessFileType': 'CONTRACT'}); const protocolUploadRef = ref(); const protocolUploadFiles = ref([]); -const protocolUploadData = ref({}); +const protocolUploadData = ref({'businessType': 'PROJECT_ORDER', 'businessId': formData.value.id, 'businessFileType': 'TECHNOLOGY_PROTOCOL'}); const contractUploadChange = (file, files) => { contractUploadFiles.value = files; @@ -886,7 +885,7 @@ const resetForm = () => { blueprintNo: undefined, hasPrice: 1, price: undefined, - currency: 1, + currency: "1", projectStartTime: undefined, projectEndTime: undefined, isUrgency: 0, @@ -912,6 +911,9 @@ const resetForm = () => { formRef.value?.resetFields() } +const openMe = (url) => { + window.open(url) +} onMounted(() => { queryData(query.active, query.id); }) diff --git a/sql/v1.1.0/heli.sql b/sql/v1.1.0/heli.sql index 786a34c6..2c726da2 100644 --- a/sql/v1.1.0/heli.sql +++ b/sql/v1.1.0/heli.sql @@ -93,7 +93,7 @@ CREATE TABLE `project_order` ( `deleted` BIT ( 1 ) NOT NULL DEFAULT b'0' COMMENT '是否删除', `tenant_id` BIGINT ( 20 ) NOT NULL DEFAULT '0' COMMENT '租户编号', PRIMARY KEY ( `id` ) USING BTREE, - UNIQUE KEY `idx_code` ( `code` ) USING BTREE + UNIQUE KEY `uk_code` (`code`) USING BTREE ) ENGINE = InnoDB COMMENT = '项目订单表'; DROP TABLE IF EXISTS project_order_sub; @@ -113,7 +113,7 @@ CREATE TABLE `project_order_sub` ( `deleted` BIT ( 1 ) NOT NULL DEFAULT b'0' COMMENT '是否删除', `tenant_id` BIGINT ( 20 ) NOT NULL DEFAULT '0' COMMENT '租户编号', PRIMARY KEY ( `id` ) USING BTREE, - UNIQUE KEY `idx_name` ( `name` ) USING BTREE + UNIQUE KEY `uk_project_name` (`project_order_id`,`name`) USING BTREE ) ENGINE = InnoDB COMMENT = '项目订单子项目表'; ALTER TABLE project_order ADD COLUMN `contract_no` VARCHAR ( 128 ) COMMENT '模具名称' AFTER customer_id;