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

mes新增接口

Browse Source
This commit is contained in:
loujf
2023-02-12 10:33:11 +08:00
parent 181e1b9502
commit 2d2c4116ff
5 changed files with 155 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
acs/qd/src/views/acs/monitor/device/index.vue
View File

@@ -462,6 +462,9 @@ export default {
} else if (val === 'Wthickness') {
const obj = { name: 'W厚度', value: data[val] }
arr.push(obj)
} else if (val === 'material_type') {
const obj = { name: '物料类型', value: data[val] }
arr.push(obj)
}
/* else {
const obj = { name: val, value: data[val] }

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

@@ -127,5 +127,21 @@ public interface WmsToJnService {
Map<String, Object> feedBackOutPartStock(Map whereJson);
/**
* 拆码垛工单上传
*
* @param
* @return Map<String, Object>
*/
Map<String, Object> feedBackPackWordShop(Map whereJson);
/**
* 刚托盘回收
*
* @param
* @return Map<String, Object>
*/
Map<String, Object> feedBackTrayBak(Map whereJson);
}

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

@@ -803,5 +803,102 @@ public class WmsToJnServiceImpl implements WmsToJnService {
return null;
}
@Override
public Map<String, Object> feedBackPackWordShop(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 = "/PackWordShop";
String producetask_code = (String) whereJson.get("producetask_code");
JSONObject jsonObject = WQL.getWO("WMSTOJN_001").addParam("flag", "14").addParam("producetask_code", producetask_code).process().uniqueResult(0);
JSONObject obj = new JSONObject();
obj.put("ticker", "WLXT");
obj.put("stringData", jsonObject.toString());
log.info("诺力请求嘉耐反馈包装工单入参{}", obj.toString());
String returnResultMsg = null;
try {
returnResultMsg = HttpRequest.post(URL + method)
.body(String.valueOf(obj)).timeout(timeout)
.execute().body();
} catch (Exception e) {
log.info("诺力请求嘉耐反馈包装工单失败！{}",e.getMessage());
JSONObject jo = new JSONObject();
jo.put("record_id", IdUtil.getSnowflake(1, 1).nextId());
jo.put("method", method);
jo.put("status", "2");
jo.put("content", obj);
jo.put("create_time", DateUtil.now());
wo.insert(jo);
return null;
}
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("status", "2");
jo.put("content", obj);
jo.put("create_time", DateUtil.now());
wo.insert(jo);
}
log.info("诺力请求嘉耐反馈包装工单出参{}", returnResultMsg);
return null;
}
@Override
public Map<String, Object> feedBackTrayBak(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 = "/TrayBak";
String vehicle_code = (String) whereJson.get("vehicle_code");
JSONObject jsonObject = WQL.getWO("WMSTOJN_001").addParam("flag", "15").addParam("vehicle_code", vehicle_code).process().uniqueResult(0);
jsonObject.put("RO",DateUtil.now());
JSONObject obj = new JSONObject();
obj.put("ticker", "WLXT");
obj.put("stringData", jsonObject.toString());
log.info("诺力请求嘉耐反馈钢托盘回收入参{}", obj.toString());
String returnResultMsg = null;
try {
returnResultMsg = HttpRequest.post(URL + method)
.body(String.valueOf(obj)).timeout(timeout)
.execute().body();
} catch (Exception e) {
log.info("诺力请求嘉耐反馈钢托盘回收失败！{}",e.getMessage());
JSONObject jo = new JSONObject();
jo.put("record_id", IdUtil.getSnowflake(1, 1).nextId());
jo.put("method", method);
jo.put("status", "2");
jo.put("content", obj);
jo.put("create_time", DateUtil.now());
wo.insert(jo);
return null;
}
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("status", "2");
jo.put("content", obj);
jo.put("create_time", DateUtil.now());
wo.insert(jo);
}
log.info("诺力请求嘉耐反馈钢托盘回收出参{}", returnResultMsg);
return null;
}
}

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

@@ -292,4 +292,41 @@ IF 输入.flag = "13"
ENDOPTION
ENDSELECT
ENDQUERY
ENDIF
IF 输入.flag = "14"
QUERY
SELECT DISTINCT
producetask.producetask_code AS SHOPORDERNO,
material.material_code AS ITEMCODE,
producetask.plan_qty AS QTY,
producetask.plan_date AS STARTDATE,
device.device_code AS SBNO
FROM
pdm_mg_producetask producetask
LEFT JOIN md_me_material material ON material.material_id = producetask.material_id
LEFT JOIN pdm_base_device device ON device.device_id = producetask.device_id
where
1=1
OPTION 输入.producetask_code <> ""
producetask.producetask_code = 输入.producetask_code
ENDOPTION
ENDSELECT
ENDQUERY
ENDIF
IF 输入.flag = "15"
QUERY
SELECT DISTINCT
group.vehicle_code AS STOCKNO,
group.task_id AS ID
FROM
st_buss_vehiclegroup group
where
1=1
OPTION 输入.vehicle_code <> ""
group.vehicle_code = 输入.vehicle_code
ENDOPTION
ENDSELECT
ENDQUERY
ENDIF

4
wms/hd/nladmin-system/src/main/java/org/nl/wms/st/basedata/service/impl/KilnServiceImpl.java
View File

@@ -150,7 +150,7 @@ public class KilnServiceImpl implements KilnService {
vehicleGroup.put("material_code", materialObj.getString("material_code"));
vehicleGroup.put("material_name", materialObj.getString("material_name"));
vehicleGroup.put("material_spec", materialObj.getString("material_spec"));
vehicleGroup.put("task_id", SecurityUtils.getCurrentUserId());
vehicleGroup.put("task_id", IdUtil.getSnowflake(1,1).nextId());
vehicleGroup.put("create_id", currentUserId);
vehicleGroup.put("create_name", nickName);
vehicleGroup.put("create_time", now);
@@ -161,7 +161,7 @@ public class KilnServiceImpl implements KilnService {
vehicleGroup.put("device_id", jsonObject.getString("device_id"));
vehicleGroup.put("qty", ivt_qty);
vehicleGroup.put("is_full", is_full);
vehicleGroup.put("material_move_id", SecurityUtils.getCurrentUserId());
vehicleGroup.put("material_move_id", IdUtil.getSnowflake(1,1).nextId());
vehicleGroupTab.insert(vehicleGroup);
}
// 点位修改