jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/domain/OmProductionOrdeInfo.java
@@ -171,6 +171,35 @@ private String dateTimeRule; private String startCode; private String[] dateConditions; private String startTime; private String endTime; public String[] getDateConditions() { return dateConditions; } public void setDateConditions(String[] dateConditions) { this.dateConditions = dateConditions; } public String getStartTime() { return startTime; } public void setStartTime(String startTime) { this.startTime = startTime; } public String getEndTime() { return endTime; } public void setEndTime(String endTime) { this.endTime = endTime; } public String getDateTimeRule() { return dateTimeRule; jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/service/impl/OmProductionOrdeInfoServiceImpl.java
@@ -47,6 +47,11 @@ @Override public List<OmProductionOrdeInfo> selectOmProductionOrdeInfoList(OmProductionOrdeInfo omProductionOrdeInfo) { if(omProductionOrdeInfo.getDateConditions()!=null){ String[] conditions = omProductionOrdeInfo.getDateConditions(); omProductionOrdeInfo.setStartTime(conditions[0]); omProductionOrdeInfo.setEndTime(conditions[1]); } return omProductionOrdeInfoMapper.selectOmProductionOrdeInfoList(omProductionOrdeInfo); } @@ -60,8 +65,6 @@ public int insertOmProductionOrdeInfo(OmProductionOrdeInfo omProductionOrdeInfo) { omProductionOrdeInfo.setCreateTime(DateUtils.getNowDate()); /* Integer streamNumber = omProductionOrdeInfoMapper.getMaxStreamNumber();*/ /* omProductionOrdeInfo.setStreamNumber(String.valueOf(streamNumber+1));*/ return omProductionOrdeInfoMapper.insertOmProductionOrdeInfo(omProductionOrdeInfo); }
@@ -72,6 +72,7 @@ <if test="softwareVersionCode != null and softwareVersionCode != ''"> and software_version_code like concat('%', #{softwareVersionCode}, '%')</if> <if test="productCompanyCode != null and productCompanyCode != ''"> and product_company_code like concat('%', #{productCompanyCode}, '%')</if> <if test="productionNotice != null and productionNotice != ''"> and production_notice like concat('%', #{productionNotice}, '%')</if> <if test="dateConditions != null and dateConditions != ''"> and create_time BETWEEN #{startTime} AND #{endTime}</if> </where> ORDER BY stream_number DESC jcdm-ui/src/views/main/bs/orderScheduling/index.vue
@@ -60,6 +60,7 @@ :value="dict.value"/> </el-select> </el-form-item> <br/> <el-form-item label="合箱报工" prop="report10"> <el-input v-model="queryParams.report10" @@ -84,6 +85,7 @@ @keyup.enter.native="handleQuery" /> </el-form-item> <br/> <el-form-item label="操作时间" prop="operateTime"> <el-date-picker v-model="queryParams.dateConditions" jcdm-ui/src/views/main/om/productionOrde/index.vue
@@ -30,23 +30,20 @@ <el-form-item style="margin-left: 14px" label="产品编号" prop="productCode"> <el-input v-model="queryParams.productCode" placeholder="请输入产品编号" clearable @keyup.enter.native="handleQuery"/> </el-form-item> <el-form-item label="订单编号" prop="salesOrderCode"> <el-input v-model="queryParams.salesOrderCode" placeholder="请输入订单编号" clearable @keyup.enter.native="handleQuery"/> <el-form-item label="机型" prop="typeZ"> <el-input v-model="queryParams.typeZ" placeholder="请输入机型" clearable @keyup.enter.native="handleQuery"/> </el-form-item> <el-form-item label="车间编号" prop="workshopCode"> <el-input v-model="queryParams.workshopCode" placeholder="请输入车间编号" clearable @keyup.enter.native="handleQuery"/> </el-form-item> <el-form-item label="产线编号" prop="lineCode"> <el-input v-model="queryParams.lineCode" placeholder="请输入产线编号" clearable @keyup.enter.native="handleQuery"/> </el-form-item> <el-form-item style="margin-left: 7px" label-width="80" label="产品BOM" prop="bomCode"> <el-input v-model="queryParams.bomCode" placeholder="请输入产品BOM" clearable @keyup.enter.native="handleQuery"/> </el-form-item> <el-form-item label="工艺流程" prop="routeCode"> <el-input v-model="queryParams.routeCode" placeholder="请输入工艺流程" clearable @keyup.enter.native="handleQuery"/> </el-form-item> <el-form-item label="工艺配方" prop="recipeCode"> <el-input v-model="queryParams.recipeCode" placeholder="请输入工艺配方" clearable @keyup.enter.native="handleQuery"/> <el-form-item label-width="130" label="通知单生成日期" prop="dateConditions"> <el-date-picker v-model="queryParams.dateConditions" type="datetimerange" :picker-options="pickerOptions" value-format="yyyy-MM-dd HH:mm:ss" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" align="right"> </el-date-picker> </el-form-item> </el-form> </el-card> @@ -461,6 +458,7 @@ flag: null, adds:null, productionNotice: null, dateConditions: [], }, materialQueryParams: { pageNum: 1, @@ -503,6 +501,33 @@ year: '', }, markNo: '', pickerOptions: { shortcuts: [{ text: '最近一周', onClick(picker) { const end = new Date(); const start = new Date(); start.setTime(start.getTime() - 3600 * 1000 * 24 * 7); picker.$emit('pick', [start, end]); } }, { text: '最近一个月', onClick(picker) { const end = new Date(); const start = new Date(); start.setTime(start.getTime() - 3600 * 1000 * 24 * 30); picker.$emit('pick', [start, end]); } }, { text: '最近三个月', onClick(picker) { const end = new Date(); const start = new Date(); start.setTime(start.getTime() - 3600 * 1000 * 24 * 90); picker.$emit('pick', [start, end]); } }] }, }; }, created() { jcdm-ui/src/views/main/om/productionOrde/planStatistics.vue
@@ -8,17 +8,8 @@ <el-form-item label-width="80" label="生产订单" prop="workOrderNo"> <el-input v-model="queryParams.workOrderNo" placeholder="请输入生产订单" clearable @keyup.enter.native="handleQuery"/> </el-form-item> <!-- <el-form-item label="产品名称" prop="productName">--> <!-- <el-input v-model="queryParams.productName" placeholder="请输入产品名称" clearable @keyup.enter.native="handleQuery"/>--> <!-- </el-form-item>--> <el-form-item label="工单状态" prop="orderStatus"> <el-select v-model="queryParams.orderStatus" placeholder="请选择工单状态" clearable> <el-option v-for="dict in dict.type.order_state" :key="dict.value" :label="dict.label" :value="dict.value"/> </el-select> <el-form-item label="机型" prop="typeZ"> <el-input v-model="queryParams.typeZ" placeholder="请输入机型" clearable @keyup.enter.native="handleQuery"/> </el-form-item> <el-form-item style="float: right"> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> @@ -29,24 +20,6 @@ <el-form :model="queryParams" ref="queryParams" size="small" :inline="true" v-show="advancedShowSearch" label-width="68px"> <el-form-item style="margin-left: 14px" label="产品编号" prop="productCode"> <el-input v-model="queryParams.productCode" placeholder="请输入产品编号" clearable @keyup.enter.native="handleQuery"/> </el-form-item> <el-form-item label="订单编号" prop="salesOrderCode"> <el-input v-model="queryParams.salesOrderCode" placeholder="请输入订单编号" clearable @keyup.enter.native="handleQuery"/> </el-form-item> <el-form-item label="车间编号" prop="workshopCode"> <el-input v-model="queryParams.workshopCode" placeholder="请输入车间编号" clearable @keyup.enter.native="handleQuery"/> </el-form-item> <el-form-item label="产线编号" prop="lineCode"> <el-input v-model="queryParams.lineCode" placeholder="请输入产线编号" clearable @keyup.enter.native="handleQuery"/> </el-form-item> <el-form-item style="margin-left: 7px" label-width="80" label="产品BOM" prop="bomCode"> <el-input v-model="queryParams.bomCode" placeholder="请输入产品BOM" clearable @keyup.enter.native="handleQuery"/> </el-form-item> <el-form-item label="工艺流程" prop="routeCode"> <el-input v-model="queryParams.routeCode" placeholder="请输入工艺流程" clearable @keyup.enter.native="handleQuery"/> </el-form-item> <el-form-item label="工艺配方" prop="recipeCode"> <el-input v-model="queryParams.recipeCode" placeholder="请输入工艺配方" clearable @keyup.enter.native="handleQuery"/> </el-form-item> </el-form> </el-card> @@ -84,11 +57,8 @@ </el-table-column> <el-table-column label="合格率" width="160" align="center"> </el-table-column> <el-table-column label="保存时间" width="160" align="center"> </el-table-column> </el-table> </el-card> <pagination v-show="total>0"
