diff --git a/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/WmsOutTaskServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/WmsOutTaskServiceImpl.java index 9d2f34f..52b2121 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/WmsOutTaskServiceImpl.java +++ b/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/WmsOutTaskServiceImpl.java @@ -4,6 +4,9 @@ import com.ktg.common.utils.DateUtils; import com.ktg.mes.md.domain.*; import com.ktg.mes.md.mapper.*; import com.ktg.mes.md.service.IWmsOutTaskService; +import com.ktg.mes.wm.domain.WmStorageArea; +import com.ktg.mes.wm.mapper.WmStorageAreaMapper; +import com.ktg.mes.wm.service.IWmStorageAreaService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -40,6 +43,9 @@ public class WmsOutTaskServiceImpl implements IWmsOutTaskService { @Autowired private MdItemMapper mdItemMapper; + @Autowired + private WmStorageAreaMapper wmStorageAreaMapper; + /** * 查询出库任务 * @@ -71,6 +77,9 @@ public class WmsOutTaskServiceImpl implements IWmsOutTaskService { // 根据出库计划获得出库类型 WmsBusinessType wmsBusinessType = this.wmsBusinessTypeMapper.selectWmsBusinessTypeByTypeId(wmsOutPlan.getWmsBusinessTypeId().toString()); + // 获取库位信息 + WmStorageArea wmStorageArea = wmStorageAreaMapper.selectWmStorageAreaByAreaId(wmsOutPlanDetail.getWmStorageAreaId()); + // 设定出库信息数据 HashMap hashMap = new HashMap<>(); /* 来自物料 */ @@ -92,6 +101,9 @@ public class WmsOutTaskServiceImpl implements IWmsOutTaskService { hashMap.put("wmStorageAreaId", wmsOutPlanDetail.getWmStorageAreaId()); // 库位ID hashMap.put("wmStorageAreaCode", wmsOutPlanDetail.getWmStorageAreaCode()); // 库位编码 hashMap.put("wmStorageAreaName", wmsOutPlanDetail.getWmStorageAreaName()); // 库位名称 + hashMap.put("cellX", wmStorageArea.getPositionX().toString()); + hashMap.put("cellY", wmStorageArea.getPositionY().toString()); + hashMap.put("cellZ", wmStorageArea.getPositionZ().toString()); hashMap.put("detailStatus", wmsOutPlanDetail.getDetailState()); // 明细状态 /* 实体 */ String outTime = null; @@ -213,7 +225,7 @@ public class WmsOutTaskServiceImpl implements IWmsOutTaskService { public List selectWmsOutTaskIncompleteList(String planSheet) { WmsOutPlan wmsOutPlan = wmsOutPlanMapper.selectWmsOutPlanByPlanCode(planSheet); List wmsOutTaskList = new ArrayList<>(); - if (wmsOutPlan != null){ + if (wmsOutPlan != null) { WmsOutTask wmsOutTask = new WmsOutTask(); wmsOutTask.setWmsOutPlanId(wmsOutPlan.getWmsOutPlanId()); wmsOutTask.setTaskState("0");