From 448759ecdbfdce20f45088995e04d0d665927acb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=81=92=E6=9D=B0?= <2658502433@qq.com>
Date: Thu, 27 Mar 2025 17:21:19 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=88=90=E5=9E=8B=E6=9C=BA=E4=BA=A7?=
 =?UTF-8?q?=E9=87=8F=E6=9F=A5=E8=AF=A2=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/producted.js          |  44 ++++
 src/views/mes/producted/index.vue | 357 ++++++++++++++++++++++++++++++
 2 files changed, 401 insertions(+)
 create mode 100644 src/api/mes/producted.js
 create mode 100644 src/views/mes/producted/index.vue

diff --git a/src/api/mes/producted.js b/src/api/mes/producted.js
new file mode 100644
index 0000000..efe70a0
--- /dev/null
+++ b/src/api/mes/producted.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询成型机产量列表
+export function listProducted(query) {
+  return request({
+    url: '/mes/producted/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询成型机产量详细
+export function getProducted(workorderCode) {
+  return request({
+    url: '/mes/producted/' + workorderCode,
+    method: 'get'
+  })
+}
+
+// 新增成型机产量
+export function addProducted(data) {
+  return request({
+    url: '/mes/producted',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改成型机产量
+export function updateProducted(data) {
+  return request({
+    url: '/mes/producted',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除成型机产量
+export function delProducted(workorderCode) {
+  return request({
+    url: '/mes/producted/' + workorderCode,
+    method: 'delete'
+  })
+}
diff --git a/src/views/mes/producted/index.vue b/src/views/mes/producted/index.vue
new file mode 100644
index 0000000..69a41ea
--- /dev/null
+++ b/src/views/mes/producted/index.vue
@@ -0,0 +1,357 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+<!--      <el-form-item label="工单号" prop="workorderCode">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.workorderCode"-->
+<!--          placeholder="请输入工单号"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+      <el-form-item label="机台编码" prop="workorderName">
+        <el-input
+          v-model="queryParams.workorderName"
+          placeholder="请输入机台编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+<!--      <el-form-item label="备用1" prop="attr1">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.attr1"-->
+<!--          placeholder="请输入备用1"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+
+
+<!--      <el-form-item label="工单日期" prop="productDateArray">-->
+<!--        <el-date-picker-->
+<!--          v-model="queryParams.createTime"-->
+<!--          format="yyyy-MM-dd"-->
+<!--          type="daterange"-->
+<!--          range-separator="至"-->
+<!--          start-placeholder="开始日期"-->
+<!--          end-placeholder="结束日期">-->
+<!--        </el-date-picker>-->
+<!--      </el-form-item>-->
+      <el-form-item label="生产日期" prop="createTime">
+        <el-date-picker
+          v-model="dateRange"
+          format="yyyy-MM-dd HH:mm:00"
+          type="datetimerange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期">
+        </el-date-picker>
+      </el-form-item>
+<!--      <el-form-item label="备用2" prop="attr2">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.attr2"-->
+<!--          placeholder="请输入备用2"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="备用2" prop="attr3">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.attr3"-->
+<!--          placeholder="请输入备用2"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+<!--    <el-row :gutter="10" class="mb8">-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="primary"-->
+<!--          plain-->
+<!--          icon="el-icon-plus"-->
+<!--          size="mini"-->
+<!--          @click="handleAdd"-->
+<!--          v-hasPermi="['system:producted:add']"-->
+<!--        >新增</el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="success"-->
+<!--          plain-->
+<!--          icon="el-icon-edit"-->
+<!--          size="mini"-->
+<!--          :disabled="single"-->
+<!--          @click="handleUpdate"-->
+<!--          v-hasPermi="['system:producted:edit']"-->
+<!--        >修改</el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="danger"-->
+<!--          plain-->
+<!--          icon="el-icon-delete"-->
+<!--          size="mini"-->
+<!--          :disabled="multiple"-->
+<!--          @click="handleDelete"-->
+<!--          v-hasPermi="['system:producted:remove']"-->
+<!--        >删除</el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['system:producted:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
+<!--      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
+<!--    </el-row>-->
+
+    <el-table v-loading="loading" :data="productedList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="工单号" align="center" prop="workorderCode" />
+      <el-table-column label="机台编码" align="center" prop="workorderName" />
+      <el-table-column label="产品编码" align="center" prop="productCode" />
+      <el-table-column label="产品名称" align="center" prop="productName" />
+<!--      <el-table-column label="班次" align="center" prop="shiftId" />-->
+      <el-table-column label="班次" align="center">
+        <template slot-scope="scope">
+          {{ scope.row.shiftId === '5' ? '白班' : (scope.row.shiftId === '2' ? '夜班' : scope.row.shiftId) }}
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime" />
+<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+<!--        <template slot-scope="scope">-->
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-edit"-->
+<!--            @click="handleUpdate(scope.row)"-->
+<!--            v-hasPermi="['system:producted:edit']"-->
+<!--          >修改</el-button>-->
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-delete"-->
+<!--            @click="handleDelete(scope.row)"-->
+<!--            v-hasPermi="['system:producted:remove']"-->
+<!--          >删除</el-button>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改成型机产量对话框 -->
+<!--    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>-->
+<!--      <el-form ref="form" :model="form" :rules="rules" label-width="80px">-->
+<!--        <el-form-item label="工单号" prop="workorderCode">-->
+<!--          <el-input v-model="form.workorderCode" placeholder="请输入工单号" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="机台编码" prop="workorderName">-->
+<!--          <el-input v-model="form.workorderName" placeholder="请输入机台编码" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="备用1" prop="attr1">-->
+<!--          <el-input v-model="form.attr1" placeholder="请输入备用1" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="备用2" prop="attr2">-->
+<!--          <el-input v-model="form.attr2" placeholder="请输入备用2" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="备用2" prop="attr3">-->
+<!--          <el-input v-model="form.attr3" placeholder="请输入备用2" />-->
+<!--        </el-form-item>-->
+<!--      </el-form>-->
+<!--      <div slot="footer" class="dialog-footer">-->
+<!--        <el-button type="primary" @click="submitForm">确 定</el-button>-->
+<!--        <el-button @click="cancel">取 消</el-button>-->
+<!--      </div>-->
+<!--    </el-dialog>-->
+  </div>
+</template>
+
+<script>
+import { listProducted, getProducted, delProducted, addProducted, updateProducted } from "@/api/mes/producted";
+
+export default {
+  name: "Producted",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 成型机产量表格数据
+      productedList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      dateRange: [this.getStartOfDay(), this.getEndOfDay()], // 默认当天
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        workorderCode: null,
+        workorderName: null,
+        productName: null,
+        shiftId: null,
+        productCode: null,
+        createTime: null,
+        beginTime: null,  // 新增开始时间
+        endTime: null     // 新增结束时间
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    // 生成当天开始时间
+    getStartOfDay() {
+      const date = new Date();
+      date.setHours(0, 0, 0, 0);
+      return date;
+    },
+    // 生成当天结束时间
+    getEndOfDay() {
+      const date = new Date();
+      date.setHours(23, 59, 59, 999);
+      return date;
+    },
+    /** 查询成型机产量列表 */
+    getList() {
+      this.loading = true;
+      if (this.dateRange && this.dateRange.length === 2) {
+        // 处理时区偏移并格式化
+        const formatDate = (date) => {
+          const offset = date.getTimezoneOffset() * 60000;
+          const localDate = new Date(date.getTime() - offset);
+          return localDate.toISOString().replace('T', ' ').substring(0, 19);
+        };
+        this.queryParams.beginTime = formatDate(this.dateRange[0]);
+        this.queryParams.endTime = formatDate(this.dateRange[1]);
+      } else {
+        this.queryParams.beginTime = null;
+        this.queryParams.endTime = null;
+      }
+      listProducted(this.queryParams).then(response => {
+        this.productedList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        workorderCode: null,
+        workorderName: null,
+        createTime: null,
+        attr1: null,
+        attr2: null,
+        attr3: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.workorderCode)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    // handleAdd() {
+    //   this.reset();
+    //   this.open = true;
+    //   this.title = "添加成型机产量";
+    // },
+    // /** 修改按钮操作 */
+    // handleUpdate(row) {
+    //   this.reset();
+    //   const workorderCode = row.workorderCode || this.ids
+    //   getProducted(workorderCode).then(response => {
+    //     this.form = response.data;
+    //     this.open = true;
+    //     this.title = "修改成型机产量";
+    //   });
+    // },
+    // /** 提交按钮 */
+    // submitForm() {
+    //   this.$refs["form"].validate(valid => {
+    //     if (valid) {
+    //       if (this.form.workorderCode != null) {
+    //         updateProducted(this.form).then(response => {
+    //           this.$modal.msgSuccess("修改成功");
+    //           this.open = false;
+    //           this.getList();
+    //         });
+    //       } else {
+    //         addProducted(this.form).then(response => {
+    //           this.$modal.msgSuccess("新增成功");
+    //           this.open = false;
+    //           this.getList();
+    //         });
+    //       }
+    //     }
+    //   });
+    // },
+    // /** 删除按钮操作 */
+    // handleDelete(row) {
+    //   const workorderCodes = row.workorderCode || this.ids;
+    //   this.$modal.confirm('是否确认删除成型机产量编号为"' + workorderCodes + '"的数据项？').then(function() {
+    //     return delProducted(workorderCodes);
+    //   }).then(() => {
+    //     this.getList();
+    //     this.$modal.msgSuccess("删除成功");
+    //   }).catch(() => {});
+    // },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('system/producted/export', {
+        ...this.queryParams
+      }, `producted_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

From 118bb320ca7cbe46a3519a220f6535a2f710c8a5 Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Fri, 28 Mar 2025 14:44:52 +0800
Subject: [PATCH 2/2] =?UTF-8?q?wms=E6=8A=A5=E6=A3=80=E6=8A=A5=E8=A1=A8?=
 =?UTF-8?q?=E5=B0=8F=E4=BF=AE=E6=94=B92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/odsRawOrderIn.js            | 6 +++---
 src/views/wms/odsRawOrderInBJ/index.vue | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/api/wms/odsRawOrderIn.js b/src/api/wms/odsRawOrderIn.js
index 402c07d..958e524 100644
--- a/src/api/wms/odsRawOrderIn.js
+++ b/src/api/wms/odsRawOrderIn.js
@@ -9,11 +9,11 @@ export function listOdsRawOrderIn(query) {
 	});
 }
 // 报检报表查询接口
-export function listZJ(data) {
+export function listZJ(query) {
   return request({
     url: '/wms/odsRawOrderIn/listZJ',
-    method: 'post',
-    data: data
+    method: 'get',
+    params: query
   });
 }
 // 查询包材到货单详细
diff --git a/src/views/wms/odsRawOrderInBJ/index.vue b/src/views/wms/odsRawOrderInBJ/index.vue
index 5128ec7..0127257 100644
--- a/src/views/wms/odsRawOrderInBJ/index.vue
+++ b/src/views/wms/odsRawOrderInBJ/index.vue
@@ -432,7 +432,7 @@ export default {
 		/** 查询包材到货单列表 */
 		getList() {
 			this.loading = true;
-      listZJ(JSON.stringify(this.queryParams)).then(response => {
+      listZJ(this.queryParams).then(response => {
 				this.odsRawOrderInList = response.rows;
 				this.total = response.total;
 				this.loading = false;