Browse Source

opt: 去除部分注释代码

master
李永德 1 year ago
parent
commit
2189e5aa75
  1. 4
      lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/impl/SysInteractRecordServiceImpl.java
  2. 4
      lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AutoCreateTask.java
  3. 16
      lms/nladmin-ui/src/views/wms/sch/group/index.vue

4
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/impl/SysInteractRecordServiceImpl.java

@ -116,13 +116,13 @@ public class SysInteractRecordServiceImpl extends ServiceImpl<SysInteractRecordM
entity.setDirection(direction); entity.setDirection(direction);
entity.setRequest_param(JSONObject.toJSONString(request)); entity.setRequest_param(JSONObject.toJSONString(request));
entity.setResponse_param(JSONObject.toJSONString(response)); entity.setResponse_param(JSONObject.toJSONString(response));
if (response instanceof BaseResponse) { if (response instanceof BaseResponse) { // acs请求wms的返回数据
BaseResponse re = (BaseResponse) response; BaseResponse re = (BaseResponse) response;
entity.setCode(re.getCode()); entity.setCode(re.getCode());
entity.setMessage(re.getMessage()); entity.setMessage(re.getMessage());
entity.setIs_success(re.getCode() == HttpStatus.HTTP_OK); entity.setIs_success(re.getCode() == HttpStatus.HTTP_OK);
} }
if (response instanceof ResultForAcs) { if (response instanceof ResultForAcs) { // wms请求acs的返回数据
ResultForAcs re = (ResultForAcs) response; ResultForAcs re = (ResultForAcs) response;
entity.setCode(re.getStatus()); entity.setCode(re.getStatus());
entity.setMessage(re.getMessage()); entity.setMessage(re.getMessage());

4
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AutoCreateTask.java

@ -39,10 +39,6 @@ public class AutoCreateTask {
// 调用AbstractAcsTask类的每个子类的schedule()方法 // 调用AbstractAcsTask类的每个子类的schedule()方法
try { try {
Object obj = SpringContextHolder.getBean(clz); Object obj = SpringContextHolder.getBean(clz);
// if (ObjectUtil.isEmpty(obj)) { // 如果spring中获取不到,就用newInstance创建
// obj = clz.newInstance();
// }
//Method m = obj.getClass().getDeclaredMethod("schedule");
Method m = obj.getClass().getMethod("schedule"); Method m = obj.getClass().getMethod("schedule");
m.invoke(obj); m.invoke(obj);
} catch (InvocationTargetException e) { } catch (InvocationTargetException e) {

16
lms/nladmin-ui/src/views/wms/sch/group/index.vue

@ -198,12 +198,12 @@
<el-form-item label="流程顺序"> <el-form-item label="流程顺序">
<el-input v-model="form.flow_num" style="width: 240px;" /> <el-input v-model="form.flow_num" style="width: 240px;" />
</el-form-item> </el-form-item>
<el-form-item label="上一任务"> <!-- <el-form-item label="上一任务">-->
<el-input v-model="form.before_task_code" style="width: 240px;" /> <!-- <el-input v-model="form.before_task_code" style="width: 240px;" />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="下一任务"> <!-- <el-form-item label="下一任务">-->
<el-input v-model="form.next_task_code" style="width: 240px;" /> <!-- <el-input v-model="form.next_task_code" style="width: 240px;" />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<label slot="label">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label> <label slot="label">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
<el-input v-model.trim="form.remark" style="width: 480px;" rows="2" type="textarea" :disabled="crud.status.view > 0" /> <el-input v-model.trim="form.remark" style="width: 480px;" rows="2" type="textarea" :disabled="crud.status.view > 0" />
@ -256,8 +256,8 @@
<!-- <el-table-column prop="flow_num" label="流程顺序" :min-width="flexWidth('flow_num',crud.data,'流程顺序')"/>--> <!-- <el-table-column prop="flow_num" label="流程顺序" :min-width="flexWidth('flow_num',crud.data,'流程顺序')"/>-->
<el-table-column prop="into_kiln_time" label="入窑时间" :min-width="flexWidth('into_kiln_time',crud.data,'上一任务')" /> <el-table-column prop="into_kiln_time" label="入窑时间" :min-width="flexWidth('into_kiln_time',crud.data,'上一任务')" />
<el-table-column prop="out_kiln_time" label="出窑时间" :min-width="flexWidth('out_kiln_time',crud.data,'上一任务')" /> <el-table-column prop="out_kiln_time" label="出窑时间" :min-width="flexWidth('out_kiln_time',crud.data,'上一任务')" />
<el-table-column prop="before_task_code" label="上一任务" :min-width="flexWidth('before_task_code',crud.data,'上一任务')" /> <!-- <el-table-column prop="before_task_code" label="上一任务" :min-width="flexWidth('before_task_code',crud.data,'上一任务')" />-->
<el-table-column prop="next_task_code" label="下一任务" :min-width="flexWidth('next_task_code',crud.data,'上一任务')" /> <!-- <el-table-column prop="next_task_code" label="下一任务" :min-width="flexWidth('next_task_code',crud.data,'上一任务')" />-->
<el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" /> <el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
<el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')" /> <el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')" />
<el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" /> <el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />

Loading…
Cancel
Save