Skip to content

孙克 / smf-core

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 9245f231 由 张少辉
选项

1.自动抛送odn优化

1 个父辈 c27b9264
内嵌 并排
正在显示 8 个修改的文件 包含 8 行增加 和 21 行删除
src/main/java/com/neotel/smfcore/core/barcode/service/po/Barcode.java
...@@ -389,8 +389,6 @@ public class Barcode extends BasePo implements Serializable { ...@@ -389,8 +389,6 @@ public class Barcode extends BasePo implements Serializable {
private String currentRequestId; private String currentRequestId;
private String bindOdn;
private Map<String,Integer> heightMap = new HashMap<>(); private Map<String,Integer> heightMap = new HashMap<>();
public void updateHeightMap(String key,Integer value){ public void updateHeightMap(String key,Integer value){
......
src/main/java/com/neotel/smfcore/core/kanban/rest/BoxKanbanController.java
...@@ -2,7 +2,6 @@ package com.neotel.smfcore.core.kanban.rest; ...@@ -2,7 +2,6 @@ package com.neotel.smfcore.core.kanban.rest;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import com.google.common.collect.Lists;
import com.neotel.smfcore.common.bean.PageData; import com.neotel.smfcore.common.bean.PageData;
import com.neotel.smfcore.common.bean.ResultBean; import com.neotel.smfcore.common.bean.ResultBean;
import com.neotel.smfcore.common.exception.ValidateException; import com.neotel.smfcore.common.exception.ValidateException;
...@@ -25,19 +24,15 @@ import com.neotel.smfcore.core.storage.service.po.Storage; ...@@ -25,19 +24,15 @@ import com.neotel.smfcore.core.storage.service.po.Storage;
import com.neotel.smfcore.core.storage.service.po.StoragePos; import com.neotel.smfcore.core.storage.service.po.StoragePos;
import com.neotel.smfcore.core.system.service.manager.impl.DataLogManagerImpl; import com.neotel.smfcore.core.system.service.manager.impl.DataLogManagerImpl;
import com.neotel.smfcore.core.system.service.po.DataLog; import com.neotel.smfcore.core.system.service.po.DataLog;
import com.neotel.smfcore.core.system.service.po.Humiture;
import com.neotel.smfcore.core.system.util.DevicesStatusUtil; import com.neotel.smfcore.core.system.util.DevicesStatusUtil;
import com.neotel.smfcore.core.system.util.TaskService; import com.neotel.smfcore.core.system.util.TaskService;
import com.neotel.smfcore.security.annotation.AnonymousPutMapping; import com.neotel.smfcore.security.annotation.AnonymousPutMapping;
import com.neotel.smfcore.security.service.manager.IGroupManager; import com.neotel.smfcore.security.service.manager.IGroupManager;
import com.neotel.smfcore.security.service.manager.impl.GroupManagerImpl;
import com.neotel.smfcore.security.service.manager.impl.UserManagerImpl; import com.neotel.smfcore.security.service.manager.impl.UserManagerImpl;
import com.neotel.smfcore.security.service.po.Group; import com.neotel.smfcore.security.service.po.Group;
import com.neotel.smfcore.security.service.po.User; import com.neotel.smfcore.security.service.po.User;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import javafx.concurrent.Task;
import lombok.Data;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -45,7 +40,6 @@ import org.springframework.data.domain.Pageable; ...@@ -45,7 +40,6 @@ import org.springframework.data.domain.Pageable;
import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query; import org.springframework.data.mongodb.core.query.Query;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
......
src/main/java/com/neotel/smfcore/custom/luxsan/api/LuxsanApi.java
...@@ -1224,7 +1224,7 @@ public class LuxsanApi extends DefaultSmfApiListener { ...@@ -1224,7 +1224,7 @@ public class LuxsanApi extends DefaultSmfApiListener {
AutoStoResult result = JSONObject.parseObject(resultStr, AutoStoResult.class); AutoStoResult result = JSONObject.parseObject(resultStr, AutoStoResult.class);
return result; return result;
} catch (ApiException e) { } catch (ApiException e) {
log.info("queryBin请求失败:" + e.getMessage()); log.info("autoSto请求失败:" + e.getMessage());
throw new ValidateException("smfcore.api.error", "接口请求失败[{0}]", new String[]{e.getMessage()}); throw new ValidateException("smfcore.api.error", "接口请求失败[{0}]", new String[]{e.getMessage()});
} }
} }
......
src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/controller/TicketSortingController.java
...@@ -10,8 +10,6 @@ import com.neotel.smfcore.core.barcode.utils.CodeResolve; ...@@ -10,8 +10,6 @@ import com.neotel.smfcore.core.barcode.utils.CodeResolve;
import com.neotel.smfcore.core.device.enums.OP; import com.neotel.smfcore.core.device.enums.OP;
import com.neotel.smfcore.core.device.enums.OP_STATUS; import com.neotel.smfcore.core.device.enums.OP_STATUS;
import com.neotel.smfcore.core.order.service.manager.ILiteOrderItemManager; import com.neotel.smfcore.core.order.service.manager.ILiteOrderItemManager;
import com.neotel.smfcore.core.order.service.manager.ILiteOrderManager;
import com.neotel.smfcore.core.order.service.po.LiteOrder;
import com.neotel.smfcore.core.order.service.po.LiteOrderItem; import com.neotel.smfcore.core.order.service.po.LiteOrderItem;
import com.neotel.smfcore.core.storage.service.manager.IStoragePosManager; import com.neotel.smfcore.core.storage.service.manager.IStoragePosManager;
import com.neotel.smfcore.core.storage.service.po.StoragePos; import com.neotel.smfcore.core.storage.service.po.StoragePos;
...@@ -25,7 +23,6 @@ import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.util.BoxHandleUtil; ...@@ -25,7 +23,6 @@ import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.util.BoxHandleUtil;
import com.neotel.smfcore.security.annotation.AnonymousAccess; import com.neotel.smfcore.security.annotation.AnonymousAccess;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import javafx.concurrent.Task;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
......
src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/controller/manual/ManualLineController.java
...@@ -15,12 +15,10 @@ import com.neotel.smfcore.core.storage.service.po.StoragePos; ...@@ -15,12 +15,10 @@ import com.neotel.smfcore.core.storage.service.po.StoragePos;
import com.neotel.smfcore.core.system.service.po.DataLog; import com.neotel.smfcore.core.system.service.po.DataLog;
import com.neotel.smfcore.core.system.util.TaskService; import com.neotel.smfcore.core.system.util.TaskService;
import com.neotel.smfcore.custom.luxsan.factory_c.common.util.CacheNameUtil; import com.neotel.smfcore.custom.luxsan.factory_c.common.util.CacheNameUtil;
import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.enums.TaskCurrentLoc;
import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.util.BoxHandleUtil; import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.util.BoxHandleUtil;
import com.neotel.smfcore.security.annotation.AnonymousAccess; import com.neotel.smfcore.security.annotation.AnonymousAccess;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import javafx.concurrent.Task;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
......
src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/wipstor/controller/AgvDeviceController.java
...@@ -70,9 +70,9 @@ public class AgvDeviceController { ...@@ -70,9 +70,9 @@ public class AgvDeviceController {
if (allTasks != null && !allTasks.isEmpty()){ if (allTasks != null && !allTasks.isEmpty()){
allTasks = allTasks.stream().sorted(Comparator.comparing(DataLog :: getPartNumber)).collect(Collectors.toList()); allTasks = allTasks.stream().sorted(Comparator.comparing(DataLog :: getPartNumber)).collect(Collectors.toList());
for (DataLog dataLog : allTasks) { for (DataLog dataLog : allTasks) {
if (dataLogList != null && dataLogList.size() > 6){ /*if (dataLogList != null && dataLogList.size() > 6){
break; break;
} }*/
if (dataLog.isCheckOutTask()) { if (dataLog.isCheckOutTask()) {
if (dataLog.isWait() || dataLog.isExecuting()) { if (dataLog.isWait() || dataLog.isExecuting()) {
if (StringUtils.isEmpty(dataLog.getLoc())) { if (StringUtils.isEmpty(dataLog.getLoc())) {
......
src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/wipstor/controller/AutoDispatchInventoryController.java
...@@ -73,7 +73,7 @@ public class AutoDispatchInventoryController { ...@@ -73,7 +73,7 @@ public class AutoDispatchInventoryController {
Query q = QueryHelp.getQuery(criteria); Query q = QueryHelp.getQuery(criteria);
Criteria c = Criteria.where("barcode").exists(true) Criteria c = Criteria.where("barcode").exists(true)
.and("enabled").is(true); .and("enabled").is(true);
q.addCriteria(c).fields().include("id","posName","barcode.barcode", "barcode.amount","barcode.palletId", "barcode.partNumber", "barcode.warehouseCode", "barcode.requestId", "barcode.odn","barcode.modelFamily"); q.addCriteria(c).fields().include("id","posName","barcode.barcode", "barcode.amount","barcode.palletId", "barcode.partNumber", "barcode.warehouseCode", "barcode.currentRequestId", "barcode.odn","barcode.modelFamily");
//查询所有的,把hold的排除 //查询所有的,把hold的排除
Map<String, FetchHoldInfoRequest> fetchHoldInfoRequestMap = new HashMap<>(); Map<String, FetchHoldInfoRequest> fetchHoldInfoRequestMap = new HashMap<>();
...@@ -98,8 +98,8 @@ public class AutoDispatchInventoryController { ...@@ -98,8 +98,8 @@ public class AutoDispatchInventoryController {
List<String> holdIdList = new ArrayList<>(); List<String> holdIdList = new ArrayList<>();
if (fetchHoldInfoRequestMap != null && !fetchHoldInfoRequestMap.isEmpty()) { if (fetchHoldInfoRequestMap != null && !fetchHoldInfoRequestMap.isEmpty()) {
for (FetchHoldInfoRequest request : fetchHoldInfoRequestMap.values()) { for (FetchHoldInfoRequest request : fetchHoldInfoRequestMap.values()) {
List<FetchHoldInfoResult> fetchHoldInfoResultList = LuxsanApi.fetchHoldInfo(request); //List<FetchHoldInfoResult> fetchHoldInfoResultList = LuxsanApi.fetchHoldInfo(request);
//List<FetchHoldInfoResult> fetchHoldInfoResultList = new ArrayList<>(); List<FetchHoldInfoResult> fetchHoldInfoResultList = new ArrayList<>();
if (fetchHoldInfoResultList != null && !fetchHoldInfoResultList.isEmpty()) { if (fetchHoldInfoResultList != null && !fetchHoldInfoResultList.isEmpty()) {
List<String> palletIdList = fetchHoldInfoResultList.stream().map(FetchHoldInfoResult::getPALLET_ID).collect(Collectors.toList()); List<String> palletIdList = fetchHoldInfoResultList.stream().map(FetchHoldInfoResult::getPALLET_ID).collect(Collectors.toList());
holdIdList.addAll(palletIdList); holdIdList.addAll(palletIdList);
...@@ -122,7 +122,7 @@ public class AutoDispatchInventoryController { ...@@ -122,7 +122,7 @@ public class AutoDispatchInventoryController {
dto.setBarcode(barcodeStr); dto.setBarcode(barcodeStr);
dto.setPalletId(palletId); dto.setPalletId(palletId);
dto.setRequestId(barcode.getCurrentRequestId()); dto.setRequestId(barcode.getCurrentRequestId());
dto.setOdn(barcode.getBindOdn()); dto.setOdn(barcode.getOdn());
dto.setPartNumber(barcode.getPartNumber()); dto.setPartNumber(barcode.getPartNumber());
dto.setWarehouseCode(barcode.getWarehouseCode()); dto.setWarehouseCode(barcode.getWarehouseCode());
dto.setPosName(pos.getPosName()); dto.setPosName(pos.getPosName());
......
src/main/resources/config/application-21088prod.yml
...@@ -189,4 +189,4 @@ api: ...@@ -189,4 +189,4 @@ api:
ticketGbPost: http://10.68.30.22:8082/api/mlb/TicketGbPost ticketGbPost: http://10.68.30.22:8082/api/mlb/TicketGbPost
#自动抛送信息,生成odn #自动抛送信息,生成odn
autoSto: http://10.68.30.22:8082/api/mlb/AutoSto autoSto: http://10.42.220.171:8082/api/mlb/AutoSto
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!