Merge remote-tracking branch 'origin/master'

zhc4dev
赵玉瑞 2 years ago
commit e0a50bdb5e
  1. 10
      ant-design-vue-jeecg/src/views/productrecord/ProductRecordList.vue
  2. 13
      ant-design-vue-jeecg/src/views/productrecord/modules/ProductRecordForm.vue
  3. 2
      ant-design-vue-jeecg/src/views/sensor/modules/SensorForm.vue
  4. 3
      ant-design-vue-jeecg/src/views/shopping/assets/common.css
  5. 171
      ant-design-vue-jeecg/src/views/shopping/components/Order/placeOrder.vue
  6. 482
      ant-design-vue-jeecg/src/views/shopping/pages/chengyi.vue
  7. 4
      ant-design-vue-jeecg/src/views/shopping/pages/sirendingzhi.vue
  8. 20
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/productrecord/controller/ProductRecordController.java
  9. 88
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/productrecord/entity/ProductRecord.java

@ -11,7 +11,7 @@
</a-col> </a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24"> <a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="工单编号"> <a-form-item label="工单编号">
<j-search-select-tag placeholder="请选择工单编号" v-model="queryParam.orderCode" dict="findgdbh,order_id,order_code,id,orders_num"/> <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-form-item>
</a-col> </a-col>
<template v-if="toggleSearchStatus"> <template v-if="toggleSearchStatus">
@ -157,7 +157,7 @@
{ {
title:'工单编号', title:'工单编号',
align:"center", align:"center",
dataIndex: 'orderId' dataIndex: 'orderId_dictText'
}, },
{ {
title:'生产开始时间', title:'生产开始时间',
@ -201,7 +201,7 @@
} }
}, },
created() { created() {
this.getSuperFieldList(); this.getSuperFieldList();
}, },
computed: { computed: {
importExcelUrl: function(){ importExcelUrl: function(){
@ -215,8 +215,8 @@
let fieldList=[]; let fieldList=[];
fieldList.push({type:'sel_search',value:'stationId',text:'工位',dictTable:'station', dictText:'station_name', dictCode:'id'}) 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:'stationName',text:'工位', popup:{code:'findgw',field:'id',orgFields:'id',destFields:'station_id'}})
fieldList.push({type:'sel_search',value:'orderCode',text:'工单编号',dictTable:'findgdbh', dictText:'order_id,order_code', dictCode:'id,orders_num'}) fieldList.push({type:'popup',value:'orderCode',text:'工单编号', popup:{code:'findgdbh',field:'id',orgFields:'id',destFields:'order_id'}})
fieldList.push({type:'popup',value:'orderId',text:'工单编号', popup:{code:'work_order',field:'id',orgFields:'id',destFields:'product_code'}}) 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:'workTime',text:'生产开始时间'})
fieldList.push({type:'datetime',value:'offTime',text:'生产结束时间'}) fieldList.push({type:'datetime',value:'offTime',text:'生产结束时间'})
fieldList.push({type:'string',value:'duration',text:'时长',dictCode:''}) fieldList.push({type:'string',value:'duration',text:'时长',dictCode:''})

@ -13,12 +13,20 @@
code="findgw" code="findgw"
:multi="true" :multi="true"
@input="popupCallback" @input="popupCallback"
/> />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="24">
<a-form-model-item label="工单编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="orderCode"> <a-form-model-item label="工单编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="orderCode">
<j-search-select-tag v-model="model.orderCode" dict="findgdbh,order_id,order_code,id,orders_num" /> <j-popup
v-model="model.orderCode"
field="orderCode"
org-fields="id,orders_num"
dest-fields="orderId,orderCode"
code="findgdbh"
:multi="true"
@input="popupCallback"
/>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="24">
@ -46,7 +54,6 @@
</j-form-container> </j-form-container>
</a-spin> </a-spin>
</template> </template>
<script> <script>
import { httpAction, getAction } from '@/api/manage' import { httpAction, getAction } from '@/api/manage'

@ -10,7 +10,7 @@
</a-col> </a-col>
<a-col :span="24"> <a-col :span="24">
<a-form-model-item label="车间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="workshopId"> <a-form-model-item label="车间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="workshopId">
<j-search-select-tag v-model="model.workshopId" dict="sys_depart,depart_name,id" /> <j-search-select-tag v-model="model.workshopId" dict="sys_depart,depart_name,id" disabled/>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="24">

@ -94,4 +94,7 @@ a {
.c_1B { .c_1B {
color: #1B1B1B; color: #1B1B1B;
} }
.c_31 {
color: #313131;
}
.textfield {overflow: hidden;text-overflow: ellipsis;white-space: nowrap;} .textfield {overflow: hidden;text-overflow: ellipsis;white-space: nowrap;}

@ -25,22 +25,131 @@
</a-radio-group> </a-radio-group>
</a-form-item> </a-form-item>
<a-form-item <a-form-item
label="Field A" label="称呼"
> >
<a-input placeholder="input placeholder" /> <a-select placeholder="请选择称呼" :value="userSex" style="width: 120px;margin-right:10px" @change="handleChange">
<a-select-option value="1">
先生
</a-select-option>
<a-select-option value="0">
女士
</a-select-option>
</a-select>
<a-input style="width:300px" placeholder="请输入姓名" :value="userName"/>
</a-form-item> </a-form-item>
<a-form-item <a-form-item
label="Field B" label="选择地址"
> >
<a-input placeholder="input placeholder" /> <a-input placeholder="input placeholder" />
</a-form-item> </a-form-item>
<a-form-item
label="详细地址"
>
<a-textarea placeholder="请输入街道、门牌号码等详细地址" auto-size />
</a-form-item>
<a-form-item
label="手机号码"
>
<a-input style="width:150px;margin-right:10px" placeholder="+86 中国大陆地区" disabled/>
<a-input style="width:300px" placeholder="请输入手机号码" :value="userName"/>
</a-form-item>
<a-form-item>
<a-checkbox @change="onChange">
保存该地址至地址簿
</a-checkbox>
</a-form-item>
<!-- <a-form-item v-bind="formItemLayout" label="手机号码">-->
<!-- <a-input-->
<!-- v-decorator="[-->
<!-- 'phone',-->
<!-- {-->
<!-- rules: [{ required: true, message: 'Please input your phone number!' }],-->
<!-- },-->
<!-- ]"-->
<!-- >-->
<!-- <a-select-->
<!-- slot="addonBefore"-->
<!-- v-decorator="['prefix', { initialValue: '86' }]"-->
<!-- style="width: 70px"-->
<!-- default-value="86"-->
<!-- >-->
<!-- <a-select-option value="86">-->
<!-- +86 中国大陆地区-->
<!-- </a-select-option>-->
<!-- <a-select-option value="87">-->
<!-- +87 中国大陆地区-->
<!-- </a-select-option>-->
<!-- </a-select>-->
<!-- </a-input>-->
<!-- </a-form-item>-->
</a-form> </a-form>
</div> </div>
</div> </div>
<div class="addr"></div> <div class="addr">
<div class="addr"></div> <div class="title">
<span class="icon">2</span>
<span class="text f_18">支付方式</span></div>
<div class="pay">
<p class="f_12 c_1B">在线支付</p>
<a-radio-group v-model="paymentMode" @change="onChange1">
<a-radio :value="1">
<a-icon type="alipay" style="background:#08AAFF;color:#fff;border-radius: 2px;padding:1px;margin-right:3px"/>
<span>支付宝</span>
</a-radio>
<a-radio :value="2">
<a-icon type="wechat" style="background:#00B40C;color:#fff;border-radius: 2px;padding:1px;margin-right:3px"/>
<span>微信支付</span>
</a-radio>
</a-radio-group>
</div>
<a-checkbox @change="onChange">
需要电子发票
</a-checkbox>
</div>
<!-- <div class="addr"></div>-->
</div>
<div class="rightDiv">
<div class="order">
<p class="d-flex title">
<span class="f_14 c_999">订单小计</span>
<span class="f_14 c_31">已选 1 件商品</span>
</p>
<div class="table d-flex">
<div class="left">
<!-- <img src="">-->
<div class="img"></div>
</div>
<div class="right">
<p class="d-flex">
<span class="f_12 c_1B">关键词12定制款立领衬</span>
<span class="f_12 c_999">数量1</span>
</p>
<p class="f_12 c_999">款式立领标签2</p>
<p class="d-flex">
<span class="f_12 c_999">主辅料主料1辅料1叮叮叮辅料n</span>
<span class="f_12 c_999">数量1</span>
</p>
<p class="f_12 c_999">尺码 XXS</p>
<p class="d-flex">
<span class="f_12 c_999">定制</span>
<span class="f_12 c_999">35,500</span>
</p>
</div>
</div>
<p class="d-flex">
<span class="f_14 c_31">商品总计</span>
<span class="f_14 c_666">35,500</span>
</p>
<p class="d-flex">
<span class="f_14 c_31">运费</span>
<span class="f_14 c_999">免费</span>
</p>
<p class="d-flex title">
<span class="f_14 c_31">总计</span>
<span class="f_20 c_31">35,500</span>
</p>
</div>
</div> </div>
<div class="rightDiv">1</div>
</div> </div>
</div> </div>
@ -50,6 +159,10 @@
data() { data() {
return { return {
formLayout: 'horizontal', formLayout: 'horizontal',
userSex:'',//
userName:'',//
value: 1,
paymentMode:'',//
}; };
}, },
computed: { computed: {
@ -75,12 +188,22 @@
handleFormLayoutChange(e) { handleFormLayoutChange(e) {
this.formLayout = e.target.value; this.formLayout = e.target.value;
}, },
handleChange(value) {
this.userSex = value
},
onChange(e) {
console.log(`checked = ${e.target.checked}`);
},
onChange1(e) {
console.log('radio checked', e.target.value);
},
}, },
}; };
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.placeOrder{ .placeOrder{
padding-top: 54px; padding-top: 54px;
padding-bottom: 80px;
background-color: #F6F6F6; background-color: #F6F6F6;
& >.jz{ & >.jz{
justify-content: space-around; justify-content: space-around;
@ -123,6 +246,15 @@
.addr{ .addr{
background-color: #fff; background-color: #fff;
padding:0 30px 30px 30px; padding:0 30px 30px 30px;
margin-bottom: 25px;
.pay{
padding: 47px 20px;
border-bottom: 1px solid #EAEAEA;
margin-bottom: 20px;
.ant-radio-wrapper{
margin-right: 20px;
}
}
} }
.form{ .form{
background-color: #fff; background-color: #fff;
@ -131,6 +263,33 @@
} }
.rightDiv{ .rightDiv{
width: 410px; width: 410px;
.order{
background: #FFFFFF;
padding: 24px 43px;
.d-flex{
justify-content: space-between;
.left{
width: 60px;
}
.right{
width: 250px;
}
}
&>.d-flex{
padding: 10px 0;
}
&>.title.d-flex{
border-bottom: 1px solid #E7E7E7;
padding: 20px 0;
}
.left{
.img{
background: #D9D9D9;
width: 60px;
height: 77px;
}
}
}
} }
} }
} }

@ -1,75 +1,76 @@
<template> <template>
<!-- 服装类型--> <!-- 成衣推荐-->
<div class="chengyi"> <div class="chengyi">
<Header fontColor="#000"></Header> <Header fontColor="#000"></Header>
<div class="main"> <div class="main">
<div class="jz d-flex"> <div class="jz d-flex">
<el-menu <el-menu
class="el-menu-vertical-demo" class="el-menu-vertical-demo"
@select="handleSelet" @select="handleSelet"
style="width: 10%; min-width: 140px" style="width: 10%; min-width: 140px"
:unique-opened="true" :unique-opened="true"
> >
<el-submenu v-for="(item, i) in typeData" :key="i" :index="item.id"> <el-submenu v-for="(item, i) in typeData" :key="i" :index="item.id">
<template slot="title"> <template slot="title">
<i class="el-icon-male"></i> <i class="el-icon-male"></i>
<span>{{ item.name }}</span> <span>{{ item.name }}</span>
</template> </template>
<el-submenu v-for="(j, i2) in item.childrens" :key="i2" :index="j.id"> <el-menu-item v-for="(j, i2) in item.childrens" :key="i2" :index="j.id">{{ j.name }}</el-menu-item>
<template slot="title">{{ j.name }}</template> <!-- <el-submenu v-for="(j, i2) in item.childrens" :key="i2" :index="j.id">-->
<el-menu-item v-for="(k, i3) in j.childrens" :key="i3" :index="k.id">{{ k.name }}</el-menu-item> <!-- <template slot="title">{{ j.name }}</template>-->
</el-submenu> <!-- <el-menu-item v-for="(k, i3) in j.childrens" :key="i3" :index="k.id">{{ k.name }}</el-menu-item>-->
</el-submenu> <!-- </el-submenu>-->
</el-menu> </el-submenu>
<div class="right"> </el-menu>
<div class="name d-flex"> <div class="right">
<span>{{this.current.name}}</span> <div class="name d-flex">
<div class="d-flex"> <span>{{this.current.name}}</span>
<el-dropdown @command="handleCommand"> <div class="d-flex">
<el-dropdown @command="handleCommand">
<span class="el-dropdown-link"> <span class="el-dropdown-link">
排序<i class="el-icon-arrow-down el-icon--right"></i> 排序<i class="el-icon-arrow-down el-icon--right"></i>
</span> </span>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item command="heat">热度</el-dropdown-item> <el-dropdown-item command="heat">热度</el-dropdown-item>
<!-- <el-dropdown-item command="esteem">评分</el-dropdown-item>--> <!-- <el-dropdown-item command="esteem">评分</el-dropdown-item>-->
<el-dropdown-item command="high">价格降序</el-dropdown-item> <el-dropdown-item command="high">价格降序</el-dropdown-item>
<el-dropdown-item command="low">价格升序</el-dropdown-item> <el-dropdown-item command="low">价格升序</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
<!-- <div class="iconDiv d-flex">--> <!-- <div class="iconDiv d-flex">-->
<!-- <span>价格</span>--> <!-- <span>价格</span>-->
<!-- <div class="icon d-flex">--> <!-- <div class="icon d-flex">-->
<!-- <i class="el-icon-arrow-up"></i>--> <!-- <i class="el-icon-arrow-up"></i>-->
<!-- <i class="el-icon-arrow-down"></i>--> <!-- <i class="el-icon-arrow-down"></i>-->
<!-- </div>--> <!-- </div>-->
<!-- </div>--> <!-- </div>-->
</div>
</div> </div>
<div class="clothDiv d-flex"> </div>
<div <div class="clothDiv d-flex">
class="item" <div
v-for="(item, index) in clothsList" class="item"
:key="index" v-for="(item, index) in clothsList"
@click="clothDetails(item)" :key="index"
> @click="clothDetails(item)"
<div class="imgDiv"> >
<img :src="item.imgUrl" alt="" /> <div class="imgDiv">
</div> <img :src="item.imgUrl" alt="" />
<div class="clothTitle"> </div>
<p class="price d-flex"> <div class="clothTitle">
<span class="f_16 c_333">{{ item.currentPrice }}</span> <p class="price d-flex">
<span class="f_12 c_999">{{ item.historicalPrice }}</span> <span class="f_16 c_333">{{ item.currentPrice }}</span>
</p> <span class="f_12 c_999">{{ item.historicalPrice }}</span>
<p class="f_12 c_333">{{ item.title }}</p> </p>
<p class="f_12 c_9a9b9b">热度{{ item.heat }}</p> <p class="f_12 c_333">{{ item.title }}</p>
</div> <p class="f_12 c_9a9b9b">热度{{ item.heat }}</p>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div>
</template> </template>
<script> <script>
@ -195,82 +196,64 @@
name: "男装", name: "男装",
childrens: [ childrens: [
{ {
id: '11', id: '111',
name: "上衣", name: "衬衫",
childrens: [ },
{ {
id: '111', id: '112',
name: "衬衫", name: "卫衣",
}, },
{ {
id: '112', id: '113',
name: "卫衣", name: "Polo衫",
}, },
{ {
id: '113', id: '114',
name: "Polo衫", name: "针织衫",
}, },
{ {
id: '114', id: '121',
name: "针织衫", name: "夹克",
}, },
], {
}, id: '122',
{ name: "羽绒服",
id: '12', },
name: "外套", {
childrens: [ id: '123',
{ name: "风衣",
id: '121', },
name: "夹克", {
}, id: '131',
{ name: "休闲裤",
id: '122', },
name: "羽绒服", {
}, id: '132',
{ name: "西裤",
id: '123', },
name: "风衣", {
}, id: '133',
], name: "工装裤",
}, },
{ {
id: '13', id: '134',
name: "裤子", name: "运动裤",
childrens: [ },
{ {
id: '131', id: '135',
name: "休闲裤", name: "卫裤",
}, },
{ {
id: '132', id: '136',
name: "西裤", name: "九分裤",
}, },
{ {
id: '133', id: '137',
name: "工装裤", name: "短裤",
}, },
{ {
id: '134', id: '138',
name: "运动裤", name: "哈伦裤",
},
{
id: '135',
name: "卫裤",
},
{
id: '136',
name: "九分裤",
},
{
id: '137',
name: "短裤",
},
{
id: '138',
name: "哈伦裤",
},
],
}, },
], ],
}, },
@ -279,82 +262,130 @@
name: "女装", name: "女装",
childrens: [ childrens: [
{ {
id: '21', id: '211',
name: "上衣", name: "衬衫",
childrens: [ },
{ {
id: '211', id: '212',
name: "衬衫", name: "卫衣",
}, },
{ {
id: '212', id: '213',
name: "卫衣", name: "Polo衫",
}, },
{ {
id: '213', id: '214',
name: "Polo衫", name: "针织衫",
}, },
{ {
id: '214', id: '221',
name: "针织衫", name: "夹克",
}, },
], {
}, id: '222',
{ name: "羽绒服",
id: '22', },
name: "外套", {
childrens: [ id: '223',
{ name: "风衣",
id: '221', },
name: "夹克", {
}, id: '231',
{ name: "休闲裤",
id: '222', },
name: "羽绒服", {
}, id: '232',
{ name: "西裤",
id: '223', },
name: "风衣", {
}, id: '233',
], name: "工装裤",
}, },
{ {
id: '23', id: '234',
name: "裤子", name: "运动裤",
childrens: [ },
{ {
id: '231', id: '235',
name: "休闲裤", name: "卫裤",
}, },
{ {
id: '232', id: '236',
name: "西裤", name: "九分裤",
}, },
{ {
id: '233', id: '237',
name: "工装裤", name: "短裤",
}, },
{ {
id: '234', id: '238',
name: "运动裤", name: "哈伦裤",
}, },
{ ],
id: '235', },
name: "卫裤", {
}, id: '3',
{ name: "童装",
id: '236', childrens: [
name: "九分裤", {
}, id: '311',
{ name: "衬衫",
id: '237', },
name: "短裤", {
}, id: '312',
{ name: "卫衣",
id: '238', },
name: "哈伦裤", {
}, id: '313',
], name: "Polo衫",
},
{
id: '314',
name: "针织衫",
},
{
id: '321',
name: "夹克",
},
{
id: '322',
name: "羽绒服",
},
{
id: '323',
name: "风衣",
},
{
id: '331',
name: "休闲裤",
},
{
id: '332',
name: "西裤",
},
{
id: '333',
name: "工装裤",
},
{
id: '334',
name: "运动裤",
},
{
id: '335',
name: "卫裤",
},
{
id: '336',
name: "九分裤",
},
{
id: '337',
name: "短裤",
},
{
id: '338',
name: "哈伦裤",
}, },
], ],
}, },
@ -362,7 +393,8 @@
// //
current:{ current:{
id:'', id:'',
name:'' name:'',
parrentName:''
} }
}; };
}, },
@ -374,19 +406,24 @@
const indexb = this.typeData[indexa].childrens.findIndex((value, keys, arr) => { const indexb = this.typeData[indexa].childrens.findIndex((value, keys, arr) => {
return value.id == indexPath[1] return value.id == indexPath[1]
}) })
const indexc = this.typeData[indexa].childrens[indexb].childrens.findIndex((value, keys, arr) => { // const indexc = this.typeData[indexa].childrens[indexb].childrens.findIndex((value, keys, arr) => {
return value.id == indexPath[2] // return value.id == indexPath[2]
}) // })
this.current.name = this.typeData[indexa].childrens[indexb].childrens[indexc].name // this.current.name = this.typeData[indexa].childrens[indexb].childrens[indexc].name
this.current.id = this.typeData[indexa].childrens[indexb].childrens[indexc].id // this.current.id = this.typeData[indexa].childrens[indexb].childrens[indexc].id
this.current.name = this.typeData[indexa].childrens[indexb].name
this.current.id = this.typeData[indexa].childrens[indexb].id
this.current.parrentName = this.typeData[indexa].name
}, },
handleSelet(index,indexPath){ handleSelet(index,indexPath){
this.findIndex(indexPath) this.findIndex(indexPath)
//,this.current.id
// this.clothsList
}, },
clothDetails(item) { clothDetails(item) {
this.$router.push({ this.$router.push({
path: "/shopping/ClothDetail", path: "/shopping/ClothDetail",
query: { id: item.id, title: item.title }, query: { id: item.id, title: item.title ,name:this.current.name,parentName:this.current.parrentName},
}); });
}, },
handleCommand(command){ handleCommand(command){
@ -396,8 +433,8 @@
else if(command == 'high'){// else if(command == 'high'){//
this.clothsList.sort(compareDown("currentPrice")) this.clothsList.sort(compareDown("currentPrice"))
} }
// else if(command == 'esteem'){// // else if(command == 'esteem'){//
// this.clothsList.sort(compare("heat")) // this.clothsList.sort(compare("heat"))
// } // }
else if(command == 'low'){// else if(command == 'low'){//
@ -405,6 +442,11 @@
} }
} }
}, },
mounted() {
this.current.name = this.typeData[0].childrens[0].name
this.current.id = this.typeData[0].childrens[0].id
this.current.parrentName = this.typeData[0].name
}
} }
</script> </script>
<style scoped> <style scoped>

@ -155,14 +155,16 @@
<div v-if="current == 3"> <div v-if="current == 3">
<PlaceOrder></PlaceOrder> <PlaceOrder></PlaceOrder>
</div> </div>
<Footer></Footer>
</div> </div>
</template> </template>
<script> <script>
import Header from "../components/Header/HeaderView"; import Header from "../components/Header/HeaderView";
import Footer from "../components/Footer/FooterView";
import PlaceOrder from "../components/Order/placeOrder" import PlaceOrder from "../components/Order/placeOrder"
export default { export default {
name: "sirendingzhi", name: "sirendingzhi",
components: { Header ,PlaceOrder}, components: { Header ,PlaceOrder,Footer},
data() { data() {
return { return {
current: 3, current: 3,

@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.jeecg.modules.demo.productrecord.utils.quartz;
import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.entity.ExportParams;
@ -51,15 +52,16 @@ public class ProductRecordController extends JeecgController<ProductRecord, IPro
@Autowired @Autowired
private IProductRecordService productRecordService; private IProductRecordService productRecordService;
/**
* 分页列表查询 /**
* * 分页列表查询
* @param productRecord *
* @param pageNo * @param productRecord
* @param pageSize * @param pageNo
* @param req * @param pageSize
* @return * @param req
*/ * @return
*/
@AutoLog(value = "生产记录表-分页列表查询") @AutoLog(value = "生产记录表-分页列表查询")
@ApiOperation(value="生产记录表-分页列表查询", notes="生产记录表-分页列表查询") @ApiOperation(value="生产记录表-分页列表查询", notes="生产记录表-分页列表查询")
@GetMapping(value = "/list") @GetMapping(value = "/list")

@ -32,66 +32,66 @@ import lombok.experimental.Accessors;
public class ProductRecord implements Serializable { public class ProductRecord implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/**主键*/ /**主键*/
@TableId(type = IdType.ASSIGN_ID) @TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "主键") @ApiModelProperty(value = "主键")
private String id; private java.lang.String id;
/**创建人*/ /**创建人*/
@ApiModelProperty(value = "创建人") @ApiModelProperty(value = "创建人")
private String createBy; private java.lang.String createBy;
/**创建日期*/ /**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建日期") @ApiModelProperty(value = "创建日期")
private Date createTime; private java.util.Date createTime;
/**更新人*/ /**更新人*/
@ApiModelProperty(value = "更新人") @ApiModelProperty(value = "更新人")
private String updateBy; private java.lang.String updateBy;
/**更新日期*/ /**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新日期") @ApiModelProperty(value = "更新日期")
private Date updateTime; private java.util.Date updateTime;
/**所属部门*/ /**所属部门*/
@ApiModelProperty(value = "所属部门") @ApiModelProperty(value = "所属部门")
private String sysOrgCode; private java.lang.String sysOrgCode;
/**工位*/ /**工位*/
@Excel(name = "工位", width = 15, dictTable = "station", dicText = "station_name", dicCode = "id") @Excel(name = "工位", width = 15, dictTable = "station", dicText = "station_name", dicCode = "id")
@Dict(dictTable = "station", dicText = "station_name", dicCode = "id") @Dict(dictTable = "station", dicText = "station_name", dicCode = "id")
@ApiModelProperty(value = "工位") @ApiModelProperty(value = "工位")
private String stationId; private java.lang.String stationId;
/**工位*/ /**工位*/
@Excel(name = "工位", width = 15) @Excel(name = "工位", width = 15)
@ApiModelProperty(value = "工位") @ApiModelProperty(value = "工位")
private String stationName; private java.lang.String stationName;
/**工单编号*/ /**工单编号*/
@Excel(name = "工单编号", width = 15, dictTable = "findgdbh", dicText = "order_id,order_code", dicCode = "id,orders_num") @Excel(name = "工单编号", width = 15)
@Dict(dictTable = "findgdbh", dicText = "order_id,order_code", dicCode = "id,orders_num")
@ApiModelProperty(value = "工单编号") @ApiModelProperty(value = "工单编号")
private String orderCode; private java.lang.String orderCode;
/**工单编号*/ /**工单编号*/
@Excel(name = "工单编号", width = 15) @Excel(name = "工单编号", width = 15, dictTable = "work_order", dicText = "product_code", dicCode = "id")
@Dict(dictTable = "work_order", dicText = "product_code", dicCode = "id")
@ApiModelProperty(value = "工单编号") @ApiModelProperty(value = "工单编号")
private String orderId; private java.lang.String orderId;
/**生产开始时间*/ /**生产开始时间*/
@Excel(name = "生产开始时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") @Excel(name = "生产开始时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "生产开始时间") @ApiModelProperty(value = "生产开始时间")
private Date workTime; private java.util.Date workTime;
/**生产结束时间*/ /**生产结束时间*/
@Excel(name = "生产结束时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") @Excel(name = "生产结束时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "生产结束时间") @ApiModelProperty(value = "生产结束时间")
private Date offTime; private java.util.Date offTime;
/**时长*/ /**时长*/
@Excel(name = "时长", width = 15) @Excel(name = "时长", width = 15)
@ApiModelProperty(value = "时长") @ApiModelProperty(value = "时长")
private String duration; private java.lang.String duration;
/**状态*/ /**状态*/
@Excel(name = "状态", width = 15, dicCode = "cgqzt") @Excel(name = "状态", width = 15, dicCode = "cgqzt")
@Dict(dicCode = "cgqzt") @Dict(dicCode = "cgqzt")
@ApiModelProperty(value = "状态") @ApiModelProperty(value = "状态")
private String status; private java.lang.String status;
} }

Loading…
Cancel
Save