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/hlvuestyle/classesSelect.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/classesSelect.vue
new file mode 100644
index 00000000..3d8bf91f
--- /dev/null
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/classesSelect.vue
@@ -0,0 +1,65 @@
+
+
+
+
+
+
+
+
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/index.vue
index b68594c4..8b3424b6 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/index.vue
@@ -9,6 +9,7 @@
部门
车间
+ 班组
职工
客户
供应商
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/indexFrom.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/indexFrom.vue
index 9c250853..82ca3c95 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/indexFrom.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/indexFrom.vue
@@ -12,6 +12,9 @@
+
+
+
@@ -49,6 +52,7 @@ import SupplierSelect from '../hlvuestyle/supplierSelect.vue'
import CompositionSelect from '../hlvuestyle/compositionSelect.vue'
import WorkshopSelect from '../hlvuestyle/workshopSelect.vue'
import MaterialSelect from '../hlvuestyle/materialSelect.vue'
+import ClassesSelect from '../hlvuestyle/classesSelect.vue'
defineOptions({ name: 'SystemDeptForm' })
@@ -68,6 +72,7 @@ const formData: any = ref({
compositionId: undefined,
workshopId: undefined,
materialId: undefined,
+ classesId:undefined,
status: CommonStatusEnum.ENABLE
})
const formRules = reactive({
@@ -119,11 +124,15 @@ const submitForm = async () => {
const resetForm = () => {
formData.value = {
id: undefined,
- parentId: undefined,
- leaderUserId: undefined,
- clientId: undefined,
- supplierId: undefined,
- status: CommonStatusEnum.ENABLE
+ parentId: undefined,
+ leaderUserId: undefined,
+ clientId: undefined,
+ supplierId: undefined,
+ compositionId: undefined,
+ workshopId: undefined,
+ materialId: undefined,
+ classesId:undefined,
+ status: CommonStatusEnum.ENABLE
}
formRef.value?.resetFields()
}
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;