lhq/FT501-WMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改国际化

Browse Source
This commit is contained in:
liuhanqing
2025-08-12 11:24:55 +08:00
parent 893609c2a4
commit cccebc0ce0
13 changed files with 102 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java
View File

@@ -12,6 +12,7 @@ import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.MessageUtils;
import com.ruoyi.in.stockin.domain.InStockin;
import com.ruoyi.in.stockin.service.IInStockinService;
import com.ruoyi.in.stockindetail.domain.InStockinDetail;
@@ -83,11 +84,11 @@ public class PdaController extends BaseController {
BasWarehouse basWarehouse = basWarehouseService.selectBasWarehouseByWarehouseId(trayCodeMsg.getWarehouseId());
if (basWarehouse == null) {
log.error("仓库不存在");
return AjaxResult.error();
return AjaxResult.error(MessageUtils.message("error.message18"));
}
if ("1".equals(basWarehouse.getWarehouseType()) && StrUtil.isEmpty(trayCodeMsg.getCargoSpaceId())) {
log.error("请选择高架库货位");
return AjaxResult.error();
return AjaxResult.error(MessageUtils.message("error.message19"));
}
if ("2".equals(basWarehouse.getWarehouseType())) {
BasCargoSpace basCargoSpace = new BasCargoSpace();
@@ -96,7 +97,7 @@ public class PdaController extends BaseController {
List<BasCargoSpace> basCargoSpaces = basCargoSpaceService.selectBasCargoSpaceList(basCargoSpace);
if (basCargoSpaces.isEmpty()) {
log.error("此仓库没有空余货位");
return AjaxResult.error();
return AjaxResult.error(MessageUtils.message("error.message20"));
} else {
trayCodeMsg.setCargoSpaceId(basCargoSpaces.get(0).getCargoSpaceId());
}
@@ -134,7 +135,7 @@ public class PdaController extends BaseController {
return AjaxResult.success(basStockList);
} else {
log.error("此区域没有空托盘库存");
return AjaxResult.error();
return AjaxResult.error(MessageUtils.message("error.message25"));
}
}
@@ -152,15 +153,15 @@ public class PdaController extends BaseController {
BasWarehouse basWarehouse = basWarehouseService.selectBasWarehouseByWarehouseId(trayCodeMsg.getWarehouseId());
if (basWarehouse == null) {
log.error("仓库不存在");
return AjaxResult.error();
return AjaxResult.error(MessageUtils.message("error.message18"));
}
if ("1".equals(basWarehouse.getWarehouseType()) && StrUtil.isEmpty(trayCodeMsg.getCargoSpaceId())) {
log.error("请选择高架库货位");
return AjaxResult.error();
return AjaxResult.error(MessageUtils.message("error.message19"));
}
if ("2".equals(basWarehouse.getWarehouseType()) && StrUtil.isEmpty(trayCodeMsg.getExitId())) {
log.error("请选择出口");
return AjaxResult.error();
return AjaxResult.error(MessageUtils.message("error.message22"));
}
if("2".equals(basWarehouse.getWarehouseType())){
BasStock basStock = new BasStock();
@@ -168,7 +169,7 @@ public class PdaController extends BaseController {
List<BasStock> basStockList = basStockService.selectKtpStock(basStock);
if(basStockList.isEmpty()){
log.warn("此区域没有空托盘库存或此用户没有该区域权限");
return AjaxResult.error();
return AjaxResult.error(MessageUtils.message("error.message26"));
}else{
trayCodeMsg.setCargoSpaceId(basStockList.get(0).getCargoSpaceId());
}
@@ -251,11 +252,11 @@ public class PdaController extends BaseController {
BasWarehouse basWarehouse = basWarehouseService.selectBasWarehouseByWarehouseId(trayCodeMsg.getWarehouseId());
if (basWarehouse == null) {
log.error("仓库不存在");
return AjaxResult.error();
return AjaxResult.error(MessageUtils.message("error.message18"));
}
if ("1".equals(basWarehouse.getWarehouseType()) && StrUtil.isEmpty(trayCodeMsg.getCargoSpaceId())) {
log.error("请选择高架库货位");
return AjaxResult.error();
return AjaxResult.error(MessageUtils.message("error.message19"));
}
if ("2".equals(basWarehouse.getWarehouseType())) {
BasCargoSpace basCargoSpace = new BasCargoSpace();
@@ -264,7 +265,7 @@ public class PdaController extends BaseController {
List<BasCargoSpace> basCargoSpaces = basCargoSpaceService.selectBasCargoSpaceList(basCargoSpace);
if (basCargoSpaces.isEmpty()) {
log.error("此仓库没有空余货位");
return AjaxResult.error();
return AjaxResult.error(MessageUtils.message("error.message20"));
} else {
trayCodeMsg.setCargoSpaceId(basCargoSpaces.get(0).getCargoSpaceId());
}

4
ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java
View File

@@ -827,8 +827,8 @@ public class PdaServiceImp implements PdaService {
BasContainerDetails basContainerDetails = new BasContainerDetails();
basContainerDetails.setContainerId(startPoint);
List<BasContainerDetails> basContainerDetails1 = basContainerDetailsService.selectBasContainerDetailsList(basContainerDetails);
if (basContainerDetails1.size() == 0) {
return AjaxResult.error("此起点无料架，请检查");
if (basContainerDetails1.isEmpty()) {
return AjaxResult.error(MessageUtils.message("error.message31"));
}
BasContainerDetails basContainer = basContainerDetails1.get(0);