Skip to content

孙克 / smf-core

转到一个项目
切换导航栏
切换导航栏固定状态
Commit e9775495 由 zshaohui
选项

增加入库 出库 机构 名称

1 个父辈 7068f592
内嵌 并排
正在显示 5 个修改的文件 包含 40 行增加 和 7 行删除
src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/controller/CDeviceController.java
...@@ -1021,7 +1021,10 @@ public class CDeviceController { ...@@ -1021,7 +1021,10 @@ public class CDeviceController {
|| dataLog.getStatus().equals(OP_STATUS.OUT_ON_AGV.name())) { || dataLog.getStatus().equals(OP_STATUS.OUT_ON_AGV.name())) {
if (TaskCurrentLoc.In1_FeedingInlet.equals(dataLog.getLoc()) if (TaskCurrentLoc.In1_FeedingInlet.equals(dataLog.getLoc())
|| TaskCurrentLoc.In2_FeedingInlet.equals(dataLog.getLoc()) || TaskCurrentLoc.In2_FeedingInlet.equals(dataLog.getLoc())
|| TaskCurrentLoc.In_FeedingInlet.equals(dataLog.getLoc())) { || TaskCurrentLoc.In_FeedingInlet.equals(dataLog.getLoc())
|| TaskCurrentLoc.In3_FeedingInlet.equals(dataLog.getLoc())
|| TaskCurrentLoc.In4_FeedingInlet.equals(dataLog.getLoc())
) {
count = count + 1; count = count + 1;
} }
} }
......
src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/controller/CtuDeviceController.java
...@@ -90,7 +90,10 @@ public class CtuDeviceController { ...@@ -90,7 +90,10 @@ public class CtuDeviceController {
if (shelfToLineTaskList != null && shelfToLineTaskList.size() >= 6) { if (shelfToLineTaskList != null && shelfToLineTaskList.size() >= 6) {
if (TaskCurrentLoc.In1_FeedingInlet.equals(dataLog.getLoc()) if (TaskCurrentLoc.In1_FeedingInlet.equals(dataLog.getLoc())
|| TaskCurrentLoc.In2_FeedingInlet.equals(dataLog.getLoc()) || TaskCurrentLoc.In2_FeedingInlet.equals(dataLog.getLoc())
|| TaskCurrentLoc.In_FeedingInlet.equals(dataLog.getLoc())) { || TaskCurrentLoc.In_FeedingInlet.equals(dataLog.getLoc())
|| TaskCurrentLoc.In3_FeedingInlet.equals(dataLog.getLoc())
|| TaskCurrentLoc.In4_FeedingInlet.equals(dataLog.getLoc())
) {
} else { } else {
continue; continue;
...@@ -109,7 +112,7 @@ public class CtuDeviceController { ...@@ -109,7 +112,7 @@ public class CtuDeviceController {
//手动出空箱的目的地已经设置为In_FeedingInlet, 所以其他出库的未设置目的地的设置为Out_FeedingInlet //手动出空箱的目的地已经设置为In_FeedingInlet, 所以其他出库的未设置目的地的设置为Out_FeedingInlet
String toLoc = dataLog.getLoc(); String toLoc = dataLog.getLoc();
if (Strings.isBlank(toLoc)) { if (Strings.isBlank(toLoc)) {
toLoc = "Out_FeedingInlet"; toLoc = TaskCurrentLoc.Out_FeedingInlet;
} }
ctuTask.setToLoc(toLoc); ctuTask.setToLoc(toLoc);
ctuTask.setCreateDate(dataLog.getCreateDate()); ctuTask.setCreateDate(dataLog.getCreateDate());
...@@ -146,7 +149,7 @@ public class CtuDeviceController { ...@@ -146,7 +149,7 @@ public class CtuDeviceController {
//手动出空箱的目的地已经设置为In_FeedingInlet, 所以其他出库的未设置目的地的设置为Out_FeedingInlet //手动出空箱的目的地已经设置为In_FeedingInlet, 所以其他出库的未设置目的地的设置为Out_FeedingInlet
String toLoc = dataLog.getLoc(); String toLoc = dataLog.getLoc();
if (Strings.isBlank(toLoc)) { if (Strings.isBlank(toLoc)) {
toLoc = "Out_FeedingInlet"; toLoc = TaskCurrentLoc.Out_FeedingInlet;
} }
ctuTask.setToLoc(toLoc); ctuTask.setToLoc(toLoc);
ctuTask.setCreateDate(dataLog.getCreateDate()); ctuTask.setCreateDate(dataLog.getCreateDate());
...@@ -273,8 +276,13 @@ public class CtuDeviceController { ...@@ -273,8 +276,13 @@ public class CtuDeviceController {
dataLog.setCurrentLoc(loc); dataLog.setCurrentLoc(loc);
if (TaskCurrentLoc.In1_FeedingInlet.equals(loc) if (TaskCurrentLoc.In1_FeedingInlet.equals(loc)
|| TaskCurrentLoc.In2_FeedingInlet.equals(loc) || TaskCurrentLoc.In2_FeedingInlet.equals(loc)
|| TaskCurrentLoc.In2_FeedingInlet.equals(loc)
|| TaskCurrentLoc.In3_FeedingInlet.equals(loc)
|| TaskCurrentLoc.In4_FeedingInlet.equals(loc)
|| TaskCurrentLoc.Out1_FeedingInlet.equals(loc) || TaskCurrentLoc.Out1_FeedingInlet.equals(loc)
|| TaskCurrentLoc.Out2_FeedingInlet.equals(loc) || TaskCurrentLoc.Out2_FeedingInlet.equals(loc)
|| TaskCurrentLoc.Out3_FeedingInlet.equals(loc)
|| TaskCurrentLoc.Out4_FeedingInlet.equals(loc)
) { ) {
if (dataLog.isCheckOutTask()) { if (dataLog.isCheckOutTask()) {
dataLog.setStatus(loc); dataLog.setStatus(loc);
......
src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/enums/TaskCurrentLoc.java
...@@ -6,16 +6,25 @@ import lombok.Data; ...@@ -6,16 +6,25 @@ import lombok.Data;
public class TaskCurrentLoc { public class TaskCurrentLoc {
public static final String In1_FeedingInlet = "In1_FeedingInlet"; public static final String In1_FeedingInlet = "In1_FeedingInlet";
public static final String In2_FeedingInlet = "In2_FeedingInlet"; public static final String In2_FeedingInlet = "In2_FeedingInlet";
public static final String In3_FeedingInlet = "In3_FeedingInlet";
public static final String In4_FeedingInlet = "In4_FeedingInlet";
public static final String In_FeedingInlet = "In_FeedingInlet"; public static final String In_FeedingInlet = "In_FeedingInlet";
public static final String Out1_FeedingInlet = "Out1_FeedingInlet"; public static final String Out1_FeedingInlet = "Out1_FeedingInlet";
public static final String Out2_FeedingInlet = "Out2_FeedingInlet"; public static final String Out2_FeedingInlet = "Out2_FeedingInlet";
public static final String Out3_FeedingInlet = "Out3_FeedingInlet";
public static final String Out4_FeedingInlet = "Out4_FeedingInlet";
public static final String Out_FeedingInlet = "Out_FeedingInlet"; public static final String Out_FeedingInlet = "Out_FeedingInlet";
public static final String In1_DischargeHole = "In1_DischargeHole"; public static final String In1_DischargeHole = "In1_DischargeHole";
public static final String In2_DischargeHole = "In2_DischargeHole"; public static final String In2_DischargeHole = "In2_DischargeHole";
public static final String In3_DischargeHole = "In3_DischargeHole";
public static final String In4_DischargeHole = "In4_DischargeHole";
public static final String Out1_DischargeHole = "Out1_DischargeHole"; public static final String Out1_DischargeHole = "Out1_DischargeHole";
public static final String Out2_DischargeHole = "Out2_DischargeHole"; public static final String Out2_DischargeHole = "Out2_DischargeHole";
public static final String Out3_DischargeHole = "Out3_DischargeHole";
public static final String Out4_DischargeHole = "Out4_DischargeHole";
//人工工位入料口 //人工工位入料口
public static final String Manual_FeedingInlet = "rawLine_in"; public static final String Manual_FeedingInlet = "rawLine_in";
......
src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/util/BinCacheUtil.java
...@@ -332,7 +332,11 @@ public class BinCacheUtil { ...@@ -332,7 +332,11 @@ public class BinCacheUtil {
if (TaskCurrentLoc.In_FeedingInlet.equals(dataLog.getLoc())) { if (TaskCurrentLoc.In_FeedingInlet.equals(dataLog.getLoc())) {
loc = source; loc = source;
} else { } else {
if (!TaskCurrentLoc.In1_FeedingInlet.equals(dataLog.getLoc()) && !TaskCurrentLoc.In2_FeedingInlet.equals(dataLog.getLoc())) { if (!TaskCurrentLoc.In1_FeedingInlet.equals(dataLog.getLoc())
&& !TaskCurrentLoc.In2_FeedingInlet.equals(dataLog.getLoc())
&& !TaskCurrentLoc.In3_FeedingInlet.equals(dataLog.getLoc())
&& !TaskCurrentLoc.In4_FeedingInlet.equals(dataLog.getLoc())
) {
loc = source; loc = source;
} else { } else {
loc = dataLog.getLoc(); loc = dataLog.getLoc();
...@@ -367,6 +371,10 @@ public class BinCacheUtil { ...@@ -367,6 +371,10 @@ public class BinCacheUtil {
outLet = "2"; outLet = "2";
} else if (TaskCurrentLoc.In1_FeedingInlet.equals(source)) { } else if (TaskCurrentLoc.In1_FeedingInlet.equals(source)) {
outLet = "1"; outLet = "1";
} else if (TaskCurrentLoc.In3_FeedingInlet.equals(source)) {
outLet = "3";
} else if (TaskCurrentLoc.In4_FeedingInlet.equals(source)) {
outLet = "4";
} }
StoragePos storagePos = BoxHandleUtil.callEmptyBox(materialSize, outLet, stackerBarcode.getWarehouseCode(),needBinCodeList); StoragePos storagePos = BoxHandleUtil.callEmptyBox(materialSize, outLet, stackerBarcode.getWarehouseCode(),needBinCodeList);
......
src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/util/BoxHandleUtil.java
...@@ -20,6 +20,7 @@ import com.neotel.smfcore.core.storage.service.po.StoragePos; ...@@ -20,6 +20,7 @@ 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.lizhen.innerBox.enums.ExtendType; import com.neotel.smfcore.custom.lizhen.innerBox.enums.ExtendType;
import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.enums.TaskCurrentLoc;
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.data.domain.Sort; import org.springframework.data.domain.Sort;
...@@ -269,9 +270,13 @@ public class BoxHandleUtil { ...@@ -269,9 +270,13 @@ public class BoxHandleUtil {
String toLoc = "In_FeedingInlet"; String toLoc = "In_FeedingInlet";
if (StringUtils.isNotEmpty(outLet)) { if (StringUtils.isNotEmpty(outLet)) {
if ("1".equals(outLet)) { if ("1".equals(outLet)) {
toLoc = "In1_FeedingInlet"; toLoc = TaskCurrentLoc.In1_FeedingInlet;
} else if ("2".equals(outLet)) { } else if ("2".equals(outLet)) {
toLoc = "In2_FeedingInlet"; toLoc = TaskCurrentLoc.In2_FeedingInlet;
}else if ("3".equals(outLet)) {
toLoc = TaskCurrentLoc.In3_FeedingInlet;
}else if ("4".equals(outLet)) {
toLoc = TaskCurrentLoc.In4_FeedingInlet;
} }
} }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!