huojin
/
Byd_Dg_Java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

main
HUOJIN\92525 2024-06-18 15:55:34 +08:00
parent 7482e6e133
commit 9c04f675e2
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
youchain-system/src/main/java/com/youchain/basicdata/service/impl/PointServiceImpl.java
View File

@ -150,7 +150,7 @@ public class PointServiceImpl implements PointService {
map.put("描述", point.getDescription()); map.put("描述", point.getDescription());
map.put("区域编码", point.getBeatCode()); map.put("区域编码", point.getBeatCode());
map.put("物料编码", point.getItemCode()); map.put("物料编码", point.getItemCode());
map.put("库区名称", .getName()); map.put("库区名称", point.getArea().getName());
map.put("是否启用", point.getEnabled()); map.put("是否启用", point.getEnabled());
map.put("仓库名称", point.getDept().getName()); map.put("仓库名称", point.getDept().getName());
map.put("坐标X", point.getPosX()); map.put("坐标X", point.getPosX());

8
youchain-system/src/main/java/com/youchain/basicdata/service/impl/StockServiceImpl.java
View File

@ -215,11 +215,11 @@ public class StockServiceImpl implements StockService {
public void containerIn(String containerCode, String position, String itemCode) { public void containerIn(String containerCode, String position, String itemCode) {
Stock stock = validateStock(containerCode);//验证容器 Stock stock = validateStock(containerCode);//验证容器
Point point = validateSrcPoint(position);//验证点位 Point point = validateSrcPoint(position);//验证点位
if (!isRestrictedArea(.getCode())) { if (!isRestrictedArea(point.getArea().getCode())) {
throw new RuntimeException(point.getCode() + "点位不能入场!"); throw new RuntimeException(point.getCode() + "点位不能入场!");
} }
switch (.getCode()) { switch (point.getArea().getCode()) {
case AreaNameDic.XJQ: case AreaNameDic.XJQ:
case AreaNameDic.DJQ: case AreaNameDic.DJQ:
if (StringUtils.isEmpty(itemCode)) { if (StringUtils.isEmpty(itemCode)) {
@ -288,7 +288,7 @@ public class StockServiceImpl implements StockService {
validateStockStatus(stock);//验证容器状态 validateStockStatus(stock);//验证容器状态
validateStockAndItem(stock, item);//验证容器类型和物料类型是否匹配 validateStockAndItem(stock, item);//验证容器类型和物料类型是否匹配
Point srcPoint = validateSrcPoint(pointCode);//验证点位 Point srcPoint = validateSrcPoint(pointCode);//验证点位
String srcPointAreaName = src.getCode(); String srcPointAreaName = srcPoint.getArea().getCode();
if (!isValidMCArea(srcPointAreaName)) { if (!isValidMCArea(srcPointAreaName)) {
throw new RuntimeException(srcPoint.getCode() + "为" + srcPointAreaName + "不能入库!"); throw new RuntimeException(srcPoint.getCode() + "为" + srcPointAreaName + "不能入库!");
} }
@ -439,7 +439,7 @@ public class StockServiceImpl implements StockService {
private void handleFullContainerCall(String itemCode, Point endPoint) { private void handleFullContainerCall(String itemCode, Point endPoint) {
Item item = validateItem(itemCode);//验证物料 Item item = validateItem(itemCode);//验证物料
String endPointAreaName = end.getCode(); String endPointAreaName = endPoint.getArea().getCode();
//只允许叫料区叫满车 //只允许叫料区叫满车
if (!isValidMCJLArea(endPointAreaName)) { if (!isValidMCJLArea(endPointAreaName)) {
throw new RuntimeException(endPoint.getCode() + "点位不能叫满车!"); throw new RuntimeException(endPoint.getCode() + "点位不能叫满车!");