commit
f1350efc39
43 changed files with 1536 additions and 307 deletions
@ -0,0 +1,381 @@ |
|||||||
|
<template> |
||||||
|
<a-card :bordered="false"> |
||||||
|
<template> |
||||||
|
<div> |
||||||
|
<el-descriptions border :column='4'> |
||||||
|
<el-descriptions-item label="工单编号 ">{{ planInfo.productCode }}</el-descriptions-item> |
||||||
|
<el-descriptions-item label="生产企业">{{ planInfo.productOrg }}</el-descriptions-item> |
||||||
|
<!-- <el-descriptions-item label="企业负责人 ">admin</el-descriptions-item>--> |
||||||
|
<el-descriptions-item label="车间 ">{{ planInfo.workshop }}</el-descriptions-item> |
||||||
|
<!-- <el-descriptions-item label="车间负责人 ">admin</el-descriptions-item>--> |
||||||
|
<el-descriptions-item label="班组">{{ planInfo.team }}</el-descriptions-item> |
||||||
|
<el-descriptions-item label="班组长">{{ planInfo.teamLade }}</el-descriptions-item> |
||||||
|
<el-descriptions-item label="产品类型">{{ planInfo.productType }}</el-descriptions-item> |
||||||
|
<el-descriptions-item label="产品编号">{{ planInfo.productNo }}</el-descriptions-item> |
||||||
|
<el-descriptions-item label="产品名称">{{ planInfo.productName }}</el-descriptions-item> |
||||||
|
<el-descriptions-item label="开始时间">{{ planInfo.workTime }}</el-descriptions-item> |
||||||
|
<el-descriptions-item label="生产时长">{{ planInfo.duration }}</el-descriptions-item> |
||||||
|
<el-descriptions-item label="生产状态">{{ planInfo.status }}</el-descriptions-item> |
||||||
|
<el-descriptions-item label="加急">{{ planInfo.speedUp }}</el-descriptions-item> |
||||||
|
<el-descriptions-item label="销售企业">{{ planInfo.salesEnterprise }}</el-descriptions-item> |
||||||
|
<el-descriptions-item label="订货期">{{ planInfo.orderTime }}</el-descriptions-item> |
||||||
|
<!-- <el-descriptions-item label="制定人">100</el-descriptions-item>--> |
||||||
|
<!-- <el-descriptions-item label="制定时间">100</el-descriptions-item>--> |
||||||
|
<el-descriptions-item label="审核人">{{ planInfo.auditBy }}</el-descriptions-item> |
||||||
|
<el-descriptions-item label="审核时间">{{ planInfo.auditTimr }}</el-descriptions-item> |
||||||
|
</el-descriptions> |
||||||
|
</div> |
||||||
|
</template> |
||||||
|
|
||||||
|
<!-- table区域-begin --> |
||||||
|
<div> |
||||||
|
<j-vxe-table |
||||||
|
ref="xTable" |
||||||
|
toolbar |
||||||
|
:toolbarConfig="toolbarConfig" |
||||||
|
row-number |
||||||
|
row-selection |
||||||
|
keep-source |
||||||
|
:rowSelection="clickTrue" |
||||||
|
:clickSelectRow="clickTrue" |
||||||
|
:loading="loading" |
||||||
|
:columns="columns" |
||||||
|
@selectRowChange="handleSelectRowChange" |
||||||
|
:dataSource="dataSource" |
||||||
|
@valueChange="handleValueChange" |
||||||
|
@save="handleTableSave" |
||||||
|
> |
||||||
|
<template v-slot:toolbarSuffix> |
||||||
|
<a-button type="primary" icon="plus-circle" @click="syncProductProcess()">读取工序</a-button> |
||||||
|
<a-button type="primary" icon="download" @click="handleExportXls('计划工序')">导出</a-button> |
||||||
|
<a-button type="primary" icon="rollback" @click="fanHui()">返回</a-button> |
||||||
|
</template> |
||||||
|
<template v-slot:action="props"> |
||||||
|
<a @click="jump2MianLiao('mianLiao',props)">面料</a> |
||||||
|
<a-divider type="vertical"/> |
||||||
|
<a @click="jump2FuLiao('fuLiao',props)">辅料</a> |
||||||
|
<a-divider type="vertical"/> |
||||||
|
<a @click="detail(props)">详情</a> |
||||||
|
</template> |
||||||
|
</j-vxe-table> |
||||||
|
</div> |
||||||
|
</a-card> |
||||||
|
</template> |
||||||
|
|
||||||
|
<script> |
||||||
|
|
||||||
|
import '@/assets/less/TableExpand.less' |
||||||
|
import {mixinDevice} from '@/utils/mixin' |
||||||
|
import {JeecgListMixin} from '@/mixins/JeecgListMixin' |
||||||
|
import {getAction, postAction} from "@api/manage"; |
||||||
|
import {filterObj, pushIfNotExist, randomNumber, randomUUID} from "@/utils/util"; |
||||||
|
import {JVXETypes} from '@/components/jeecg/JVxeTable' |
||||||
|
import Area from "@comp/_util/Area"; |
||||||
|
|
||||||
|
export default { |
||||||
|
name: 'ZyPlanProcessDataList', |
||||||
|
mixins: [JeecgListMixin, mixinDevice], |
||||||
|
data() { |
||||||
|
return { |
||||||
|
toolbarConfig: { |
||||||
|
// add 新增按钮；remove 删除按钮；clearSelection 清空选择按钮 |
||||||
|
btn: ['save',] |
||||||
|
}, |
||||||
|
description: '生产计划工序管理页面', |
||||||
|
loading: false, |
||||||
|
dataSource: [], |
||||||
|
columns: [ |
||||||
|
{ |
||||||
|
title: '工序名称', |
||||||
|
key: 'processName', |
||||||
|
width: '180px', |
||||||
|
}, |
||||||
|
{ |
||||||
|
title: '工位ID', |
||||||
|
key: 'stationId', |
||||||
|
type: JVXETypes.hidden, |
||||||
|
}, |
||||||
|
{ |
||||||
|
title: '工位名称', |
||||||
|
key: 'stationName', |
||||||
|
type: JVXETypes.select, |
||||||
|
width: '200px', |
||||||
|
options: [], |
||||||
|
placeholder: '请选择${title}', |
||||||
|
}, |
||||||
|
{ |
||||||
|
title: '设备名称', |
||||||
|
key: 'machineIds', |
||||||
|
type: JVXETypes.hidden |
||||||
|
}, |
||||||
|
{ |
||||||
|
title: '设备名称', |
||||||
|
key: 'machineNames', |
||||||
|
type: JVXETypes.selectMultiple, |
||||||
|
width: '180px', |
||||||
|
options: [], |
||||||
|
placeholder: '请选择${title}', |
||||||
|
}, |
||||||
|
{ |
||||||
|
title: 'toodsIds', |
||||||
|
key: 'toolsIds', |
||||||
|
type: JVXETypes.hidden, |
||||||
|
}, |
||||||
|
{ |
||||||
|
title: '工具名称', |
||||||
|
key: 'toolsNames', |
||||||
|
type: JVXETypes.selectMultiple, |
||||||
|
width: '180px', |
||||||
|
options: [], |
||||||
|
placeholder: '请选择${title}', |
||||||
|
}, |
||||||
|
{key: 'proProcess', type: JVXETypes.hidden, title: '前导工序ID', width: '120px'}, |
||||||
|
{ |
||||||
|
title: '前导工序', |
||||||
|
key: 'proProcessName', |
||||||
|
type: JVXETypes.popup, |
||||||
|
width: '180px', |
||||||
|
popupCode: 'zy_process', |
||||||
|
field: 'id,process_code,process_name,process_describe', |
||||||
|
// orgFields: 'id,process_code,process_name,process_describe', |
||||||
|
// destFields: 'proProcessName,process_code,process_name,process_describe', |
||||||
|
orgFields: 'process_name,id', |
||||||
|
destFields: 'proProcessName,proProcess', |
||||||
|
}, |
||||||
|
{key: 'postProcess', type: JVXETypes.hidden, title: '后导工序ID', width: '120px'}, |
||||||
|
{ |
||||||
|
title: '后导工序', |
||||||
|
key: 'postProcessName', |
||||||
|
type: JVXETypes.popup, |
||||||
|
width: '180px', |
||||||
|
popupCode: 'zy_process', |
||||||
|
field: 'id,process_code,process_name,process_describe', |
||||||
|
orgFields: 'process_name,id', |
||||||
|
destFields: 'postProcessName,postProcess', |
||||||
|
}, |
||||||
|
{key: 'inputProduct', title: '输入产品', width: '150', type: JVXETypes.input}, |
||||||
|
{key: 'semiProduct', title: '成品/半成品', width: '150', type: JVXETypes.input}, |
||||||
|
// {key: 'semiProduct', title: '面料', width: '150', type: JVXETypes.input}, |
||||||
|
{key: 'totalMachine', title: '机器时长', width: '80', type: JVXETypes.normal}, |
||||||
|
{key: 'totalMaunal', title: '人工时长', width: '80', type: JVXETypes.normal}, |
||||||
|
{ |
||||||
|
title: '管理', |
||||||
|
key: 'action', |
||||||
|
type: JVXETypes.slot, |
||||||
|
fixed: 'right', |
||||||
|
minWidth: '150px', |
||||||
|
align: 'center', |
||||||
|
slotName: 'action', |
||||||
|
}, |
||||||
|
], |
||||||
|
url: { |
||||||
|
list: "/org.jeecg.modules.productplan/zyPlanProcess/getProcessDatalist", |
||||||
|
getPlanInfo: "/org.jeecg.modules.productplan/zyPlanProcess/getPlanInfo", |
||||||
|
syncProductProcess: "/org.jeecg.modules.productplan/zyPlanProcess/syncProductProcess", |
||||||
|
stationToolslist: "/stationTool/list2", |
||||||
|
stationMachinelist: "/stationMachine/list2", |
||||||
|
addProcessBatch: "/org.jeecg.modules.productplan/zyPlanProcess/addProcessBatch", |
||||||
|
}, |
||||||
|
loadRouteType: false, |
||||||
|
planId: "", |
||||||
|
dictOptions: {}, |
||||||
|
planInfo: {}, |
||||||
|
superFieldList: [], |
||||||
|
stationIdList: [], |
||||||
|
toolsList: [], |
||||||
|
machineList: [], |
||||||
|
clickTrue: true, |
||||||
|
} |
||||||
|
}, |
||||||
|
created() { |
||||||
|
this.loadParameter(); |
||||||
|
this.getPlanInfo(this.planId); |
||||||
|
}, |
||||||
|
methods: { |
||||||
|
jump2MianLiao(key,props){ |
||||||
|
console.log("mianLiao() ----key:",key) |
||||||
|
console.log("mianLiao() ----props:",props) |
||||||
|
this.$router.push({ |
||||||
|
path: '/productplan/ZyPlanProcessFabricList', |
||||||
|
// query: { // 路由携带参数 |
||||||
|
// 'planProcessId': record.id, |
||||||
|
// }, |
||||||
|
}); |
||||||
|
}, |
||||||
|
|
||||||
|
jump2FuLiao(key,props){ |
||||||
|
console.log("fuLiao() ----key:",key) |
||||||
|
console.log("fuLiao() ----props:",props) |
||||||
|
}, |
||||||
|
detail(props){ |
||||||
|
alert("稍等，正在开发中。。。") |
||||||
|
}, |
||||||
|
getPlanInfo(planId) { |
||||||
|
// debugger; |
||||||
|
getAction(this.url.getPlanInfo, {"planId": planId}).then((res) => { |
||||||
|
if (res.success) { |
||||||
|
this.planInfo = res.result.records || res.result; |
||||||
|
// console.log("getPlanInfo------------:" + JSON.stringify(this.planInfo)); |
||||||
|
} else { |
||||||
|
// this.stationIdCode = "station,station_name,id,depart_id in (select workshop_id from zy_product_plan where id='" + this.planId + "')"; |
||||||
|
this.$message.warning(res.message) |
||||||
|
} |
||||||
|
}).finally(() => { |
||||||
|
this.loading = false |
||||||
|
}) |
||||||
|
}, |
||||||
|
|
||||||
|
// 【整体保存】点击保存按钮时触发的事件 |
||||||
|
handleTableSave({$table, target}) { |
||||||
|
console.log("生产计划工序保存开始-----------------") |
||||||
|
// 校验整个表格 |
||||||
|
$table.validate().then((errMap) => { |
||||||
|
// 校验通过 |
||||||
|
if (!errMap) { |
||||||
|
// 获取所有数据 |
||||||
|
let tableData = target.getTableData() |
||||||
|
console.log('当前保存的数据是：', tableData) |
||||||
|
// 【模拟保存】 |
||||||
|
this.loading = true |
||||||
|
postAction(this.url.addProcessBatch, tableData).then(res => { |
||||||
|
if (res.success) { |
||||||
|
this.$message.success(`保存成功！`) |
||||||
|
} else { |
||||||
|
this.$message.warn(`保存失败：` + res.message) |
||||||
|
} |
||||||
|
}).finally(() => { |
||||||
|
this.loading = false |
||||||
|
}) |
||||||
|
} |
||||||
|
}) |
||||||
|
}, |
||||||
|
fanHui() { |
||||||
|
this.$router.push({ |
||||||
|
path: '/productplan/ZyProductPlanList', |
||||||
|
}); |
||||||
|
}, |
||||||
|
|
||||||
|
//读取工序 |
||||||
|
syncProductProcess() { |
||||||
|
getAction(this.url.syncProductProcess, {"planId": this.planId}).then((res) => { |
||||||
|
if (res.success) { |
||||||
|
this.$message.success("操作成功"); |
||||||
|
this.loadData(); |
||||||
|
} else { |
||||||
|
this.$message.warning(res.message) |
||||||
|
} |
||||||
|
}).finally(() => { |
||||||
|
this.loading = false |
||||||
|
}) |
||||||
|
}, |
||||||
|
|
||||||
|
//加载传递参数 |
||||||
|
loadParameter() { |
||||||
|
// debugger; |
||||||
|
if (this.loadRouteType === false) { |
||||||
|
this.planId = this.$route.query.planId; |
||||||
|
// this.biaoTi = this.$route.query.styleNames+"款式面料管理"; |
||||||
|
console.log("*******传递的planId:" + this.planId) |
||||||
|
this.loadRouteType = true; |
||||||
|
} |
||||||
|
}, |
||||||
|
loadData(arg) { |
||||||
|
console.log("the loadData---------开始"); |
||||||
|
// var that = this; |
||||||
|
if (!this.url.list) { |
||||||
|
this.$message.error("请设置url.list属性!") |
||||||
|
return |
||||||
|
} |
||||||
|
//加载数据 若传入参数1则加载第一页的内容 |
||||||
|
this.loadParameter(); |
||||||
|
var params = this.getQueryParams();//查询条件 |
||||||
|
this.loading = true; |
||||||
|
console.log("----------------the params:", params); |
||||||
|
getAction(this.url.list, params).then((res) => { |
||||||
|
if (res.success) { |
||||||
|
this.dataSource = res.result.records || res.result; |
||||||
|
// this.stationId = this.dataSource[0].stationId; |
||||||
|
this.stationIdList = this.dataSource[0].stationIdList; |
||||||
|
} else { |
||||||
|
// this.stationIdCode = "station,station_name,id,depart_id in (select workshop_id from zy_product_plan where id='" + this.planId + "')"; |
||||||
|
this.$message.warning(res.message) |
||||||
|
} |
||||||
|
}).finally(() => { |
||||||
|
this.loading = false |
||||||
|
}) |
||||||
|
}, |
||||||
|
getQueryParams() { |
||||||
|
//获取查询条件 |
||||||
|
let sqp = {} |
||||||
|
if (this.superQueryParams) { |
||||||
|
sqp['superQueryParams'] = encodeURI(this.superQueryParams) |
||||||
|
sqp['superQueryMatchType'] = this.superQueryMatchType |
||||||
|
} |
||||||
|
var param = Object.assign(sqp, this.queryParam, this.isorter, this.filters); |
||||||
|
param.field = this.getQueryField(); |
||||||
|
param.pageNo = this.ipagination.current; |
||||||
|
param.pageSize = this.ipagination.pageSize; |
||||||
|
param.planId = this.planId; |
||||||
|
return filterObj(param); |
||||||
|
}, |
||||||
|
|
||||||
|
// 当选择的行变化时触发的事件 |
||||||
|
handleSelectRowChange(event) { |
||||||
|
// console.log("handleSelectRowChange") |
||||||
|
console.log("handleSelectRowChange-event:", event) |
||||||
|
const {type, row, column, value, target, $table} = event |
||||||
|
console.log("stationIdList", JSON.stringify(this.stationIdList)); |
||||||
|
target.$refs.vxe.columns[4].options = this.stationIdList; |
||||||
|
}, |
||||||
|
/** 当选项被改变时，联动其他组件 */ |
||||||
|
handleValueChange(event) { |
||||||
|
const {type, row, column, value, target} = event |
||||||
|
console.log("选择列-" + column.key + "：的事件-----", event) |
||||||
|
console.log("选择列-" + column.key + "：所在行数据-----", row) |
||||||
|
// console.log("row", row) |
||||||
|
// 选中工位列操作 |
||||||
|
if (column.key === 'stationName') { |
||||||
|
let selectedStationId = event.value; |
||||||
|
// 设置第二列的 options |
||||||
|
// console.log('选择的工位列id---------:', selectedStationId) |
||||||
|
row.stationId = selectedStationId; |
||||||
|
// 清空后两列的数据 |
||||||
|
target.setValues([{ |
||||||
|
rowKey: row.id, |
||||||
|
values: {machineIds: '', toolsIds: '', machineNames: '', toolsNames: ''} |
||||||
|
}]) |
||||||
|
target.$refs.vxe.columns[6].options = [] |
||||||
|
target.$refs.vxe.columns[8].options = [] |
||||||
|
|
||||||
|
getAction(this.url.stationMachinelist, {"stationId": selectedStationId}).then((res) => { |
||||||
|
if (res.success) { |
||||||
|
this.machineList = res.result.records || res.result; |
||||||
|
console.log("machineList", JSON.stringify(this.machineList)) |
||||||
|
target.$refs.vxe.columns[6].options = this.machineList; |
||||||
|
} else { |
||||||
|
this.$message.warning(res.message) |
||||||
|
} |
||||||
|
}); |
||||||
|
|
||||||
|
getAction(this.url.stationToolslist, {"stationId": selectedStationId}).then((res) => { |
||||||
|
if (res.success) { |
||||||
|
this.toolsList = res.result.records || res.result; |
||||||
|
console.log("toolsList", JSON.stringify(this.toolsList)) |
||||||
|
target.$refs.vxe.columns[8].options = this.toolsList; |
||||||
|
} else { |
||||||
|
this.$message.warning(res.message) |
||||||
|
} |
||||||
|
}); |
||||||
|
} |
||||||
|
|
||||||
|
//选中列操作 |
||||||
|
if (column.key === 'machineNames') { |
||||||
|
row.machineIds = event.value; |
||||||
|
} |
||||||
|
if (column.key === 'toolsNames') { |
||||||
|
row.toolsIds = event.value; |
||||||
|
} |
||||||
|
} |
||||||
|
}, |
||||||
|
}; |
||||||
|
</script> |
||||||
@ -0,0 +1,44 @@ |
|||||||
|
package org.jeecg.modules.demo.ordergoods.entity; |
||||||
|
|
||||||
|
import java.io.Serializable; |
||||||
|
import java.io.UnsupportedEncodingException; |
||||||
|
import java.util.Date; |
||||||
|
import java.math.BigDecimal; |
||||||
|
import com.baomidou.mybatisplus.annotation.IdType; |
||||||
|
import com.baomidou.mybatisplus.annotation.TableId; |
||||||
|
import com.baomidou.mybatisplus.annotation.TableName; |
||||||
|
import lombok.Data; |
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat; |
||||||
|
import org.springframework.format.annotation.DateTimeFormat; |
||||||
|
import org.jeecgframework.poi.excel.annotation.Excel; |
||||||
|
import org.jeecg.common.aspect.annotation.Dict; |
||||||
|
import io.swagger.annotations.ApiModel; |
||||||
|
import io.swagger.annotations.ApiModelProperty; |
||||||
|
import lombok.EqualsAndHashCode; |
||||||
|
import lombok.experimental.Accessors; |
||||||
|
|
||||||
|
/** |
||||||
|
* @Description: 订单商品表 |
||||||
|
* @Author: jeecg-boot |
||||||
|
* @Date: 2022-12-28 |
||||||
|
* @Version: V1.0 |
||||||
|
*/ |
||||||
|
@Data |
||||||
|
public class OrderGoodsJk implements Serializable { |
||||||
|
private static final long serialVersionUID = 1L; |
||||||
|
|
||||||
|
/**商品id*/ |
||||||
|
@Excel(name = "商品id", width = 15, dictTable = "zy_goods", dicText = "goods_name", dicCode = "id") |
||||||
|
@Dict(dictTable = "zy_goods", dicText = "goods_name", dicCode = "id") |
||||||
|
@ApiModelProperty(value = "商品id") |
||||||
|
private java.lang.String goodsId; |
||||||
|
/**商品数量*/ |
||||||
|
@Excel(name = "商品数量", width = 15) |
||||||
|
@ApiModelProperty(value = "商品数量") |
||||||
|
private java.lang.Integer goodsNum; |
||||||
|
/**顾客量体id*/ |
||||||
|
@Excel(name = "顾客量体id", width = 15, dictTable = "customer_measure", dicText = "username", dicCode = "id") |
||||||
|
@Dict(dictTable = "customer_measure", dicText = "username", dicCode = "id") |
||||||
|
@ApiModelProperty(value = "顾客量体id") |
||||||
|
private java.lang.String measureId; |
||||||
|
} |
||||||
@ -0,0 +1,85 @@ |
|||||||
|
package org.jeecg.modules.demo.zyorders.entity; |
||||||
|
|
||||||
|
import java.io.Serializable; |
||||||
|
import java.io.UnsupportedEncodingException; |
||||||
|
import java.util.Date; |
||||||
|
import java.math.BigDecimal; |
||||||
|
import com.baomidou.mybatisplus.annotation.IdType; |
||||||
|
import com.baomidou.mybatisplus.annotation.TableId; |
||||||
|
import com.baomidou.mybatisplus.annotation.TableName; |
||||||
|
import lombok.Data; |
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat; |
||||||
|
import org.springframework.format.annotation.DateTimeFormat; |
||||||
|
import org.jeecgframework.poi.excel.annotation.Excel; |
||||||
|
import org.jeecg.common.aspect.annotation.Dict; |
||||||
|
import io.swagger.annotations.ApiModel; |
||||||
|
import io.swagger.annotations.ApiModelProperty; |
||||||
|
import lombok.EqualsAndHashCode; |
||||||
|
import lombok.experimental.Accessors; |
||||||
|
|
||||||
|
/** |
||||||
|
* @Description: 订单基本信息 |
||||||
|
* @Author: jeecg-boot |
||||||
|
* @Date: 2022-12-26 |
||||||
|
* @Version: V1.0 |
||||||
|
*/ |
||||||
|
@Data |
||||||
|
public class ZyOrdersJk implements Serializable { |
||||||
|
private static final long serialVersionUID = 1L; |
||||||
|
|
||||||
|
/**运费*/ |
||||||
|
@Excel(name = "运费", width = 15) |
||||||
|
@ApiModelProperty(value = "运费") |
||||||
|
private java.lang.Double freight; |
||||||
|
/**交货期*/ |
||||||
|
@Excel(name = "交货期", width = 15) |
||||||
|
@ApiModelProperty(value = "交货期") |
||||||
|
private java.lang.Integer deliveryTime; |
||||||
|
/**订单类型*/ |
||||||
|
@Excel(name = "订单类型", width = 15, dicCode = "orders_type") |
||||||
|
@Dict(dicCode = "orders_type") |
||||||
|
@ApiModelProperty(value = "订单类型") |
||||||
|
private java.lang.Integer ordersType; |
||||||
|
/**顾客id*/ |
||||||
|
@Excel(name = "顾客id", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "username") |
||||||
|
@Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username") |
||||||
|
@ApiModelProperty(value = "顾客id") |
||||||
|
private java.lang.String userId; |
||||||
|
/**商品条目数量*/ |
||||||
|
@Excel(name = "商品条目数量", width = 15) |
||||||
|
@ApiModelProperty(value = "商品条目数量") |
||||||
|
private java.lang.Integer goodsQuantity; |
||||||
|
/**顾客地址id*/ |
||||||
|
@Excel(name = "顾客地址id", width = 15) |
||||||
|
@ApiModelProperty(value = "顾客地址id") |
||||||
|
private java.lang.String addressId; |
||||||
|
/**收货人*/ |
||||||
|
@Excel(name = "收货人", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "username") |
||||||
|
@Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username") |
||||||
|
@ApiModelProperty(value = "收货人") |
||||||
|
private java.lang.String receiver; |
||||||
|
/**顾客发票id*/ |
||||||
|
@Excel(name = "顾客发票id", width = 15) |
||||||
|
@ApiModelProperty(value = "顾客发票id") |
||||||
|
private java.lang.String invoiceId; |
||||||
|
/**销售门店*/ |
||||||
|
@Excel(name = "销售门店", width = 15, dictTable = "sys_depart", dicText = "depart_name", dicCode = "id") |
||||||
|
@Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id") |
||||||
|
@ApiModelProperty(value = "销售门店") |
||||||
|
private java.lang.String salesEnterpriseId; |
||||||
|
/**销售员*/ |
||||||
|
@Excel(name = "销售员", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "username") |
||||||
|
@Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username") |
||||||
|
@ApiModelProperty(value = "销售员") |
||||||
|
private java.lang.String salespersonId; |
||||||
|
/**物流企业*/ |
||||||
|
@Excel(name = "物流企业", width = 15, dictTable = "sys_depart", dicText = "depart_name", dicCode = "id") |
||||||
|
@Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id") |
||||||
|
@ApiModelProperty(value = "物流企业") |
||||||
|
private java.lang.String logisticsEnterprisesId; |
||||||
|
/**交付状态*/ |
||||||
|
@Excel(name = "交付状态", width = 15, dicCode = "delivery_status") |
||||||
|
@Dict(dicCode = "delivery_status") |
||||||
|
@ApiModelProperty(value = "交付状态") |
||||||
|
private java.lang.Integer deliveryStatus; |
||||||
|
} |
||||||
@ -0,0 +1,66 @@ |
|||||||
|
package org.jeecg.modules.productplan.enums; |
||||||
|
/** |
||||||
|
* 生产计划状态枚举 |
||||||
|
*/ |
||||||
|
public enum ProductPlanStatusEnum { |
||||||
|
|
||||||
|
UNAUDITED("0", "未审核"), |
||||||
|
REVIEWED("1", "已审核"), |
||||||
|
PRODUCTION("2", "生产中"), |
||||||
|
COMPLETED("3", "已完成"), |
||||||
|
REVOKED("8", "已撤销"), |
||||||
|
EXCEPTION("9", "异常"); |
||||||
|
|
||||||
|
private String code; |
||||||
|
|
||||||
|
private String val; |
||||||
|
|
||||||
|
private ProductPlanStatusEnum(String code, String val) { |
||||||
|
this.code = code; |
||||||
|
this.val = val; |
||||||
|
} |
||||||
|
|
||||||
|
public String getCode() { |
||||||
|
return code; |
||||||
|
} |
||||||
|
|
||||||
|
public void setCode(String code) { |
||||||
|
this.code = code; |
||||||
|
} |
||||||
|
|
||||||
|
public String getVal() { |
||||||
|
return val; |
||||||
|
} |
||||||
|
|
||||||
|
public void setVal(String val) { |
||||||
|
this.val = val; |
||||||
|
} |
||||||
|
|
||||||
|
public static String getValueByCode(String code) { |
||||||
|
ProductPlanStatusEnum[] values = ProductPlanStatusEnum.values(); |
||||||
|
for (ProductPlanStatusEnum type : values) { |
||||||
|
if (type.code.equals(code)) { |
||||||
|
return type.val; |
||||||
|
} |
||||||
|
} |
||||||
|
return null; |
||||||
|
} |
||||||
|
|
||||||
|
public static String getCodeByValue(String value) { |
||||||
|
ProductPlanStatusEnum[] values = ProductPlanStatusEnum.values(); |
||||||
|
for (ProductPlanStatusEnum type : values) { |
||||||
|
if (type.val.equals(value)) { |
||||||
|
return type.code; |
||||||
|
} |
||||||
|
} |
||||||
|
return null; |
||||||
|
} |
||||||
|
|
||||||
|
@Override |
||||||
|
public String toString() { |
||||||
|
return "ProductPlanStatusEnum{" + |
||||||
|
"code='" + code + '\'' + |
||||||
|
", val='" + val + '\'' + |
||||||
|
'}'; |
||||||
|
} |
||||||
|
} |
||||||
Loading…
Reference in new issue