Merge branch 'master' of http://182.92.169.222:3000/yu/CostumingPlatform
commit
3ff3e9426b
13 changed files with 896 additions and 241 deletions
@ -0,0 +1,314 @@ |
||||
<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="工序名称"> |
||||
<a-input placeholder="请输入工序名称" v-model="queryParam.processName"></a-input> |
||||
</a-form-item> |
||||
</a-col> |
||||
<a-col :xl="6" :lg="7" :md="8" :sm="24"> |
||||
<a-form-item label="设备名称"> |
||||
<a-input placeholder="请输入设备名称" v-model="queryParam.machineNames"></a-input> |
||||
</a-form-item> |
||||
</a-col> |
||||
<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> |
||||
</span> |
||||
</a-col> |
||||
</a-row> |
||||
</a-form> |
||||
</div> |
||||
<!-- 查询区域-END --> |
||||
|
||||
<!-- 操作按钮区域 --> |
||||
<div class="table-operator"> |
||||
<!-- 高级查询区域 --> |
||||
</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="gw" slot-scope="text, record"> |
||||
<a @click="gw(record.stationId)">{{text}}</a> |
||||
</template> |
||||
<template slot="gd" slot-scope="text, record"> |
||||
<a @click="gd(record.productNo)">{{text}}</a> |
||||
</template> |
||||
<template slot="cp" slot-scope="text, record"> |
||||
<a @click="cp(record.productCode)">{{text}}</a> |
||||
</template> |
||||
<template slot="gx" slot-scope="text, record"> |
||||
<a @click="gx(record.processId)">{{text}}</a> |
||||
</template> |
||||
<template slot="sb" slot-scope="text, record"> |
||||
<a @click="sb(record.machineIds)">{{text}}</a> |
||||
</template> |
||||
<template slot="nodata" slot-scope="text, record"> |
||||
<span v-if="!text" style="font-size: 14px;font-style: italic;">无</span> |
||||
<span v-else style="font-size: 14px;font-style: italic;">{{record.proProcessName}}</span> |
||||
</template> |
||||
<template slot="nodata1" slot-scope="text, record"> |
||||
<span v-if="!text" style="font-size: 14px;font-style: italic;">无</span> |
||||
<span v-else style="font-size: 14px;font-style: italic;">{{record.postProcessName}}</span> |
||||
</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> |
||||
|
||||
<zy-plan-process-modal ref="modalForm" @ok="modalFormOk"></zy-plan-process-modal> |
||||
<station-modal1 ref="modalFormgw"></station-modal1> |
||||
<work-order-modal ref="modalFormgd"></work-order-modal> |
||||
<zy-product-modal ref="modalFormcp"></zy-product-modal> |
||||
<ZyProcessDetail ref="zyProcessDetail"></ZyProcessDetail> |
||||
<ZyDeviceDetail ref="ZyDeviceDetail"></ZyDeviceDetail> |
||||
</a-card> |
||||
</template> |
||||
|
||||
<script> |
||||
|
||||
import '@/assets/less/TableExpand.less' |
||||
import { mixinDevice } from '@/utils/mixin' |
||||
import { JeecgListMixin } from '@/mixins/JeecgListMixin' |
||||
import ZyPlanProcessModal from './modules/ZyPlanProcessModal' |
||||
import {filterMultiDictText} from '@/components/dict/JDictSelectUtil' |
||||
import StationModal1 from "../team/modules/StationModal1"; |
||||
import WorkOrderModal from "../workorder/modules/WorkOrderModal"; |
||||
import {deleteAction, getAction} from "@api/manage"; |
||||
import ZyProductModal from "../zyWorkProduct/modules/ZyProductModal"; |
||||
import ZyProcessDetail from "../process/modules/ZyProcessDetail"; |
||||
import ZyDeviceDetail from "../device/modules/ZyDeviceDetail"; |
||||
|
||||
export default { |
||||
name: 'ZyPlanProcessList1', |
||||
mixins:[JeecgListMixin, mixinDevice], |
||||
components: { |
||||
ZyPlanProcessModal, |
||||
StationModal1, |
||||
WorkOrderModal, |
||||
ZyProductModal, |
||||
ZyProcessDetail, |
||||
ZyDeviceDetail |
||||
}, |
||||
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: 'productNo', |
||||
scopedSlots: {customRender: 'gd'} |
||||
}, |
||||
{ |
||||
title:'产品名称', |
||||
align:"center", |
||||
dataIndex: 'productCode_dictText', |
||||
scopedSlots: {customRender: 'cp'} |
||||
}, |
||||
{ |
||||
title:'工序名称', |
||||
align:"center", |
||||
dataIndex: 'processName', |
||||
scopedSlots: {customRender: 'gx'} |
||||
}, |
||||
{ |
||||
title:'工位名称', |
||||
align:"center", |
||||
dataIndex: 'stationName', |
||||
scopedSlots: {customRender: 'gw'} |
||||
}, |
||||
{ |
||||
title:'工位序号', |
||||
align:"center", |
||||
dataIndex: 'stationNum' |
||||
}, |
||||
{ |
||||
title:'设备名称', |
||||
align:"center", |
||||
dataIndex: 'machineNames', |
||||
scopedSlots: {customRender: 'sb'} |
||||
}, |
||||
/* { |
||||
title:'工具名称', |
||||
align:"center", |
||||
dataIndex: 'toolsNames' |
||||
},*/ |
||||
{ |
||||
title:'前导工序', |
||||
align:"center", |
||||
dataIndex: 'proProcessName', |
||||
scopedSlots: {customRender: 'nodata'} |
||||
}, |
||||
{ |
||||
title:'后导工序', |
||||
align:"center", |
||||
dataIndex: 'postProcessName', |
||||
scopedSlots: {customRender: 'nodata1'} |
||||
}, |
||||
/* { |
||||
title:'输入产品', |
||||
align:"center", |
||||
dataIndex: 'inputProduct' |
||||
}, |
||||
{ |
||||
title:'成品/半成品', |
||||
align:"center", |
||||
dataIndex: 'semiProduct' |
||||
}, |
||||
{ |
||||
title:'工人名称', |
||||
align:"center", |
||||
dataIndex: 'userNames' |
||||
},*/ |
||||
{ |
||||
title:'机器时长', |
||||
align:"center", |
||||
dataIndex: 'totalMachine' |
||||
}, |
||||
{ |
||||
title:'人工时长', |
||||
align:"center", |
||||
dataIndex: 'totalMaunal' |
||||
}, |
||||
/* { |
||||
title: '操作', |
||||
dataIndex: 'action', |
||||
align:"center", |
||||
fixed:"right", |
||||
width:147, |
||||
scopedSlots: { customRender: 'action' } |
||||
}*/ |
||||
], |
||||
url: { |
||||
list: "/org.jeecg.modules.productplan/zyPlanProcess/pagelist1", |
||||
|
||||
}, |
||||
dictOptions:{}, |
||||
superFieldList:[], |
||||
} |
||||
}, |
||||
created() { |
||||
//this.getSuperFieldList(); |
||||
}, |
||||
computed: { |
||||
importExcelUrl: function(){ |
||||
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`; |
||||
}, |
||||
}, |
||||
methods: { |
||||
gw(stationId){ |
||||
getAction("/team/station/queryById", {id: stationId}).then((res) => { |
||||
if (res.success) { |
||||
this.$refs.modalFormgw.edit(res.result); |
||||
this.$refs.modalFormgw.title="详情"; |
||||
} else { |
||||
} |
||||
}) |
||||
}, |
||||
gd(orderCode){ |
||||
getAction("/workOrder/workOrder/queryByOrderCode", {orderCode: orderCode}).then((res) => { |
||||
if (res.success) { |
||||
this.$refs.modalFormgd.edit(res.result); |
||||
this.$refs.modalFormgd.title="详情"; |
||||
this.$refs.modalFormgd.disableSubmit = true; |
||||
} else { |
||||
} |
||||
}) |
||||
}, |
||||
cp(productCode){ |
||||
getAction("/zyproduct/zyProduct/queryByProductCode", {productCode: productCode}).then((res) => { |
||||
if (res.success) { |
||||
this.$refs.modalFormcp.edit(res.result); |
||||
this.$refs.modalFormcp.title="详情"; |
||||
this.$refs.modalFormcp.disableSubmit = true; |
||||
} else { |
||||
} |
||||
}) |
||||
}, |
||||
gx(processId){ |
||||
this.$refs.zyProcessDetail.showModal(processId); |
||||
}, |
||||
sb(machineIds){ |
||||
this.$refs.ZyDeviceDetail.showModal(machineIds.split(",")[0]); |
||||
}, |
||||
initDictConfig(){ |
||||
}, |
||||
} |
||||
} |
||||
</script> |
||||
<style scoped> |
||||
@import '~@assets/less/common.less'; |
||||
</style> |
||||
@ -1,211 +1,293 @@ |
||||
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 |
||||
@TableName("zy_orders") |
||||
@Accessors(chain = true) |
||||
@EqualsAndHashCode(callSuper = false) |
||||
@ApiModel(value="zy_orders对象", description="订单基本信息管理") |
||||
public class ZyOrders implements Serializable { |
||||
private static final long serialVersionUID = 1L; |
||||
|
||||
/**主键*/ |
||||
@TableId(type = IdType.ASSIGN_ID) |
||||
@ApiModelProperty(value = "主键") |
||||
private java.lang.String id; |
||||
/**创建人*/ |
||||
@ApiModelProperty(value = "创建人") |
||||
private java.lang.String createBy; |
||||
/**创建日期*/ |
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") |
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") |
||||
@ApiModelProperty(value = "创建日期") |
||||
private java.util.Date createTime; |
||||
/**更新人*/ |
||||
@ApiModelProperty(value = "更新人") |
||||
private java.lang.String updateBy; |
||||
/**更新日期*/ |
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") |
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") |
||||
@ApiModelProperty(value = "更新日期") |
||||
private java.util.Date updateTime; |
||||
/**所属部门*/ |
||||
@ApiModelProperty(value = "所属部门") |
||||
private java.lang.String sysOrgCode; |
||||
/**是否子单*/ |
||||
@Excel(name = "是否子单", width = 15, dicCode = "ischild") |
||||
@Dict(dicCode = "ischild") |
||||
@ApiModelProperty(value = "是否子单") |
||||
private java.lang.Integer ischild; |
||||
/**原订单id*/ |
||||
@Excel(name = "原订单id", width = 15) |
||||
@Dict(dictTable = "zy_orders", dicText = "orders_num", dicCode = "id") |
||||
@ApiModelProperty(value = "原订单id") |
||||
private java.lang.String orderId; |
||||
/**下单时间*/ |
||||
@Excel(name = "下单时间", width = 15, format = "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") |
||||
@ApiModelProperty(value = "下单时间") |
||||
private java.util.Date orderTime; |
||||
/**订单编号*/ |
||||
@Excel(name = "订单编号", width = 15) |
||||
@ApiModelProperty(value = "订单编号") |
||||
private java.lang.String ordersNum; |
||||
/**总金额*/ |
||||
@Excel(name = "总金额", width = 15) |
||||
@ApiModelProperty(value = "总金额") |
||||
private java.lang.Double money; |
||||
/**运费*/ |
||||
@Excel(name = "运费", width = 15) |
||||
@ApiModelProperty(value = "运费") |
||||
private java.lang.Double freight; |
||||
/**促销*/ |
||||
@Excel(name = "促销", width = 15) |
||||
@ApiModelProperty(value = "促销") |
||||
private java.lang.Double promotionPrice; |
||||
/**实付款*/ |
||||
@Excel(name = "实付款", width = 15) |
||||
@ApiModelProperty(value = "实付款") |
||||
private java.lang.Double actualPayment; |
||||
/**交货期*/ |
||||
@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 = "id") |
||||
@ApiModelProperty(value = "顾客id") |
||||
private java.lang.String userId; |
||||
/**商品条目数量*/ |
||||
@Excel(name = "商品条目数量", width = 15) |
||||
@ApiModelProperty(value = "商品条目数量") |
||||
private java.lang.Integer goodsQuantity; |
||||
/**支付方式*/ |
||||
@Excel(name = "支付方式", width = 15, dicCode = "payment_method") |
||||
@Dict(dicCode = "payment_method") |
||||
@ApiModelProperty(value = "支付方式") |
||||
private java.lang.Integer paymentMethod; |
||||
/**支付状态*/ |
||||
@Excel(name = "支付状态", width = 15, dicCode = "payment_status") |
||||
@Dict(dicCode = "payment_status") |
||||
@ApiModelProperty(value = "支付状态") |
||||
private java.lang.Integer paymentStatus; |
||||
/**账号/卡号*/ |
||||
@Excel(name = "账号/卡号", width = 15) |
||||
@ApiModelProperty(value = "账号/卡号") |
||||
private java.lang.String accountNo; |
||||
/**开户银行*/ |
||||
@Excel(name = "开户银行", width = 15) |
||||
@ApiModelProperty(value = "开户银行") |
||||
private java.lang.String bankDeposit; |
||||
/**支付时间*/ |
||||
@Excel(name = "支付时间", width = 15, format = "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") |
||||
@ApiModelProperty(value = "支付时间") |
||||
private java.util.Date paymentTime; |
||||
/**城市*/ |
||||
@Excel(name = "城市", width = 15) |
||||
@ApiModelProperty(value = "城市") |
||||
private java.lang.String cityId; |
||||
/**地址*/ |
||||
@Excel(name = "地址", width = 15) |
||||
@ApiModelProperty(value = "地址") |
||||
private java.lang.String address; |
||||
/**邮编*/ |
||||
@Excel(name = "邮编", width = 15) |
||||
@ApiModelProperty(value = "邮编") |
||||
private java.lang.String zipCode; |
||||
/**收货人*/ |
||||
@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; |
||||
/**联系电话*/ |
||||
@Excel(name = "联系电话", width = 15) |
||||
@ApiModelProperty(value = "联系电话") |
||||
private java.lang.String mobile; |
||||
/**发票客户类型*/ |
||||
@Excel(name = "发票客户类型", width = 15, dicCode = "invoice_customer_type") |
||||
@Dict(dicCode = "invoice_customer_type") |
||||
@ApiModelProperty(value = "发票客户类型") |
||||
private java.lang.Integer invoiceCustomerType; |
||||
/**发票类型*/ |
||||
@Excel(name = "发票类型", width = 15, dicCode = "invoice_type") |
||||
@Dict(dicCode = "invoice_type") |
||||
@ApiModelProperty(value = "发票类型") |
||||
private java.lang.Integer invoiceType; |
||||
/**纳税人识别号*/ |
||||
@Excel(name = "纳税人识别号", width = 15) |
||||
@ApiModelProperty(value = "纳税人识别号") |
||||
private java.lang.String taxIdentificationNumber; |
||||
/**开票地址*/ |
||||
@Excel(name = "开票地址", width = 15) |
||||
@ApiModelProperty(value = "开票地址") |
||||
private java.lang.String addressBilling; |
||||
/**电话*/ |
||||
@Excel(name = "电话", width = 15) |
||||
@ApiModelProperty(value = "电话") |
||||
private java.lang.String telephone; |
||||
/**公户开户行*/ |
||||
@Excel(name = "公户开户行", width = 15) |
||||
@ApiModelProperty(value = "公户开户行") |
||||
private java.lang.String bankPublic; |
||||
/**公户账号*/ |
||||
@Excel(name = "公户账号", width = 15) |
||||
@ApiModelProperty(value = "公户账号") |
||||
private java.lang.String accountNumber; |
||||
/**销售门店*/ |
||||
@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; |
||||
|
||||
/**是否虚拟订单*/ |
||||
@Dict(dicCode = "isvirtual") |
||||
@ApiModelProperty(value = "是否虚拟订单") |
||||
private java.lang.String isvirtual; |
||||
} |
||||
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 |
||||
@TableName("zy_orders") |
||||
@Accessors(chain = true) |
||||
@EqualsAndHashCode(callSuper = false) |
||||
@ApiModel(value = "zy_orders对象", description = "订单基本信息管理") |
||||
public class ZyOrders implements Serializable { |
||||
private static final long serialVersionUID = 1L; |
||||
|
||||
/** |
||||
* 主键 |
||||
*/ |
||||
@TableId(type = IdType.ASSIGN_ID) |
||||
@ApiModelProperty(value = "主键") |
||||
private java.lang.String id; |
||||
/** |
||||
* 创建人 |
||||
*/ |
||||
@ApiModelProperty(value = "创建人") |
||||
private java.lang.String createBy; |
||||
/** |
||||
* 创建日期 |
||||
*/ |
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") |
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
||||
@ApiModelProperty(value = "创建日期") |
||||
private java.util.Date createTime; |
||||
/** |
||||
* 更新人 |
||||
*/ |
||||
@ApiModelProperty(value = "更新人") |
||||
private java.lang.String updateBy; |
||||
/** |
||||
* 更新日期 |
||||
*/ |
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") |
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
||||
@ApiModelProperty(value = "更新日期") |
||||
private java.util.Date updateTime; |
||||
/** |
||||
* 所属部门 |
||||
*/ |
||||
@ApiModelProperty(value = "所属部门") |
||||
private java.lang.String sysOrgCode; |
||||
/** |
||||
* 是否子单 |
||||
*/ |
||||
@Excel(name = "是否子单", width = 15, dicCode = "ischild") |
||||
@Dict(dicCode = "ischild") |
||||
@ApiModelProperty(value = "是否子单") |
||||
private java.lang.Integer ischild; |
||||
/** |
||||
* 原订单id |
||||
*/ |
||||
@Excel(name = "原订单id", width = 15) |
||||
@Dict(dictTable = "zy_orders", dicText = "orders_num", dicCode = "id") |
||||
@ApiModelProperty(value = "原订单id") |
||||
private java.lang.String orderId; |
||||
/** |
||||
* 下单时间 |
||||
*/ |
||||
@Excel(name = "下单时间", width = 15, format = "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") |
||||
@ApiModelProperty(value = "下单时间") |
||||
private java.util.Date orderTime; |
||||
/** |
||||
* 订单编号 |
||||
*/ |
||||
@Excel(name = "订单编号", width = 15) |
||||
@ApiModelProperty(value = "订单编号") |
||||
private java.lang.String ordersNum; |
||||
/** |
||||
* 总金额 |
||||
*/ |
||||
@Excel(name = "总金额", width = 15) |
||||
@ApiModelProperty(value = "总金额") |
||||
private java.lang.Double money; |
||||
/** |
||||
* 运费 |
||||
*/ |
||||
@Excel(name = "运费", width = 15) |
||||
@ApiModelProperty(value = "运费") |
||||
private java.lang.Double freight; |
||||
/** |
||||
* 促销 |
||||
*/ |
||||
@Excel(name = "促销", width = 15) |
||||
@ApiModelProperty(value = "促销") |
||||
private java.lang.Double promotionPrice; |
||||
/** |
||||
* 实付款 |
||||
*/ |
||||
@Excel(name = "实付款", width = 15) |
||||
@ApiModelProperty(value = "实付款") |
||||
private java.lang.Double actualPayment; |
||||
/** |
||||
* 交货期 |
||||
*/ |
||||
@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 = "id") |
||||
@ApiModelProperty(value = "顾客id") |
||||
private java.lang.String userId; |
||||
/** |
||||
* 商品条目数量 |
||||
*/ |
||||
@Excel(name = "商品条目数量", width = 15) |
||||
@ApiModelProperty(value = "商品条目数量") |
||||
private java.lang.Integer goodsQuantity; |
||||
/** |
||||
* 支付方式 |
||||
*/ |
||||
@Excel(name = "支付方式", width = 15, dicCode = "payment_method") |
||||
@Dict(dicCode = "payment_method") |
||||
@ApiModelProperty(value = "支付方式") |
||||
private java.lang.Integer paymentMethod; |
||||
/** |
||||
* 支付状态 |
||||
*/ |
||||
@Excel(name = "支付状态", width = 15, dicCode = "payment_status") |
||||
@Dict(dicCode = "payment_status") |
||||
@ApiModelProperty(value = "支付状态") |
||||
private java.lang.Integer paymentStatus; |
||||
/** |
||||
* 账号/卡号 |
||||
*/ |
||||
@Excel(name = "账号/卡号", width = 15) |
||||
@ApiModelProperty(value = "账号/卡号") |
||||
private java.lang.String accountNo; |
||||
/** |
||||
* 开户银行 |
||||
*/ |
||||
@Excel(name = "开户银行", width = 15) |
||||
@ApiModelProperty(value = "开户银行") |
||||
private java.lang.String bankDeposit; |
||||
/** |
||||
* 支付时间 |
||||
*/ |
||||
@Excel(name = "支付时间", width = 15, format = "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") |
||||
@ApiModelProperty(value = "支付时间") |
||||
private java.util.Date paymentTime; |
||||
/** |
||||
* 城市 |
||||
*/ |
||||
@Excel(name = "城市", width = 15) |
||||
@ApiModelProperty(value = "城市") |
||||
private java.lang.String cityId; |
||||
/** |
||||
* 地址 |
||||
*/ |
||||
@Excel(name = "地址", width = 15) |
||||
@ApiModelProperty(value = "地址") |
||||
private java.lang.String address; |
||||
/** |
||||
* 邮编 |
||||
*/ |
||||
@Excel(name = "邮编", width = 15) |
||||
@ApiModelProperty(value = "邮编") |
||||
private java.lang.String zipCode; |
||||
/** |
||||
* 收货人 |
||||
*/ |
||||
@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; |
||||
/** |
||||
* 联系电话 |
||||
*/ |
||||
@Excel(name = "联系电话", width = 15) |
||||
@ApiModelProperty(value = "联系电话") |
||||
private java.lang.String mobile; |
||||
/** |
||||
* 发票客户类型 |
||||
*/ |
||||
@Excel(name = "发票客户类型", width = 15, dicCode = "invoice_customer_type") |
||||
@Dict(dicCode = "invoice_customer_type") |
||||
@ApiModelProperty(value = "发票客户类型") |
||||
private java.lang.Integer invoiceCustomerType; |
||||
/** |
||||
* 发票类型 |
||||
*/ |
||||
@Excel(name = "发票类型", width = 15, dicCode = "invoice_type") |
||||
@Dict(dicCode = "invoice_type") |
||||
@ApiModelProperty(value = "发票类型") |
||||
private java.lang.Integer invoiceType; |
||||
/** |
||||
* 纳税人识别号 |
||||
*/ |
||||
@Excel(name = "纳税人识别号", width = 15) |
||||
@ApiModelProperty(value = "纳税人识别号") |
||||
private java.lang.String taxIdentificationNumber; |
||||
/** |
||||
* 开票地址 |
||||
*/ |
||||
@Excel(name = "开票地址", width = 15) |
||||
@ApiModelProperty(value = "开票地址") |
||||
private java.lang.String addressBilling; |
||||
/** |
||||
* 电话 |
||||
*/ |
||||
@Excel(name = "电话", width = 15) |
||||
@ApiModelProperty(value = "电话") |
||||
private java.lang.String telephone; |
||||
/** |
||||
* 公户开户行 |
||||
*/ |
||||
@Excel(name = "公户开户行", width = 15) |
||||
@ApiModelProperty(value = "公户开户行") |
||||
private java.lang.String bankPublic; |
||||
/** |
||||
* 公户账号 |
||||
*/ |
||||
@Excel(name = "公户账号", width = 15) |
||||
@ApiModelProperty(value = "公户账号") |
||||
private java.lang.String accountNumber; |
||||
/** |
||||
* 销售门店 |
||||
*/ |
||||
@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; |
||||
/** |
||||
* 交付状态 |
||||
* 值：未支付0、已支付1、待生产中2、生产中3、已发货4、已到货5、已签收6、申请撤销8、已撤销9，默认0 |
||||
*/ |
||||
@Excel(name = "交付状态", width = 15, dicCode = "delivery_status") |
||||
@Dict(dicCode = "delivery_status") |
||||
@ApiModelProperty(value = "交付状态") |
||||
private java.lang.Integer deliveryStatus; |
||||
|
||||
/** |
||||
* 是否虚拟订单 |
||||
*/ |
||||
@Dict(dicCode = "isvirtual") |
||||
@ApiModelProperty(value = "是否虚拟订单") |
||||
private java.lang.String isvirtual; |
||||
} |
||||
|
||||
@ -0,0 +1,30 @@ |
||||
package org.jeecg.modules.productplan.entity.vo; |
||||
|
||||
import lombok.Data; |
||||
import lombok.EqualsAndHashCode; |
||||
import lombok.experimental.Accessors; |
||||
import org.jeecg.modules.team.vo.GroupxMemeberVo; |
||||
import org.jeecg.modules.team.vo.StationVo; |
||||
|
||||
import java.io.Serializable; |
||||
import java.util.List; |
||||
|
||||
@Data |
||||
@EqualsAndHashCode(callSuper = false) |
||||
@Accessors(chain = true) |
||||
public class ChanXianShiShiXinXiVo implements Serializable { |
||||
|
||||
private static final long serialVersionUID = 1009888L; |
||||
|
||||
//工单id
|
||||
private String workOrderId; |
||||
|
||||
// private String departId;
|
||||
// private String departName;
|
||||
|
||||
//工位
|
||||
private String stationName; |
||||
|
||||
// private String groupName;
|
||||
private String processName; |
||||
} |
||||
@ -0,0 +1,16 @@ |
||||
package org.jeecg.modules.workorder.vo; |
||||
|
||||
import io.swagger.annotations.ApiModel; |
||||
import io.swagger.annotations.ApiModelProperty; |
||||
import lombok.Data; |
||||
import org.jeecg.modules.demo.zyorders.entity.ZyOrders; |
||||
import org.jeecg.modules.workorder.entity.WorkOrder; |
||||
|
||||
|
||||
@Data |
||||
@ApiModel(value = "WorkOrderVo", description = "WorkOrderVo") |
||||
public class WorkOrderVo extends WorkOrder { |
||||
|
||||
@ApiModelProperty(value = "订单信息") |
||||
private ZyOrders ordersInfo; |
||||
} |
||||
Loading…
Reference in new issue