root
/
lixin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

opt:设备模块与质检单代码检查

master
DESKTOP-5DIJMF9\admin 3 weeks ago
parent
4e709e77f3
commit
25986ec791
10 changed files with 56 additions and 223 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      lxapi/com/noblelift/imp/products/mes/api/em/EquipmentFileService.java
  2. 56
      lxapp/app/products/mes/em/equipmentfile_insert.jsp
  3. 49
      lxapp/app/products/mes/em/equipmentfile_query.jsp
  4. 55
      lxapp/app/products/mes/em/equipmentfile_update.jsp
  5. 26
      lxapp/app/products/mes/em/equipmentfile_view.jsp
  6. 2
      lxapp/app/wdk/theme/je/module/designer/pageWithJSfunctions.html
  7. 6
      lxapp/src/wql/mes/em/EM_EQUIPMENT_001.wql
  8. 12
      lxapp/src/wql/mes/st/rc/ST_RC_QC_TASK_01.wql
  9. 20
      lxservice/com/noblelift/imp/products/mes/service/em/EquipmentFileServiceImpl.java
  10. 2
      lxservice/com/noblelift/imp/products/mes/service/st/rc/QcTaskAtrributeServiceImpl.java

11
lxapi/com/noblelift/imp/products/mes/api/em/EquipmentFileService.java
View File

@ -44,17 +44,6 @@ public interface EquipmentFileService {
*/ */
public ServiceResultBean queryDeviceType(ServiceContext ctx,String account_id); public ServiceResultBean queryDeviceType(ServiceContext ctx,String account_id);
/**
*
* @discription 查询ABC分类
* @author lmyu
* @created 2018年12月4日 上午11:29:19
* @param ctx 上下文
* @param account_id 操作者id
* @return
*/
public ServiceResultBean queryAbcClass(ServiceContext ctx,String account_id);
/** /**
* *
* @discription 查询技术水平 * @discription 查询技术水平

56
lxapp/app/products/mes/em/equipmentfile_insert.jsp
View File

@ -98,33 +98,6 @@
$("#techlevel_name").val(rows.text); $("#techlevel_name").val(rows.text);
} }
}); });
//formABC分类下拉框
$.combobox({
id : 'abcclass_uuid',
url : 'wdk?action=wdk.pub&method=call_service&ajaxparam='
+ new Date().getTime(),
queryParams : {
_SRVNAME : 'server.em.equipment',
_SRVMETHOD : 'queryAbcClass',
_DATA : $.json2str({
accountId :$.getSessionUser()
}),
_RSFIELD : 'result'
},
required : false,
editable:false,
multiple:false,
panelHeight:'auto',
initvalue:'',
height:25,
idField:'id',
textField:'text',
tipPosition:'bottom',
onSelect:function(rows){
$("#abcclass_code").val(rows.code);
$("#abcclass_name").val(rows.text);
}
});
//form设备类型下拉框 //form设备类型下拉框
$.combobox({ $.combobox({
id : 'devicetype_uuid', id : 'devicetype_uuid',
@ -419,8 +392,6 @@
<input type="hidden" id="devicetype_name" name="devicetype_name" value="" /> <input type="hidden" id="devicetype_name" name="devicetype_name" value="" />
<input type="hidden" id="deviceclass_code" name="deviceclass_code" value="" /> <input type="hidden" id="deviceclass_code" name="deviceclass_code" value="" />
<input type="hidden" id="deviceclass_name" name="deviceclass_name" value="" /> <input type="hidden" id="deviceclass_name" name="deviceclass_name" value="" />
<input type="hidden" id="abcclass_code" name="abcclass_code" value="" />
<input type="hidden" id="abcclass_name" name="abcclass_name" value="" />
<input type="hidden" id="techlevel_code" name="techlevel_code" value="" /> <input type="hidden" id="techlevel_code" name="techlevel_code" value="" />
<input type="hidden" id="techlevel_name" name="techlevel_name" value="" /> <input type="hidden" id="techlevel_name" name="techlevel_name" value="" />
<input type="hidden" id="belong_ids" name="belong_ids" /> <input type="hidden" id="belong_ids" name="belong_ids" />
@ -568,12 +539,6 @@
</div> </div>
<div class="h_layout"> <div class="h_layout">
<div> <div>
<div class="inputgroup">
<label >ABC分类:</label>
<div>
<input id="abcclass_uuid" class="easyui-validatebox" name="abcclass_uuid"/>
</div>
</div>
<div class="inputgroup"> <div class="inputgroup">
<label>生产用途:</label> <label>生产用途:</label>
<div> <div>
@ -592,16 +557,16 @@
<input id="power_cap" class="easyui-validatebox" name="power_cap"/> <input id="power_cap" class="easyui-validatebox" name="power_cap"/>
</div> </div>
</div> </div>
</div>
</div>
<div class="h_layout">
<div>
<div class="inputgroup"> <div class="inputgroup">
<label>日制度工作时间(h):</label> <label>日制度工作时间(h):</label>
<div> <div>
<input id="worktime_hour" class="easyui-validatebox" name="worktime_hour"/> <input id="worktime_hour" class="easyui-validatebox" name="worktime_hour"/>
</div> </div>
</div> </div>
</div>
</div>
<div class="h_layout">
<div>
<div class="inputgroup"> <div class="inputgroup">
<label>对应物料名称:</label> <label>对应物料名称:</label>
<div> <div>
@ -620,16 +585,17 @@
<input id="mcoefficient" class="easyui-validatebox nospaceinside nospaceinside" name="mcoefficient"/> <input id="mcoefficient" class="easyui-validatebox nospaceinside nospaceinside" name="mcoefficient"/>
</div> </div>
</div> </div>
</div>
</div>
<div class="h_layout">
<div>
<div class="inputgroup" > <div class="inputgroup" >
<label>电气复杂系数:</label> <label>电气复杂系数:</label>
<div> <div>
<input id="ecoefficient" class="easyui-validatebox" name="ecoefficient"/> <input id="ecoefficient" class="easyui-validatebox" name="ecoefficient"/>
</div> </div>
</div> </div>
</div>
</div>
<div class="h_layout">
<div>
<div class="inputgroup" > <div class="inputgroup" >
<label class="required">归属类型:</label> <label class="required">归属类型:</label>
<div> <div>
@ -642,10 +608,6 @@
<input id="belong_names" class="easyui-validatebox nospaceinside" name="belong_names" value="" readonly="readonly" onclick="alert21();"/> <input id="belong_names" class="easyui-validatebox nospaceinside" name="belong_names" value="" readonly="readonly" onclick="alert21();"/>
</div> </div>
</div> </div>
</div>
</div>
<div class="h_layout">
<div>
<div class="inputgroup2 "> <div class="inputgroup2 ">
<label >备注</label> <label >备注</label>
<div> <div>

49
lxapp/app/products/mes/em/equipmentfile_query.jsp
View File

@ -16,8 +16,6 @@
Combo_box_devicestatus(); Combo_box_devicestatus();
//form设备类型下拉框 //form设备类型下拉框
Combo_box_devicetype(); Combo_box_devicetype();
//formABC分类下拉框
Combo_box_abcclass();
//初始化订单日期 //初始化订单日期
init_query_date(); init_query_date();
//生产用途 //生产用途
@ -66,39 +64,6 @@
return showValue; return showValue;
} }
//formABC分类下拉框
function Combo_box_abcclass() {
$.combobox({
id : 'abcclass_uuid',
url : 'wdk?action=wdk.pub&method=call_service&ajaxparam='
+ new Date().getTime(),
queryParams : {
_SRVNAME : 'server.em.equipment',
_SRVMETHOD : 'queryAbcClass',
_DATA : $.json2str({
accountId :$.getSessionUser()
}),
_RSTYPE : 'combobox',
_RSFIELD : 'result',
_RSPARAM : $.json2str({
idField : 'id',
textField : 'text'
})
},
required : false,
editable:false,
multiple:false,
panelHeight:'auto',
initvalue:'',
idField:'id',
height:25,
textField:'text',
tipPosition:'bottom',
defaultOption:'全部',
onSelect:function(rows){
}
});
}
//form设备类型下拉框 //form设备类型下拉框
function Combo_box_devicetype() { function Combo_box_devicetype() {
$.combobox({ $.combobox({
@ -531,15 +496,15 @@
</div> </div>
</div> </div>
<div class="inputgroup"> <div class="inputgroup">
<label>ABC分类:</label> <label>设备状态:</label>
<div> <div>
<input id="abcclass_uuid" name="abcclass_uuid"> <input id="devicestatus_uuid" name="devicestatus_uuid">
</div> </div>
</div> </div>
<div class="inputgroup"> <div class="inputgroup">
<label>设备状态:</label> <label>图号:</label>
<div> <div>
<input id="devicestatus_uuid" name="devicestatus_uuid"> <input id="drawing_number" name="drawing_number" placeholder="编号">
</div> </div>
</div> </div>
</div> </div>
@ -559,12 +524,6 @@
<input class="easyui-validatebox" id="is_produceuse" name="is_produceuse"> <input class="easyui-validatebox" id="is_produceuse" name="is_produceuse">
</div> </div>
</div> </div>
<div class="inputgroup">
<label>图号:</label>
<div>
<input id="drawing_number" name="drawing_number" placeholder="编号">
</div>
</div>
</div> </div>
<div style="width:125px;margin-botton:10px;"> <div style="width:125px;margin-botton:10px;">
<a class="eapbutton" style="float:right;" onclick="query()"><i class="fa fa-search" aria-hidden="true"></i><span><span>查询</span></span></a> <a class="eapbutton" style="float:right;" onclick="query()"><i class="fa fa-search" aria-hidden="true"></i><span><span>查询</span></span></a>

55
lxapp/app/products/mes/em/equipmentfile_update.jsp
View File

@ -164,33 +164,6 @@
$("#techlevel_name").val(rows.text); $("#techlevel_name").val(rows.text);
} }
}); });
//formABC分类下拉框
$.combobox({
id : 'abcclass_uuid',
url : 'wdk?action=wdk.pub&method=call_service&ajaxparam='
+ new Date().getTime(),
queryParams : {
_SRVNAME : 'server.em.equipment',
_SRVMETHOD : 'queryAbcClass',
_DATA : $.json2str({
accountId :$.getSessionUser()
}),
_RSFIELD : 'result'
},
required : false,
editable:false,
multiple:false,
panelHeight:'auto',
initvalue:result.abcclass_uuid,
height:25,
idField:'id',
textField:'text',
tipPosition:'bottom',
onSelect:function(rows){
$("#abcclass_code").val(rows.code);
$("#abcclass_name").val(rows.text);
}
});
//form设备类型下拉框 //form设备类型下拉框
$.combobox({ $.combobox({
id : 'devicetype_uuid', id : 'devicetype_uuid',
@ -491,8 +464,6 @@
<input type="hidden" id="devicetype_name" name="devicetype_name" value="" /> <input type="hidden" id="devicetype_name" name="devicetype_name" value="" />
<input type="hidden" id="deviceclass_code" name="deviceclass_code" value="" /> <input type="hidden" id="deviceclass_code" name="deviceclass_code" value="" />
<input type="hidden" id="deviceclass_name" name="deviceclass_name" value="" /> <input type="hidden" id="deviceclass_name" name="deviceclass_name" value="" />
<input type="hidden" id="abcclass_code" name="abcclass_code" value="" />
<input type="hidden" id="abcclass_name" name="abcclass_name" value="" />
<input type="hidden" id="techlevel_code" name="techlevel_code" value="" /> <input type="hidden" id="techlevel_code" name="techlevel_code" value="" />
<input type="hidden" id="techlevel_name" name="techlevel_name" value="" /> <input type="hidden" id="techlevel_name" name="techlevel_name" value="" />
<input type="hidden" id="belong_ids" name="belong_ids" /> <input type="hidden" id="belong_ids" name="belong_ids" />
@ -640,12 +611,6 @@
</div> </div>
<div class="h_layout"> <div class="h_layout">
<div> <div>
<div class="inputgroup">
<label >ABC分类:</label>
<div>
<input id="abcclass_uuid" class="easyui-validatebox" name="abcclass_uuid"/>
</div>
</div>
<div class="inputgroup"> <div class="inputgroup">
<label>生产用途:</label> <label>生产用途:</label>
<div> <div>
@ -664,16 +629,16 @@
<input id="power_cap" class="easyui-validatebox" name="power_cap"/> <input id="power_cap" class="easyui-validatebox" name="power_cap"/>
</div> </div>
</div> </div>
</div>
</div>
<div class="h_layout">
<div>
<div class="inputgroup"> <div class="inputgroup">
<label>日制度工作时间(h):</label> <label>日制度工作时间(h):</label>
<div> <div>
<input id="worktime_hour" class="easyui-validatebox" name="worktime_hour"/> <input id="worktime_hour" class="easyui-validatebox" name="worktime_hour"/>
</div> </div>
</div> </div>
</div>
</div>
<div class="h_layout">
<div>
<div class="inputgroup"> <div class="inputgroup">
<label>对应物料名称:</label> <label>对应物料名称:</label>
<div> <div>
@ -692,16 +657,16 @@
<input id="mcoefficient" class="easyui-validatebox nospaceinside nospaceinside" name="mcoefficient"/> <input id="mcoefficient" class="easyui-validatebox nospaceinside nospaceinside" name="mcoefficient"/>
</div> </div>
</div> </div>
</div>
</div>
<div class="h_layout">
<div>
<div class="inputgroup" > <div class="inputgroup" >
<label>电气复杂系数:</label> <label>电气复杂系数:</label>
<div> <div>
<input id="ecoefficient" class="easyui-validatebox" name="ecoefficient"/> <input id="ecoefficient" class="easyui-validatebox" name="ecoefficient"/>
</div> </div>
</div> </div>
</div>
</div>
<div class="h_layout">
<div>
<div class="inputgroup" > <div class="inputgroup" >
<label class="required">归属类型:</label> <label class="required">归属类型:</label>
<div> <div>
@ -714,10 +679,6 @@
<input id="belong_names" class="easyui-validatebox nospaceinside" name="belong_names" value="" readonly="readonly" onclick="alert21();"/> <input id="belong_names" class="easyui-validatebox nospaceinside" name="belong_names" value="" readonly="readonly" onclick="alert21();"/>
</div> </div>
</div> </div>
</div>
</div>
<div class="h_layout">
<div>
<div class="inputgroup2 "> <div class="inputgroup2 ">
<label >备注</label> <label >备注</label>
<div> <div>

26
lxapp/app/products/mes/em/equipmentfile_view.jsp
View File

@ -314,12 +314,6 @@
</div> </div>
<div class="h_layout"> <div class="h_layout">
<div> <div>
<div class="inputgroup">
<label >ABC分类:</label>
<div>
<input id="abcclass_name" class="easyui-validatebox" name="abcclass_name" disabled="disabled"/>
</div>
</div>
<div class="inputgroup"> <div class="inputgroup">
<label>生产用途:</label> <label>生产用途:</label>
<div> <div>
@ -338,16 +332,16 @@
<input id="power_cap" class="easyui-validatebox" name="power_cap" disabled="disabled"/> <input id="power_cap" class="easyui-validatebox" name="power_cap" disabled="disabled"/>
</div> </div>
</div> </div>
</div>
</div>
<div class="h_layout">
<div>
<div class="inputgroup"> <div class="inputgroup">
<label>日制度工作时间(h):</label> <label>日制度工作时间(h):</label>
<div> <div>
<input id="worktime_hour" class="easyui-validatebox" name="worktime_hour" disabled="disabled"/> <input id="worktime_hour" class="easyui-validatebox" name="worktime_hour" disabled="disabled"/>
</div> </div>
</div> </div>
</div>
</div>
<div class="h_layout">
<div>
<div class="inputgroup"> <div class="inputgroup">
<label>对应物料名称:</label> <label>对应物料名称:</label>
<div> <div>
@ -366,16 +360,16 @@
<input id="mcoefficient" class="easyui-validatebox nospaceinside nospaceinside" name="mcoefficient" disabled="disabled"/> <input id="mcoefficient" class="easyui-validatebox nospaceinside nospaceinside" name="mcoefficient" disabled="disabled"/>
</div> </div>
</div> </div>
</div>
</div>
<div class="h_layout">
<div>
<div class="inputgroup" > <div class="inputgroup" >
<label>电气复杂系数:</label> <label>电气复杂系数:</label>
<div> <div>
<input id="ecoefficient" class="easyui-validatebox" name="ecoefficient" disabled="disabled"/> <input id="ecoefficient" class="easyui-validatebox" name="ecoefficient" disabled="disabled"/>
</div> </div>
</div> </div>
</div>
</div>
<div class="h_layout">
<div>
<div class="inputgroup" > <div class="inputgroup" >
<label class="required">归属类型:</label> <label class="required">归属类型:</label>
<div> <div>
@ -388,10 +382,6 @@
<input id="belong_names" class="easyui-validatebox nospaceinside" name="belong_names" value="" disabled="disabled"/> <input id="belong_names" class="easyui-validatebox nospaceinside" name="belong_names" value="" disabled="disabled"/>
</div> </div>
</div> </div>
</div>
</div>
<div class="h_layout">
<div>
<div class="inputgroup2 "> <div class="inputgroup2 ">
<label >备注</label> <label >备注</label>
<div> <div>

2
lxapp/app/wdk/theme/je/module/designer/pageWithJSfunctions.html
View File

@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8"> <meta http-equiv="content-type" content="text/html; charset=UTF-8"></meta>
</head> </head>
<body> <body>
<script type="text/javascript"> <script type="text/javascript">

6
lxapp/src/wql/mes/em/EM_EQUIPMENT_001.wql
View File

@ -32,8 +32,6 @@
输入.date_end TYPEAS s_string 输入.date_end TYPEAS s_string
//对应物料 //对应物料
输入.corrmaterial_uuid TYPEAS s_string 输入.corrmaterial_uuid TYPEAS s_string
//ABC分类
输入.abcclass_uuid TYPEAS s_string
//设备状态 //设备状态
输入.devicestatus_uuid TYPEAS s_string 输入.devicestatus_uuid TYPEAS s_string
//供应商 //供应商
@ -77,7 +75,6 @@ IF 输入.flag = "1"
ebef.device_specification, ebef.device_specification,
ppsd2.sysdic_name AS device_attribute_scode, ppsd2.sysdic_name AS device_attribute_scode,
ebef.deviceclass_name, ebef.deviceclass_name,
ebef.abcclass_name,
ebef.devicetype_name, ebef.devicetype_name,
ebef.devicestatus_code, ebef.devicestatus_code,
ebef.devicestatus_name, ebef.devicestatus_name,
@ -140,9 +137,6 @@ IF 输入.flag = "1"
OPTION 输入.corrmaterial_uuid <> "" OPTION 输入.corrmaterial_uuid <> ""
ebef.corrmaterial_uuid = 输入.corrmaterial_uuid ebef.corrmaterial_uuid = 输入.corrmaterial_uuid
ENDOPTION ENDOPTION
OPTION 输入.abcclass_uuid <> ""
ebef.abcclass_uuid = 输入.abcclass_uuid
ENDOPTION
OPTION 输入.devicestatus_uuid <> "" OPTION 输入.devicestatus_uuid <> ""
ebef.devicestatus_uuid = 输入.devicestatus_uuid ebef.devicestatus_uuid = 输入.devicestatus_uuid
ENDOPTION ENDOPTION

12
lxapp/src/wql/mes/st/rc/ST_RC_QC_TASK_01.wql
View File

@ -24,9 +24,9 @@
//查询字段 //查询字段
输入.stor_uuid TYPEAS s_string 输入.stor_uuid TYPEAS s_string
//开始日期 //开始日期
输入.begin_date TYPEAS s_string 输入.date_begin TYPEAS s_string
//结束日期 //结束日期
输入.end_date TYPEAS s_string 输入.date_end TYPEAS s_string
//显示全部 //显示全部
输入.is_check TYPEAS s_string 输入.is_check TYPEAS s_string
输入.today TYPEAS s_string 输入.today TYPEAS s_string
@ -119,11 +119,11 @@
OPTION 输入.QCperson <> "" OPTION 输入.QCperson <> ""
(pe.emp_no like 输入.QCperson OR pe.person_name like 输入.QCperson) (pe.emp_no like 输入.QCperson OR pe.person_name like 输入.QCperson)
ENDOPTION ENDOPTION
OPTION 输入.begin_date <> "" OPTION 输入.date_begin <> ""
mst.input_time >= 输入.begin_date mst.input_time >= 输入.date_begin
ENDOPTION ENDOPTION
OPTION 输入.end_date <> "" OPTION 输入.date_end <> ""
mst.input_time <= 输入.end_date mst.input_time <= 输入.date_end
ENDOPTION ENDOPTION
OPTION 输入.is_check = "1" OPTION 输入.is_check = "1"
dtl.status in ('02','03','04','05','06','99') dtl.status in ('02','03','04','05','06','99')

20
lxservice/com/noblelift/imp/products/mes/service/em/EquipmentFileServiceImpl.java
View File

@ -77,26 +77,6 @@ public class EquipmentFileServiceImpl implements EquipmentFileService {
return srb; return srb;
} }
@Override
public ServiceResultBean queryAbcClass(ServiceContext ctx, String account_id) {
JSONArray ja = WQLObject.getWQLObject("ENUM_EM_ABCClassification").query("sysisdelete = '0'")
.getResultJSONArray(0);
JSONArray ja2 = new JSONArray();
for (int i = 0; i < ja.size(); i++) {
JSONObject jo = ja.getJSONObject(i);
JSONObject jo2 = new JSONObject();
jo2.put("id", jo.optString("abcclass_uuid"));
jo2.put("code", jo.optString("abcclass_code"));
jo2.put("text", jo.optString("abcclass_name"));
ja2.add(jo2);
}
ServiceResultBean srb = new ServiceResultBean();
srb.setSuccess();
srb.setDesc("查询成功");
srb.addJSONArray("result", ja2);
return srb;
}
@Override @Override
public ServiceResultBean queryTechLevel(ServiceContext ctx, String account_id) { public ServiceResultBean queryTechLevel(ServiceContext ctx, String account_id) {
JSONArray ja = WQLObject.getWQLObject("ENUM_EM_TechLevel").query("sysisdelete = '0'").getResultJSONArray(0); JSONArray ja = WQLObject.getWQLObject("ENUM_EM_TechLevel").query("sysisdelete = '0'").getResultJSONArray(0);

2
lxservice/com/noblelift/imp/products/mes/service/st/rc/QcTaskAtrributeServiceImpl.java
View File

@ -30,8 +30,6 @@ public class QcTaskAtrributeServiceImpl implements QcTaskAtrributeService {
if (uString.isNotBlank(date_begin)) { if (uString.isNotBlank(date_begin)) {
form.put("date_begin", form.optString("date_begin") + " 00:00:00"); form.put("date_begin", form.optString("date_begin") + " 00:00:00");
} }
String today = (WDK.getDateTime()).substring(0, 10);
form.put("today", "%" + today + "%");
JSONObject jres = WQL.getWO("ST_RC_QC_TASK_01").addParamMap(WDK.json2map(form)).addParam("flag", "1").pageQuery(context, ""); JSONObject jres = WQL.getWO("ST_RC_QC_TASK_01").addParamMap(WDK.json2map(form)).addParam("flag", "1").pageQuery(context, "");
ServiceResultBean srb = new ServiceResultBean(); ServiceResultBean srb = new ServiceResultBean();

Write Preview
Loading…
Cancel
Save