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

no message

Browse Source
This commit is contained in:
18188916393
2022-08-23 11:29:54 +08:00
parent e2b11f64e9
commit 2bffb17dae
6 changed files with 79 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,21 +25,26 @@ import java.util.Map;
@RequiredArgsConstructor @RequiredArgsConstructor
@Slf4j @Slf4j
public class WmsToJnServiceImpl implements WmsToJnService { public class WmsToJnServiceImpl implements WmsToJnService {
private String URL = "192.168.23.32"; private String URL = "http://61.177.143.218:8888/ZQ_ZLGL_JsonFacade/ZQJT/MES/MES_ProductionFacade.asmx";
final static int timeout = 3000; final static int timeout = 3000;
@Override @Override
public Map<String, Object> synchroDaySchedule(Map whereJson) { public Map<String, Object> synchroDaySchedule(Map whereJson) {
String methon = "/getshoporder";
String today = DateUtil.today(); String today = DateUtil.today();
//同步日计划 //同步日计划
JSONObject obj = new JSONObject(); JSONObject obj = new JSONObject();
obj.put("startdate", whereJson.get("startdate")); obj.put("startdate", whereJson.get("startdate"));
obj.put("enddate", whereJson.get("enddate")); obj.put("enddate", whereJson.get("enddate"));
String resultMsg = HttpRequest.post(URL) obj.put("ticker", "WLXT");
log.info("诺力请求同步嘉耐mes物料入参为{}", obj.toString());
String resultMsg = HttpRequest.post(URL + methon)
.body(String.valueOf(obj)).timeout(timeout) .body(String.valueOf(obj)).timeout(timeout)
.execute().body(); .execute().body();
JSONObject result = JSONObject.parseObject(resultMsg); JSONObject result = JSONObject.parseObject(resultMsg);
log.info("诺力请求同步嘉耐mes物料出参为{}", resultMsg);
String status = result.getString("status"); String status = result.getString("status");
if (StrUtil.isNotEmpty(status) && status.equals("1")) { if (StrUtil.isNotEmpty(status) && status.equals("1")) {
log.info("wms同步嘉耐工单成功！"); log.info("wms同步嘉耐工单成功！");
@@ -96,7 +101,7 @@ public class WmsToJnServiceImpl implements WmsToJnService {
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public Map<String, Object> synchroMaterial(Map whereJson) { public Map<String, Object> synchroMaterial(Map whereJson) {
String methon = "getItems"; String methon = "/getItems";
/** /**
* DM: "物料代码", * DM: "物料代码",
* NAME: "物料名称", * NAME: "物料名称",
@@ -108,9 +113,13 @@ public class WmsToJnServiceImpl implements WmsToJnService {
*/ */
WQLObject material_table = WQLObject.getWQLObject("MD_ME_Material"); WQLObject material_table = WQLObject.getWQLObject("MD_ME_Material");
JSONObject obj = new JSONObject(); JSONObject obj = new JSONObject();
String resultMsg = HttpRequest.post(URL) obj.put("ticker", "WLXT");
log.info("诺力请求同步嘉耐mes物料入参为{}", obj.toString());
String resultMsg = HttpRequest.post(URL + methon)
.body(String.valueOf(obj)).timeout(timeout) .body(String.valueOf(obj)).timeout(timeout)
.execute().body(); .execute().body();
log.info("诺力请求同步嘉耐mes物料出参为{}", resultMsg);
JSONObject result = JSONObject.parseObject(resultMsg); JSONObject result = JSONObject.parseObject(resultMsg);
String status = result.getString("status"); String status = result.getString("status");
if (StrUtil.isNotEmpty(status) && status.equals("1")) { if (StrUtil.isNotEmpty(status) && status.equals("1")) {
@@ -121,48 +130,55 @@ public class WmsToJnServiceImpl implements WmsToJnService {
JSONArray Table = new JSONArray(); JSONArray Table = new JSONArray();
JSONObject param = new JSONObject(); JSONObject param = new JSONObject();
JSONArray materialarr = result.getJSONArray("Table"); JSONArray materialarr = result.getJSONObject("returnData").getJSONArray("Table");
for (int i = 0; i < materialarr.size(); i++) { for (int i = 0; i < materialarr.size(); i++) {
JSONObject materialjo = materialarr.getJSONObject(i); JSONObject materialjo = materialarr.getJSONObject(i);
String DM = materialjo.getString("DM"); String DM = materialjo.getString("DM");
param.put("ITEMCODE", DM); param.put("ITEMCODE", DM);
Table.add(param); Table.add(param);
JSONObject materialObj = material_table.query("material_code='" + DM + "'").uniqueResult(0); JSONObject material_jo = material_table.query("material_code='" + DM + "'").uniqueResult(0);
//如果有就更新，没有就插入 //如果有就更新，没有就插入
if (ObjectUtil.isEmpty(materialObj)) { if (ObjectUtil.isNotEmpty(material_jo)) {
materialObj.put("material_name", materialjo.getString("NAME")); String stewing_time = "0";
materialObj.put("material_spec", materialjo.getString("GG")); if (StrUtil.isNotEmpty(materialjo.getString("WAITTIME"))) {
materialObj.put("material_model", materialjo.getString("GG")); stewing_time = materialjo.getString("WAITTIME");
materialObj.put("english_name", materialjo.getString("NAME")); }
materialObj.put("stewing_time", materialjo.getString("WAITTIME")); material_jo.put("material_name", materialjo.getString("NAME"));
materialObj.put("print_model", materialjo.getString("PRINTTYPE")); material_jo.put("material_spec", materialjo.getString("GG"));
materialObj.put("is_auto_package", materialjo.getString("ISAUTO")); material_jo.put("material_model", materialjo.getString("GG"));
materialObj.put("is_used", "1"); material_jo.put("english_name", materialjo.getString("NAME"));
materialObj.put("update_optid", SecurityUtils.getCurrentUserId()); material_jo.put("stewing_time", stewing_time);
materialObj.put("update_optname", SecurityUtils.getNickName()); material_jo.put("print_model", materialjo.getString("PRINTTYPE"));
materialObj.put("update_time", DateUtil.now()); material_jo.put("is_auto_package", materialjo.getString("ISAUTO"));
material_table.update(materialObj); material_jo.put("is_used", "1");
material_jo.put("update_optid", "1");
material_jo.put("update_optname", "管理员");
material_jo.put("update_time", DateUtil.now());
material_table.update(material_jo);
} else { } else {
String stewing_time = "0";
if (StrUtil.isNotEmpty(materialjo.getString("WAITTIME"))) {
stewing_time = materialjo.getString("WAITTIME");
}
JSONObject materialObj = new JSONObject();
materialObj.put("material_id", IdUtil.getSnowflake(1, 1).nextId()); materialObj.put("material_id", IdUtil.getSnowflake(1, 1).nextId());
materialObj.put("material_name", materialjo.getString("NAME")); materialObj.put("material_name", materialjo.getString("NAME"));
materialObj.put("material_code", materialjo.getString("GG")); materialObj.put("material_code", materialjo.getString("DM"));
materialObj.put("material_model", materialjo.getString("GG")); materialObj.put("material_model", materialjo.getString("GG"));
materialObj.put("english_name", materialjo.getString("NAME")); materialObj.put("english_name", materialjo.getString("NAME"));
materialObj.put("stewing_time", stewing_time);
materialObj.put("print_model", materialjo.getString("PRINTTYPE")); materialObj.put("print_model", materialjo.getString("PRINTTYPE"));
materialObj.put("is_auto_package", materialjo.getString("ISAUTO")); materialObj.put("is_auto_package", materialjo.getString("ISAUTO"));
materialObj.put("is_used", "1"); materialObj.put("is_used", "1");
materialObj.put("create_id", SecurityUtils.getCurrentUserId()); materialObj.put("create_id", "1");
materialObj.put("create_name", SecurityUtils.getNickName()); materialObj.put("create_name", "管理员");
materialObj.put("create_time", DateUtil.now()); materialObj.put("create_time", DateUtil.now());
materialObj.put("update_optid", SecurityUtils.getCurrentUserId());
materialObj.put("update_optname", SecurityUtils.getNickName());
materialObj.put("update_time", DateUtil.now());
material_table.insert(materialObj); material_table.insert(materialObj);
} }
} }
//调用接口告诉wms 调用已经同步该物料 //调用接口告诉wms 调用已经同步该物料
String returnResultMsg = HttpRequest.post(URL) /* String returnResultMsg = HttpRequest.post(URL)
.body(String.valueOf(obj)).timeout(timeout) .body(String.valueOf(obj)).timeout(timeout)
.execute().body(); .execute().body();
JSONObject returnResult = JSONObject.parseObject(returnResultMsg); JSONObject returnResult = JSONObject.parseObject(returnResultMsg);
@@ -171,7 +187,7 @@ public class WmsToJnServiceImpl implements WmsToJnService {
log.info("wms反馈嘉耐物料成功！"); log.info("wms反馈嘉耐物料成功！");
} else { } else {
log.info("wms反馈嘉耐物料失败！"); log.info("wms反馈嘉耐物料失败！");
} }*/
JSONObject returnjo = new JSONObject(); JSONObject returnjo = new JSONObject();
returnjo.put("status", HttpStatus.OK.value()); returnjo.put("status", HttpStatus.OK.value());
returnjo.put("message", "任务状态反馈成功!"); returnjo.put("message", "任务状态反馈成功!");
@@ -224,7 +240,7 @@ public class WmsToJnServiceImpl implements WmsToJnService {
public Map<String, Object> feedBackPackage(Map whereJson) { public Map<String, Object> feedBackPackage(Map whereJson) {
//木托盘号码 //木托盘号码
String vehicle_code = (String) whereJson.get("vehicle_code"); String vehicle_code = (String) whereJson.get("vehicle_code");
if (StrUtil.isEmpty(vehicle_code)){ if (StrUtil.isEmpty(vehicle_code)) {
throw new BadRequestException("托盘编码不能为空！"); throw new BadRequestException("托盘编码不能为空！");
} }
return null; return null;

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

@@ -53,7 +53,7 @@ public class SendMaterialTask extends AbstractAcsTask {
//更新任务状态为执行中 //更新任务状态为执行中
jsonTask.put("task_status", TaskStatusEnum.EXECUTING.getCode()); jsonTask.put("task_status", TaskStatusEnum.EXECUTING.getCode());
jsonTask.put("update_time", DateUtil.now()); jsonTask.put("update_time", DateUtil.now());
jsonTask.put("car_no", car_no);
taskTab.update(jsonTask); taskTab.update(jsonTask);
HashMap map = new HashMap(); HashMap map = new HashMap();
map.put("update_optid", SecurityUtils.getCurrentUserId()); map.put("update_optid", SecurityUtils.getCurrentUserId());
@@ -68,6 +68,7 @@ public class SendMaterialTask extends AbstractAcsTask {
jsonTask.put("task_status", TaskStatusEnum.FINISHED.getCode()); jsonTask.put("task_status", TaskStatusEnum.FINISHED.getCode());
jsonTask.put("taskfinish_mode", taskObj.getString("taskfinish_mode")); jsonTask.put("taskfinish_mode", taskObj.getString("taskfinish_mode"));
jsonTask.put("update_time", DateUtil.now()); jsonTask.put("update_time", DateUtil.now());
jsonTask.put("car_no", car_no);
jsonTask.put("remark", "任务执行完成"); jsonTask.put("remark", "任务执行完成");
///审核单据 增加库存 改变出入库表的状态 ///审核单据 增加库存 改变出入库表的状态
WQLObject mstTab = WQLObject.getWQLObject("ST_IVT_workProcedureIOS"); WQLObject mstTab = WQLObject.getWQLObject("ST_IVT_workProcedureIOS");

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

@@ -53,7 +53,7 @@ public class ToConveyorTask extends AbstractAcsTask {
if (TaskStatusEnum.EXECUTING.getCode().equals(status)) { if (TaskStatusEnum.EXECUTING.getCode().equals(status)) {
//更新任务状态为执行中 //更新任务状态为执行中
jsonTask.put("task_status", TaskStatusEnum.EXECUTING.getCode()); jsonTask.put("task_status", TaskStatusEnum.EXECUTING.getCode());
jsonTask.put("car_no", car_no);
jsonTask.put("update_time", DateUtil.now()); jsonTask.put("update_time", DateUtil.now());
taskTab.update(jsonTask); taskTab.update(jsonTask);
HashMap map = new HashMap(); HashMap map = new HashMap();
@@ -66,6 +66,7 @@ public class ToConveyorTask extends AbstractAcsTask {
if (TaskStatusEnum.FINISHED.getCode().equals(status)) { if (TaskStatusEnum.FINISHED.getCode().equals(status)) {
// 更新任务状态为完成 // 更新任务状态为完成
jsonTask.put("car_no", car_no);
jsonTask.put("task_status", TaskStatusEnum.FINISHED.getCode()); jsonTask.put("task_status", TaskStatusEnum.FINISHED.getCode());
jsonTask.put("taskfinish_mode", taskObj.getString("taskfinish_mode")); jsonTask.put("taskfinish_mode", taskObj.getString("taskfinish_mode"));
jsonTask.put("update_time", DateUtil.now()); jsonTask.put("update_time", DateUtil.now());

28
wms/hd/nladmin-system/src/main/resources/WmsToJn.xml Normal file
View File

@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<included>
<springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
<property name="LOG_HOME" value="${logPath}"/>
<!-- 按照每天生成日志文件 -->
<appender name="FILE5" class="ch.qos.logback.core.rolling.RollingFileAppender">
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<!--日志文件输出的文件名-->
<FileNamePattern>${LOG_HOME}/wmstojn/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
<!--日志文件保留天数-->
<maxHistory>15</maxHistory>
<!--单个日志最大容量 至少10MB才能看得出来-->
<maxFileSize>200MB</maxFileSize>
<!--所有日志最多占多大容量-->
<totalSizeCap>20GB</totalSizeCap>
</rollingPolicy>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
</encoder>
</appender>
<logger name="org.nl.wms.ext.acs.service.impl.WmsToJnServiceImpl" level="info" additivity="true">
<appender-ref ref="FILE5"/>
</logger>
<!-- 打印sql -->
</included>

2
wms/hd/nladmin-system/src/main/resources/config/application.yml
View File

@@ -43,7 +43,7 @@ rsa:
private_key: MIIBUwIBADANBgkqhkiG9w0BAQEFAASCAT0wggE5AgEAAkEA0vfvyTdGJkdbHkB8mp0f3FE0GYP3AYPaJF7jUd1M0XxFSE2ceK3k2kw20YvQ09NJKk+OMjWQl9WitG9pB6tSCQIDAQABAkA2SimBrWC2/wvauBuYqjCFwLvYiRYqZKThUS3MZlebXJiLB+Ue/gUifAAKIg1avttUZsHBHrop4qfJCwAI0+YRAiEA+W3NK/RaXtnRqmoUUkb59zsZUBLpvZgQPfj1MhyHDz0CIQDYhsAhPJ3mgS64NbUZmGWuuNKp5coY2GIj/zYDMJp6vQIgUueLFXv/eZ1ekgz2Oi67MNCk5jeTF2BurZqNLR3MSmUCIFT3Q6uHMtsB9Eha4u7hS31tj1UWE+D+ADzp59MGnoftAiBeHT7gDMuqeJHPL4b+kC+gzV4FGTfhR9q3tTbklZkD2A== private_key: MIIBUwIBADANBgkqhkiG9w0BAQEFAASCAT0wggE5AgEAAkEA0vfvyTdGJkdbHkB8mp0f3FE0GYP3AYPaJF7jUd1M0XxFSE2ceK3k2kw20YvQ09NJKk+OMjWQl9WitG9pB6tSCQIDAQABAkA2SimBrWC2/wvauBuYqjCFwLvYiRYqZKThUS3MZlebXJiLB+Ue/gUifAAKIg1avttUZsHBHrop4qfJCwAI0+YRAiEA+W3NK/RaXtnRqmoUUkb59zsZUBLpvZgQPfj1MhyHDz0CIQDYhsAhPJ3mgS64NbUZmGWuuNKp5coY2GIj/zYDMJp6vQIgUueLFXv/eZ1ekgz2Oi67MNCk5jeTF2BurZqNLR3MSmUCIFT3Q6uHMtsB9Eha4u7hS31tj1UWE+D+ADzp59MGnoftAiBeHT7gDMuqeJHPL4b+kC+gzV4FGTfhR9q3tTbklZkD2A==
logging: logging:
file: file:
path: C:\logs\nlacs\ path: C:\logs\wms\
demo: demo:
monitor: monitor:
server-url: https://www.demo-monitor.com server-url: https://www.demo-monitor.com

2
wms/hd/nladmin-system/src/main/resources/logback-spring.xml
View File

@@ -17,6 +17,8 @@ https://juejin.cn/post/6844903775631572999
<property name="LOG_HOME" value="${logPath}"/> <property name="LOG_HOME" value="${logPath}"/>
<!--引入默认的一些设置--> <!--引入默认的一些设置-->
<!-- <include resource="log/AutoCreateInst.xml"/>--> <!-- <include resource="log/AutoCreateInst.xml"/>-->
<!--引入默认的一些设置-->
<include resource="WmsToJn.xml"/>
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender"> <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder> <encoder>