huojin
/
Byd_Dg_Java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

main
HUOJIN\92525 2025-03-04 14:42:00 +08:00
parent 6583c535a1
commit 0e37e91b74
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
youchain-system/src/main/java/com/youchain/appupdate/service/impl/BydAppServiceImpl.java
View File

@ -370,7 +370,7 @@ public class BydAppServiceImpl implements BydAppService {
public void createAsnDetailsAndItemKeysAndTasks(List<BarCodeVo> barCodeVos, Item item, Stock stock, Point srcPoint, Point endPoint, AgvTask agvTask) { public void createAsnDetailsAndItemKeysAndTasks(List<BarCodeVo> barCodeVos, Item item, Stock stock, Point srcPoint, Point endPoint, AgvTask agvTask) {
for (BarCodeVo barCodeVo : barCodeVos) { for (BarCodeVo barCodeVo : barCodeVos) {
AsnDetail asnDetail = asnDetailService.createAsnDetail(item, stock, srcPoint, barCodeVo.getPropC1(), barCodeVo.getBoxNumber(), barCodeVo.getPropC3(), Timestamp.valueOf(DateUtil.formatDateTime(DateUtil.parse(barCodeVo.getPropD1()))), barCodeVo.getOrderQty(), barCodeVo.getMo()); AsnDetail asnDetail = asnDetailService.createAsnDetail(item, stock, srcPoint, barCodeVo.getPropC1(), barCodeVo.getBoxNumber(), barCodeVo.getPropC3(), barCodeVo.getPropD1() == null ? null : Timestamp.valueOf(DateUtil.formatDateTime(DateUtil.parse(barCodeVo.getPropD1()))), barCodeVo.getOrderQty(), barCodeVo.getMo());
ItemKey itemKey = itemKeyService.createItemKey(item, barCodeVo.getPropC1(), asnDetail.getPropD1(), barCodeVo.getBoxNumber()); ItemKey itemKey = itemKeyService.createItemKey(item, barCodeVo.getPropC1(), asnDetail.getPropD1(), barCodeVo.getBoxNumber());
Task task = taskService.createTask(item, asnDetail.getOrderQty(), itemKey, asnDetail, BizStatus.ASN, null, null, stock, srcPoint, endPoint, agvTask); Task task = taskService.createTask(item, asnDetail.getOrderQty(), itemKey, asnDetail, BizStatus.ASN, null, null, stock, srcPoint, endPoint, agvTask);
} }

22
youchain-system/src/main/java/com/youchain/businessdata/service/impl/PickServiceImpl.java
View File

@ -170,6 +170,8 @@ public class PickServiceImpl implements PickService {
@Override @Override
public JSONObject returnPickJson(Task task) { public JSONObject returnPickJson(Task task) {
Pick pick=task.getPickDetail().getPick();
int complete = getCompleteStatus(pick);
JSONObject jsonObject = new JSONObject(new LinkedHashMap<>()); JSONObject jsonObject = new JSONObject(new LinkedHashMap<>());
//需求工位 //需求工位
jsonObject.put("OpName", task.getPickDetail().getPick().getStation()); jsonObject.put("OpName", task.getPickDetail().getPick().getStation());
@ -182,28 +184,20 @@ public class PickServiceImpl implements PickService {
jsonObject.put("number", task.getMoveQty()== null ? 0 : task.getMoveQty().intValue()); jsonObject.put("number", task.getMoveQty()== null ? 0 : task.getMoveQty().intValue());
//taskId //taskId
jsonObject.put("taskId", task.getPickDetail().getPick().getTaskCode()); jsonObject.put("taskId", task.getPickDetail().getPick().getTaskCode());
//complete 完成标识；0未完成；1完成
jsonObject.put("complete", complete);
return jsonObject; return jsonObject;
} }
private int getCompleteStatus(Pick pick) {
return BizStatus.PICK_ALL.equals(pick.getStatus()) ? 1 : 0;
}
@Override @Override
public void returnPickByTask(Task task) { public void returnPickByTask(Task task) {
sendPick(UrlApi.stock(), task); sendPick(UrlApi.stock(), task);
} }
public void refreshPickReturn(Pick pick) {
List<PickDetail> pickDetailList = pickDetailRepository.findByAllPickDetail(pick.getId());
List<PickDetail> filteredList = pickDetailList.stream()
.filter(detail -> detail.getSourceId() == null || detail.getSourceId() == 0)
.collect(Collectors.toList());
if (filteredList.isEmpty()) {
pick.setSourceId(1L);
pickRepository.save(pick);
return;
}
pick.setSourceId(0L);
pickRepository.save(pick);
}
@Override @Override
public void sendPick(String url, Task task) { public void sendPick(String url, Task task) {
String message = null; String message = null;