diff --git a/ant-design-vue-jeecg/src/views/system/receipt/modules/ReceiptContainerStatusSelectModal.vue b/ant-design-vue-jeecg/src/views/system/receipt/modules/ReceiptContainerStatusSelectModal.vue
index 7bc63ca..0649e39 100644
--- a/ant-design-vue-jeecg/src/views/system/receipt/modules/ReceiptContainerStatusSelectModal.vue
+++ b/ant-design-vue-jeecg/src/views/system/receipt/modules/ReceiptContainerStatusSelectModal.vue
@@ -29,7 +29,7 @@
<!-- <a-input placeholder="请输入入库口" v-model="quickMainModel.toPort"/>-->
<j-search-select-tag
placeholder="请选择入库口"
- v-model="model.fromPort"
+ v-model="model.toPort"
dict="port,name,code,type !='2'"
:pageSize="5"
:async="true">
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/tv/TvController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/tv/TvController.java
index 3b58b99..0940874 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/tv/TvController.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/tv/TvController.java
@@ -1,18 +1,34 @@
package org.jeecg.modules.wms.api.tv;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.wms.api.mobile.entity.TvTaskVo;
+import org.jeecg.modules.wms.config.location.entity.Location;
+import org.jeecg.modules.wms.config.location.service.ILocationService;
import org.jeecg.modules.wms.config.parameterConfiguration.service.IParameterConfigurationService;
+import org.jeecg.modules.wms.inventory.inventoryHeader.entity.InventoryDetail;
+import org.jeecg.modules.wms.inventory.inventoryHeader.service.IInventoryDetailService;
+import org.jeecg.modules.wms.inventory.inventoryTransaction.entity.InventoryTransaction;
+import org.jeecg.modules.wms.inventory.inventoryTransaction.service.IInventoryTransactionService;
+import org.jeecg.modules.wms.shipment.shipmentHeader.entity.ShipmentDetail;
+import org.jeecg.modules.wms.shipment.shipmentHeader.service.IShipmentDetailService;
import org.jeecg.modules.wms.task.taskHeader.entity.TaskDetail;
import org.jeecg.modules.wms.task.taskHeader.entity.TaskHeader;
+import org.jeecg.modules.wms.task.taskHeader.service.ITaskDetailService;
+import org.jeecg.modules.wms.task.taskHeader.service.ITaskHeaderService;
import org.jeecg.modules.wms.task.taskHeader.service.impl.TaskDetailServiceImpl;
import org.jeecg.modules.wms.task.taskHeader.service.impl.TaskHeaderServiceImpl;
import org.jeecg.utils.StringUtils;
import org.jeecg.utils.constant.QuantityConstant;
+import org.jeecg.utils.support.PassApiAuthentication;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -20,10 +36,9 @@ import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.stream.Collectors;
/**
*/
@@ -45,6 +60,18 @@ public class TvController {
@Resource
private TaskDetailServiceImpl taskDetailService;
+ @Resource
+ private ILocationService locationService;
+
+ @Resource
+ private IShipmentDetailService shipmentDetailService;
+
+ @Resource
+ private IInventoryTransactionService inventoryTransactionService;
+
+ @Resource
+ private IInventoryDetailService inventoryDetailService;
+
@GetMapping("taskOfStation")
public Result<List<TvTaskVo>> importExcel(String code, HttpServletResponse response) {
@@ -110,4 +137,222 @@ public class TvController {
log.error("查找电视版本参数错误", e);
}
}
+
+ /**
+ * 当天出入库量
+ * @param zoneCode 库区编码
+ * @return
+ */
+ @GetMapping("todayTaskNum")
+ public Result todayTaskNum(String zoneCode, HttpServletResponse response) {
+ addResponseHeader(response, QuantityConstant.TV_VERSION);
+ ArrayList<Object> result = CollUtil.newArrayList();
+ LambdaQueryWrapper<TaskHeader> taskHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
+ taskHeaderLambdaQueryWrapper.eq(TaskHeader::getZoneCode, zoneCode);
+ taskHeaderLambdaQueryWrapper.likeRight(TaskHeader::getCreateTime, DateUtil.today());
+ taskHeaderLambdaQueryWrapper.in(TaskHeader::getInnernalTaskType, QuantityConstant.TASK_INTENERTYPE_RECEIPT, QuantityConstant.TASK_INTENERTYPE_SHIPMENT,
+ QuantityConstant.TASK_INTENERTYPE_TRANSFER_POSITION);
+ List<TaskHeader> taskHeaderList = taskHeaderService.list(taskHeaderLambdaQueryWrapper);
+ Map<Integer, List<TaskHeader>> taskTypeMap = taskHeaderList.stream().collect(Collectors.groupingBy(TaskHeader::getInnernalTaskType));
+ List<TaskHeader> receiptTaskList = taskTypeMap.get(QuantityConstant.TASK_INTENERTYPE_RECEIPT);
+ List<TaskHeader> shipmentTaskList = taskTypeMap.get(QuantityConstant.TASK_INTENERTYPE_SHIPMENT);
+ HashMap<String, Integer> resultMap = new HashMap<>();
+ int receiptNum = 0;
+ int shipmentNum = 0;
+ if (CollectionUtils.isNotEmpty(receiptTaskList)) {
+ receiptNum = receiptTaskList.size();
+ resultMap.put("receiptNum", receiptNum);
+ } else {
+ resultMap.put("receiptNum", 0);
+ }
+ if (CollectionUtils.isNotEmpty(shipmentTaskList)) {
+ shipmentNum = shipmentTaskList.size();
+ resultMap.put("shipmentNum", shipmentNum);
+ } else {
+ resultMap.put("shipmentNum", 0);
+ }
+ if (shipmentNum != 0 && receiptNum != 0) {
+ float proportion = (Math.round(receiptTaskList.size() / (float)shipmentTaskList.size() * 100)) / 100f;
+ resultMap.put("proportion", (int)(proportion * 100));
+ } else {
+ resultMap.put("proportion", 100);
+ }
+ result.add(resultMap);
+ return Result.OK(result);
+ }
+
+ /**
+ * 当周出入库量
+ * @param zoneCode 库区编码
+ * @return
+ */
+ @GetMapping("weekTaskNum")
+ public Result weekTaskNum(String zoneCode, HttpServletResponse response) {
+ addResponseHeader(response, QuantityConstant.TV_VERSION);
+ ArrayList<Object> result = CollUtil.newArrayList();
+ LambdaQueryWrapper<TaskHeader> taskHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
+ taskHeaderLambdaQueryWrapper.eq(TaskHeader::getZoneCode, zoneCode);
+ taskHeaderLambdaQueryWrapper.ge(TaskHeader::getCreateTime, DateUtil.offsetDay(new Date(), -7));
+ taskHeaderLambdaQueryWrapper.in(TaskHeader::getInnernalTaskType, QuantityConstant.TASK_INTENERTYPE_RECEIPT, QuantityConstant.TASK_INTENERTYPE_SHIPMENT,
+ QuantityConstant.TASK_INTENERTYPE_TRANSFER_POSITION);
+ List<TaskHeader> taskHeaderList = taskHeaderService.list(taskHeaderLambdaQueryWrapper);
+ Map<Integer, List<TaskHeader>> taskTypeMap = taskHeaderList.stream().collect(Collectors.groupingBy(TaskHeader::getInnernalTaskType));
+ List<TaskHeader> receiptTaskList = taskTypeMap.get(QuantityConstant.TASK_INTENERTYPE_RECEIPT);
+ List<TaskHeader> shipmentTaskList = taskTypeMap.get(QuantityConstant.TASK_INTENERTYPE_SHIPMENT);
+ HashMap<String, Integer> resultMap = new HashMap<>();
+ int receiptNum = 0;
+ int shipmentNum = 0;
+ if (CollectionUtils.isNotEmpty(receiptTaskList)) {
+ receiptNum = receiptTaskList.size();
+ resultMap.put("receiptNum", receiptNum);
+ } else {
+ resultMap.put("receiptNum", 0);
+ }
+ if (CollectionUtils.isNotEmpty(shipmentTaskList)) {
+ shipmentNum = shipmentTaskList.size();
+ resultMap.put("shipmentNum", shipmentNum);
+ } else {
+ resultMap.put("shipmentNum", 0);
+ }
+ if (shipmentNum != 0 && receiptNum != 0) {
+ float proportion = (Math.round(receiptTaskList.size() / (float)shipmentTaskList.size() * 100)) / 100f;
+ resultMap.put("proportion", (int)(proportion * 100));
+ } else {
+ resultMap.put("proportion", 100);
+ }
+ result.add(resultMap);
+ return Result.OK(result);
+ }
+
+ /**
+ * 当月出入库量
+ * @param zoneCode 库区编码
+ * @return
+ */
+ @GetMapping("monthTaskNum")
+ public Result monthTaskNum(String zoneCode, HttpServletResponse response) {
+ addResponseHeader(response, QuantityConstant.TV_VERSION);
+ ArrayList<Object> result = CollUtil.newArrayList();
+ LambdaQueryWrapper<TaskHeader> taskHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
+ taskHeaderLambdaQueryWrapper.eq(TaskHeader::getZoneCode, zoneCode);
+ taskHeaderLambdaQueryWrapper.ge(TaskHeader::getCreateTime, DateUtil.offsetDay(new Date(), -30));
+ taskHeaderLambdaQueryWrapper.in(TaskHeader::getInnernalTaskType, QuantityConstant.TASK_INTENERTYPE_RECEIPT, QuantityConstant.TASK_INTENERTYPE_SHIPMENT,
+ QuantityConstant.TASK_INTENERTYPE_TRANSFER_POSITION);
+ List<TaskHeader> taskHeaderList = taskHeaderService.list(taskHeaderLambdaQueryWrapper);
+ Map<Integer, List<TaskHeader>> taskTypeMap = taskHeaderList.stream().collect(Collectors.groupingBy(TaskHeader::getInnernalTaskType));
+ List<TaskHeader> receiptTaskList = taskTypeMap.get(QuantityConstant.TASK_INTENERTYPE_RECEIPT);
+ List<TaskHeader> shipmentTaskList = taskTypeMap.get(QuantityConstant.TASK_INTENERTYPE_SHIPMENT);
+ HashMap<String, Integer> resultMap = new HashMap<>();
+ int receiptNum = 0;
+ int shipmentNum = 0;
+ if (CollectionUtils.isNotEmpty(receiptTaskList)) {
+ receiptNum = receiptTaskList.size();
+ resultMap.put("receiptNum", receiptNum);
+ } else {
+ resultMap.put("receiptNum", 0);
+ }
+ if (CollectionUtils.isNotEmpty(shipmentTaskList)) {
+ shipmentNum = shipmentTaskList.size();
+ resultMap.put("shipmentNum", shipmentNum);
+ } else {
+ resultMap.put("shipmentNum", 0);
+ }
+ if (shipmentNum != 0 && receiptNum != 0) {
+ float proportion = (Math.round(receiptTaskList.size() / (float)shipmentTaskList.size() * 100)) / 100f;
+ resultMap.put("proportion", (int)(proportion * 100));
+ } else {
+ resultMap.put("proportion", 100);
+ }
+ result.add(resultMap);
+ return Result.OK(result);
+ }
+
+ /**
+ * 库位使用情况(按巷道来)
+ * @param zoneCode 库区编码
+ * @return
+ */
+ @GetMapping("roadWayLocation")
+ public Result<?> roadWayLocation(String zoneCode, HttpServletResponse response) {
+ addResponseHeader(response, QuantityConstant.TV_VERSION);
+ ArrayList<Object> result = CollUtil.newArrayList();
+ LambdaQueryWrapper<Location> locationLambdaQueryWrapper = Wrappers.lambdaQuery();
+ locationLambdaQueryWrapper.eq(Location::getZoneCode, zoneCode);
+ List<Location> locationList = locationService.list(locationLambdaQueryWrapper);
+ Map<Integer, List<Location>> locationMap = locationList.stream().collect(Collectors.groupingBy(Location::getRoadWay));
+ for (Map.Entry<Integer, List<Location>> entry : locationMap.entrySet()) {
+ HashMap<String, String> resultMap = new HashMap<>();
+ Integer roadWay = entry.getKey();
+ List<Location> sumLocationList = entry.getValue();
+ long sumNum = sumLocationList.size();
+ long haveContainerNum = sumLocationList.stream().filter(l -> StringUtils.isNotEmpty(l.getContainerCode())).count();
+ long unHaveContainerNum = sumNum - haveContainerNum;
+ //巷道
+ resultMap.put("roadWay", roadWay + "号巷道");
+ //库位总数
+ resultMap.put("sumNum", String.valueOf(sumNum));
+ //有托盘库位
+ resultMap.put("haveContainerNum", String.valueOf(haveContainerNum));
+ //空闲库位
+ resultMap.put("unHaveContainerNum", String.valueOf(unHaveContainerNum));
+ float usagerate = (Math.round(haveContainerNum / (float)sumNum * 100)) / 100f;
+ resultMap.put("usagerate", (int)(usagerate * 100) + "%");
+ result.add(resultMap);
+ }
+ return Result.OK(result);
+ }
+
+ /**
+ * produce 生产情况
+ * @param zoneCode 库区编码
+ * @return
+ */
+ @GetMapping("produceSituation")
+ public Result produceSituation(String zoneCode, HttpServletResponse response) {
+ addResponseHeader(response, QuantityConstant.TV_VERSION);
+ ArrayList<Object> result = CollUtil.newArrayList();
+ LambdaQueryWrapper<InventoryTransaction> inventoryTransactionLambdaQueryWrapper = Wrappers.lambdaQuery();
+ inventoryTransactionLambdaQueryWrapper.eq(InventoryTransaction::getZoneCode, zoneCode);
+ inventoryTransactionLambdaQueryWrapper.ge(InventoryTransaction::getCreateTime, DateUtil.offsetHour(new Date(), -24));
+ inventoryTransactionLambdaQueryWrapper.eq(InventoryTransaction::getType, QuantityConstant.INVENTORY_TRANSACTION_SHIPMENT);
+ List<InventoryTransaction> inventoryTransactionList = inventoryTransactionService.list(inventoryTransactionLambdaQueryWrapper);
+ Map<String, List<InventoryTransaction>> map =
+ inventoryTransactionList.stream().filter(i -> i.getMaterialCode() != null).collect(Collectors.groupingBy(InventoryTransaction::getMaterialCode));
+ for (Map.Entry<String, List<InventoryTransaction>> entry : map.entrySet()) {
+ HashMap<String, String> resultMap = new HashMap<>();
+ String materialCode = entry.getKey();
+ List<InventoryTransaction> inventoryTransactions = entry.getValue();
+ BigDecimal sumCosumeQty = inventoryTransactions.stream().map(InventoryTransaction::getQty).reduce(BigDecimal.ZERO, BigDecimal::add);
+ LambdaQueryWrapper<ShipmentDetail> shipmentDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
+ shipmentDetailLambdaQueryWrapper.eq(ShipmentDetail::getMaterialCode, materialCode);
+ shipmentDetailLambdaQueryWrapper.ge(ShipmentDetail::getCreateTime, DateUtil.offsetHour(new Date(), -24));
+ List<ShipmentDetail> shipmentDetailList = shipmentDetailService.list(shipmentDetailLambdaQueryWrapper);
+ BigDecimal sumNeedQty = shipmentDetailList.stream().map(ShipmentDetail::getQty).reduce(BigDecimal.ZERO, BigDecimal::add);
+ LambdaQueryWrapper<InventoryDetail> inventoryDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
+ inventoryDetailLambdaQueryWrapper.eq(InventoryDetail::getMaterialCode, materialCode).eq(InventoryDetail::getZoneCode, zoneCode);
+ List<InventoryDetail> inventoryDetailList = inventoryDetailService.list(inventoryDetailLambdaQueryWrapper);
+ BigDecimal inventorySumQty = inventoryDetailList.stream().map(InventoryDetail::getQty).reduce(BigDecimal.ZERO, BigDecimal::add);
+ if (sumCosumeQty != null) {
+ // 交易记录使用数量
+ resultMap.put("sumCosumeQty", sumCosumeQty.toString());
+ }
+ if (sumNeedQty != null) {
+ // 出库单明细数量
+ resultMap.put("sumNeedQty", sumNeedQty.toString());
+ }
+ if (inventorySumQty != null) {
+ // 库存明细数量
+ resultMap.put("inventorySumQty", inventorySumQty.toString());
+ // 物料名称
+ resultMap.put("materialName", inventoryDetailList.get(0).getMaterialName());
+ }
+ resultMap.put("materialCode", materialCode);
+ result.add(resultMap);
+ if (result.size() > 30) {
+ return Result.OK(result);
+ }
+ }
+ return Result.OK(result);
+ }
+
}
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/service/LocationAllocationServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/service/LocationAllocationServiceImpl.java
index 9fd2ba2..97a1b54 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/service/LocationAllocationServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/service/LocationAllocationServiceImpl.java
@@ -103,8 +103,7 @@ public class LocationAllocationServiceImpl implements LocationAllocationService
public String doubleRk(String zoneCode, List<Integer> roadWays, int high, String warehouseCode, List<String> locationTypeCodeList, String materialAreaCode,
String materialCode) {
if (roadWays == null || roadWays.size() < 1) {
- List<Location> locationList = locationService.getLocationListByZoneCode(zoneCode, warehouseCode);
- roadWays = locationList.stream().map(Location::getRoadWay).distinct().collect(toList());
+ roadWays = locationService.getRoadWayByZoneCode(zoneCode,warehouseCode);
}
String value = parameterConfigurationService.getValueByCode(QuantityConstant.DOUBLE_FORK_RESERVE_LOCATION);
int reserveNumber = 4;
@@ -192,8 +191,7 @@ public class LocationAllocationServiceImpl implements LocationAllocationService
public String singleRk(String zoneCode, List<Integer> roadWays, int high, String warehouseCode, List<String> locationTypeCodeList, String materialAreaCode,
String materialCode) {
if (roadWays == null || roadWays.size() < 1) {
- List<Location> locationList = locationService.getLocationListByZoneCode(zoneCode, warehouseCode);
- roadWays = locationList.stream().map(Location::getRoadWay).distinct().collect(toList());
+ roadWays = locationService.getRoadWayByZoneCode(zoneCode,warehouseCode);
}
List<Integer> removeRoadWays = new ArrayList<>();
// 寻找可用巷道，空闲的空库位低于设定值，那么这个巷道就不能用来分配库位
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/service/WcsServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/service/WcsServiceImpl.java
index cf41c50..ec89e6a 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/service/WcsServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/service/WcsServiceImpl.java
@@ -30,6 +30,7 @@ import org.jeecg.modules.wms.config.material.service.IMaterialService;
import org.jeecg.modules.wms.config.parameterConfiguration.service.IParameterConfigurationService;
import org.jeecg.modules.wms.config.zone.entity.Zone;
import org.jeecg.modules.wms.config.zone.service.IZoneService;
+import org.jeecg.modules.wms.lockStation.service.ILockStationService;
import org.jeecg.modules.wms.receipt.receiptContainerHeader.entity.ReceiptContainerDetail;
import org.jeecg.modules.wms.receipt.receiptContainerHeader.entity.ReceiptContainerHeader;
import org.jeecg.modules.wms.receipt.receiptContainerHeader.service.IReceiptContainerDetailService;
@@ -104,6 +105,9 @@ public class WcsServiceImpl implements WcsService {
@Resource
private IContainerTypeService containerTypeService;
+ @Resource
+ private ILockStationService lockStationService;
+
/**
* 库位分配
* @throws SocketException
@@ -197,7 +201,6 @@ public class WcsServiceImpl implements WcsService {
}
}
}
-
locationCode = locationAllocationService.allocation(allocationRule, locationTypeCodeList, high, zoneCode, roadWays, warehouseCode, containerCode,
materialAreaCode, materialCode);
if (StringUtils.isEmpty(locationCode)) {
@@ -236,7 +239,6 @@ public class WcsServiceImpl implements WcsService {
}
}
}
-
// 修改任务明细目标库位
Location location = locationService.getLocationByCode(locationCode, warehouseCode);
int rowFlag = location.getRowFlag().intValue();
@@ -266,7 +268,11 @@ public class WcsServiceImpl implements WcsService {
}
}
}
-
+ if (taskType == QuantityConstant.TASK_TYPE_WHOLERECEIPT) {
+ if (!lockStationService.unlockStation(taskHeader.getToPortCode(), warehouseCode)) {
+ throw new JeecgBootException("分配库位，解锁站台失败：" + taskHeader.getToPortCode());
+ }
+ }
taskHeader = new TaskHeader();
taskHeader.setId(Integer.parseInt(taskNo));
taskHeader.setZoneCode(location.getZoneCode());
@@ -278,7 +284,6 @@ public class WcsServiceImpl implements WcsService {
if (!taskHeaderService.updateById(taskHeader)) {
throw new JeecgBootException("更新任务头表目标库位失败");
}
-
WcsTask wcsTask = new WcsTask();
wcsTask.setToLocationCode(locationCode);
wcsTask.setPreTaskNo(String.valueOf(preTaskNo));
@@ -289,7 +294,7 @@ public class WcsServiceImpl implements WcsService {
log.info("完成分配库位，任务号：" + taskNo + ", 库位编码：" + locationCode);
return Result.OK(wcsTask);
}
-
+
@Override
@Cacheable(cacheNames = "getAvailableRowdway#10", key = "#root.methodName + '_' + #zoneCode", unless = "#result == null ")
public Result<List<Integer>> getAvailableRowdway(String zoneCode) {
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/service/ILocationService.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/service/ILocationService.java
index eaced59..6db0055 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/service/ILocationService.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/service/ILocationService.java
@@ -27,6 +27,8 @@ public interface ILocationService extends IService<Location> {
List<Location> getLocationListByZoneCode(String zoneCode, String warehouseCode);
+ List<Integer> getRoadWayByZoneCode(String zoneCode, String warehouseCode);
+
boolean updateStatus(String locationCode, String status, String warehouseCode);
boolean updateContainerCodeAndStatus(String locationCode, String containerCode, String status, String warehouseCode);
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/service/impl/LocationServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/service/impl/LocationServiceImpl.java
index 52ae20f..9398f9a 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/service/impl/LocationServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/service/impl/LocationServiceImpl.java
@@ -7,6 +7,7 @@ import java.util.stream.Collectors;
import javax.annotation.Resource;
+import cn.hutool.core.collection.CollUtil;
import org.apache.commons.collections4.ListUtils;
import org.apache.shiro.util.CollectionUtils;
import org.jeecg.common.api.vo.Result;
@@ -113,6 +114,18 @@ public class LocationServiceImpl extends ServiceImpl<LocationMapper, Location> i
}
@Override
+ public List<Integer> getRoadWayByZoneCode(String zoneCode, String warehouseCode) {
+ LambdaQueryWrapper<Location> locationLambdaQueryWrapper = Wrappers.lambdaQuery();
+ locationLambdaQueryWrapper.eq(Location::getZoneCode, zoneCode).eq(Location::getEnable, QuantityConstant.STATUS_ENABLE)
+ .eq(Location::getWarehouseCode, warehouseCode).select(Location::getRoadWay).groupBy(Location::getRoadWay);
+ List<Location> locationList = locationService.list(locationLambdaQueryWrapper);
+ if (CollectionUtils.isEmpty(locationList)) {
+ return CollUtil.newArrayList();
+ }
+ return locationList.stream().map(Location::getRoadWay).collect(Collectors.toList());
+ }
+
+ @Override
@Transactional
public boolean updateStatus(String locationCode, String status, String warehouseCode) {
LambdaUpdateWrapper<Location> updateWrapper = Wrappers.lambdaUpdate();
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/service/impl/ReceiptContainerHeaderServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/service/impl/ReceiptContainerHeaderServiceImpl.java
index 9b0bbf7..7cbe865 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/service/impl/ReceiptContainerHeaderServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/service/impl/ReceiptContainerHeaderServiceImpl.java
@@ -137,6 +137,7 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl<ReceiptContai
String toLocationCode = receiptContainerHeader.getToLocationCode();
int taskType = receiptContainerHeader.getTaskType();
String fromPort = receiptContainerHeader.getFromPort();
+ String toPort = receiptContainerHeader.getToPort();
Container container = containerService.getContainerByCode(containerCode, warehouseCode);
if (container == null) {
return Result.error("托盘：" + containerCode + " 信息为空");
@@ -183,7 +184,7 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl<ReceiptContai
taskHeader.setReceiptContainerHeaderId(receiptContainerHeader.getId());
taskHeader.setWarehouseCode(warehouseCode);
taskHeader.setZoneCode(zoneCode);
- taskHeader.setToPortCode(receiptContainerHeader.getToPort());
+ taskHeader.setToPortCode(toPort);
success = taskHeaderService.save(taskHeader);
if (!success) {
throw new JeecgBootException("创建入库任务, 任务生成失败");
@@ -263,8 +264,8 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl<ReceiptContai
if (StringUtils.isNotEmpty(value)) {
int lockStation = Integer.parseInt(value);
if (lockStation == QuantityConstant.START_LOCK_STATION) {
- if (!lockStationService.lockStation(fromPort, warehouseCode)) {
- throw new JeecgBootException("生成入库任务时，站台已经锁定：" + fromPort);
+ if (!lockStationService.lockStation(toPort, warehouseCode)) {
+ throw new JeecgBootException("生成入库任务时，站台已经锁定：" + toPort);
}
}
}
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java
index 0e28f74..5977b4b 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java
@@ -1069,14 +1069,14 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
// if (StringUtils.isEmpty(toPortCode)) {
// return Result.error("创建空托盘入库时, 站台编码为空");
// }
-// Container container = containerService.getContainerByCode(containerCode, warehouseCode);
-// if (container == null) {
-// return Result.error("托盘：" + containerCode + " 信息为空");
-// }
-// String zoneCode = container.getZoneCode();
-// if (StringUtils.isEmpty(zoneCode)) {
-// return Result.error("容器没有配置库区，请配置！");
-// }
+ Container container = containerService.getContainerByCode(containerCode, warehouseCode);
+ if (container == null) {
+ return Result.error("托盘：" + containerCode + " 信息为空");
+ }
+ String zoneCode = container.getZoneCode();
+ if (StringUtils.isEmpty(zoneCode)) {
+ return Result.error("容器没有配置库区，请配置！");
+ }
Result result = taskHeaderService.createTaskLockContainerAndLocation(QuantityConstant.TASK_TYPE_EMPTYRECEIPT, containerCode, QuantityConstant.EMPTY_STRING,
toLocationCode, warehouseCode);
@@ -1090,7 +1090,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
taskHeader.setInnernalTaskType(QuantityConstant.TASK_INTENERTYPE_RECEIPT);
taskHeader.setToLocationCode(toLocationCode);
taskHeader.setStatus(QuantityConstant.TASK_STATUS_BUILD);
-// taskHeader.setZoneCode(zoneCode);
+ taskHeader.setZoneCode(zoneCode);
boolean success = taskHeaderService.save(taskHeader);
// String value = parameterConfigurationService.getValueByCode(QuantityConstant.START_LOCKING_STATION, zoneCode);
// if (StringUtils.isNotEmpty(value)) {