root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2022-12-12 18:16:25 +08:00
parent 386e435f78 2eaa82d462
commit fbe10f98b7
10 changed files with 103 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lms/nladmin-system/src/main/java/org/nl/wms/pda/task/service/impl/PdaTaskServiceImpl.java
View File

@@ -4,6 +4,7 @@ package org.nl.wms.pda.task.service.impl;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@@ -54,8 +55,15 @@ public class PdaTaskServiceImpl implements PdaTaskService {
JSONObject jsonTask = tab.query("task_code = '" + task_rows.getString("task_code") + "'").uniqueResult(0); JSONObject jsonTask = tab.query("task_code = '" + task_rows.getString("task_code") + "'").uniqueResult(0);
jsonTask.put("method_name", "immediateNotifyAcs"); jsonTask.put("method_name", "immediateNotifyAcs");
if (StrUtil.equals(jsonTask.getString("task_status"), "07") || StrUtil.equals(jsonTask.getString("task_status"), "06")) {
throw new BadRequestException("任务已完成或正在执行中");
}
SpringContextHolder.getBean(TaskService.class).operation(jsonTask); SpringContextHolder.getBean(TaskService.class).operation(jsonTask);
jsonTask.put("task_status","05");
tab.update(jsonTask);
JSONObject result = new JSONObject(); JSONObject result = new JSONObject();
result.put("message", "下发成功"); result.put("message", "下发成功");
return result; return result;
@@ -68,10 +76,13 @@ public class PdaTaskServiceImpl implements PdaTaskService {
JSONObject jsonTask = tab.query("task_code = '" + task_rows.getString("task_code") + "'").uniqueResult(0); JSONObject jsonTask = tab.query("task_code = '" + task_rows.getString("task_code") + "'").uniqueResult(0);
jsonTask.put("method_name", "forceFinish"); jsonTask.put("method_name", "forceFinish");
if (StrUtil.equals(jsonTask.getString("task_status"), "07")) {
throw new BadRequestException("任务已完成");
}
SpringContextHolder.getBean(TaskService.class).operation(jsonTask); SpringContextHolder.getBean(TaskService.class).operation(jsonTask);
JSONObject result = new JSONObject(); JSONObject result = new JSONObject();
result.put("message", "下发成功"); result.put("message", "操作完成");
return result; return result;
} }
} }

18
lms/nladmin-system/src/main/java/org/nl/wms/pda/task/wql/PDA_TASK.wql
View File

@@ -50,12 +50,12 @@
point_code4, point_code4,
( (
CASE task_status CASE task_status
WHEN '1' THEN '生成' WHEN '01' THEN '生成'
WHEN '2' THEN '确定起点' WHEN '02' THEN '确定起点'
WHEN '3' THEN '确定终点' WHEN '03' THEN '确定终点'
WHEN '4' THEN '起点和终点确定' WHEN '04' THEN '起点和终点确定'
WHEN '5' THEN '下发' WHEN '05' THEN '下发'
WHEN '6' THEN '执行中' WHEN '06' THEN '执行中'
END END
) AS task_status, ) AS task_status,
( (
@@ -78,12 +78,14 @@
END END
) AS task_type, ) AS task_type,
car_no, car_no,
create_time create_time,
vehicle_code2,
material_code
FROM FROM
SCH_BASE_Task SCH_BASE_Task
WHERE WHERE
is_delete = '0' is_delete = '0'
AND task_status <> '7' AND task_status <> '07'
OPTION 输入.search <> "" OPTION 输入.search <> ""
(vehicle_code like 输入.search or (vehicle_code like 输入.search or

16
lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/CoolPointIvtServiceImpl.java
View File

@@ -3,6 +3,7 @@ package org.nl.wms.pdm.ivt.service.impl;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
@@ -149,13 +150,20 @@ public class CoolPointIvtServiceImpl implements CoolPointIvtService {
*/ */
@Override @Override
public Map<String, Object> coolRegionIOQueryAll(Map whereJson, Pageable page) { public Map<String, Object> coolRegionIOQueryAll(Map whereJson, Pageable page) {
HashMap map = new HashMap(); String start_point_code = MapUtil.getStr(whereJson, "start_point_code");
String end_point_code = MapUtil.getStr(whereJson, "end_point_code");
String pcsn = MapUtil.getStr(whereJson, "pcsn");
String vehicle_code = MapUtil.getStr(whereJson, "vehicle_code");
JSONObject map = new JSONObject();
map.put("flag", "2"); map.put("flag", "2");
if (whereJson.get("start_point_code")!=null)
map.put("start_point_code", "%" + whereJson.get("start_point_code") + "%");
map.put("bill_status", whereJson.get("bill_status"));
map.put("begin_time", whereJson.get("begin_time")); map.put("begin_time", whereJson.get("begin_time"));
map.put("end_time", whereJson.get("end_time")); map.put("end_time", whereJson.get("end_time"));
if (ObjectUtil.isNotEmpty(start_point_code)) map.put("start_point_code","%"+start_point_code+"%");
if (ObjectUtil.isNotEmpty(end_point_code)) map.put("end_point_code","%"+end_point_code+"%");
if (ObjectUtil.isNotEmpty(pcsn)) map.put("pcsn","%"+pcsn+"%");
if (ObjectUtil.isNotEmpty(vehicle_code)) map.put("vehicle_code","%"+vehicle_code+"%");
JSONObject json = WQL.getWO("ST_IVT_COOLPOINTIVT").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "update_time desc"); JSONObject json = WQL.getWO("ST_IVT_COOLPOINTIVT").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "update_time desc");
return json; return json;
} }

24
lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_COOLPOINTIVT.wql
View File

@@ -24,6 +24,9 @@
输入.begin_time TYPEAS s_string 输入.begin_time TYPEAS s_string
输入.end_time TYPEAS s_string 输入.end_time TYPEAS s_string
输入.start_point_code TYPEAS s_string 输入.start_point_code TYPEAS s_string
输入.end_point_code TYPEAS s_string
输入.pcsn TYPEAS s_string
输入.vehicle_code TYPEAS s_string
输入.bill_status TYPEAS s_string 输入.bill_status TYPEAS s_string
@@ -89,23 +92,36 @@
IF 输入.flag = "2" IF 输入.flag = "2"
PAGEQUERY PAGEQUERY
SELECT SELECT
coolregionio.* *
FROM FROM
st_ivt_coolregionio coolregionio st_ivt_coolregionio
WHERE WHERE
1=1 1=1
OPTION 输入.start_point_code <> "" OPTION 输入.start_point_code <> ""
start_point_code LIKE 输入.start_point_code start_point_code LIKE 输入.start_point_code
ENDOPTION ENDOPTION
OPTION 输入.bill_status <> ""
bill_status = 输入.bill_status OPTION 输入.end_point_code <> ""
end_point_code like 输入.end_point_code
ENDOPTION ENDOPTION
OPTION 输入.pcsn <> ""
pcsn like 输入.pcsn
ENDOPTION
OPTION 输入.vehicle_code <> ""
vehicle_code like 输入.vehicle_code
ENDOPTION
OPTION 输入.begin_time <> "" OPTION 输入.begin_time <> ""
create_time >= 输入.begin_time create_time >= 输入.begin_time
ENDOPTION ENDOPTION
OPTION 输入.end_time <> "" OPTION 输入.end_time <> ""
create_time <= 输入.end_time create_time <= 输入.end_time
ENDOPTION ENDOPTION
ENDSELECT ENDSELECT
ENDPAGEQUERY ENDPAGEQUERY
ENDIF ENDIF

2
lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java
View File

@@ -107,7 +107,7 @@ public abstract class AbstractAcsTask {
/** /**
* *
*/ */
public JSONObject immediateNotifyAcs() { public JSONObject immediateNotifyAcs(String task_id) {
List<AcsTaskDto> taskList = this.schedule(); List<AcsTaskDto> taskList = this.schedule();
if (ObjectUtil.isNotEmpty(taskList)) { if (ObjectUtil.isNotEmpty(taskList)) {

5
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallEmpReelTask.java
View File

@@ -4,6 +4,7 @@ import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@@ -14,6 +15,7 @@ import org.nl.modules.system.util.CodeUtil;
import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.SpringContextHolder; import org.nl.modules.wql.util.SpringContextHolder;
import org.nl.wms.sch.AcsTaskDto; import org.nl.wms.sch.AcsTaskDto;
import org.nl.wms.sch.AcsUtil;
import org.nl.wms.sch.manage.AbstractAcsTask; import org.nl.wms.sch.manage.AbstractAcsTask;
import org.nl.wms.sch.manage.TaskStatusEnum; import org.nl.wms.sch.manage.TaskStatusEnum;
import org.nl.wms.sch.service.PointService; import org.nl.wms.sch.service.PointService;
@@ -282,7 +284,7 @@ public class CallEmpReelTask extends AbstractAcsTask {
json.put("acs_task_type", "1"); json.put("acs_task_type", "1");
tab.insert(json); tab.insert(json);
this.immediateNotifyAcs(); this.immediateNotifyAcs(null);
return json.getString("task_id"); return json.getString("task_id");
} }
@@ -299,5 +301,4 @@ public class CallEmpReelTask extends AbstractAcsTask {
JSONObject taskObj = WQLObject.getWQLObject("SCH_BASE_Task").query("task_id = '" + task_id + "'").uniqueResult(0); JSONObject taskObj = WQLObject.getWQLObject("SCH_BASE_Task").query("task_id = '" + task_id + "'").uniqueResult(0);
this.updateTaskStatus(taskObj, "0"); this.updateTaskStatus(taskObj, "0");
} }
} }

2
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutHotTask.java
View File

@@ -178,7 +178,7 @@ public class OutHotTask extends AbstractAcsTask {
json.put("priority", "1"); json.put("priority", "1");
json.put("acs_task_type", "1"); json.put("acs_task_type", "1");
tab.insert(json); tab.insert(json);
immediateNotifyAcs(); immediateNotifyAcs(null);
return json.getString("task_id"); return json.getString("task_id");
} }

2
lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
View File

@@ -1761,7 +1761,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
} }
} }
// 下发 // 下发
outTask.immediateNotifyAcs(); outTask.immediateNotifyAcs(null);
} }
} }

69
lms/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/coolregionio.vue
View File

@@ -21,22 +21,35 @@
@keyup.enter.native="crud.toQuery" @keyup.enter.native="crud.toQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="单据状态"> <el-form-item label="终点点位编码" label-width="120px">
<el-select <el-input
v-model="query.bill_status" v-model="query.end_point_code"
clearable clearable
filterable placeholder="输入终点点位编码"
size="mini"
class="filter-item"
style="width: 185px;" style="width: 185px;"
@change="hand" class="filter-item"
> @keyup.enter.native="crud.toQuery"
<el-option />
v-for="item in dict.st_bill_status" </el-form-item>
:label="item.label" <el-form-item label="批次号" label-width="120px">
:value="item.value" <el-input
/> v-model="query.pcsn"
</el-select> clearable
placeholder="输入批次"
style="width: 185px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="载具编码" label-width="120px">
<el-input
v-model="query.vehicle_code"
clearable
placeholder="输入载具"
style="width: 185px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="创建时间"> <el-form-item label="创建时间">
<el-date-picker <el-date-picker
@@ -128,27 +141,27 @@
<!--表格渲染--> <!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler"> <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55" /> <el-table-column type="selection" width="55" />
<el-table-column prop="bill_code" label="单据编号" /> <el-table-column show-overflow-tooltip prop="bill_code" label="单据编号" width="120px" />
<el-table-column prop="io_type" label="出入类型" > <el-table-column prop="io_type" label="出入类型" >
<template slot-scope="scope"> <template slot-scope="scope">
{{ dict.label.io_type[scope.row.io_type] }} {{ dict.label.io_type[scope.row.io_type] }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="vehicle_code" label="载具编码" /> <el-table-column show-overflow-tooltip prop="vehicle_code" label="载具编码" />
<el-table-column prop="qty" label="数量" /> <el-table-column show-overflow-tooltip prop="qty" label="数量" />
<el-table-column prop="bill_status" label="单据状态" > <!-- <el-table-column prop="bill_status" label="单据状态" >
<template slot-scope="scope"> <template slot-scope="scope">
{{ dict.label.st_bill_status[scope.row.bill_status] }} {{ dict.label.st_bill_status[scope.row.bill_status] }}
</template> </template>
</el-table-column> </el-table-column>-->
<el-table-column prop="is_used" label="是否启用" > <!-- <el-table-column prop="is_used" label="是否启用" >
<template slot-scope="scope"> <template slot-scope="scope">
{{ dict.label.is_used[scope.row.is_used] }} {{ dict.label.is_used[scope.row.is_used] }}
</template> </template>
</el-table-column> </el-table-column>-->
<el-table-column prop="pcsn" label="批次" /> <el-table-column show-overflow-tooltip prop="pcsn" label="批次" width="120px" />
<el-table-column prop="start_point_code" label="起始点位编码"/> <el-table-column show-overflow-tooltip prop="start_point_code" label="起始点位" width="120px" />
<el-table-column prop="end_point_code" label="终点点位编码" /> <el-table-column show-overflow-tooltip prop="end_point_code" label="终点点位" width="120px" />
<el-table-column prop="create_mode" label="生成方式" > <el-table-column prop="create_mode" label="生成方式" >
<template slot-scope="scope"> <template slot-scope="scope">
{{ dict.label.ST_CREATE_MODE[scope.row.create_mode] }} {{ dict.label.ST_CREATE_MODE[scope.row.create_mode] }}
@@ -156,10 +169,10 @@
</el-table-column> </el-table-column>
<el-table-column prop="remark" label="备注" /> <el-table-column prop="remark" label="备注" />
<el-table-column prop="create_name" label="创建人" /> <el-table-column prop="create_name" label="创建人" />
<el-table-column prop="update_time" label="修改时间" min-width="150" show-overflow-tooltip /> <el-table-column prop="create_time" label="创建时间" min-width="150" show-overflow-tooltip />
<el-table-column prop="confirm_optname" label="确认人" /> <el-table-column prop="confirm_optname" label="确认人" />
<el-table-column prop="confirm_time" label="确认时间" min-width="150" show-overflow-tooltip /> <el-table-column prop="confirm_time" label="确认时间" min-width="150" show-overflow-tooltip />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right"> <!-- <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<udOperation <udOperation
:data="scope.row" :data="scope.row"
@@ -167,7 +180,7 @@
:is-visiable-del="false" :is-visiable-del="false"
/> />
</template> </template>
</el-table-column> </el-table-column>-->
</el-table> </el-table>
<!--分页组件--> <!--分页组件-->
<pagination /> <pagination />
@@ -198,7 +211,7 @@ export default {
crudMethod: { ...crudStIvtCoolpointivt }, crudMethod: { ...crudStIvtCoolpointivt },
optShow: { optShow: {
add: false, add: false,
edit: true, edit: false,
del: false, del: false,
download: false, download: false,
reset: true reset: true

5
lms/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/index.vue
View File

@@ -5,10 +5,9 @@
<span slot="label"><i class="el-icon-date" /> 库存查询</span> <span slot="label"><i class="el-icon-date" /> 库存查询</span>
<Inventory /> <Inventory />
</el-tab-pane> </el-tab-pane>
<!-- <el-tab-pane label="生箔下料"> <el-tab-pane label="暂存区出入记录">
<CoolRegionIO/> <CoolRegionIO/>
</el-tab-pane>--> </el-tab-pane>
<!-- <el-tab-pane label="出烘箱">出烘箱</el-tab-pane>-->
</el-tabs> </el-tabs>
</div> </div>
</template> </template>