add iot record

src/api/iot/formula/index.ts

@@ -70,3 +70,50 @@ export const FormulaApi = {
     return await request.get({ url: `/iot/formula/formula-detail/get?id=` + id })
   },
 }
+
+// 变量记录 VO
+export interface FormulaRecordVO {
+  id: number // ID
+  machineId: number // 机台ID
+  machineName: string // 机台
+  workerId: number // 用户id
+  workerName: string // 用户
+  resultType: string // 类型
+  formulaId: number // 公式ID
+  formulaCode: string // 公式编号
+  dataValue: number // 值
+  dataUnit: string // 单位
+}
+
+// 变量记录 API
+export const FormulaRecordApi = {
+  // 查询变量记录分页
+  getFormulaRecordPage: async (params: any) => {
+    return await request.get({ url: `/iot/formula-record/page`, params })
+  },
+
+  // 查询变量记录详情
+  getFormulaRecord: async (id: number) => {
+    return await request.get({ url: `/iot/formula-record/get?id=` + id })
+  },
+
+  // 新增变量记录
+  createFormulaRecord: async (data: FormulaRecordVO) => {
+    return await request.post({ url: `/iot/formula-record/create`, data })
+  },
+
+  // 修改变量记录
+  updateFormulaRecord: async (data: FormulaRecordVO) => {
+    return await request.put({ url: `/iot/formula-record/update`, data })
+  },
+
+  // 删除变量记录
+  deleteFormulaRecord: async (id: number) => {
+    return await request.delete({ url: `/iot/formula-record/delete?id=` + id })
+  },
+
+  // 导出变量记录 Excel
+  exportFormulaRecord: async (params) => {
+    return await request.download({ url: `/iot/formula-record/export-excel`, params })
+  },
+}

src/api/iot/mqttrecord/index.ts

@@ -0,0 +1,49 @@
+import request from '@/config/axios'
+
+// 数采记录 VO
+export interface MqttRecordVO {
+  id: number // ID
+  machineId: number // 机台ID
+  machineName: string // 机台
+  deviceDataTime: Date // 采集时间
+  deviceData: string // 数据
+  deviceId: number // 设备id
+  deviceCode: string // 设备编码
+  deviceName: string // 设备名称
+  workerId: number // 用户id
+  workerName: string // 用户
+  gatewayCode: string // 网关
+}
+
+// 数采记录 API
+export const MqttRecordApi = {
+  // 查询数采记录分页
+  getMqttRecordPage: async (params: any) => {
+    return await request.get({ url: `/iot/mqtt-record/page`, params })
+  },
+
+  // 查询数采记录详情
+  getMqttRecord: async (id: number) => {
+    return await request.get({ url: `/iot/mqtt-record/get?id=` + id })
+  },
+
+  // 新增数采记录
+  createMqttRecord: async (data: MqttRecordVO) => {
+    return await request.post({ url: `/iot/mqtt-record/create`, data })
+  },
+
+  // 修改数采记录
+  updateMqttRecord: async (data: MqttRecordVO) => {
+    return await request.put({ url: `/iot/mqtt-record/update`, data })
+  },
+
+  // 删除数采记录
+  deleteMqttRecord: async (id: number) => {
+    return await request.delete({ url: `/iot/mqtt-record/delete?id=` + id })
+  },
+
+  // 导出数采记录 Excel
+  exportMqttRecord: async (params) => {
+    return await request.download({ url: `/iot/mqtt-record/export-excel`, params })
+  },
+}

src/api/mes/saleorder/index.ts

@@ -0,0 +1,73 @@
+import request from '@/config/axios'
+
+// 销售订单 VO
+export interface SaleOrderVO {
+  id: number
+  no: string // 销售单编号
+  status: number // 销售状态
+  customerId: number // 客户编号
+  orderTime: Date // 下单时间
+  totalCount: number // 合计数量
+  totalPrice: number // 合计价格，单位：元
+  totalProductPrice: number // 合计产品价格，单位：元
+  remark: string // 备注
+}
+
+// 销售订单 API
+export const SaleOrderApi = {
+  // 查询销售订单分页
+  getSaleOrderPage: async (params: any) => {
+    return await request.get({ url: `/mes/sale-order/page`, params })
+  },
+
+  // 查询销售订单详情
+  getSaleOrder: async (id: number) => {
+    return await request.get({ url: `/mes/sale-order/get?id=` + id })
+  },
+
+  // 新增销售订单
+  createSaleOrder: async (data: SaleOrderVO) => {
+    return await request.post({ url: `/mes/sale-order/create`, data })
+  },
+
+  // 修改销售订单
+  updateSaleOrder: async (data: SaleOrderVO) => {
+    return await request.put({ url: `/mes/sale-order/update`, data })
+  },
+
+  // 删除销售订单
+  deleteSaleOrder: async (id: number) => {
+    return await request.delete({ url: `/mes/sale-order/delete?id=` + id })
+  },
+
+  // 导出销售订单 Excel
+  exportSaleOrder: async (params) => {
+    return await request.download({ url: `/mes/sale-order/export-excel`, params })
+  },
+
+// ==================== 子表（销售订单项） ====================
+
+  // 获得销售订单项分页
+  getSaleOrderItemsPage: async (params) => {
+    return await request.get({ url: `/mes/sale-order/sale-order-items/page`, params })
+  },
+  // 新增销售订单项
+  createSaleOrderItems: async (data) => {
+    return await request.post({ url: `/mes/sale-order/sale-order-items/create`, data })
+  },
+
+  // 修改销售订单项
+  updateSaleOrderItems: async (data) => {
+    return await request.put({ url: `/mes/sale-order/sale-order-items/update`, data })
+  },
+
+  // 删除销售订单项
+  deleteSaleOrderItems: async (id: number) => {
+    return await request.delete({ url: `/mes/sale-order/sale-order-items/delete?id=` + id })
+  },
+
+  // 获得销售订单项
+  getSaleOrderItems: async (id: number) => {
+    return await request.get({ url: `/mes/sale-order/sale-order-items/get?id=` + id })
+  },
+}

src/views/iot/formula/FormulaForm.vue

@@ -30,6 +30,9 @@
       <el-form-item label="机台ID" prop="machineId">
         <el-input v-model="formData.machineId" placeholder="请输入机台ID" />
       </el-form-item>
+      <el-form-item label="单位" prop="dataUnit">
+        <el-input v-model="formData.dataUnit" placeholder="请输入单位" />
+      </el-form-item>
       <el-form-item label="备注" prop="remark">
         <el-input v-model="formData.remark" type="textarea" placeholder="请输入备注" />
       </el-form-item>

src/views/iot/formula/FormulaRecordForm.vue

@@ -0,0 +1,150 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
+      <el-form-item label="机台ID" prop="machineId">
+        <el-input v-model="formData.machineId" placeholder="请输入机台ID" />
+      </el-form-item>
+      <el-form-item label="机台" prop="machineName">
+        <el-input v-model="formData.machineName" placeholder="请输入机台" />
+      </el-form-item>
+      <el-form-item label="用户id" prop="workerId">
+        <el-input v-model="formData.workerId" placeholder="请输入用户id" />
+      </el-form-item>
+      <el-form-item label="用户" prop="workerName">
+        <el-input v-model="formData.workerName" placeholder="请输入用户" />
+      </el-form-item>
+      <el-form-item label="类型" prop="resultType">
+        <el-radio-group v-model="formData.resultType">
+          <el-radio
+            v-for="dict in getStrDictOptions(DICT_TYPE.MES_DATA_TYPE)"
+            :key="dict.value"
+            :label="dict.value"
+          >
+            {{ dict.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="公式ID" prop="formulaId">
+        <el-input v-model="formData.formulaId" placeholder="请输入公式ID" />
+      </el-form-item>
+      <el-form-item label="公式编号" prop="formulaCode">
+        <el-input v-model="formData.formulaCode" placeholder="请输入公式编号" />
+      </el-form-item>
+      <el-form-item label="值" prop="dataValue">
+        <el-input v-model="formData.dataValue" placeholder="请输入值" />
+      </el-form-item>
+      <el-form-item label="单位" prop="dataUnit">
+        <el-input v-model="formData.dataUnit" placeholder="请输入单位" />
+      </el-form-item>
+      <el-form-item label="采集时间" prop="deviceDataTime">
+        <el-date-picker
+          v-model="formData.deviceDataTime"
+          type="date"
+          value-format="x"
+          placeholder="选择采集时间"
+        />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import { getStrDictOptions, DICT_TYPE } from '@/utils/dict'
+import { FormulaRecordApi, FormulaRecordVO } from '@/api/iot/formula'
+
+/** 变量记录 表单 */
+defineOptions({ name: 'FormulaRecordForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  machineId: undefined,
+  machineName: undefined,
+  workerId: undefined,
+  workerName: undefined,
+  resultType: undefined,
+  formulaId: undefined,
+  formulaCode: undefined,
+  dataValue: undefined,
+  dataUnit: undefined,
+})
+const formRules = reactive({
+  machineId: [{ required: true, message: '机台ID不能为空', trigger: 'blur' }],
+  formulaId: [{ required: true, message: '公式ID不能为空', trigger: 'blur' }],
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await FormulaRecordApi.getFormulaRecord(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as FormulaRecordVO
+    if (formType.value === 'create') {
+      await FormulaRecordApi.createFormulaRecord(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await FormulaRecordApi.updateFormulaRecord(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    machineId: undefined,
+    machineName: undefined,
+    workerId: undefined,
+    workerName: undefined,
+    resultType: undefined,
+    formulaId: undefined,
+    formulaCode: undefined,
+    dataValue: undefined,
+    dataUnit: undefined,
+  }
+  formRef.value?.resetFields()
+}
+</script>

src/views/iot/formula/FormulaRecordIndex.vue

@@ -0,0 +1,252 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="机台" prop="machineName">
+        <el-input
+          v-model="queryParams.machineName"
+          placeholder="请输入机台"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="用户" prop="workerName">
+        <el-input
+          v-model="queryParams.workerName"
+          placeholder="请输入用户"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="类型" prop="resultType">
+        <el-select
+          v-model="queryParams.resultType"
+          placeholder="请选择类型"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getStrDictOptions(DICT_TYPE.MES_DATA_TYPE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="公式编号" prop="formulaCode">
+        <el-input
+          v-model="queryParams.formulaCode"
+          placeholder="请输入公式编号"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker
+          v-model="queryParams.createTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="采集时间" prop="deviceDataTime">
+        <el-date-picker
+          v-model="queryParams.deviceDataTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        <el-button
+          type="primary"
+          plain
+          @click="openForm('create')"
+          v-hasPermi="['iot:formula-record:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['iot:formula-record:export']"
+        >
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <el-table-column label="ID" align="center" prop="id" />
+      <el-table-column label="机台" align="center" prop="machineName" />
+      <el-table-column label="用户" align="center" prop="workerName" />
+      <el-table-column label="类型" align="center" prop="resultType">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.MES_DATA_TYPE" :value="scope.row.resultType" />
+        </template>
+      </el-table-column>
+      <el-table-column label="公式编号" align="center" prop="formulaCode" />
+      <el-table-column label="值" align="center" prop="dataValue" />
+      <el-table-column label="单位" align="center" prop="dataUnit" />
+      <el-table-column
+        label="采集时间"
+        align="center"
+        prop="deviceDataTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="操作" align="center">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['iot:formula-record:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['iot:formula-record:delete']"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <FormulaRecordForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { getStrDictOptions, DICT_TYPE } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import { FormulaRecordApi, FormulaRecordVO } from '@/api/iot/formula'
+import FormulaRecordForm from './FormulaRecordForm.vue'
+
+/** 变量记录 列表 */
+defineOptions({ name: 'FormulaRecord' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const list = ref<FormulaRecordVO[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  machineName: undefined,
+  workerName: undefined,
+  resultType: undefined,
+  formulaCode: undefined,
+  deviceDataTime: [],
+  createTime: [],
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await FormulaRecordApi.getFormulaRecordPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await FormulaRecordApi.deleteFormulaRecord(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await FormulaRecordApi.exportFormulaRecord(queryParams)
+    download.excel(data, '变量记录.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>

src/views/iot/formula/index.vue

@@ -119,6 +119,7 @@
         </template>
       </el-table-column>
       <el-table-column label="机台ID" align="center" prop="machineId" />
+      <el-table-column label="单位" align="center" prop="dataUnit" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="是否启用" align="center" prop="isEnable" >
         <template #default="scope">

src/views/iot/mqttrecord/MqttRecordForm.vue

@@ -0,0 +1,144 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
+      <el-form-item label="机台ID" prop="machineId">
+        <el-input v-model="formData.machineId" placeholder="请输入机台ID" />
+      </el-form-item>
+      <el-form-item label="机台" prop="machineName">
+        <el-input v-model="formData.machineName" placeholder="请输入机台" />
+      </el-form-item>
+      <el-form-item label="采集时间" prop="deviceDataTime">
+        <el-date-picker
+          v-model="formData.deviceDataTime"
+          type="date"
+          value-format="x"
+          placeholder="选择采集时间"
+        />
+      </el-form-item>
+      <el-form-item label="数据" prop="deviceData">
+        <el-input v-model="formData.deviceData" placeholder="请输入数据" />
+      </el-form-item>
+      <el-form-item label="设备id" prop="deviceId">
+        <el-input v-model="formData.deviceId" placeholder="请输入设备id" />
+      </el-form-item>
+      <el-form-item label="设备编码" prop="deviceCode">
+        <el-input v-model="formData.deviceCode" placeholder="请输入设备编码" />
+      </el-form-item>
+      <el-form-item label="设备名称" prop="deviceName">
+        <el-input v-model="formData.deviceName" placeholder="请输入设备名称" />
+      </el-form-item>
+      <el-form-item label="用户id" prop="workerId">
+        <el-input v-model="formData.workerId" placeholder="请输入用户id" />
+      </el-form-item>
+      <el-form-item label="用户" prop="workerName">
+        <el-input v-model="formData.workerName" placeholder="请输入用户" />
+      </el-form-item>
+      <el-form-item label="网关" prop="gatewayCode">
+        <el-input v-model="formData.gatewayCode" placeholder="请输入网关" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import { MqttRecordApi, MqttRecordVO } from '@/api/iot/mqttrecord'
+
+/** 数采记录 表单 */
+defineOptions({ name: 'MqttRecordForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  machineId: undefined,
+  machineName: undefined,
+  deviceDataTime: undefined,
+  deviceData: undefined,
+  deviceId: undefined,
+  deviceCode: undefined,
+  deviceName: undefined,
+  workerId: undefined,
+  workerName: undefined,
+  gatewayCode: undefined,
+})
+const formRules = reactive({
+  machineId: [{ required: true, message: '机台ID不能为空', trigger: 'blur' }],
+  deviceDataTime: [{ required: true, message: '采集时间不能为空', trigger: 'blur' }],
+  deviceId: [{ required: true, message: '设备id不能为空', trigger: 'blur' }],
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await MqttRecordApi.getMqttRecord(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as MqttRecordVO
+    if (formType.value === 'create') {
+      await MqttRecordApi.createMqttRecord(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await MqttRecordApi.updateMqttRecord(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    machineId: undefined,
+    machineName: undefined,
+    deviceDataTime: undefined,
+    deviceData: undefined,
+    deviceId: undefined,
+    deviceCode: undefined,
+    deviceName: undefined,
+    workerId: undefined,
+    workerName: undefined,
+    gatewayCode: undefined,
+  }
+  formRef.value?.resetFields()
+}
+</script>

src/views/iot/mqttrecord/index.vue

@@ -0,0 +1,261 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="机台" prop="machineName">
+        <el-input
+          v-model="queryParams.machineName"
+          placeholder="请输入机台"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="采集时间" prop="deviceDataTime">
+        <el-date-picker
+          v-model="queryParams.deviceDataTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="数据" prop="deviceData">
+        <el-input
+          v-model="queryParams.deviceData"
+          placeholder="请输入数据"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="设备编码" prop="deviceCode">
+        <el-input
+          v-model="queryParams.deviceCode"
+          placeholder="请输入设备编码"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="设备名称" prop="deviceName">
+        <el-input
+          v-model="queryParams.deviceName"
+          placeholder="请输入设备名称"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="用户" prop="workerName">
+        <el-input
+          v-model="queryParams.workerName"
+          placeholder="请输入用户"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="网关" prop="gatewayCode">
+        <el-input
+          v-model="queryParams.gatewayCode"
+          placeholder="请输入网关"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker
+          v-model="queryParams.createTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        <el-button
+          type="primary"
+          plain
+          @click="openForm('create')"
+          v-hasPermi="['iot:mqtt-record:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['iot:mqtt-record:export']"
+        >
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <el-table-column label="ID" align="center" prop="id" />
+      <el-table-column label="机台" align="center" prop="machineName" />
+      <el-table-column
+        label="采集时间"
+        align="center"
+        prop="deviceDataTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="数据" align="center" prop="deviceData" />
+      <el-table-column label="设备编码" align="center" prop="deviceCode" />
+      <el-table-column label="设备名称" align="center" prop="deviceName" />
+      <el-table-column label="用户" align="center" prop="workerName" />
+      <el-table-column label="网关" align="center" prop="gatewayCode" />
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="操作" align="center">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['iot:mqtt-record:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['iot:mqtt-record:delete']"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <MqttRecordForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import { MqttRecordApi, MqttRecordVO } from '@/api/iot/mqttrecord'
+import MqttRecordForm from './MqttRecordForm.vue'
+
+/** 数采记录 列表 */
+defineOptions({ name: 'MqttRecord' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const list = ref<MqttRecordVO[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  machineName: undefined,
+  deviceDataTime: [],
+  deviceData: undefined,
+  deviceCode: undefined,
+  deviceName: undefined,
+  workerName: undefined,
+  gatewayCode: undefined,
+  createTime: [],
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await MqttRecordApi.getMqttRecordPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await MqttRecordApi.deleteMqttRecord(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await MqttRecordApi.exportMqttRecord(queryParams)
+    download.excel(data, '数采记录.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>

src/views/mes/task/TaskAddSaleForm.vue

@@ -1,5 +1,5 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible" width="800px">
+  <Dialog :title="dialogTitle" v-model="dialogVisible" width="1000px">
     <el-form
       ref="formRef"
       :model="formData"

src/views/mes/task/components/SaleOrderIndex.vue

@@ -0,0 +1,208 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible" width="1200px">
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="销售单编号" prop="no">
+        <el-input
+          v-model="queryParams.no"
+          placeholder="请输入销售单编号"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="客户编号" prop="customerId">
+        <el-input
+          v-model="queryParams.customerId"
+          placeholder="请输入客户编号"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="下单时间" prop="orderTime">
+        <el-date-picker
+          v-model="queryParams.orderTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item>
+
+      <el-form-item label="备注" prop="remark">
+        <el-input
+          v-model="queryParams.remark"
+          placeholder="请输入备注"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table
+      v-loading="loading"
+      :data="list"
+      :stripe="true"
+      :show-overflow-tooltip="true"
+      highlight-current-row
+      @current-change="handleCurrentChange"
+    >
+      <el-table-column label="ID" align="center" prop="id" />
+      <el-table-column label="销售单编号" align="center" prop="no" />
+      <el-table-column label="销售状态" align="center" prop="status">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.ERP_AUDIT_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column label="客户" align="center" prop="customerName" />
+      <el-table-column label="合计数量" align="center" prop="totalCount" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column
+        label="下单时间"
+        align="center"
+        prop="orderTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 子表的列表 -->
+  <ContentWrap>
+    <el-tabs model-value="saleOrderItems">
+      <el-tab-pane label="销售订单项" name="saleOrderItems">
+        <SaleOrderItemsList ref="saleOrderItemsListRef" :order-id="currentRow.id" />
+      </el-tab-pane>
+    </el-tabs>
+  </ContentWrap>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="loading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+
+</template>
+<script setup lang="ts">
+import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import { SaleOrderApi, SaleOrderVO } from '@/api/mes/saleorder'
+import SaleOrderItemsList from './SaleOrderItemsList.vue'
+
+/** 销售订单 列表 */
+defineOptions({ name: 'SaleOrder' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const listDetail = ref([]) // 列表的数据
+
+const loading = ref(true) // 列表的加载中
+const list = ref<SaleOrderVO[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  no: undefined,
+  status: undefined,
+  customerId: undefined,
+  orderTime: [],
+  totalCount: undefined,
+  totalPrice: undefined,
+  totalProductPrice: undefined,
+  remark: undefined,
+  createTime: [],
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+const saleOrderItemsListRef = ref()
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    queryParams.status = 20
+    const data = await SaleOrderApi.getSaleOrderPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 选中行操作 */
+const currentRow = ref({}) // 选中行
+const handleCurrentChange = (row) => {
+  currentRow.value = row
+}
+
+/** 打开弹窗 */
+const open = async () => {
+  dialogVisible.value = true
+  dialogTitle.value = "选择销售单"
+  // 产品单位
+  console.log("I'm in sale order list!")
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  //校验是否选中数据
+
+  // 提交请求
+  try {
+    dialogVisible.value = false
+    console.log(currentRow.value)
+    // 发送操作成功的事件
+    emit('success', currentRow.value)
+  } finally {
+    console.log("-----submitForm----")
+  }
+}
+
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>

src/views/mes/task/components/SaleOrderItemsList.vue

@@ -1,36 +1,16 @@
 <template>
-  <ContentWrap>
-    <!-- 搜索工作栏 -->
-    <el-form
-      class="-mb-15px"
-      :model="queryParams"
-      ref="queryFormRef"
-      :inline="true"
-      label-width="68px"
-    >
-      <el-form-item label="销售订单编号" prop="orderId">
-        <el-input
-          v-model="queryParams.orderId"
-          placeholder="请输入销售订单编号"
-          class="!w-240px"
-        />
-      </el-form-item>
-    </el-form>
-  </ContentWrap>
 
   <!-- 列表 -->
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
       <el-table-column label="编号" align="center" prop="id" />
-      <el-table-column label="销售订单编号" align="center" prop="orderId" />
-      <el-table-column label="产品编号" align="center" prop="productId" />
-      <el-table-column label="产品单位单位" align="center" prop="productUnitId" />
-      <el-table-column label="产品单价" align="center" prop="productPrice" />
+      <el-table-column label="产品" align="center" prop="productName" />
       <el-table-column label="数量" align="center" prop="count" />
+      <el-table-column label="单位" align="center" prop="unitName" />
+      <el-table-column label="单价" align="center" prop="productPrice" />
       <el-table-column label="总价" align="center" prop="totalPrice" />
       <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="销售出库数量" align="center" prop="outCount" />
-      <el-table-column label="销售退货数量" align="center" prop="returnCount" />
+
       <el-table-column
         label="创建时间"
         align="center"
@@ -38,26 +18,7 @@
         :formatter="dateFormatter"
         width="180px"
       />
-      <el-table-column label="操作" align="center">
-        <template #default="scope">
-          <el-button
-            link
-            type="primary"
-            @click="openForm('update', scope.row.id)"
-            v-hasPermi="['erp:sale-order-items:update']"
-          >
-            编辑
-          </el-button>
-          <el-button
-            link
-            type="danger"
-            @click="handleDelete(scope.row.id)"
-            v-hasPermi="['erp:sale-order-items:delete']"
-          >
-            删除
-          </el-button>
-        </template>
-      </el-table-column>
+
     </el-table>
     <!-- 分页 -->
     <Pagination
@@ -69,48 +30,50 @@
   </ContentWrap>
 
 </template>
-
 <script setup lang="ts">
 import { dateFormatter } from '@/utils/formatTime'
-import {SaleOrderApi, SaleOrderItemsVO} from "@/api/erp/sale/order";
-
-/** ERP 销售订单项 列表 */
-defineOptions({ name: 'SaleOrderItems' })
+import { SaleOrderApi } from '@/api/mes/saleorder'
 
-const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
 
-const loading = ref(true) // 列表的加载中
-const list = ref<SaleOrderItemsVO[]>([]) // 列表的数据
+const props = defineProps<{
+  orderId?: number // 销售订单编号（主表的关联字段）
+}>()
+const loading = ref(false) // 列表的加载中
+const list = ref([]) // 列表的数据
 const total = ref(0) // 列表的总页数
-const queryFormRef = ref() // 搜索的表单
-
 const queryParams = reactive({
   pageNo: 1,
-  pageSize: 10,
-  orderId: undefined,
+  pageSize: 100,
+  orderId: undefined
 })
+
+/** 监听主表的关联字段的变化，加载对应的子表数据 */
+watch(
+  () => props.orderId,
+  (val: number) => {
+    if (!val) {
+      return
+    }
+    queryParams.orderId = val
+    queryParams.pageNo = 1
+    getList()
+  },
+    { immediate: true, deep: true }
+)
+
 /** 查询列表 */
 const getList = async () => {
   loading.value = true
   try {
-    const data = await  SaleOrderApi.getSaleOrder(17)
-    list.value = data.items
-    total.value = list.value.length
+    const data = await SaleOrderApi.getSaleOrderItemsPage(queryParams)
+    list.value = data.list
+    total.value = data.total
   } finally {
     loading.value = false
   }
 }
 
-/** 初始化 **/
-onMounted(() => {
-  getList()
-})
 
-/** 打开弹窗 */
-const open = async () => {
-  // 产品单位
-  console.log("I'm in sale order list!")
-}
-defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 </script>

src/views/mes/task/components/TaskAddSaleDetailForm.vue

@@ -147,14 +147,15 @@
     <el-button @click="openOrderItemsList" round>+ 从销售单添加</el-button>
   </el-row>
   <el-row>
-    <SaleOrderItemsList ref="orderItemsRef" />
+    <SaleOrderIndex ref="orderItemsRef" @success="dealOrder"/>
   </el-row>
 </template>
 <script setup lang="ts">
 import { TaskApi } from '@/api/mes/task'
 import { ProductUnitApi, ProductUnitVO } from '@/api/erp/product/unit'
 import {ProductApi, ProductVO} from "@/api/erp/product/product";
-import SaleOrderItemsList from './SaleOrderItemsList.vue'
+import SaleOrderIndex from './SaleOrderIndex.vue'
+import {SaleOrderApi, SaleOrderVO} from "@/api/mes/saleorder";
 
 const unitList = ref<ProductUnitVO[]>([]) // 产品单位列表
 const productList = ref<ProductVO[]>([]) // 产品列表
@@ -177,10 +178,25 @@ const formRef = ref() // 表单 Ref
 /** 添加/修改操作 */
 const orderItemsRef = ref()
 const openOrderItemsList = () => {
-  console.log("---openOrderItemsList--------")
   orderItemsRef.value.open()
 }
 
+/** 表单值 */
+const dealOrder = async (e)  => {
+  let queryParams = {
+    pageNo: 1,
+    pageSize: 100,
+    orderId: undefined
+  }
+  queryParams.orderId = e.id
+  console.log(e.no)
+
+  const data = await SaleOrderApi.getSaleOrderItemsPage(queryParams)
+  let orderItems = data.list
+
+  console.log(orderItems)
+  console.log(e)
+}
 /** 初始化 */
 onMounted(async () => {
   // 产品单位