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

9
ruoyi-admin/src/main/java/com/ruoyi/check/difference/controller/CheckDifferenceRecordController.java
View File

@@ -11,6 +11,7 @@ import cn.hutool.core.util.StrUtil;
import com.ruoyi.bas.basJobId.service.IBasJobIdService;
import com.ruoyi.bas.warehouse.domain.BasWarehouse;
import com.ruoyi.bas.warehouse.service.IBasWarehouseService;
import com.ruoyi.common.utils.MessageUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
@@ -143,7 +144,7 @@ public class CheckDifferenceRecordController extends BaseController {
// 根据stockId、trayCode、oldQuantity查找库存记录
if (StrUtil.isEmpty(record.getStockId())) {
log.error("没有找到该库存ID：{}" , record.getStockId());
return AjaxResult.error();
return AjaxResult.error(MessageUtils.message("error.message15"));
}
BasStock queryStock = new BasStock();
@@ -152,7 +153,7 @@ public class CheckDifferenceRecordController extends BaseController {
if (stocks.isEmpty()) {
log.error("没有在库存中找到该条记录：库存ID {}, 托盘号 {}", record.getStockId() , record.getTrayCode());
return AjaxResult.error();
return AjaxResult.error(MessageUtils.message("error.message15"));
}
// 更新库存数量和状态
@@ -164,7 +165,7 @@ public class CheckDifferenceRecordController extends BaseController {
// 检查物料ID是否存在
if (record.getProductId() == null || record.getProductId().trim().isEmpty()) {
log.error("物料ID不能为空");
return AjaxResult.error();
return AjaxResult.error(MessageUtils.message("error.message16"));
}
// 创建新的库存记录
@@ -214,7 +215,7 @@ public class CheckDifferenceRecordController extends BaseController {
if (stocks.isEmpty()) {
log.error("要删除的库存不存在");
return AjaxResult.error();
return AjaxResult.error(MessageUtils.message("error.message15"));
}

9
ruoyi-admin/src/main/java/com/ruoyi/check/difference/service/impl/CheckDifferenceRecordServiceImpl.java
View File

@@ -9,6 +9,7 @@ import com.ruoyi.bas.cargoSpace.service.IBasCargoSpaceService;
import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.MessageUtils;
import com.ruoyi.stock.stock.domain.BasStock;
import com.ruoyi.stock.stock.service.IBasStockService;
import lombok.extern.slf4j.Slf4j;
@@ -76,7 +77,7 @@ public class CheckDifferenceRecordServiceImpl implements ICheckDifferenceRecordS
BasStock basStock = basStockService.selectBasStockByStockId(stockId);
if (!"1".equals(basStock.getProductStatus())){
log.warn("库存非正常状态{}",basStock.getStockId());
return AjaxResult.error();
return AjaxResult.error(MessageUtils.message("error.message10"));
}
if (basStock.getQuantity().equals(checkDifferenceRecord.getNewQuantity())){
return AjaxResult.success();
@@ -96,14 +97,14 @@ public class CheckDifferenceRecordServiceImpl implements ICheckDifferenceRecordS
List<BasStock> stocks = basStockService.selectBasStockList(queryStock);
if (!stocks.isEmpty()) {
log.warn("该物料已存在{}",checkDifferenceRecord.getProductId());
return AjaxResult.error();
return AjaxResult.error(MessageUtils.message("error.message8"));
}
BasCargoSpace queryCargoSpace = new BasCargoSpace();
queryCargoSpace.setWarehouseId(checkDifferenceRecord.getWarehouseId());
List<BasCargoSpace> cargoSpaces = basCargoSpaceService.selectBasCargoSpaceList(queryCargoSpace);
if (cargoSpaces.isEmpty()){
log.warn("没有货位");
return AjaxResult.error();
return AjaxResult.error(MessageUtils.message("error.message9"));
}
checkDifferenceRecord.setCargoSpaceId(cargoSpaces.get(0).getCargoSpaceId());
checkDifferenceRecord.setOldQuantity("0");
@@ -111,7 +112,7 @@ public class CheckDifferenceRecordServiceImpl implements ICheckDifferenceRecordS
BasStock basStock = basStockService.selectBasStockByStockId(checkDifferenceRecord.getStockId());
if (!"1".equals(basStock.getProductStatus())){
log.warn("库存非正常状态 productId:{} status:{}",basStock.getProductId(),basStock.getProductStatus());
return AjaxResult.error();
return AjaxResult.error(MessageUtils.message("error.message10"));
}
basStock.setProductStatus("2");
basStockService.updateBasStock(basStock);

11
ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/service/impl/CheckStockinServiceImpl.java
View File

@@ -21,6 +21,7 @@ import com.ruoyi.check.stockcheckdetail.domain.CheckStockinDetail;
import com.ruoyi.check.stockcheckdetail.service.ICheckStockinDetailService;
import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.MessageUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.uuid.UUID;
import com.ruoyi.in.stockin.domain.InStockin;
@@ -114,7 +115,7 @@ public class CheckStockinServiceImpl implements ICheckStockinService
//作废
if (!"1".equals(old.getStatus())){
log.error("单据状态非未执行状态!");
return AjaxResult.error();
return AjaxResult.error(MessageUtils.message("error.message21"));
}
checkStockinMapper.updateCheckStockin(checkStockin);
//插入历史单据
@@ -122,12 +123,12 @@ public class CheckStockinServiceImpl implements ICheckStockinService
}else if ("2".equals(checkStockin.getStatus())){
if (StrUtil.isEmpty(checkStockin.getSpare1())){
log.error("请选择出口!");
return AjaxResult.error();
return AjaxResult.error(MessageUtils.message("error.message22"));
}
//审核
if (!"1".equals(old.getStatus())){
log.error("单据状态非未执行状态!");
return AjaxResult.error();
return AjaxResult.error(MessageUtils.message("error.message21"));
}
checkStockinMapper.updateCheckStockin(checkStockin);
@@ -135,7 +136,7 @@ public class CheckStockinServiceImpl implements ICheckStockinService
//确认
if (!"3".equals(old.getStatus())){
log.error("单据状态非正执行状态!");
return AjaxResult.error();
return AjaxResult.error(MessageUtils.message("error.message23"));
}
checkStockinMapper.updateCheckStockin(checkStockin);
insertCheckStockinHistory(checkStockin);
@@ -234,7 +235,7 @@ public class CheckStockinServiceImpl implements ICheckStockinService
CheckStockin currentCheckStock = selectCheckStockinByStockGuid(checkStockin.getStockGuid());
if (ObjUtil.isNull(currentCheckStock)){
log.warn("单据不存在! stockGudi:{}",checkStockin.getStockGuid());
return AjaxResult.error();
return AjaxResult.error(MessageUtils.message("error.message27"));
}
HashMap<String, String> map = new HashMap<>();
map.put("v_stock_check_id", currentCheckStock.getStockCheckId());