From 142718f5af8c3d15e2e3573915936a4cb504fca1 Mon Sep 17 00:00:00 2001 From: "HUOJIN\\92525" <925258474@qq.com> Date: Thu, 18 Apr 2024 15:23:07 +0800 Subject: [PATCH] no message --- .../com/youchain/businessdata/domain/PickDetail.java | 4 ++-- .../main/java/com/youchain/businessdata/domain/Task.java | 2 +- .../youchain/businessdata/service/AgvTaskService.java | 2 +- .../businessdata/service/dto/TaskQueryCriteria.java | 4 ++++ .../businessdata/service/impl/InventoryServiceImpl.java | 3 ++- .../businessdata/service/impl/MlsServiceImpl.java | 9 ++++++--- 6 files changed, 16 insertions(+), 8 deletions(-) diff --git a/youchain-system/src/main/java/com/youchain/businessdata/domain/PickDetail.java b/youchain-system/src/main/java/com/youchain/businessdata/domain/PickDetail.java index 4604493..e0c22b8 100644 --- a/youchain-system/src/main/java/com/youchain/businessdata/domain/PickDetail.java +++ b/youchain-system/src/main/java/com/youchain/businessdata/domain/PickDetail.java @@ -96,11 +96,11 @@ public class PickDetail extends BaseEntity implements Serializable { private String remark; @Column(name = "`prop_c1`") - @ApiModelProperty(value = "批次号") + @ApiModelProperty(value = "标签号") private String propC1; @Column(name = "`prop_c2`") - @ApiModelProperty(value = "序列号") + @ApiModelProperty(value = "任务号") private String propC2; @Column(name = "`prop_c3`") diff --git a/youchain-system/src/main/java/com/youchain/businessdata/domain/Task.java b/youchain-system/src/main/java/com/youchain/businessdata/domain/Task.java index 92c16a0..5354721 100644 --- a/youchain-system/src/main/java/com/youchain/businessdata/domain/Task.java +++ b/youchain-system/src/main/java/com/youchain/businessdata/domain/Task.java @@ -58,7 +58,7 @@ public class Task extends BaseEntity implements Serializable { private ItemKey itemKey; @Column(name = "`bill_code`") - @ApiModelProperty(value = "单据号") + @ApiModelProperty(value = "任务号") private String billCode; @Column(name = "`task_type`") diff --git a/youchain-system/src/main/java/com/youchain/businessdata/service/AgvTaskService.java b/youchain-system/src/main/java/com/youchain/businessdata/service/AgvTaskService.java index c94763c..8de018a 100644 --- a/youchain-system/src/main/java/com/youchain/businessdata/service/AgvTaskService.java +++ b/youchain-system/src/main/java/com/youchain/businessdata/service/AgvTaskService.java @@ -144,7 +144,7 @@ public interface AgvTaskService { * 任务回报更新状态 * @param agvTask * @param status - * @param containerCode + * @param */ void agvTaskCallback(AgvTask agvTask,Task task, String status); diff --git a/youchain-system/src/main/java/com/youchain/businessdata/service/dto/TaskQueryCriteria.java b/youchain-system/src/main/java/com/youchain/businessdata/service/dto/TaskQueryCriteria.java index 198d4de..2239579 100644 --- a/youchain-system/src/main/java/com/youchain/businessdata/service/dto/TaskQueryCriteria.java +++ b/youchain-system/src/main/java/com/youchain/businessdata/service/dto/TaskQueryCriteria.java @@ -29,6 +29,10 @@ import com.youchain.annotation.Query; @Data public class TaskQueryCriteria{ + /** 模糊 */ + @Query(type = Query.Type.INNER_LIKE) + private String billCode; + /** 模糊 */ @Query(type = Query.Type.INNER_LIKE) private String srcPointCode; diff --git a/youchain-system/src/main/java/com/youchain/businessdata/service/impl/InventoryServiceImpl.java b/youchain-system/src/main/java/com/youchain/businessdata/service/impl/InventoryServiceImpl.java index 3ef08d3..eed472f 100644 --- a/youchain-system/src/main/java/com/youchain/businessdata/service/impl/InventoryServiceImpl.java +++ b/youchain-system/src/main/java/com/youchain/businessdata/service/impl/InventoryServiceImpl.java @@ -189,6 +189,7 @@ public class InventoryServiceImpl implements InventoryService { inventory.setStock(stock); inventory.setStockCode(stock.getCode()); inventory.setDept(dept); + inventory.setBillCode(itemKey.getOrderNumber()); this.create(inventory); } } @@ -223,7 +224,7 @@ public class InventoryServiceImpl implements InventoryService { if (billCode.isEmpty()) { return null; } - String hql = " from Inventory inv where 1=1 and inv.billCode in (:billCode) "; + String hql = " from Inventory inv where 1=1 and inv.billCode in (:billCode) and inv.quantity>0 "; Query query = entityManager.createQuery(hql); query.setParameter("billCode", billCode); List list = query.getResultList(); diff --git a/youchain-system/src/main/java/com/youchain/businessdata/service/impl/MlsServiceImpl.java b/youchain-system/src/main/java/com/youchain/businessdata/service/impl/MlsServiceImpl.java index 5accd42..dace0b1 100644 --- a/youchain-system/src/main/java/com/youchain/businessdata/service/impl/MlsServiceImpl.java +++ b/youchain-system/src/main/java/com/youchain/businessdata/service/impl/MlsServiceImpl.java @@ -333,6 +333,7 @@ public class MlsServiceImpl implements MlsService { @Override @Transactional(rollbackFor = Exception.class) public synchronized void getIssueInfo(IssueInfo issueInfo) { + String taskNumber=issueInfo.getTaskNumber();//任务号 // 指定Set的类型 Set workOrderNameSet = issueInfo.getWorkOrderName(); if (workOrderNameSet.isEmpty()) { @@ -352,12 +353,13 @@ public class MlsServiceImpl implements MlsService { Point startPoint = inv.getPoint();//起始点位 Item item = inv.getItemKey().getItem(); - inv.setQueuedQty(inv.getQueuedQty()); + inv.setQueuedQty(inv.getQuantity()); inventoryService.update(inv); PickDetail pd = new PickDetail(); pd.setItem(item); pd.setPo(inv.getBillCode()); - + pd.setPropC1(inv.getItemKey().getPropC1()); + pd.setLineNo(1l); pd.setOrderQty(inv.getQuantity()); pd.setAllocatedQty(inv.getQuantity()); pd.setStatus(BizStatus.ALLOCATE); @@ -371,7 +373,7 @@ public class MlsServiceImpl implements MlsService { task.setItem(item); task.setItemKey(inv.getItemKey()); task.setPickDetail(pd); - task.setBillCode(pd.getPo()); + task.setBillCode(taskNumber); task.setSrcStock(inv.getStock()); task.setDstStock(inv.getStock()); task.setSrcPoint(startPoint); @@ -380,6 +382,7 @@ public class MlsServiceImpl implements MlsService { task.setSrcPointCode(startPoint.getCode()); task.setDstPointCode(endPoint.getCode()); task.setInvStatus(inv.getStatus()); + task.setTaskType(BizStatus.PICK); task.setTaskStatus(BizStatus.OPEN); task.setPlanQty(inv.getQuantity()); task.setInvId(inv.getId());