From 30b58af5365bc4d81c82ab2045de874aabb82c8a Mon Sep 17 00:00:00 2001
From: Gitea <gitea@fake.local>
Date: Tue, 23 May 2023 16:21:41 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86=E6=94=B9?=
 =?UTF-8?q?=E5=BC=B9=E5=87=BA=E6=A1=86=E8=81=94=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/zygoods/modules/ZyGoodsForm.vue | 76 ++++++++++++++++++-
 1 file changed, 73 insertions(+), 3 deletions(-)

diff --git a/ant-design-vue-jeecg/src/views/zygoods/modules/ZyGoodsForm.vue b/ant-design-vue-jeecg/src/views/zygoods/modules/ZyGoodsForm.vue
index 8391ce0e..ada55544 100644
--- a/ant-design-vue-jeecg/src/views/zygoods/modules/ZyGoodsForm.vue
+++ b/ant-design-vue-jeecg/src/views/zygoods/modules/ZyGoodsForm.vue
@@ -11,17 +11,49 @@
           <a-col :span="24">
             <a-form-model-item label="服装类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="clothsTypeId">
               <!--<j-dict-select-tag type="list" v-model="model.clothsTypeId" :dictCode="lx" placeholder="请选择类型" @change="getks()"/>-->
-              <j-dict-select-tag type="list" v-model="model.clothsTypeId" dictCode="zy_cloths_type,type_name,id" placeholder="请选择类型" @change="getks()"/>
+              <!--<j-dict-select-tag type="list" v-model="model.clothsTypeId" dictCode="zy_cloths_type,type_name,id" placeholder="请选择类型" @change="getks()"/>-->
+              <j-popup
+                v-model="model.typeName"
+                field="typeName"
+                org-fields="id,type_name"
+                dest-fields="clothsTypeId,typeName"
+                code="zy_cloths_type"
+                :multi="multi"
+                @input="popupCallback"
+              />
+              <a-input v-model="model.clothsTypeId" hidden />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="服装款式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="styleId">
-              <j-dict-select-tag type="list" v-model="model.styleId" :dictCode="ks" placeholder="请选择款式" @change="getxh()"/>
+              <!--<j-dict-select-tag type="list" v-model="model.styleId" :dictCode="ks" placeholder="请选择款式" @change="getxh()"/>-->
+              <j-popup
+                v-model="model.styleName"
+                field="styleName"
+                org-fields="id,style_names"
+                dest-fields="styleId,styleName"
+                code="zy_cloths_style"
+                :multi="multi"
+                :param = "param"
+                @input="popupCallback2"
+              />
+              <a-input v-model="model.styleId" hidden />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="服装型号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="modelId">
-              <j-dict-select-tag type="list" v-model="model.modelId" :dictCode="xh" placeholder="请选择型号" @change="getspbh()"/>
+              <!--<j-dict-select-tag type="list" v-model="model.modelId" :dictCode="xh" placeholder="请选择型号" @change="getspbh()"/>-->
+              <j-popup
+                v-model="model.modelName"
+                field="modelName"
+                org-fields="id,model_number"
+                dest-fields="modelId,modelName"
+                code="zy_style_model"
+                :multi="multi"
+                :param = "param2"
+                @input="popupCallback3"
+              />
+              <a-input v-model="model.modelId" hidden />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -129,6 +161,8 @@
         lx:'zy_cloths_type ,type_name,id',
         ks:'zy_cloths_style,style_names,id',
         xh:'zy_style_model,model_number,id',
+        param:{type_id:""},
+        param2:{style_id:""},
         autoplay:true,
         model:{
             customized:0,
@@ -144,6 +178,7 @@
           sm: { span: 16 },
         },
         confirmLoading: false,
+        multi: false,
         validatorRules: {
           enterprisesId:[{
             required: true, message: '请选择企业!'
@@ -206,6 +241,41 @@
       this.modelDefault = JSON.parse(JSON.stringify(this.model));
     },
     methods: {
+      popupCallback(value,row){
+        this.model = Object.assign(this.model, row);
+        this.param.type_id = this.model.clothsTypeId;
+      },
+      popupCallback2(value,row){
+        this.model = Object.assign(this.model, row);
+        this.param2.style_id = this.model.styleId;
+        getAction(this.url.zystyle, {ksid:this.model.styleId}).then((res) => {
+          if (res.success) {
+            // this.$forceUpdate();
+            this.$set(this.model,'goodsIntr',res.result.productOverview);
+            this.$set(this.model,'goodsPicture',res.result.designSketch);
+            this.$set(this.model,'defaultPicture',res.result.designSketch);
+          } else {
+
+          }
+        });
+      },
+      popupCallback3(value,row){
+        this.model = Object.assign(this.model, row);
+        // //如果编辑-商品编码不该改变
+        if(!this.model.id)
+        {
+          getAction(this.url.zy, {lxid:this.model.clothsTypeId,xhid:this.model.modelId}).then((res) => {
+            if (res.success) {
+              // console.log(res.result.nums)
+              // this.$forceUpdate();
+              //写一个接口返回一个拼装好的商品编号
+              this.$set(this.model,'goodsCode',res.result);
+            } else {
+
+            }
+          });
+        }
+      },
       getlx(){
         this.lx ="zy_cloths_type ,type_name,id,enterprise_id='" + this.model.enterprisesId + "'";
       },

From 6991bdd5783fc57fe3f97bbba247091a17bf7f0c Mon Sep 17 00:00:00 2001
From: Gitea <gitea@fake.local>
Date: Tue, 23 May 2023 16:56:51 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E6=88=90=E8=A1=A3=E6=A0=B7=E6=9D=BF?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86=E6=94=B9=E5=BC=B9=E5=87=BA=E6=A1=86?=
 =?UTF-8?q?=E8=81=94=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/ZyClothSampleForm.vue             | 48 ++++++++++++++++---
 1 file changed, 42 insertions(+), 6 deletions(-)

diff --git a/ant-design-vue-jeecg/src/views/zyclothsample/modules/ZyClothSampleForm.vue b/ant-design-vue-jeecg/src/views/zyclothsample/modules/ZyClothSampleForm.vue
index 7b9a8901..eca3c159 100644
--- a/ant-design-vue-jeecg/src/views/zyclothsample/modules/ZyClothSampleForm.vue
+++ b/ant-design-vue-jeecg/src/views/zyclothsample/modules/ZyClothSampleForm.vue
@@ -18,8 +18,19 @@
           <!--关联服装款式表 zy_cloths_style 关联列：名称 传值id-->
           <a-col :span="24">
             <a-form-model-item label="款式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="styleId" v-if="this.model.id==null">
-              <j-dict-select-tag v-model="model.styleId" placeholder="请输入款式"
-                                 :dict-code="dict" @change="xiugai"></j-dict-select-tag>
+<!--              <j-dict-select-tag v-model="model.styleId" placeholder="请输入款式"
+                                 :dict-code="dict" @change="xiugai"></j-dict-select-tag>-->
+              <j-popup
+                v-model="model.styleName"
+                field="styleName"
+                org-fields="id,style_names"
+                dest-fields="styleId,styleName"
+                code="zy_cloths_style_enterprise_id"
+                :multi="multi"
+                :param = "param"
+                @input="popupCallback"
+              />
+              <a-input v-model="model.styleId" hidden />
 
             </a-form-model-item>
             <a-form-model-item label="款式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="styleId"  v-else>
@@ -35,8 +46,19 @@
               <!--              <a-input v-model="model.stylemodelId" placeholder="请输入款式型号" @change="(vaule) => handletypeSelect(value)"></a-input>-->
 <!--              <j-dict-select-tag v-model="model.stylemodelId" placeholder="请输入款式型号"-->
 <!--                                 dict-code="zy_style_model,model_number,model_number"></j-dict-select-tag>-->
-              <j-dict-select-tag v-model="model.stylemodelId" placeholder="请选择款式型号"
-                                 :dictCode="modenumber" @change="gaibian"></j-dict-select-tag>
+<!--              <j-dict-select-tag v-model="model.stylemodelId" placeholder="请选择款式型号"
+                                 :dictCode="modenumber" @change="gaibian"></j-dict-select-tag>-->
+              <j-popup
+                v-model="model.modelName"
+                field="modelName"
+                org-fields="id,model_number"
+                dest-fields="stylemodelId,modelName"
+                code="zy_style_model"
+                :multi="multi"
+                :param = "param2"
+                @input="popupCallback2"
+              />
+              <a-input v-model="model.stylemodelId" hidden />
             </a-form-model-item>
             <a-form-model-item label="款式型号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="stylemodelId" v-else>
               <!--              <a-input v-model="model.stylemodelId" placeholder="请输入款式型号" @change="(vaule) => handletypeSelect(value)"></a-input>-->
@@ -113,6 +135,9 @@ export default {
   data() {
     return {
       nums: '',
+      multi: false,
+      param:{enterprise_id:""},
+      param2:{style_id:""},
       selectedKey: '', // 款式id
       typeid: '', // 型号,
       serialNumber: '', // 顺序号
@@ -178,17 +203,28 @@ export default {
     console.log(this.props, 'superFieldList')
   },
   methods: {
+    popupCallback(value,row){
+      this.model = Object.assign(this.model, row);
+      this.param2.style_id = this.model.styleId;
+    },
+    popupCallback2(value,row){
+      this.model = Object.assign(this.model, row);
+      this.gaibian();
+    },
     add() {
       this.edit(this.modelDefault);
     },
     //
     kuanshi(){
-   this.dict="zy_cloths_style,style_names,id,enterprise_id="+"'"+this.model.enterpriseId+"'";
+      this.param.enterprise_id = this.model.enterpriseId;
+   /*this.dict="zy_cloths_style,style_names,id,enterprise_id="+"'"+this.model.enterpriseId+"'";*/
       // this.model.styleId=null
       // this.model.nums=null
     },
     xiugai(){
-      this.modenumber="zy_style_model,model_number,id,style_id="+"'"+this.model.styleId+"'"
+/*      this.modenumber="zy_style_model,model_number,id,style_id="+"'"+this.model.styleId+"'"*/
+      this.param2.style_id = this.model.styleId;
+
       // this.model.stylemodelId=null
       // this.model.nums=null
       // if(this.model.stylemodelId!=null&&this.model.enterpriseId!=null){

From 3a4224969ae4519ca495f33ac59b8131be6cf8e0 Mon Sep 17 00:00:00 2001
From: Gitea <gitea@fake.local>
Date: Tue, 23 May 2023 17:11:49 +0800
Subject: [PATCH 3/5] bug

---
 .../src/views/zyclothsample/modules/ZyClothSampleForm.vue       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ant-design-vue-jeecg/src/views/zyclothsample/modules/ZyClothSampleForm.vue b/ant-design-vue-jeecg/src/views/zyclothsample/modules/ZyClothSampleForm.vue
index eca3c159..cce2bcd4 100644
--- a/ant-design-vue-jeecg/src/views/zyclothsample/modules/ZyClothSampleForm.vue
+++ b/ant-design-vue-jeecg/src/views/zyclothsample/modules/ZyClothSampleForm.vue
@@ -259,7 +259,7 @@ export default {
     },
     edit(record) {
       this.model = Object.assign({}, record);
-      this.dict="zy_cloths_style,style_names,nums,enterprise_id="+"'"+this.model.enterpriseId+"'";
+      this.dict="zy_cloths_style,style_names,id,enterprise_id="+"'"+this.model.enterpriseId+"'";
       this.modenumber="zy_style_model,model_number,id,style_id="+"'"+this.model.styleId+"'"
       this.visible = true;
     }

From 188198de313ba80fa0eb0e418b9e16eb51201c74 Mon Sep 17 00:00:00 2001
From: Gitea <gitea@fake.local>
Date: Mon, 29 May 2023 14:46:33 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productrecord/ProductRecordList1.vue      | 238 ++++++++++++++++++
 .../views/sensorrecord/SensorRecordList1.vue  | 202 +++++++++++++++
 2 files changed, 440 insertions(+)
 create mode 100644 ant-design-vue-jeecg/src/views/productrecord/ProductRecordList1.vue
 create mode 100644 ant-design-vue-jeecg/src/views/sensorrecord/SensorRecordList1.vue

diff --git a/ant-design-vue-jeecg/src/views/productrecord/ProductRecordList1.vue b/ant-design-vue-jeecg/src/views/productrecord/ProductRecordList1.vue
new file mode 100644
index 00000000..06d5d1af
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/productrecord/ProductRecordList1.vue
@@ -0,0 +1,238 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="工位">
+              <j-search-select-tag placeholder="请选择工位" v-model="queryParam.stationId" dict="station,station_name,id"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="工单编号">
+              <j-popup placeholder="请选择工单编号" v-model="queryParam.orderCode" code="findgdbh" org-fields="id,orders_num" dest-fields="order_id,order_code" :field="getPopupField('order_id,order_code')" :multi="true"/>
+            </a-form-item>
+          </a-col>
+          <template v-if="toggleSearchStatus">
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="状态">
+                <j-dict-select-tag placeholder="请选择状态" v-model="queryParam.status" dictCode="cgqzt"/>
+              </a-form-item>
+            </a-col>
+          </template>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('生产记录表')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <!-- 高级查询区域 -->
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <a-tabs defaultActiveKey="1">
+      <a-tab-pane key="1" tab="传感记录" >
+        <SensorRecordList1 />
+      </a-tab-pane>
+    </a-tabs>
+    <product-record-modal ref="modalForm" @ok="modalFormOk"></product-record-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import ProductRecordModal from './modules/ProductRecordModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+  import SensorRecordList1 from '../sensorrecord/SensorRecordList1'
+
+  export default {
+    name: 'ProductRecordList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      SensorRecordList1,
+      ProductRecordModal
+    },
+    data () {
+      return {
+        description: '生产记录表管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'工位',
+            align:"center",
+            dataIndex: 'stationId_dictText'
+          },
+          {
+            title:'工单编号',
+            align:"center",
+            dataIndex: 'orderCode'
+          },
+          {
+            title:'生产开始时间',
+            align:"center",
+            dataIndex: 'workTime'
+          },
+          {
+            title:'生产结束时间',
+            align:"center",
+            dataIndex: 'offTime'
+          },
+          {
+            title:'时长',
+            align:"center",
+            dataIndex: 'duration'
+          },
+          {
+            title:'状态',
+            align:"center",
+            dataIndex: 'status_dictText'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/productrecord/productRecord/list",
+          delete: "/productrecord/productRecord/delete",
+          deleteBatch: "/productrecord/productRecord/deleteBatch",
+          exportXlsUrl: "/productrecord/productRecord/exportXls",
+          importExcelUrl: "productrecord/productRecord/importExcel",
+
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+      this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'sel_search',value:'stationId',text:'工位',dictTable:'station', dictText:'station_name', dictCode:'id'})
+        fieldList.push({type:'popup',value:'stationName',text:'工位', popup:{code:'findgw',field:'id',orgFields:'id',destFields:'station_id'}})
+        fieldList.push({type:'popup',value:'orderCode',text:'工单编号', popup:{code:'findgdbh',field:'id',orgFields:'id',destFields:'order_id'}})
+        fieldList.push({type:'sel_search',value:'orderId',text:'工单编号',dictTable:'work_order', dictText:'product_code', dictCode:'id'})
+        fieldList.push({type:'datetime',value:'workTime',text:'生产开始时间'})
+        fieldList.push({type:'datetime',value:'offTime',text:'生产结束时间'})
+        fieldList.push({type:'string',value:'duration',text:'时长',dictCode:''})
+        fieldList.push({type:'string',value:'status',text:'状态',dictCode:'cgqzt'})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/sensorrecord/SensorRecordList1.vue b/ant-design-vue-jeecg/src/views/sensorrecord/SensorRecordList1.vue
new file mode 100644
index 00000000..a110ab83
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/sensorrecord/SensorRecordList1.vue
@@ -0,0 +1,202 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('传感记录表')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <!-- 高级查询区域 -->
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <sensor-record-modal ref="modalForm" @ok="modalFormOk"></sensor-record-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import SensorRecordModal from './modules/SensorRecordModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+
+  export default {
+    name: 'SensorRecordList1',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      SensorRecordModal
+    },
+    data () {
+      return {
+        description: '传感记录表管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'传感器编号',
+            align:"center",
+            dataIndex: 'sensorCode_dictText'
+          },
+          {
+            title:'网络地址',
+            align:"center",
+            dataIndex: 'sensorIp'
+          },
+          {
+            title:'工位',
+            align:"center",
+            dataIndex: 'stationId_dictText'
+          },
+          {
+            title:'进出标记',
+            align:"center",
+            dataIndex: 'iiOsign_dictText'
+          },
+          {
+            title:'产品标识',
+            align:"center",
+            dataIndex: 'productIdenti'
+          },
+          {
+            title:'触发时间',
+            align:"center",
+            dataIndex: 'triggerTime'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/sensorrecord/sensorRecord/list",
+          delete: "/sensorrecord/sensorRecord/delete",
+          deleteBatch: "/sensorrecord/sensorRecord/deleteBatch",
+          exportXlsUrl: "/sensorrecord/sensorRecord/exportXls",
+          importExcelUrl: "sensorrecord/sensorRecord/importExcel",
+
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'sel_search',value:'sensorCode',text:'传感器编号',dictTable:'sensor', dictText:'sensor_code', dictCode:'id'})
+        fieldList.push({type:'string',value:'sensorIp',text:'网络地址',dictCode:''})
+        fieldList.push({type:'sel_search',value:'stationId',text:'工位',dictTable:'station', dictText:'station_name', dictCode:'id'})
+        fieldList.push({type:'string',value:'iiOsign',text:'进出标记',dictCode:'ioinset'})
+        fieldList.push({type:'string',value:'productIdenti',text:'产品标识',dictCode:''})
+        fieldList.push({type:'datetime',value:'triggerTime',text:'触发时间'})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>
\ No newline at end of file

From 0acd60e869508a2f5be844f3c3822d8860033108 Mon Sep 17 00:00:00 2001
From: zhc077 <565291854>
Date: Sat, 3 Jun 2023 15:57:18 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=B7=A5=E5=BA=8F?=
 =?UTF-8?q?=E8=A1=A8=20=E6=B7=BB=E5=8A=A0=20status=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/jeecg/modules/productplan/entity/ZyPlanProcess.java   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/entity/ZyPlanProcess.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/entity/ZyPlanProcess.java
index 102eaecf..73e5e3f6 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/entity/ZyPlanProcess.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/entity/ZyPlanProcess.java
@@ -163,4 +163,8 @@ public class ZyPlanProcess implements Serializable {
 
     @ApiModelProperty(value = "工位序号")
     private Integer stationNum;
+
+    //未生产1、生产中2、已完成3、异常9，默认1
+    @ApiModelProperty(value = "状态")
+    private Integer status;
 }