xiugaibufen

zhc4dev
wangjiadong 2 years ago
parent e7b8984024
commit 1f4b304e42
  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. 20
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/productrecord/controller/ProductRecordController.java
  5. 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">

@ -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