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

新增借口

Browse Source
This commit is contained in:
18188916393
2022-09-01 15:43:06 +08:00
parent 8fb99f4e9b
commit 182d4f498b
10 changed files with 313 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/WmsToAcsController.java
View File

@@ -74,4 +74,5 @@ public class WmsToAcsController {
}

26
wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/WmsToJnController.java
View File

@@ -101,4 +101,30 @@ public class WmsToJnController {
return new ResponseEntity<>(WmsToJnService.queryCurrentOrder(whereJson), HttpStatus.OK);
}
@PostMapping("/feedBackInWait")
@Log("反馈入冷却缓冲区")
@ApiOperation("反馈冷却缓冲区")
public ResponseEntity<Object> feedBackInWait(@RequestBody Map whereJson) {
return new ResponseEntity<>(WmsToJnService.feedBackInWait(whereJson), HttpStatus.OK);
}
@PostMapping("/feedBackOutWait")
@Log("反馈出冷却缓冲区")
@ApiOperation("反馈出冷却缓冲区")
public ResponseEntity<Object> feedBackOutWait(@RequestBody Map whereJson) {
return new ResponseEntity<>(WmsToJnService.feedBackOutWait(whereJson), HttpStatus.OK);
}
@PostMapping("/feedBackInPartStock")
@Log("反馈半木托入临时库区")
@ApiOperation("反馈半木托入临时库区")
public ResponseEntity<Object> feedBackInPartStock(@RequestBody Map whereJson) {
return new ResponseEntity<>(WmsToJnService.feedBackInPartStock(whereJson), HttpStatus.OK);
}
@PostMapping("/feedBackOutPartStock")
@Log("反馈半木托出临时库区")
@ApiOperation("反馈半木托出临时库区")
public ResponseEntity<Object> feedBackOutPartStock(@RequestBody Map whereJson) {
return new ResponseEntity<>(WmsToJnService.feedBackOutPartStock(whereJson), HttpStatus.OK);
}
}

33
wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/WmsToJnService.java
View File

@@ -94,5 +94,38 @@ public interface WmsToJnService {
Map<String, Object> queryCurrentOrder(Map whereJson);
/**
* 反馈冷却缓冲区
*
* @param
* @return Map<String, Object>
*/
Map<String, Object> feedBackInWait(Map whereJson);
/**
* 反馈出冷却缓冲区
*
* @param
* @return Map<String, Object>
*/
Map<String, Object> feedBackOutWait(Map whereJson);
/**
* 反馈半木托入临时库区
*
* @param
* @return Map<String, Object>
*/
Map<String, Object> feedBackInPartStock(Map whereJson);
/**
* 反馈半木托出临时库区
*
* @param
* @return Map<String, Object>
*/
Map<String, Object> feedBackOutPartStock(Map whereJson);
}

2
wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
View File

@@ -110,8 +110,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
Double stewing_time = materiralObj.getDouble("stewing_time");
jsonObject.put("stewing_time", stewing_time);
String area_type = pointTable.query("point_code ='" + device_code + "'").uniqueResult(0).getString("area_type");
//假如是压制下料的几个位置，则要考虑是入输送线 还是入立体库
if (StrUtil.equals(area_type, AreaEnum.YZQY.getCode()) && stewing_time <= 0) {
//1.首先更新所有输送线的点位状态

136
wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToJnServiceImpl.java
View File

@@ -489,5 +489,141 @@ public class WmsToJnServiceImpl implements WmsToJnService {
return joo;
}
@Override
public Map<String, Object> feedBackInWait(Map whereJson) {
WQLObject wo = WQLObject.getWQLObject("pdm_bi_feedbackrecord");
String value = WQLObject.getWQLObject("sys_param").query("code='IS_CONNECT_JN'").uniqueResult(0).getString("value");
if (StrUtil.equals(value, "0")) {
return null;
}
String method = "InWait";
String task_id = (String) whereJson.get("task_id");
JSONObject jsonObject = WQL.getWO("WMSTOJN_001").addParam("flag", "10").addParam("task_id", task_id).process().uniqueResult(0);
JSONObject obj = new JSONObject();
obj.put("ticker", "WLXT");
obj.put("stringData", jsonObject);
log.info("诺力请求嘉耐反馈入冷却缓冲区入参{}", obj.toString());
String returnResultMsg = HttpRequest.post(URL + method)
.body(String.valueOf(obj)).timeout(timeout)
.execute().body();
JSONObject returnResult = JSONObject.parseObject(returnResultMsg);
String returnStatus = returnResult.getString("status");
if (StrUtil.isNotEmpty(returnStatus) && returnStatus.equals("1")) {
log.info("诺力请求嘉耐反馈入冷却缓冲区成功！");
} else {
log.info("诺力请求嘉耐反馈入冷却缓冲区失败！");
JSONObject jo = new JSONObject();
jo.put("record_id", IdUtil.getSnowflake(1, 1).nextId());
jo.put("method", method);
jo.put("content", obj);
jo.put("create_time", DateUtil.now());
wo.insert(jo);
}
log.info("诺力请求嘉耐反馈入冷却缓冲区出参{}", returnResultMsg);
return null;
}
@Override
public Map<String, Object> feedBackOutWait(Map whereJson) {
WQLObject wo = WQLObject.getWQLObject("pdm_bi_feedbackrecord");
String value = WQLObject.getWQLObject("sys_param").query("code='IS_CONNECT_JN'").uniqueResult(0).getString("value");
if (StrUtil.equals(value, "0")) {
return null;
}
String method = "outWait";
String task_id = (String) whereJson.get("task_id");
JSONObject jsonObject = WQL.getWO("WMSTOJN_001").addParam("flag", "11").addParam("task_id", task_id).process().uniqueResult(0);
JSONObject obj = new JSONObject();
obj.put("ticker", "WLXT");
obj.put("stringData", jsonObject);
log.info("诺力请求嘉耐反馈出冷却缓冲区入参{}", obj.toString());
String returnResultMsg = HttpRequest.post(URL + method)
.body(String.valueOf(obj)).timeout(timeout)
.execute().body();
JSONObject returnResult = JSONObject.parseObject(returnResultMsg);
String returnStatus = returnResult.getString("status");
if (StrUtil.isNotEmpty(returnStatus) && returnStatus.equals("1")) {
log.info("诺力请求嘉耐反馈出冷却缓冲区成功！");
} else {
log.info("诺力请求嘉耐反馈出冷却缓冲区失败！");
JSONObject jo = new JSONObject();
jo.put("record_id", IdUtil.getSnowflake(1, 1).nextId());
jo.put("method", method);
jo.put("content", obj);
jo.put("create_time", DateUtil.now());
wo.insert(jo);
}
log.info("诺力请求嘉耐反馈出冷却缓冲区出参{}", returnResultMsg);
return null;
}
@Override
public Map<String, Object> feedBackInPartStock(Map whereJson) {
WQLObject wo = WQLObject.getWQLObject("pdm_bi_feedbackrecord");
String value = WQLObject.getWQLObject("sys_param").query("code='IS_CONNECT_JN'").uniqueResult(0).getString("value");
if (StrUtil.equals(value, "0")) {
return null;
}
String method = "InPartStock";
String task_id = (String) whereJson.get("task_id");
JSONObject jsonObject = WQL.getWO("WMSTOJN_001").addParam("flag", "12").addParam("task_id", task_id).process().uniqueResult(0);
JSONObject obj = new JSONObject();
obj.put("ticker", "WLXT");
obj.put("stringData", jsonObject);
log.info("诺力请求嘉耐反馈半木托入临时库区入参{}", obj.toString());
String returnResultMsg = HttpRequest.post(URL + method)
.body(String.valueOf(obj)).timeout(timeout)
.execute().body();
JSONObject returnResult = JSONObject.parseObject(returnResultMsg);
String returnStatus = returnResult.getString("status");
if (StrUtil.isNotEmpty(returnStatus) && returnStatus.equals("1")) {
log.info("诺力请求嘉耐反馈半木托入临时库区成功！");
} else {
log.info("诺力请求嘉耐反馈半木托入临时库区失败！");
JSONObject jo = new JSONObject();
jo.put("record_id", IdUtil.getSnowflake(1, 1).nextId());
jo.put("method", method);
jo.put("content", obj);
jo.put("create_time", DateUtil.now());
wo.insert(jo);
}
log.info("诺力请求嘉耐反馈半木托入临时库区出参{}", returnResultMsg);
return null;
}
@Override
public Map<String, Object> feedBackOutPartStock(Map whereJson) {
WQLObject wo = WQLObject.getWQLObject("pdm_bi_feedbackrecord");
String value = WQLObject.getWQLObject("sys_param").query("code='IS_CONNECT_JN'").uniqueResult(0).getString("value");
if (StrUtil.equals(value, "0")) {
return null;
}
String method = "outWait";
String task_id = (String) whereJson.get("task_id");
JSONObject jsonObject = WQL.getWO("WMSTOJN_001").addParam("flag", "13").addParam("task_id", task_id).process().uniqueResult(0);
JSONObject obj = new JSONObject();
obj.put("ticker", "WLXT");
obj.put("stringData", jsonObject);
log.info("诺力请求嘉耐反馈半木托出临时库区入参{}", obj.toString());
String returnResultMsg = HttpRequest.post(URL + method)
.body(String.valueOf(obj)).timeout(timeout)
.execute().body();
JSONObject returnResult = JSONObject.parseObject(returnResultMsg);
String returnStatus = returnResult.getString("status");
if (StrUtil.isNotEmpty(returnStatus) && returnStatus.equals("1")) {
log.info("诺力请求嘉耐反馈半木托出临时库区成功！");
} else {
log.info("诺力请求嘉耐反馈半木托出临时库区失败！");
JSONObject jo = new JSONObject();
jo.put("record_id", IdUtil.getSnowflake(1, 1).nextId());
jo.put("method", method);
jo.put("content", obj);
jo.put("create_time", DateUtil.now());
wo.insert(jo);
}
log.info("诺力请求嘉耐反馈半木托出临时库区出参{}", returnResultMsg);
return null;
}
}

86
wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/wql/WMSTOJN_001.wql
View File

@@ -199,4 +199,88 @@ IF 输入.flag = "8"
ENDOPTION
ENDSELECT
ENDQUERY
ENDIF
ENDIF
IF 输入.flag = "10"
QUERY
SELECT DISTINCT
vehicle_group.material_move_id AS ID,
task.update_time AS INWAITDATE,
task.next_point_code AS LOCDESC
FROM
sch_base_task task
LEFT JOIN st_buss_vehiclegroup vehicle_group ON vehicle_group.vehicle_code = task.vehicle_code
where
1=1
OPTION 输入.task_id <> ""
task.task_id = 输入.task_id
ENDOPTION
ENDSELECT
ENDQUERY
ENDIF
IF 输入.flag = "11"
QUERY
SELECT DISTINCT
vehicle_group.material_move_id AS ID,
task.update_time AS OUTWAITDATE
FROM
sch_base_task task
LEFT JOIN st_buss_vehiclegroup vehicle_group ON vehicle_group.vehicle_code = task.vehicle_code
where
1=1
OPTION 输入.task_id <> ""
task.task_id = 输入.task_id
ENDOPTION
ENDSELECT
ENDQUERY
ENDIF
IF 输入.flag = "12"
QUERY
SELECT DISTINCT
material.material_code AS ITEMCODE,
vehicle_group.qty,
task.next_point_code AS LOCDESC,
"" AS SHOPORDERNO,
task.update_time AS INDATE
FROM
sch_base_task task
LEFT JOIN st_buss_vehiclegroup vehicle_group ON vehicle_group.vehicle_code = task.vehicle_code
LEFT JOIN st_buss_vehicleRelaRecord recordmst ON recordmst.vehicle_code = task.vehicle_code
LEFT JOIN st_buss_vehicleRelaRecordtl recorddtl ON recorddtl.record_id = recordmst.record_id
LEFT JOIN md_me_material material ON material.material_id = recordmst.material_id
where
1=1
OPTION 输入.task_id <> ""
task.task_id = 输入.task_id
ENDOPTION
ENDSELECT
ENDQUERY
ENDIF
IF 输入.flag = "13"
QUERY
SELECT DISTINCT
material.material_code AS ITEMCODE,
vehicle_group.qty,
task.start_point_code AS LOCDESC,
"" AS SHOPORDERNO,
task.update_time AS INDATE
FROM
sch_base_task task
LEFT JOIN st_buss_vehiclegroup vehicle_group ON vehicle_group.vehicle_code = task.vehicle_code
LEFT JOIN st_buss_vehicleRelaRecord recordmst ON recordmst.vehicle_code = task.vehicle_code
LEFT JOIN st_buss_vehicleRelaRecordtl recorddtl ON recorddtl.record_id = recordmst.record_id
LEFT JOIN md_me_material material ON material.material_id = recordmst.material_id
where
1=1
OPTION 输入.task_id <> ""
task.task_id = 输入.task_id
ENDOPTION
ENDSELECT
ENDQUERY
ENDIF

17
wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/login/service/impl/HandLoginServiceImpl.java
View File

@@ -44,22 +44,6 @@ public class HandLoginServiceImpl implements HandLoginService {
JSONObject resultJson = new JSONObject();
String user = jsonObject.get("user");
String password = jsonObject.get("password");
String device_id = jsonObject.get("device_id");
if (StrUtil.isEmpty("user")) {
resultJson.put("code", "0");
resultJson.put("desc", "用户不能为空");
return resultJson;
}
if (StrUtil.isEmpty("device_id")) {
resultJson.put("code", "0");
resultJson.put("desc", "设备不能为空");
return resultJson;
}
if (StrUtil.isEmpty("password")) {
resultJson.put("code", "0");
resultJson.put("desc", "密码不能为空!");
return resultJson;
}
boolean is_match = false;
Long account_id = 0L;
try {
@@ -86,7 +70,6 @@ public class HandLoginServiceImpl implements HandLoginService {
final JwtUserDto jwtUserDto = (JwtUserDto) authentication.getPrincipal();
// 保存在线信息
onlineUserService.save(jwtUserDto, token, null);
JSONObject jo = new JSONObject();
jo.put("user_name", user);
jo.put("token", properties.getTokenStartWith() + token);

21
wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallMaterialTask.java
View File

@@ -13,6 +13,7 @@ import org.nl.utils.SpringContextHolder;
import org.nl.wms.WorkProcedureEnum;
import org.nl.wms.common.SortingUtil;
import org.nl.wms.common.StructFindUtil;
import org.nl.wms.ext.acs.service.impl.WmsToJnServiceImpl;
import org.nl.wms.sch.manage.AbstractAcsTask;
import org.nl.wms.sch.manage.AreaEnum;
import org.nl.wms.sch.manage.BillTypeEnum;
@@ -123,8 +124,8 @@ public class CallMaterialTask extends AbstractAcsTask {
StrUtil.equals(next_point_code, "FJJXSXLW301") ||
StrUtil.equals(next_point_code, "FJJXSXLW302")) {
JSONObject jo = new JSONObject();
jo.put("device_code",next_point_code);
jo.put("vehicle_code",vehicle_code);
jo.put("device_code", next_point_code);
jo.put("vehicle_code", vehicle_code);
SortingUtil.record(jo);
}
//如果是上料位置 则需要去找点位记录表上的托盘记录
@@ -146,6 +147,18 @@ public class CallMaterialTask extends AbstractAcsTask {
startPointObj.put("vehicle_code", "");
pointTab.update(startPointObj);
taskTab.update(jsonTask);
//2是出窑缓存货架，调用反馈出冷却缓冲区
//3是木托盘缓存货架，调用反馈半木托出临时库区
String point_type = startPointObj.getString("point_type");
JSONObject jo = new JSONObject();
jo.put("task_id", task_id);
WmsToJnServiceImpl wmsToJnServiceImpl = new WmsToJnServiceImpl();
if (StrUtil.equals(point_type, AreaEnum.CYHCHJ.getCode())) {
// wmsToJnServiceImpl.feedBackOutWait(jo);
}
if (StrUtil.equals(point_type, AreaEnum.MTPQ.getCode())) {
// wmsToJnServiceImpl.feedBackOutPartStock(jo);
}
}
}
@@ -208,7 +221,7 @@ public class CallMaterialTask extends AbstractAcsTask {
String pcsn = form.getString("pcsn");
String is_full = form.getString("is_full");
String workprocedure_id = form.getString("workprocedure_id");
String group_device= form.getString("group_device");
String group_device = form.getString("group_device");
WQLObject taskTable = WQLObject.getWQLObject("SCH_BASE_Task");
String iostorinv_id = form.getString("iostorinv_id");
if (StrUtil.isEmpty(next_point_code)) {
@@ -314,7 +327,7 @@ public class CallMaterialTask extends AbstractAcsTask {
param.put("area_type", startArea_type);
param.put("workprocedure_id", ivt_workprocedure_id);
param.put("is_full", is_full);
param.put("group_device",group_device);
param.put("group_device", group_device);
JSONObject outStructObj = StructFindUtil.getOutStruct(param);
if (ObjectUtil.isEmpty(outStructObj)) {
throw new BadRequestException("未找到合适的出库仓位！");

18
wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/SendMaterialTask.java
View File

@@ -122,11 +122,23 @@ public class SendMaterialTask extends AbstractAcsTask {
startPointObj.put("vehicle_code", "");
pointTab.update(startPointObj);
taskTab.update(jsonTask);
//调用接口反馈给嘉耐 搬运任务
String point_type = endpointObj.getString("point_type");
//1压机下料货架调用接口反馈给嘉耐 搬运任务
//2是出窑缓存货架，调用反馈入冷却缓冲区
//3是木托盘缓存货架，调用反馈半木托入临时库区
JSONObject jo = new JSONObject();
jo.put("task_id", task_id);
WmsToJnServiceImpl wmsToJnServiceImpl = new WmsToJnServiceImpl();
// wmsToJnServiceImpl.feedBackCarryRecord(jo);
if (StrUtil.equals(point_type,AreaEnum.RYHCHJ.getCode())){
// wmsToJnServiceImpl.feedBackCarryRecord(jo);
}
if (StrUtil.equals(point_type,AreaEnum.CYHCHJ.getCode())){
// wmsToJnServiceImpl.feedBackInWait(jo);
}
if (StrUtil.equals(point_type,AreaEnum.MTPQ.getCode())){
// wmsToJnServiceImpl.feedBackInPartStock(jo);
}
}
}
@@ -347,7 +359,7 @@ public class SendMaterialTask extends AbstractAcsTask {
JSONObject workInfo = WQL.getWO("QSTRUCT_RULE").addParam("flag", "1").addParam("code", start_point_code)
.process().uniqueResult(0);
if (StrUtil.equals(WorkProcedureEnum.YZGX.getCode(), workInfo.getString("workprocedure_code"))
||StrUtil.equals(WorkProcedureEnum.FJGX.getCode(), workInfo.getString("workprocedure_code"))) {
|| StrUtil.equals(WorkProcedureEnum.FJGX.getCode(), workInfo.getString("workprocedure_code"))) {
WQLObject groupTable = WQLObject.getWQLObject("st_buss_vehiclegroup");
JSONObject groupInfo = groupTable.query("group_id='" + group_id + "'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(groupInfo)) {

BIN
wms/hd/nladmin-system/src/main/java/org/nl/wms/wms.xls
View File

Binary file not shown.