工序维护修改
This commit is contained in:
@@ -38,7 +38,7 @@ public interface WorkProcedureService {
|
||||
* @param workProcedure_id ID
|
||||
* @return WorkProcedure
|
||||
*/
|
||||
WorkProcedureDto findById(Long workProcedure_id);
|
||||
WorkProcedureDto findById(String workProcedure_id);
|
||||
|
||||
/**
|
||||
* 根据编码查询
|
||||
|
||||
@@ -17,11 +17,11 @@ import java.util.Date;
|
||||
@Data
|
||||
public class WorkProcedureDto implements Serializable {
|
||||
|
||||
|
||||
/** 工序标识 */
|
||||
/** 防止精度丢失 */
|
||||
@JsonSerialize(using= ToStringSerializer.class)
|
||||
private Long workprocedure_id;
|
||||
private String workprocedure_id;
|
||||
|
||||
/** 生产区域 */
|
||||
private String product_area;
|
||||
|
||||
/** 工序编码 */
|
||||
private String workprocedure_code;
|
||||
@@ -56,9 +56,6 @@ public class WorkProcedureDto implements Serializable {
|
||||
/** 创建时间 */
|
||||
private String create_time;
|
||||
|
||||
/** 是否删除 */
|
||||
private String is_delete;
|
||||
|
||||
/** 修改人 */
|
||||
private String update_id;
|
||||
|
||||
@@ -67,10 +64,5 @@ public class WorkProcedureDto implements Serializable {
|
||||
|
||||
/** 修改时间 */
|
||||
private String update_time;
|
||||
|
||||
/** 外部标识 */
|
||||
private String ext_id;
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -47,10 +47,14 @@ public class WorkProcedureServiceImpl implements WorkProcedureService {
|
||||
String where = "";
|
||||
WQLObject wo = WQLObject.getWQLObject("pdm_bi_workprocedure");
|
||||
String search = (String) whereJson.get("search");
|
||||
String product_area = (String) whereJson.get("product_area");
|
||||
if (!StrUtil.isEmpty(search)) {
|
||||
where = " AND (workprocedure_code like '%" + search + "%' OR workprocedure_name like '%" + search + "%' ) ";
|
||||
where += " AND (workprocedure_code like '%" + search + "%' OR workprocedure_name like '%" + search + "%' )";
|
||||
}
|
||||
ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), "is_delete= '0' " + where, "workprocedure_code");
|
||||
if(!StrUtil.isEmpty(product_area)) {
|
||||
where += " AND product_area = '" + product_area + "'";
|
||||
}
|
||||
ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), "is_used = '1' " + where, "workprocedure_code");
|
||||
final JSONObject json = rb.pageResult();
|
||||
return json;
|
||||
}
|
||||
@@ -64,7 +68,7 @@ public class WorkProcedureServiceImpl implements WorkProcedureService {
|
||||
}
|
||||
|
||||
@Override
|
||||
public WorkProcedureDto findById(Long workProcedure_id) {
|
||||
public WorkProcedureDto findById(String workProcedure_id) {
|
||||
WQLObject wo = WQLObject.getWQLObject("pdm_bi_workProcedure");
|
||||
JSONObject json = wo.query("workProcedure_id =" + workProcedure_id + "").uniqueResult(0);
|
||||
if (ObjectUtil.isEmpty(json)) return null;
|
||||
@@ -92,7 +96,7 @@ public class WorkProcedureServiceImpl implements WorkProcedureService {
|
||||
String currentUserId = currentUser.getId();
|
||||
String nickName = SecurityUtils.getCurrentNickName();
|
||||
|
||||
dto.setWorkprocedure_id(IdUtil.getSnowflake(1, 1).nextId());
|
||||
dto.setWorkprocedure_id(IdUtil.getSnowflake(1, 1).nextIdStr());
|
||||
dto.setCreate_id(currentUserId);
|
||||
dto.setCreate_name(nickName);
|
||||
dto.setUpdate_id(currentUserId);
|
||||
@@ -152,7 +156,7 @@ public class WorkProcedureServiceImpl implements WorkProcedureService {
|
||||
public JSONArray downSelect() {
|
||||
//工序表【PDM_BI_WorkProcedure】
|
||||
WQLObject workProcedureTab = WQLObject.getWQLObject("PDM_BI_WorkProcedure");
|
||||
JSONArray resultJSONArray = workProcedureTab.query("is_delete = '0' and is_used ='1'", "workprocedure_code").getResultJSONArray(0);
|
||||
JSONArray resultJSONArray = workProcedureTab.query("is_used ='1'", "workprocedure_code").getResultJSONArray(0);
|
||||
return resultJSONArray;
|
||||
}
|
||||
|
||||
@@ -160,7 +164,7 @@ public class WorkProcedureServiceImpl implements WorkProcedureService {
|
||||
public List<WorkprocedureDto> queryWorkprocedure() {
|
||||
WQLObject wo = WQLObject.getWQLObject("pdm_bi_workprocedure");
|
||||
//只查清洗 跟仓储
|
||||
JSONArray arr = wo.query(" is_delete = '0' and workprocedure_code in ('12','08')").getResultJSONArray(0);
|
||||
JSONArray arr = wo.query(" is_used = '1' and workprocedure_code in ('12','08')").getResultJSONArray(0);
|
||||
if (ObjectUtil.isNotEmpty(arr)) return arr.toJavaList(WorkprocedureDto.class);
|
||||
return null;
|
||||
}
|
||||
|
||||
@@ -54,7 +54,7 @@
|
||||
PDM_BI_PersonCorrDevice personDevice
|
||||
LEFT JOIN sys_user user ON personDevice.jockey_id = user.user_id
|
||||
WHERE
|
||||
user.enabled = '1'
|
||||
user.is_used = '1'
|
||||
GROUP BY
|
||||
personDevice.jockey_id
|
||||
) view_person
|
||||
|
||||
Binary file not shown.
@@ -2,17 +2,43 @@
|
||||
<div class="app-container">
|
||||
<!--工具栏-->
|
||||
<div class="head-container">
|
||||
<el-form
|
||||
:inline="true"
|
||||
class="demo-form-inline"
|
||||
label-position="right"
|
||||
label-width="90px"
|
||||
label-suffix=":"
|
||||
>
|
||||
<el-form-item label="所属区域">
|
||||
<el-select
|
||||
v-model="query.product_area"
|
||||
clearable
|
||||
filterable
|
||||
size="mini"
|
||||
placeholder="区域类型"
|
||||
class="filter-item"
|
||||
@change="crud.toQuery()"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in dict.product_area"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="工序编码">
|
||||
<el-input
|
||||
v-model="query.search"
|
||||
clearable
|
||||
size="mini"
|
||||
placeholder="输入工序编码或名称"
|
||||
prefix-icon="el-icon-search"
|
||||
class="filter-item"
|
||||
/>
|
||||
</el-form-item>
|
||||
<rrOperation />
|
||||
</el-form>
|
||||
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
|
||||
<el-input
|
||||
v-model="query.search"
|
||||
clearable
|
||||
style="width: 300px"
|
||||
size="mini"
|
||||
placeholder="输入工序编码或名称"
|
||||
prefix-icon="el-icon-search"
|
||||
class="filter-item"
|
||||
/>
|
||||
<rrOperation />
|
||||
<crudOperation :permission="permission" />
|
||||
<!--表单组件-->
|
||||
<el-dialog
|
||||
@@ -26,6 +52,20 @@
|
||||
<el-form-item v-if="false" label="工序标识" prop="workprocedure_id">
|
||||
<el-input v-model="form.workprocedure_id" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="生产区域" prop="product_area">
|
||||
<el-select
|
||||
v-model="form.product_area"
|
||||
placeholder=""
|
||||
style="width: 370px"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in dict.product_area"
|
||||
:key="item.id"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="工序编码" prop="workprocedure_code">
|
||||
<el-input v-model="form.workprocedure_code" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
@@ -149,12 +189,27 @@ import udOperation from '@crud/UD.operation'
|
||||
import pagination from '@crud/Pagination'
|
||||
|
||||
const defaultForm = {
|
||||
workprocedure_id: null, workprocedure_code: null, workprocedure_name: null, worksection_type_scode: null, burst_type_scode: null, is_keyworkprocedure: '1', is_first: '1', is_used: '1', remark: null, create_id: null, create_name: null, create_time: null, is_delete: null, update_optid: null, update_optname: null, update_time: null, ext_id: null, sysdeptid: null, syscompanyid: null
|
||||
workprocedure_id: null,
|
||||
product_area: null,
|
||||
workprocedure_code: null,
|
||||
workprocedure_name: null,
|
||||
worksection_type_scode: null,
|
||||
burst_type_scode: null,
|
||||
is_keyworkprocedure: '1',
|
||||
is_first: '1',
|
||||
is_used: '1',
|
||||
remark: null,
|
||||
create_id: null,
|
||||
create_name: null,
|
||||
create_time: null,
|
||||
update_id: null,
|
||||
update_name: null,
|
||||
update_time: null
|
||||
}
|
||||
export default {
|
||||
name: 'WorkProcedure',
|
||||
components: { pagination, crudOperation, rrOperation, udOperation },
|
||||
dicts: ['PDM_BI_SECTION', 'PDM_BI_BURSTTYPE'],
|
||||
dicts: ['PDM_BI_SECTION', 'PDM_BI_BURSTTYPE', 'product_area'],
|
||||
mixins: [presenter(), header(), form(defaultForm), crud()],
|
||||
cruds() {
|
||||
return CRUD({
|
||||
@@ -163,6 +218,9 @@ export default {
|
||||
idField: 'workprocedure_id',
|
||||
sort: 'workprocedure_id,desc',
|
||||
crudMethod: { ...crudWorkProcedure },
|
||||
query: {
|
||||
product_area: 'A1'
|
||||
},
|
||||
optShow: {
|
||||
add: true,
|
||||
edit: true,
|
||||
|
||||
Reference in New Issue
Block a user