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

Merge branch 'b_lms' into master_merge

Browse Source 
# Conflicts:
#	lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/LmsToMesService.java
#	lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java
This commit is contained in:
liuxy
2024-06-21 18:14:34 +08:00
parent 7bb3955a40 387f5a77f8
commit 3a9e0275e9
11 changed files with 154 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInEmpTask.java
View File

@@ -99,7 +99,6 @@ public class TwoInEmpTask extends AbstractAcsTask {
JSONObject jsonAttr = attrTab.query("struct_code = '" + jsonTask.getString("point_code2") + "'").uniqueResult(0);
jsonAttr.put("lock_type",IOSEnum.LOCK_TYPE.code("未锁定"));
jsonAttr.put("storagevehicle_code",jsonTask.getString("vehicle_code"));
jsonAttr.put("storagevehicle_type",jsonTask.getString("vehicle_type"));
jsonAttr.put("is_emptyvehicle",IOSEnum.IS_NOTANDYES.code("是"));
attrTab.update(jsonAttr);

50
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoLashTask.java
View File

@@ -23,6 +23,8 @@ import org.nl.b_lms.storage_manage.ios.enums.IOSEnum;
import org.nl.common.utils.SecurityUtils;
import org.nl.modules.common.exception.BadRequestException;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.SpringContextHolder;
import org.nl.wms.ext.acs.service.WmsToAcsService;
import org.nl.wms.sch.AcsTaskDto;
import org.nl.wms.sch.manage.AbstractAcsTask;
import org.nl.wms.sch.manage.TaskStatusEnum;
@@ -85,13 +87,13 @@ public class TwoLashTask extends AbstractAcsTask {
}
JSONObject interaction_json = new JSONObject();
interaction_json.put("isLeave",json.getString("is_auto_issue"));
interaction_json.put("length",dao.get(0).getBox_length());
interaction_json.put("weight",dao.get(0).getBox_width());
interaction_json.put("height",dao.get(0).getBox_high());
interaction_json.put("template",dao.get(0).getLash_num());
interaction_json.put("isLeave", json.getString("is_auto_issue"));
interaction_json.put("length", dao.get(0).getBox_length());
interaction_json.put("weight", dao.get(0).getBox_width());
interaction_json.put("height", dao.get(0).getBox_high());
interaction_json.put("template", dao.get(0).getLash_num());
//第二次捆扎次数
interaction_json.put("bindingTimes","3");
interaction_json.put("bindingTimes", "3");
interaction_json.put("isBinding", IOSEnum.IS_SEND.code("是"));
char dtl_type = json.getString("task_type").charAt(json.getString("task_type").length() - 1);
AcsTaskDto dto = AcsTaskDto.builder()
@@ -121,6 +123,7 @@ public class TwoLashTask extends AbstractAcsTask {
@Override
@Transactional(rollbackFor = Exception.class)
public void updateTaskStatus(JSONObject taskObj, String status) {
JSONObject task_jo = WQLObject.getWQLObject("sch_base_task").query("task_code = '"+taskObj.getString("task_code")+"'").uniqueResult(0);
// 点位表
WQLObject pointTab = WQLObject.getWQLObject("sch_base_point");
// 木箱绑定表
@@ -140,19 +143,28 @@ public class TwoLashTask extends AbstractAcsTask {
// 完成
if (status.equals(TaskStatusEnum.FINISHED.getCode())) {
// 判断当前任务组的所有任务是否都为完成：如果都为完成则 调用acs接口允许此木箱离开
JSONObject groupTask = WQLObject.getWQLObject("sch_base_task").query("task_group_id = '" + taskObj.getString("task_group_id") + "' and is_delete = '0' and task_status <> 07 and task_id <> '"+taskObj.getString("task_id")+"'")
JSONObject groupTask = WQLObject.getWQLObject("sch_base_task").query("task_group_id = '" + task_jo.getString("task_group_id") + "' and is_delete = '0' and task_status <> 07 and task_id <> '" + taskObj.getString("task_id") + "'")
.uniqueResult(0);
if (ObjectUtil.isEmpty(groupTask)) {
// 更新点位载具、数量
JSONObject pointDao = pointTab.query("point_code = '" + taskObj.getString("point_code2") + "'").uniqueResult(0);
pointDao.put("vehicle_code", "");
pointDao.put("vehicle_qty",0);
WQLObject.getWQLObject("sch_base_point").update(pointDao);
// TODO 调用acs接口告诉此木箱可以离开
//给捆扎点下发强制放行
WmsToAcsService wmsToAcsService = SpringContextHolder.getBean(WmsToAcsService.class);
JSONArray action_rows = new JSONArray();
JSONObject action_jo = new JSONObject();
action_jo.put("device_code", task_jo.getString("point_code2"));
action_jo.put("code", "to_command");
action_jo.put("product_area", "BLK");
action_jo.put("value", "26");
action_rows.add(action_jo);
wmsToAcsService.action(action_rows);
// 更新点位载具、数量
JSONObject pointDao = pointTab.query("point_code = '" + task_jo.getString("point_code2") + "'").uniqueResult(0);
pointDao.put("vehicle_code", "");
pointDao.put("vehicle_qty", 0);
WQLObject.getWQLObject("sch_base_point").update(pointDao);
}
@@ -170,26 +182,26 @@ public class TwoLashTask extends AbstractAcsTask {
map.put("is_delete", IOSEnum.IS_NOTANDYES.code("是"));
// 减去终点点位载具数量
JSONObject pointDao = pointTab.query("point_code = '" + taskObj.getString("point_code2") + "'").uniqueResult(0);
JSONObject pointDao = pointTab.query("point_code = '" + task_jo.getString("point_code2") + "'").uniqueResult(0);
pointDao.put("vehicle_qty", NumberUtil.sub(pointDao.getIntValue("vehicle_qty"),1));
pointDao.put("vehicle_qty", NumberUtil.sub(pointDao.getIntValue("vehicle_qty"), 1));
if (pointDao.getIntValue("vehicle_qty") <= 0) {
// 清空载具号
pointDao.put("vehicle_code", "");
pointDao.put("vehicle_qty",0);
pointDao.put("vehicle_qty", 0);
}
pointTab.update(pointDao);
// 删除木箱绑定数据
boxTab.delete("box_no = '"+taskObj.getString("vehicle_code")+"'");
boxTab.delete("box_no = '" + task_jo.getString("vehicle_code") + "'");
}
map.put("update_optid", SecurityUtils.getCurrentUserId());
map.put("update_optname", SecurityUtils.getCurrentNickName());
map.put("update_time", DateUtil.now());
WQLObject.getWQLObject("SCH_BASE_Task").update(map, "task_id = '" + taskObj.getString("task_id") + "'");
WQLObject.getWQLObject("SCH_BASE_Task").update(map, "task_id = '" + task_jo.getString("task_id") + "'");
}
@Override

3
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoMoveBoxTask.java
View File

@@ -17,6 +17,8 @@ import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
import static org.nl.wms.util.TaskUtil.getRoutePlanCode;
/**
* 二期空木箱移库任务类
* Created by Lxy on 2024/1/19.
@@ -46,6 +48,7 @@ public class TwoMoveBoxTask extends AbstractAcsTask {
.task_type(json.getString("acs_task_type"))
.start_device_code(json.getString("point_code1"))
.next_device_code(json.getString("point_code2"))
.route_plan_code(getRoutePlanCode(json.getString("point_code2")))
.vehicle_code(json.getString("vehicle_code"))
.priority(json.getString("priority"))
.class_type(json.getString("task_type"))

3
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoSendOutTask.java
View File

@@ -42,6 +42,8 @@ public class TwoSendOutTask extends AbstractAcsTask {
WQLObject taskTab = WQLObject.getWQLObject("sch_base_task");
JSONArray arr = WQLObject.getWQLObject("SCH_BASE_Task").query("handle_class = '" + THIS_CLASS + "' and task_status = '" + TaskStatusEnum.START_AND_POINT.getCode() + "' and is_delete ='0'").getResultJSONArray(0);
// 获取系统参数
String expandWidthLength = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("expandWidthLength").getValue();
ArrayList<AcsTaskDto> resultList = new ArrayList<>();
for (int i = 0; i < arr.size(); i++) {
@@ -60,6 +62,7 @@ public class TwoSendOutTask extends AbstractAcsTask {
.dtl_type(String.valueOf(dtl_type))
.route_plan_code(getRoutePlanCode(json.getString("point_code1")))
.remark(json.getString("remark"))
.expandWidthLength(expandWidthLength)
.build();
resultList.add(dto);

2
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBoxManageServiceImpl.java
View File

@@ -538,6 +538,8 @@ public class OutBoxManageServiceImpl implements OutBoxManageService {
JSONObject paramIn = new JSONObject();
paramIn.put("stor_id", IOSEnum.STOR_ID.code("二期"));
paramIn.put("sect_id", RegionTypeEnum.TWO_BZC01.getId());
paramIn.put("vehicle_type", jsonObject.getString("storagevehicle_type"));
paramIn.put("height", jsonObject.getString("height"));
InBoxManageServiceImpl bean = SpringContextHolder.getBean(InBoxManageServiceImpl.class);
JSONObject jsonAttr = bean.getStruct(paramIn);

35
lms/nladmin-system/src/main/java/org/nl/common/enums/PackageInfoIvtEnum.java
View File

@@ -18,23 +18,38 @@ import java.util.Map;
@Getter
public enum PackageInfoIvtEnum {
//点位类型
POINT_STATUS(MapOf.of("满轴缓存位", "1", "空载具缓存位", "2", "待检区", "3", "管制区", "4", "装箱位", "5","装箱区", "6")),
POINT_STATUS(MapOf.of("满轴缓存位", "1", "空载具缓存位", "2", "待检区", "3", "管制区", "4", "装箱位", "5", "装箱区", "6","等待点", "7")),
//任务类型
TASK_TYPE(MapOf.of("输送线->满轴缓存位", "010901", "满轴缓存位->待检区", "010902", "满轴缓存位->管制区", "010903", "放空(空载具缓存位->输送线)",
"010904", "取空(待检区或管制区->空载具缓存位)", "010905", "待检区->管制区", "010906","管制区->待检区", "010907","待检区->装箱区", "010908", "装箱区->装箱对接位", "010909","放空(装箱区->待检区)", "010910","输送线四个点任务", "010911","送空(装箱区->待检区或管制区)", "010912")),
"010904", "补空(待检区或管制区->空载具缓存位)", "010905", "待检区->管制区", "010906", "管制区->待检区", "010907", "待检区->装箱区", "010908", "装箱区->装箱对接位", "010909", "放空(装箱区->待检区)", "010910", "输送线四个点任务", "010911", "送空(装箱区->待检区或管制区)", "010912")),
//ACS任务类型
ACS_TASK_TYPE(MapOf.of("agv任务", "1", "桁架任务", "6")),
//agv二次分配类型
AGV_ACTION_TYPE(MapOf.of("普通任务", "1", "取货二次分配", "2", "放货二次分配", "3", "取放货二次分配", "4")),
//二次分配请求类型
TASK_ACTION_TYPE(MapOf.of("取货分配", "1", "放货分配", "2", "取货完成", "3", "放货完成", "4")),
//起点终点类型
TASK_POINT_TYPE(MapOf.of("取货任务", "1", "放货任务", "2")),
//排序方式
SORT_TYPE(MapOf.of("升序", "1", "降序", "2")),
//ACS系统类型
AGV_SYSTEM_TYPE(MapOf.of("1楼诺宝任务", "1", "2楼1区域AGV系统", "2", "1楼叉车任务", "3")),
//桁架任务类型
TRUSS_TYPE(MapOf.of("点对点任务", "1", "下卷拔轴任务", "6", "换轴任务", "7","放轴任务", "8")),
TRUSS_TYPE(MapOf.of("点对点任务", "1", "下卷拔轴任务", "6", "换轴任务", "7", "放轴任务", "8")),
//是否
IS_USED(MapOf.of("启用", "1", "未启用", "0")),
@@ -43,7 +58,7 @@ public enum PackageInfoIvtEnum {
POINT_LOCATION(MapOf.of("上", "0", "下", "1")),
//库存状态
IVT_STATUS(MapOf.of("空", "0","空载具", "1","有子卷","2","合格品","3","管制品","4"));
IVT_STATUS(MapOf.of("空", "0", "空载具", "1", "有子卷", "2", "合格品", "3", "管制品", "4"));
private Map<String, String> code;
@@ -56,6 +71,14 @@ public enum PackageInfoIvtEnum {
throw new BadRequestException(this.name() + "对应类型" + desc + "未定义");
}
public Long longCode(String desc) {
String code = this.getCode().get(desc);
if (StringUtils.isNotEmpty(code)) {
return Long.valueOf(code);
}
throw new BadRequestException(this.name() + "对应类型" + desc + "未定义");
}
public String check(String code) {
for (Map.Entry<String, String> entry : this.getCode().entrySet()) {
if (entry.getValue().equals("code")) {

7
lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/StoragevehicleinfoServiceImpl.java
View File

@@ -129,7 +129,12 @@ public class StoragevehicleinfoServiceImpl implements StoragevehicleinfoService
code = "VEHICLE_CODE_GXTP";
break;
case "0003":
code = "VEHICLE_CODE_LK";
if (class_jo.getString("class_code").equals("000301")){
code = "VEHICLE_CODE_LK";
}
if (class_jo.getString("class_code").equals("000302")){
code = "VEHICLE_CODE_LKB";
}
break;
default:
break;

40
lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/rest/BLmsToMesController.java Normal file
View File

@@ -0,0 +1,40 @@
package org.nl.wms.ext.mes.rest;
import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.modules.logging.annotation.Log;
import org.nl.wms.ext.mes.service.LmsToMesService;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@RestController
@RequiredArgsConstructor
@RequestMapping("/CamstarApi")
@Slf4j
public class BLmsToMesController {
private final LmsToMesService lmsToMesService;
@PostMapping("/momAutoTransterMoveIn")
@Log("表处、分切上料反馈接口")
public ResponseEntity<Object> momAutoTransterMoveIn(@RequestBody JSONObject jo) {
return new ResponseEntity<>(lmsToMesService.momAutoTransterMoveIn(jo), HttpStatus.OK);
}
@PostMapping("/momGetPackingInfo")
@Log("LMS通过木箱号调用木箱信息")
public ResponseEntity<Object> momGetPackingInfo(@RequestBody JSONObject jo) {
return new ResponseEntity<>(lmsToMesService.momGetPackingInfo(jo), HttpStatus.OK);
}
@PostMapping("/momBoxPackageSubmit")
@Log("LMS装箱完成传MES包装关系")
public ResponseEntity<Object> momBoxPackageSubmit(@RequestBody JSONObject jo) {
return new ResponseEntity<>(lmsToMesService.momBoxPackageSubmit(jo), HttpStatus.OK);
}
}

41
lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/LmsToMesService.java
View File

@@ -136,44 +136,9 @@ public interface LmsToMesService {
*/
JSONObject ChildScrapUpdate(JSONObject jo);
JSONObject momAutoTransterMoveIn(JSONObject jo);
/**
* 向飞书推送图片
* @param file_name : 图片名称
* @return {
* "RTYPE": "S",
* "RTMSG": "图片上传成功",
* "RTOAL": 0,
* "RSYS": null,
* "RTDAT": "img_v3_028m_594c5c05-e1d6-4b2c-8298-445f3df23d4g",
* "RTDAT2": null
* }
*/
JSONObject sendSalesIvtMsg(String file_name);
/**
* 向飞书推送业务员对应的图片参数
* @param param {
* "UserList": [
* {
* "User": "********" //用户工号列表
* }
* ],
* "Code": "*********", //卡片ID
* "card": { //卡片参数
* "**": {},
* "**": {}
* }
* }
* @return {
* "RTYPE": "S",
* "RTMSG": "消息发送成功",
* "RTOAL": 0,
* "RSYS": null,
* "RTDAT": null,
* "RTDAT2": null
* }
*/
JSONObject sendSalesIvtMsgParam(JSONObject param);
JSONObject momGetPackingInfo(JSONObject jo);
JSONObject momBoxPackageSubmit(JSONObject jo);
}

71
lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java
View File

@@ -702,62 +702,29 @@ public class LmsToMesServiceImpl implements LmsToMesService {
}
@Override
public JSONObject sendSalesIvtMsg(String file_name) {
JSONObject result = new JSONObject();
if (StrUtil.equals("0", is_connect_mes)) {
result.put("status", HttpStatus.OK.value());
result.put("message", "下发成功，但未连接飞书!");
result.put("data", new JSONObject());
return result;
}
String url = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("FEISHU_URL").getValue();
String api = "/FeiShuNoticesWebApi/UploadImage";
url = url + api +"?fileName="+file_name;
log.info("sendSalesIvtMsg接口输入参数为：-------------------" + url.toString());
try {
String resultMsg = HttpRequest.post(url)
.execute().body();
result = JSONObject.parseObject(resultMsg);
log.info("sendSalesIvtMsg接口输出参数为：-------------------" + result.toString());
String RTYPE = result.getString("RTYPE");
if ("E".equals(RTYPE)) {
throw new BadRequestException(result.getString("RTMSG"));
}
public JSONObject momAutoTransterMoveIn(JSONObject param){ return null;} /*{
String from_area = param.getString("from_area");
String to_area = param.getString("to_area");
String container_name = param.getString("container_name");
} catch (Exception e) {
throw new BadRequestException("飞书提示错误：" + e.getMessage());
}
return result;
}
log.info("momAutoTransterMoveIn接口输入参数为：-------------------" + param.toString());
@Override
public JSONObject sendSalesIvtMsgParam(JSONObject param) {
log.info("sendSalesIvtMsgParam接口输入参数为：-------------------" + param.toString());
JSONObject result = new JSONObject();
if (StrUtil.equals("0", is_connect_mes)) {
result.put("status", HttpStatus.OK.value());
result.put("message", "下发成功，但未连接飞书!");
result.put("data", new JSONObject());
return result;
}
String url = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("FEISHU_URL").getValue();
String api = "/FeiShuNoticesWebApi/SendCard";
String url = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("MES_URL").getValue();
String api = "CamstarApi/momAutoTransterMoveIn";
url = url + api;
String UserName = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("MES_USERNAME").getValue();
String Password = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("MES_PASSWORD").getValue();
param.put("UserName", UserName);
param.put("Password", Password);
try {
String resultMsg = HttpRequest.post(url)
.body(String.valueOf(param))
.execute().body();
result = JSONObject.parseObject(resultMsg);
log.info("sendSalesIvtMsgParam接口输出参数为：-------------------" + result.toString());
log.info("LMSPackakge接口输出参数为：-------------------" + result.toString());
String RTYPE = result.getString("RTYPE");
@@ -767,8 +734,18 @@ public class LmsToMesServiceImpl implements LmsToMesService {
} catch (Exception e) {
throw new BadRequestException("飞书提示错误：" + e.getMessage());
throw new BadRequestException("MES提示错误：" + e.getMessage());
}
return result;
}*/
@Override
public JSONObject momGetPackingInfo(JSONObject jo) {
return null;
}
@Override
public JSONObject momBoxPackageSubmit(JSONObject jo) {
return null;
}
}

13
lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsTaskDto.java
View File

@@ -51,6 +51,13 @@ public class AcsTaskDto {
* Agv系统类型
*/
private String agv_system_type;
/**
* agv二次分配类型（1、普通任务 2、取货二次分配 3、放货二次分配 4、取放货二次分配）
*/
private String agv_action_type;
/**
* 备注
*/
@@ -133,4 +140,10 @@ public class AcsTaskDto {
private String barcode;
/**
* 发货任务下发货叉宽度
*/
private String expandWidthLength;
}