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

rev:修改了点位仓位启用禁用同步、新增手持查询立库RGV状态接口

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2023-06-27 14:23:38 +08:00
parent 160e3989c0
commit 9a8652f3ca
10 changed files with 57 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructattrServiceImpl.java
View File

@@ -61,6 +61,7 @@ public class StructattrServiceImpl implements StructattrService {
map.put("sect_id", (String) whereJson.get("sect_id"));
map.put("lock_type", (String) whereJson.get("lock_type"));
map.put("layer_num", (String) whereJson.get("layer_num"));
map.put("is_used", (String) whereJson.get("is_used"));
//获取人员对应的仓库
UserStorServiceImpl userStorService = new UserStorServiceImpl();
@@ -223,7 +224,7 @@ public class StructattrServiceImpl implements StructattrService {
}
String currentUserId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getCurrentNickName();
String struct_id = json.getString("struct_id");
String struct_code = json.getString("struct_code");
String now = DateUtil.now();
String is_used = "1";
@@ -241,7 +242,7 @@ public class StructattrServiceImpl implements StructattrService {
json.put("update_optid", currentUserId);
json.put("update_optname", nickName);
json.put("update_time", now);
WQLObject.getWQLObject("sch_base_point").update(json, " point_id = '" + struct_id + "'");
WQLObject.getWQLObject("sch_base_point").update(json, " point_code = '" + struct_code + "'");
}
@Override

3
lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCT_ATTR.wql
View File

@@ -75,6 +75,9 @@
OPTION 输入.layer_num <> ""
struct.layer_num = 输入.layer_num
ENDOPTION
OPTION 输入.is_used <> ""
struct.is_used = 输入.is_used
ENDOPTION
OPTION 输入.lock_type = "1"
(struct.storagevehicle_code is null or struct.storagevehicle_code = '')
ENDOPTION

7
lms/nladmin-system/src/main/java/org/nl/wms/pda/task/rest/PdaTaskController.java
View File

@@ -52,4 +52,11 @@ public class PdaTaskController {
return new ResponseEntity<>(pdaTaskService.confirm(whereJson), HttpStatus.OK);
}
@PostMapping("/rgvStatusQuery")
@Log("rgv状态查询")
@ApiOperation("rgv状态查询")
public ResponseEntity<Object> rgvStatusQuery(@RequestBody JSONObject whereJson) {
return new ResponseEntity<>(pdaTaskService.rgvStatusQuery(whereJson), HttpStatus.OK);
}
}

3
lms/nladmin-system/src/main/java/org/nl/wms/pda/task/service/PdaTaskService.java
View File

@@ -1,6 +1,7 @@
package org.nl.wms.pda.task.service;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import org.nl.modules.wql.core.content.HttpContext;
@@ -31,4 +32,6 @@ public interface PdaTaskService {
* @return JSONObject /
*/
JSONObject confirm(JSONObject whereJson);
JSONArray rgvStatusQuery(JSONObject whereJson);
}

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

@@ -15,6 +15,7 @@ import org.nl.modules.wql.WQL;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.core.content.HttpContext;
import org.nl.modules.wql.util.SpringContextHolder;
import org.nl.wms.ext.acs.service.WmsToAcsService;
import org.nl.wms.pda.st.service.CoolInService;
import org.nl.wms.pda.task.service.PdaTaskService;
import org.nl.wms.sch.service.TaskService;
@@ -31,6 +32,7 @@ import org.springframework.transaction.annotation.Transactional;
@RequiredArgsConstructor
@Slf4j
public class PdaTaskServiceImpl implements PdaTaskService {
private final WmsToAcsService wmsToAcsService;
@Override
public JSONObject taskQuery(JSONObject whereJson) {
@@ -38,7 +40,7 @@ public class PdaTaskServiceImpl implements PdaTaskService {
JSONObject map = new JSONObject();
map.put("flag", "1");
if (ObjectUtil.isNotEmpty(search)) map.put("search", "%"+search+"%");
if (ObjectUtil.isNotEmpty(search)) map.put("search", "%" + search + "%");
JSONArray resultJSONArray = WQL.getWO("PDA_TASK").addParamMap(map).process().getResultJSONArray(0);
JSONObject jo = new JSONObject();
@@ -61,7 +63,7 @@ public class PdaTaskServiceImpl implements PdaTaskService {
}
SpringContextHolder.getBean(TaskService.class).operation(jsonTask);
jsonTask.put("task_status","05");
jsonTask.put("task_status", "05");
tab.update(jsonTask);
JSONObject result = new JSONObject();
@@ -85,4 +87,11 @@ public class PdaTaskServiceImpl implements PdaTaskService {
result.put("message", "操作完成");
return result;
}
@Override
public JSONArray rgvStatusQuery(JSONObject whereJson) {
JSONArray rows = WQL.getWO("PDA_TASK").addParam("flag", "2").process().getResultJSONArray(0);
JSONObject jo = wmsToAcsService.getHotPointStatus(rows);
return jo.getJSONArray("data");
}
}

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

@@ -83,4 +83,16 @@
ENDSELECT
ENDQUERY
ENDIF
IF 输入.flag = "2"
QUERY
SELECT
point_code AS device_code
FROM
sch_point_code
WHERE
point_code like 'RGV%'
ENDSELECT
ENDQUERY
ENDIF

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

@@ -154,7 +154,7 @@ public class HotPointIvtServiceImpl implements HotPointIvtService {
String userName = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("MES_USERNAME").getValue();
String passWord = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("MES_PASSWORD").getValue();
param.put("iContainerName", form.getString("container_name"));
param.put("iResourceName", form.getString(""));
param.put("iResourceName", form.getString("ext_code"));
param.put("iMoveInDate", DateUtil.now());
param.put("iPlanBakingTemperature", form.getDoubleValue("temperature"));
param.put("iPlanBakingTimer", form.getDoubleValue("oven_time"));

8
lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java
View File

@@ -205,10 +205,10 @@ public class PointServiceImpl implements PointService {
public void changeActive(JSONObject json) {
//如果是仓位点位，更新状态前，先去查询仓位点位所对应的库区是否启用，如果禁用抛出异常
String struct_id = json.getString("point_id");
String struct_code = json.getString("point_code");
String point_type = json.getString("point_type");
if (point_type.equals("01")) {
JSONObject st_ivt_bsRealStorAttr = WQLObject.getWQLObject("ST_IVT_StructAttr").query(" struct_id = '" + struct_id + "'").uniqueResult(0);
JSONObject st_ivt_bsRealStorAttr = WQLObject.getWQLObject("ST_IVT_StructAttr").query(" struct_code = '" + struct_code + "'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(st_ivt_bsRealStorAttr)) {
String sect_id = st_ivt_bsRealStorAttr.getString("sect_id");
JSONObject st_ivt_sectAttr = WQLObject.getWQLObject("ST_IVT_SectAttr").query(" sect_id = '" + sect_id + "' and is_used = '1'").uniqueResult(0);
@@ -238,8 +238,8 @@ public class PointServiceImpl implements PointService {
json.put("update_optid", currentUserId);
json.put("update_optname", nickName);
json.put("update_time", now);
json.put("struct_id", struct_id);
WQLObject.getWQLObject("ST_IVT_StructAttr").update(json, " struct_id = '" + struct_id + "'");
json.put("struct_code", struct_code);
WQLObject.getWQLObject("ST_IVT_StructAttr").update(json, " struct_code = '" + struct_code + "'");
}
@Override

10
lms/nladmin-ui/src/views/wms/basedata/st/struct/index.vue
View File

@@ -45,6 +45,16 @@
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="是否启用">
<el-switch
v-model="query.is_used"
active-value="0"
inactive-value="1"
active-color="#C0CCDA"
inactive-color="#409EFF"
@change="hand"
/>
</el-form-item>
<rrOperation />
</el-form>
</div>

7
lms/nladmin-ui/src/views/wms/sch/point/index.vue
View File

@@ -503,10 +503,9 @@ export default {
})
},
changeUsed(data, flag) { // 更改启用状态
const param = {}
param.data = data
param.used = flag
crudPoint.changeUsed(param).then(res => {
const param = data[0]
param.lock_type = flag
crudPoint.changeActive(param).then(res => {
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()
})