lhq/FT501-WMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

流程测试修改

Browse Source
This commit is contained in:
liuhanqing
2025-07-22 16:25:55 +08:00
parent 47f173d79f
commit 9c0e458b85
20 changed files with 218 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
ruoyi-admin/src/main/java/com/ruoyi/out/tagTask/service/impl/TagTaskServiceImpl.java
View File

@@ -15,8 +15,11 @@ import java.util.stream.Collectors;
import cn.hutool.core.collection.CollUtil;
import com.ruoyi.bas.tag.domain.BasTag;
import com.ruoyi.bas.tag.service.IBasTagService;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.out.tagTask.domain.ExecuteSocket;
import com.ruoyi.pda.domain.TrayCodeMakeSure;
import com.ruoyi.pda.service.PdaService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -39,6 +42,8 @@ public class TagTaskServiceImpl implements ITagTaskService {
private TagTaskMapper tagTaskMapper;
@Autowired
private IBasTagService basTagService;
@Autowired
private PdaService pdaService;
private HashMap<String, ExecuteSocket> tagSockteMap = new HashMap<>();
@@ -128,12 +133,18 @@ public class TagTaskServiceImpl implements ITagTaskService {
boolean b = sendDzbqOff(basTag);
log.info("灭灯:{}", b);
if (b) {
//删除标签绑定信息
basTag.setSendCompleted("0");
basTag.setTrayCode("");
basTagService.updateBasTag(basTag);
//删除tagList
tagTaskMapper.deleteTagTaskByIds(tagTaskList.stream().map(TagTask::getId).toArray(Long[]::new));
//出库确认
TrayCodeMakeSure trayCodeMakeSure = new TrayCodeMakeSure();
trayCodeMakeSure.setTrayCode(basTag.getTrayCode());
AjaxResult ajaxResult = pdaService.outMakeSure(trayCodeMakeSure);
if (ajaxResult.isSuccess()){
//删除标签绑定信息
basTag.setSendCompleted("0");
basTag.setTrayCode("");
basTagService.updateBasTag(basTag);
//删除tagList
tagTaskMapper.deleteTagTaskByIds(tagTaskList.stream().map(TagTask::getId).toArray(Long[]::new));
}
}
} else {
Optional<TagTask> first = tagTaskList.stream().filter(x -> "1".equals(x.getStatus())).findFirst();
@@ -247,7 +258,7 @@ public class TagTaskServiceImpl implements ITagTaskService {
/**
* 下发电子标签
* todo 待调试 下发电子标签
* @param basTag
* @param tagTask
* @return
@@ -267,11 +278,12 @@ public class TagTaskServiceImpl implements ITagTaskService {
int x7 = (sid + 0x02+0x80 + x3 + x4 + x5 + x6) % 256;//累加 校验
String value = "FA" + String.format("%02x", sid) + String.format("%02x", 0x02) + String.format("%02x", 0x80) + greenFirst2 +
greenLast2 + redFirst2 + redLast2 + String.format("%02x", x7) + "AF";
System.out.println(value);
return sendMsgSocket(getSocket(basTag),value);
//boolean b = sendMsgSocket(getSocket(basTag), value);
log.info("电子标签{},发送指令{}",basTag.getId(), value);
return true;
}
// 发送消息
//todo 待调试 发送消息
public boolean sendMsgSocket(Socket socket,String msg) {
byte[] bytes = hexStringToByteArray(msg);
try(OutputStream os = socket.getOutputStream()) {