rakor
/
wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新名称

This commit is contained in:
曹鹏飞 2025-07-02 12:05:31 +08:00
parent bf9b500af8
commit 093d4e4772
28 changed files with 344 additions and 344 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ModelController.java
View File

@ -7,7 +7,7 @@ import com.nflg.wms.common.pojo.qo.EnableQO;
import com.nflg.wms.common.pojo.qo.ModelAddQO; import com.nflg.wms.common.pojo.qo.ModelAddQO;
import com.nflg.wms.common.pojo.qo.ModelSearchQO; import com.nflg.wms.common.pojo.qo.ModelSearchQO;
import com.nflg.wms.common.pojo.qo.ModelUpdateQO; import com.nflg.wms.common.pojo.qo.ModelUpdateQO;
import com.nflg.wms.repository.entity.Model; import com.nflg.wms.repository.entity.WmsModel;
import com.nflg.wms.starter.BaseController; import com.nflg.wms.starter.BaseController;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
@ -72,7 +72,7 @@ public class ModelController extends BaseController {
* @param request 搜索参数 * @param request 搜索参数
*/ */
@PostMapping("search") @PostMapping("search")
public ApiResult<PageData<Model>> search(@Valid @RequestBody ModelSearchQO request){ public ApiResult<PageData<WmsModel>> search(@Valid @RequestBody ModelSearchQO request){
return ApiResult.success(modelControllerService.search(request)); return ApiResult.success(modelControllerService.search(request));
} }

4
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/WorkbenchController.java
View File

@ -7,7 +7,7 @@ import com.nflg.wms.common.pojo.qo.EnableQO;
import com.nflg.wms.common.pojo.qo.ModelAddQO; import com.nflg.wms.common.pojo.qo.ModelAddQO;
import com.nflg.wms.common.pojo.qo.ModelSearchQO; import com.nflg.wms.common.pojo.qo.ModelSearchQO;
import com.nflg.wms.common.pojo.qo.ModelUpdateQO; import com.nflg.wms.common.pojo.qo.ModelUpdateQO;
import com.nflg.wms.repository.entity.Workbench; import com.nflg.wms.repository.entity.WmsWorkbench;
import com.nflg.wms.starter.BaseController; import com.nflg.wms.starter.BaseController;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
@ -72,7 +72,7 @@ public class WorkbenchController extends BaseController {
* @param request 搜索参数 * @param request 搜索参数
*/ */
@PostMapping("search") @PostMapping("search")
public ApiResult<PageData<Workbench>> search(@Valid @RequestBody ModelSearchQO request){ public ApiResult<PageData<WmsWorkbench>> search(@Valid @RequestBody ModelSearchQO request){
return ApiResult.success(workbenchControllerService.search(request)); return ApiResult.success(workbenchControllerService.search(request));
} }

38
nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/MaterialControllerService.java
View File

@ -10,8 +10,8 @@ import com.nflg.wms.common.pojo.qo.MaterialUpdateQO;
import com.nflg.wms.common.pojo.vo.MaterialVO; import com.nflg.wms.common.pojo.vo.MaterialVO;
import com.nflg.wms.common.util.UserUtil; import com.nflg.wms.common.util.UserUtil;
import com.nflg.wms.common.util.VUtil; import com.nflg.wms.common.util.VUtil;
import com.nflg.wms.repository.entity.Material; import com.nflg.wms.repository.entity.WmsMaterial;
import com.nflg.wms.repository.service.IMaterialService; import com.nflg.wms.repository.service.IWmsMaterialService;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid; import jakarta.validation.Valid;
@ -34,29 +34,29 @@ import java.util.stream.Collectors;
public class MaterialControllerService { public class MaterialControllerService {
@Resource @Resource
private IMaterialService materialService; private IWmsMaterialService materialService;
public void add(@Valid MaterialAddQO request) { public void add(@Valid MaterialAddQO request) {
Material material = Convert.convert(Material.class, request); WmsMaterial wmsMaterial = Convert.convert(WmsMaterial.class, request);
material.setCreateBy(UserUtil.getUserName()); wmsMaterial.setCreateBy(UserUtil.getUserName());
material.setCreateTime(LocalDateTime.now()); wmsMaterial.setCreateTime(LocalDateTime.now());
materialService.add(material); materialService.add(wmsMaterial);
} }
public void update(@Valid MaterialUpdateQO request) { public void update(@Valid MaterialUpdateQO request) {
Material old = materialService.getById(request.getId()); WmsMaterial old = materialService.getById(request.getId());
VUtil.trueThrowBusinessError(Objects.isNull(old)).throwMessage("数据不存在！"); VUtil.trueThrowBusinessError(Objects.isNull(old)).throwMessage("数据不存在！");
Material material = Convert.convert(Material.class, request); WmsMaterial wmsMaterial = Convert.convert(WmsMaterial.class, request);
if (StrUtil.isNotBlank(old.getImage()) && Objects.nonNull(old.getWeight())) { if (StrUtil.isNotBlank(old.getImage()) && Objects.nonNull(old.getWeight())) {
material.setVersion(old.getVersion() + 1); wmsMaterial.setVersion(old.getVersion() + 1);
material.setCreateBy(UserUtil.getUserName()); wmsMaterial.setCreateBy(UserUtil.getUserName());
material.setCreateTime(LocalDateTime.now()); wmsMaterial.setCreateTime(LocalDateTime.now());
material.setId(null); wmsMaterial.setId(null);
materialService.add(material); materialService.add(wmsMaterial);
}else { }else {
material.setUpdateBy(UserUtil.getUserName()); wmsMaterial.setUpdateBy(UserUtil.getUserName());
material.setUpdateTime(LocalDateTime.now()); wmsMaterial.setUpdateTime(LocalDateTime.now());
materialService.update(material); materialService.update(wmsMaterial);
} }
} }
@ -69,8 +69,8 @@ public class MaterialControllerService {
} }
public void exportNotSet(HttpServletResponse response) throws IOException { public void exportNotSet(HttpServletResponse response) throws IOException {
List<Material> materials = materialService.getNotSet(); List<WmsMaterial> wmsMaterials = materialService.getNotSet();
List<MaterialExcelExportDTO> datas = materials.stream().map(model -> Convert.convert(MaterialExcelExportDTO.class, model)).collect(Collectors.toList()); List<MaterialExcelExportDTO> datas = wmsMaterials.stream().map(model -> Convert.convert(MaterialExcelExportDTO.class, model)).collect(Collectors.toList());
response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE); response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=" + URLEncoder.encode("未设置物料清单.xlsx", StandardCharsets.UTF_8)); response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=" + URLEncoder.encode("未设置物料清单.xlsx", StandardCharsets.UTF_8));
new Workbook() new Workbook()

46
nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/ModelControllerService.java
View File

@ -17,8 +17,8 @@ import com.nflg.wms.common.util.DateTimeUtil;
import com.nflg.wms.common.util.EecExcelUtil; import com.nflg.wms.common.util.EecExcelUtil;
import com.nflg.wms.common.util.UserUtil; import com.nflg.wms.common.util.UserUtil;
import com.nflg.wms.common.util.VUtil; import com.nflg.wms.common.util.VUtil;
import com.nflg.wms.repository.entity.Model; import com.nflg.wms.repository.entity.WmsModel;
import com.nflg.wms.repository.service.IModelService; import com.nflg.wms.repository.service.IWmsModelService;
import com.nflg.wms.starter.service.FileUploadService; import com.nflg.wms.starter.service.FileUploadService;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
@ -48,23 +48,23 @@ import java.util.stream.Collectors;
public class ModelControllerService { public class ModelControllerService {
@Resource @Resource
private IModelService modelService; private IWmsModelService modelService;
@Resource @Resource
private FileUploadService fileUploadService; private FileUploadService fileUploadService;
public void add(@Valid ModelAddQO request) { public void add(@Valid ModelAddQO request) {
Model model= Convert.convert(Model.class, request); WmsModel wmsModel = Convert.convert(WmsModel.class, request);
model.setCreateBy(UserUtil.getUserName()); wmsModel.setCreateBy(UserUtil.getUserName());
model.setCreateTime(LocalDateTime.now()); wmsModel.setCreateTime(LocalDateTime.now());
modelService.add(model); modelService.add(wmsModel);
} }
public void update(@Valid ModelUpdateQO request) { public void update(@Valid ModelUpdateQO request) {
Model model= Convert.convert(Model.class, request); WmsModel wmsModel = Convert.convert(WmsModel.class, request);
model.setUpdateBy(UserUtil.getUserName()); wmsModel.setUpdateBy(UserUtil.getUserName());
model.setUpdateTime(LocalDateTime.now()); wmsModel.setUpdateTime(LocalDateTime.now());
modelService.update(model); modelService.update(wmsModel);
} }
public void delete(@Valid @NotNull Long id) { public void delete(@Valid @NotNull Long id) {
@ -75,7 +75,7 @@ public class ModelControllerService {
modelService.enable(request); modelService.enable(request);
} }
public IPage<Model> search(@Valid ModelSearchQO request) { public IPage<WmsModel> search(@Valid ModelSearchQO request) {
return modelService.search(request); return modelService.search(request);
} }
@ -101,37 +101,37 @@ public class ModelControllerService {
@Transactional @Transactional
public boolean updateCheckAndImport(List<ModelExcelImportDTO> data) { public boolean updateCheckAndImport(List<ModelExcelImportDTO> data) {
List<Model> models = new ArrayList<>(); List<WmsModel> wmsModels = new ArrayList<>();
for (ModelExcelImportDTO dto : data) { for (ModelExcelImportDTO dto : data) {
Model model = new Model(); WmsModel wmsModel = new WmsModel();
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
if (Objects.isNull(dto.getNo())) { if (Objects.isNull(dto.getNo())) {
sb.append("机型编号不能为空;"); sb.append("机型编号不能为空;");
} else { } else {
model = modelService.lambdaQuery().eq(Model::getNo, dto.getNo()).one(); wmsModel = modelService.lambdaQuery().eq(WmsModel::getNo, dto.getNo()).one();
if (Objects.isNull(model)) { if (Objects.isNull(wmsModel)) {
model = new Model() wmsModel = new WmsModel()
.setNo(dto.getNo()) .setNo(dto.getNo())
.setCreateBy(UserUtil.getUserName()) .setCreateBy(UserUtil.getUserName())
.setCreateTime(LocalDateTime.now()); .setCreateTime(LocalDateTime.now());
}else { }else {
model.setUpdateBy(UserUtil.getUserName()); wmsModel.setUpdateBy(UserUtil.getUserName());
model.setUpdateTime(LocalDateTime.now()); wmsModel.setUpdateTime(LocalDateTime.now());
} }
} }
model.setRemark(dto.getRemark()); wmsModel.setRemark(dto.getRemark());
dto.setError(sb.toString()); dto.setError(sb.toString());
models.add(model); wmsModels.add(wmsModel);
} }
if (data.stream().noneMatch(it -> StrUtil.isNotBlank(it.getError()))) { if (data.stream().noneMatch(it -> StrUtil.isNotBlank(it.getError()))) {
modelService.saveOrUpdateBatch(models); modelService.saveOrUpdateBatch(wmsModels);
return true; return true;
} }
return false; return false;
} }
public void exportSelect(HttpServletResponse response,List<Long> ids) throws IOException { public void exportSelect(HttpServletResponse response,List<Long> ids) throws IOException {
List<Model> users = CollectionUtil.isNotEmpty(ids)?modelService.listByIds(ids):new ArrayList<>(); List<WmsModel> users = CollectionUtil.isNotEmpty(ids)?modelService.listByIds(ids):new ArrayList<>();
List<ModelExcelExportDTO> datas = users.stream().map(model -> { List<ModelExcelExportDTO> datas = users.stream().map(model -> {
ModelExcelExportDTO dto = new ModelExcelExportDTO(); ModelExcelExportDTO dto = new ModelExcelExportDTO();
dto.setNo(model.getNo()); dto.setNo(model.getNo());

54
nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/WarehouseControllerService.java
View File

@ -20,9 +20,9 @@ import com.nflg.wms.common.util.EecExcelUtil;
import com.nflg.wms.common.util.UserUtil; import com.nflg.wms.common.util.UserUtil;
import com.nflg.wms.common.util.VUtil; import com.nflg.wms.common.util.VUtil;
import com.nflg.wms.repository.entity.DictionaryItem; import com.nflg.wms.repository.entity.DictionaryItem;
import com.nflg.wms.repository.entity.Warehouse; import com.nflg.wms.repository.entity.WmsWarehouse;
import com.nflg.wms.repository.service.IDictionaryItemService; import com.nflg.wms.repository.service.IDictionaryItemService;
import com.nflg.wms.repository.service.IWarehouseService; import com.nflg.wms.repository.service.IWmsWarehouseService;
import com.nflg.wms.starter.service.FileUploadService; import com.nflg.wms.starter.service.FileUploadService;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
@ -52,7 +52,7 @@ import java.util.stream.Collectors;
public class WarehouseControllerService { public class WarehouseControllerService {
@Resource @Resource
private IWarehouseService warehouseService; private IWmsWarehouseService warehouseService;
@Resource @Resource
private IDictionaryItemService dictionaryItemService; private IDictionaryItemService dictionaryItemService;
@ -61,17 +61,17 @@ public class WarehouseControllerService {
private FileUploadService fileUploadService; private FileUploadService fileUploadService;
public void add(@Valid WarehouseAddQO request) { public void add(@Valid WarehouseAddQO request) {
Warehouse warehouse= Convert.convert(Warehouse.class, request); WmsWarehouse wmsWarehouse = Convert.convert(WmsWarehouse.class, request);
warehouse.setCreateBy(UserUtil.getUserName()); wmsWarehouse.setCreateBy(UserUtil.getUserName());
warehouse.setCreateTime(LocalDateTime.now()); wmsWarehouse.setCreateTime(LocalDateTime.now());
warehouseService.add(warehouse); warehouseService.add(wmsWarehouse);
} }
public void update(@Valid WarehouseUpdateQO request) { public void update(@Valid WarehouseUpdateQO request) {
Warehouse warehouse= Convert.convert(Warehouse.class, request); WmsWarehouse wmsWarehouse = Convert.convert(WmsWarehouse.class, request);
warehouse.setUpdateBy(UserUtil.getUserName()); wmsWarehouse.setUpdateBy(UserUtil.getUserName());
warehouse.setUpdateTime(LocalDateTime.now()); wmsWarehouse.setUpdateTime(LocalDateTime.now());
warehouseService.update(warehouse); warehouseService.update(wmsWarehouse);
} }
public void delete(@Valid @NotNull Long id) { public void delete(@Valid @NotNull Long id) {
@ -134,34 +134,34 @@ public class WarehouseControllerService {
@Transactional @Transactional
public boolean updateCheckAndImport(List<WarehouseExcelImportDTO> data) { public boolean updateCheckAndImport(List<WarehouseExcelImportDTO> data) {
List<DictionaryItem> factorys = dictionaryItemService.getListByDictionaryCode(Constant.DICTIONARY_FACTORY); List<DictionaryItem> factorys = dictionaryItemService.getListByDictionaryCode(Constant.DICTIONARY_FACTORY);
List<Warehouse> warehouses = new ArrayList<>(); List<WmsWarehouse> wmsWarehouses = new ArrayList<>();
for (WarehouseExcelImportDTO dto : data) { for (WarehouseExcelImportDTO dto : data) {
Warehouse warehouse = new Warehouse(); WmsWarehouse wmsWarehouse = new WmsWarehouse();
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
if (Objects.isNull(dto.getNo())) { if (Objects.isNull(dto.getNo())) {
sb.append("仓库编号不能为空;"); sb.append("仓库编号不能为空;");
} else { } else {
warehouse = warehouseService.lambdaQuery().eq(Warehouse::getNo, dto.getNo()).one(); wmsWarehouse = warehouseService.lambdaQuery().eq(WmsWarehouse::getNo, dto.getNo()).one();
if (Objects.isNull(warehouse)) { if (Objects.isNull(wmsWarehouse)) {
warehouse = new Warehouse() wmsWarehouse = new WmsWarehouse()
.setNo(dto.getNo()) .setNo(dto.getNo())
.setEnable(true) .setEnable(true)
.setCreateBy(UserUtil.getUserName()) .setCreateBy(UserUtil.getUserName())
.setCreateTime(LocalDateTime.now()); .setCreateTime(LocalDateTime.now());
}else { }else {
warehouse.setUpdateBy(UserUtil.getUserName()); wmsWarehouse.setUpdateBy(UserUtil.getUserName());
warehouse.setUpdateTime(LocalDateTime.now()); wmsWarehouse.setUpdateTime(LocalDateTime.now());
} }
} }
if (StrUtil.isBlank(dto.getName())){ if (StrUtil.isBlank(dto.getName())){
sb.append("仓库名称不能为空;"); sb.append("仓库名称不能为空;");
}else { }else {
warehouse.setName(dto.getName()); wmsWarehouse.setName(dto.getName());
} }
warehouse.setUserName(dto.getUserName()); wmsWarehouse.setUserName(dto.getUserName());
warehouse.setCheckUserName(dto.getCheckUserName()); wmsWarehouse.setCheckUserName(dto.getCheckUserName());
warehouse.setPhone(dto.getPhone()); wmsWarehouse.setPhone(dto.getPhone());
warehouse.setAddress(dto.getAddress()); wmsWarehouse.setAddress(dto.getAddress());
if (StrUtil.isBlank(dto.getFactoryName())){ if (StrUtil.isBlank(dto.getFactoryName())){
sb.append("所属工厂不能为空;"); sb.append("所属工厂不能为空;");
}else { }else {
@ -169,15 +169,15 @@ public class WarehouseControllerService {
if (Objects.isNull(factory)){ if (Objects.isNull(factory)){
sb.append("所属工厂无效;"); sb.append("所属工厂无效;");
}else { }else {
warehouse.setFactoryId(factory.getId()); wmsWarehouse.setFactoryId(factory.getId());
} }
} }
warehouse.setRemark(dto.getRemark()); wmsWarehouse.setRemark(dto.getRemark());
dto.setError(sb.toString()); dto.setError(sb.toString());
warehouses.add(warehouse); wmsWarehouses.add(wmsWarehouse);
} }
if (data.stream().noneMatch(it -> StrUtil.isNotBlank(it.getError()))) { if (data.stream().noneMatch(it -> StrUtil.isNotBlank(it.getError()))) {
warehouseService.saveOrUpdateBatch(warehouses); warehouseService.saveOrUpdateBatch(wmsWarehouses);
return true; return true;
} }
return false; return false;

46
nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/WorkbenchControllerService.java
View File

@ -17,8 +17,8 @@ import com.nflg.wms.common.util.DateTimeUtil;
import com.nflg.wms.common.util.EecExcelUtil; import com.nflg.wms.common.util.EecExcelUtil;
import com.nflg.wms.common.util.UserUtil; import com.nflg.wms.common.util.UserUtil;
import com.nflg.wms.common.util.VUtil; import com.nflg.wms.common.util.VUtil;
import com.nflg.wms.repository.entity.Workbench; import com.nflg.wms.repository.entity.WmsWorkbench;
import com.nflg.wms.repository.service.IWorkbenchService; import com.nflg.wms.repository.service.IWmsWorkbenchService;
import com.nflg.wms.starter.service.FileUploadService; import com.nflg.wms.starter.service.FileUploadService;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
@ -48,23 +48,23 @@ import java.util.stream.Collectors;
public class WorkbenchControllerService { public class WorkbenchControllerService {
@Resource @Resource
private IWorkbenchService workbenchService; private IWmsWorkbenchService workbenchService;
@Resource @Resource
private FileUploadService fileUploadService; private FileUploadService fileUploadService;
public void add(@Valid ModelAddQO request) { public void add(@Valid ModelAddQO request) {
Workbench workbench= Convert.convert(Workbench.class, request); WmsWorkbench wmsWorkbench = Convert.convert(WmsWorkbench.class, request);
workbench.setCreateBy(UserUtil.getUserName()); wmsWorkbench.setCreateBy(UserUtil.getUserName());
workbench.setCreateTime(LocalDateTime.now()); wmsWorkbench.setCreateTime(LocalDateTime.now());
workbenchService.add(workbench); workbenchService.add(wmsWorkbench);
} }
public void update(@Valid ModelUpdateQO request) { public void update(@Valid ModelUpdateQO request) {
Workbench workbench= Convert.convert(Workbench.class, request); WmsWorkbench wmsWorkbench = Convert.convert(WmsWorkbench.class, request);
workbench.setUpdateBy(UserUtil.getUserName()); wmsWorkbench.setUpdateBy(UserUtil.getUserName());
workbench.setUpdateTime(LocalDateTime.now()); wmsWorkbench.setUpdateTime(LocalDateTime.now());
workbenchService.update(workbench); workbenchService.update(wmsWorkbench);
} }
public void delete(@Valid @NotNull Long id) { public void delete(@Valid @NotNull Long id) {
@ -75,7 +75,7 @@ public class WorkbenchControllerService {
workbenchService.enable(request); workbenchService.enable(request);
} }
public IPage<Workbench> search(@Valid ModelSearchQO request) { public IPage<WmsWorkbench> search(@Valid ModelSearchQO request) {
return workbenchService.search(request); return workbenchService.search(request);
} }
@ -101,37 +101,37 @@ public class WorkbenchControllerService {
@Transactional @Transactional
public boolean updateCheckAndImport(List<WorkbenchExcelImportDTO> data) { public boolean updateCheckAndImport(List<WorkbenchExcelImportDTO> data) {
List<Workbench> workbenches = new ArrayList<>(); List<WmsWorkbench> wmsWorkbenches = new ArrayList<>();
for (WorkbenchExcelImportDTO dto : data) { for (WorkbenchExcelImportDTO dto : data) {
Workbench workbench = new Workbench(); WmsWorkbench wmsWorkbench = new WmsWorkbench();
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
if (Objects.isNull(dto.getNo())) { if (Objects.isNull(dto.getNo())) {
sb.append("机型编号不能为空;"); sb.append("机型编号不能为空;");
} else { } else {
workbench = workbenchService.lambdaQuery().eq(Workbench::getNo, dto.getNo()).one(); wmsWorkbench = workbenchService.lambdaQuery().eq(WmsWorkbench::getNo, dto.getNo()).one();
if (Objects.isNull(workbench)) { if (Objects.isNull(wmsWorkbench)) {
workbench = new Workbench() wmsWorkbench = new WmsWorkbench()
.setNo(dto.getNo()) .setNo(dto.getNo())
.setCreateBy(UserUtil.getUserName()) .setCreateBy(UserUtil.getUserName())
.setCreateTime(LocalDateTime.now()); .setCreateTime(LocalDateTime.now());
}else { }else {
workbench.setUpdateBy(UserUtil.getUserName()); wmsWorkbench.setUpdateBy(UserUtil.getUserName());
workbench.setUpdateTime(LocalDateTime.now()); wmsWorkbench.setUpdateTime(LocalDateTime.now());
} }
} }
workbench.setRemark(dto.getRemark()); wmsWorkbench.setRemark(dto.getRemark());
dto.setError(sb.toString()); dto.setError(sb.toString());
workbenches.add(workbench); wmsWorkbenches.add(wmsWorkbench);
} }
if (data.stream().noneMatch(it -> StrUtil.isNotBlank(it.getError()))) { if (data.stream().noneMatch(it -> StrUtil.isNotBlank(it.getError()))) {
workbenchService.saveOrUpdateBatch(workbenches); workbenchService.saveOrUpdateBatch(wmsWorkbenches);
return true; return true;
} }
return false; return false;
} }
public void exportSelect(HttpServletResponse response, List<Long> ids) throws IOException { public void exportSelect(HttpServletResponse response, List<Long> ids) throws IOException {
List<Workbench> users = CollectionUtil.isNotEmpty(ids)?workbenchService.listByIds(ids):new ArrayList<>(); List<WmsWorkbench> users = CollectionUtil.isNotEmpty(ids)?workbenchService.listByIds(ids):new ArrayList<>();
List<WorkbenchExcelExportDTO> datas = users.stream().map(model -> { List<WorkbenchExcelExportDTO> datas = users.stream().map(model -> {
WorkbenchExcelExportDTO dto = new WorkbenchExcelExportDTO(); WorkbenchExcelExportDTO dto = new WorkbenchExcelExportDTO();
dto.setNo(model.getNo()); dto.setNo(model.getNo());

2
nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/Material.java → nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsMaterial.java
View File

@ -23,7 +23,7 @@ import java.time.LocalDateTime;
@Setter @Setter
@ToString @ToString
@Accessors(chain = true) @Accessors(chain = true)
public class Material implements Serializable { public class WmsMaterial implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;

2
nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/Model.java → nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsModel.java
View File

@ -22,7 +22,7 @@ import java.time.LocalDateTime;
@Setter @Setter
@ToString @ToString
@Accessors(chain = true) @Accessors(chain = true)
public class Model implements Serializable { public class WmsModel implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;

2
nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/Warehouse.java → nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsWarehouse.java
View File

@ -22,7 +22,7 @@ import java.time.LocalDateTime;
@Setter @Setter
@ToString @ToString
@Accessors(chain = true) @Accessors(chain = true)
public class Warehouse implements Serializable { public class WmsWarehouse implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;

2
nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/Workbench.java → nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsWorkbench.java
View File

@ -22,7 +22,7 @@ import java.time.LocalDateTime;
@Setter @Setter
@ToString @ToString
@Accessors(chain = true) @Accessors(chain = true)
public class Workbench implements Serializable { public class WmsWorkbench implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;

6
nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/MaterialMapper.java → nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsMaterialMapper.java
View File

@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.nflg.wms.common.pojo.qo.MaterialSearchQO; import com.nflg.wms.common.pojo.qo.MaterialSearchQO;
import com.nflg.wms.common.pojo.vo.MaterialVO; import com.nflg.wms.common.pojo.vo.MaterialVO;
import com.nflg.wms.repository.entity.Material; import com.nflg.wms.repository.entity.WmsMaterial;
import java.util.List; import java.util.List;
@ -17,11 +17,11 @@ import java.util.List;
* @author 代码生成器生成 * @author 代码生成器生成
* @since 2025 * @since 2025
*/ */
public interface MaterialMapper extends BaseMapper<Material> { public interface WmsMaterialMapper extends BaseMapper<WmsMaterial> {
IPage<MaterialVO> search(MaterialSearchQO request, Page<?> objectPage); IPage<MaterialVO> search(MaterialSearchQO request, Page<?> objectPage);
List<MaterialVO> getHistory(String no); List<MaterialVO> getHistory(String no);
List<Material> getNotSet(); List<WmsMaterial> getNotSet();
} }

4
nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/ModelMapper.java → nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsModelMapper.java
View File

@ -1,7 +1,7 @@
package com.nflg.wms.repository.mapper; package com.nflg.wms.repository.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.nflg.wms.repository.entity.Model; import com.nflg.wms.repository.entity.WmsModel;
/** /**
* <p> * <p>
@ -11,6 +11,6 @@ import com.nflg.wms.repository.entity.Model;
* @author 代码生成器生成 * @author 代码生成器生成
* @since 2025 * @since 2025
*/ */
public interface ModelMapper extends BaseMapper<Model> { public interface WmsModelMapper extends BaseMapper<WmsModel> {
} }

4
nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WarehouseMapper.java → nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsWarehouseMapper.java
View File

@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.nflg.wms.common.pojo.qo.WarehouseSearchQO; import com.nflg.wms.common.pojo.qo.WarehouseSearchQO;
import com.nflg.wms.common.pojo.vo.WarehouseVO; import com.nflg.wms.common.pojo.vo.WarehouseVO;
import com.nflg.wms.repository.entity.Warehouse; import com.nflg.wms.repository.entity.WmsWarehouse;
import java.util.List; import java.util.List;
@ -17,7 +17,7 @@ import java.util.List;
* @author 代码生成器生成 * @author 代码生成器生成
* @since 2025 * @since 2025
*/ */
public interface WarehouseMapper extends BaseMapper<Warehouse> { public interface WmsWarehouseMapper extends BaseMapper<WmsWarehouse> {
IPage<WarehouseVO> search(WarehouseSearchQO request, Page<?> objectPage); IPage<WarehouseVO> search(WarehouseSearchQO request, Page<?> objectPage);

4
nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WorkbenchMapper.java → nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsWorkbenchMapper.java
View File

@ -1,7 +1,7 @@
package com.nflg.wms.repository.mapper; package com.nflg.wms.repository.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.nflg.wms.repository.entity.Workbench; import com.nflg.wms.repository.entity.WmsWorkbench;
/** /**
* <p> * <p>
@ -11,6 +11,6 @@ import com.nflg.wms.repository.entity.Workbench;
* @author 代码生成器生成 * @author 代码生成器生成
* @since 2025 * @since 2025
*/ */
public interface WorkbenchMapper extends BaseMapper<Workbench> { public interface WmsWorkbenchMapper extends BaseMapper<WmsWorkbench> {
} }

10
nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IMaterialService.java → nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsMaterialService.java
View File

@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.nflg.wms.common.pojo.qo.MaterialSearchQO; import com.nflg.wms.common.pojo.qo.MaterialSearchQO;
import com.nflg.wms.common.pojo.vo.MaterialVO; import com.nflg.wms.common.pojo.vo.MaterialVO;
import com.nflg.wms.repository.entity.Material; import com.nflg.wms.repository.entity.WmsMaterial;
import jakarta.validation.Valid; import jakarta.validation.Valid;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
@ -18,15 +18,15 @@ import java.util.List;
* @author 代码生成器生成 * @author 代码生成器生成
* @since 2025 * @since 2025
*/ */
public interface IMaterialService extends IService<Material> { public interface IWmsMaterialService extends IService<WmsMaterial> {
void add(Material material); void add(WmsMaterial wmsMaterial);
void update(Material material); void update(WmsMaterial wmsMaterial);
IPage<MaterialVO> search(@Valid MaterialSearchQO request); IPage<MaterialVO> search(@Valid MaterialSearchQO request);
List<MaterialVO> getHistory(@Valid @NotBlank String no); List<MaterialVO> getHistory(@Valid @NotBlank String no);
List<Material> getNotSet(); List<WmsMaterial> getNotSet();
} }

10
nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IModelService.java → nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsModelService.java
View File

@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.nflg.wms.common.pojo.qo.EnableQO; import com.nflg.wms.common.pojo.qo.EnableQO;
import com.nflg.wms.common.pojo.qo.ModelSearchQO; import com.nflg.wms.common.pojo.qo.ModelSearchQO;
import com.nflg.wms.repository.entity.Model; import com.nflg.wms.repository.entity.WmsModel;
import jakarta.validation.Valid; import jakarta.validation.Valid;
import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
@ -16,15 +16,15 @@ import jakarta.validation.constraints.NotNull;
* @author 代码生成器生成 * @author 代码生成器生成
* @since 2025 * @since 2025
*/ */
public interface IModelService extends IService<Model> { public interface IWmsModelService extends IService<WmsModel> {
void add(Model model); void add(WmsModel wmsModel);
void update(Model model); void update(WmsModel wmsModel);
void delete(@Valid @NotNull Long id); void delete(@Valid @NotNull Long id);
void enable(@Valid EnableQO request); void enable(@Valid EnableQO request);
IPage<Model> search(@Valid ModelSearchQO request); IPage<WmsModel> search(@Valid ModelSearchQO request);
} }

8
nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWarehouseService.java → nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsWarehouseService.java
View File

@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.nflg.wms.common.pojo.qo.EnableQO; import com.nflg.wms.common.pojo.qo.EnableQO;
import com.nflg.wms.common.pojo.qo.WarehouseSearchQO; import com.nflg.wms.common.pojo.qo.WarehouseSearchQO;
import com.nflg.wms.common.pojo.vo.WarehouseVO; import com.nflg.wms.common.pojo.vo.WarehouseVO;
import com.nflg.wms.repository.entity.Warehouse; import com.nflg.wms.repository.entity.WmsWarehouse;
import jakarta.validation.Valid; import jakarta.validation.Valid;
import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
@ -19,11 +19,11 @@ import java.util.List;
* @author 代码生成器生成 * @author 代码生成器生成
* @since 2025 * @since 2025
*/ */
public interface IWarehouseService extends IService<Warehouse> { public interface IWmsWarehouseService extends IService<WmsWarehouse> {
void add(Warehouse warehouse); void add(WmsWarehouse wmsWarehouse);
void update(Warehouse warehouse); void update(WmsWarehouse wmsWarehouse);
void delete(@Valid @NotNull Long id); void delete(@Valid @NotNull Long id);

10
nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWorkbenchService.java → nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsWorkbenchService.java
View File

@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.nflg.wms.common.pojo.qo.EnableQO; import com.nflg.wms.common.pojo.qo.EnableQO;
import com.nflg.wms.common.pojo.qo.ModelSearchQO; import com.nflg.wms.common.pojo.qo.ModelSearchQO;
import com.nflg.wms.repository.entity.Workbench; import com.nflg.wms.repository.entity.WmsWorkbench;
import jakarta.validation.Valid; import jakarta.validation.Valid;
import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
@ -16,15 +16,15 @@ import jakarta.validation.constraints.NotNull;
* @author 代码生成器生成 * @author 代码生成器生成
* @since 2025 * @since 2025
*/ */
public interface IWorkbenchService extends IService<Workbench> { public interface IWmsWorkbenchService extends IService<WmsWorkbench> {
void add(Workbench workbench); void add(WmsWorkbench wmsWorkbench);
void update(Workbench workbench); void update(WmsWorkbench wmsWorkbench);
void delete(@Valid @NotNull Long id); void delete(@Valid @NotNull Long id);
void enable(@Valid EnableQO request); void enable(@Valid EnableQO request);
IPage<Workbench> search(@Valid ModelSearchQO request); IPage<WmsWorkbench> search(@Valid ModelSearchQO request);
} }

84
nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/ModelServiceImpl.java
View File

@ -1,84 +0,0 @@
package com.nflg.wms.repository.service.impl;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.nflg.wms.common.pojo.qo.EnableQO;
import com.nflg.wms.common.pojo.qo.ModelSearchQO;
import com.nflg.wms.common.util.UserUtil;
import com.nflg.wms.common.util.VUtil;
import com.nflg.wms.repository.entity.Model;
import com.nflg.wms.repository.mapper.ModelMapper;
import com.nflg.wms.repository.service.IAuditLogService;
import com.nflg.wms.repository.service.IModelService;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
import java.util.Objects;
/**
* <p>
* 服务实现类
* </p>
*
* @author 代码生成器生成
* @since 2025
*/
@Service
public class ModelServiceImpl extends ServiceImpl<ModelMapper, Model> implements IModelService {
@Resource
private IAuditLogService auditLogService;
@Transactional
@Override
public void add(Model model) {
VUtil.trueThrowBusinessError(lambdaQuery().eq(Model::getNo, model.getNo()).exists()).throwMessage("机型已存在");
save(model);
auditLogService.addInsert(Model.class,model,model.getCreateBy());
}
@Transactional
@Override
public void update(Model model) {
VUtil.trueThrowBusinessError(lambdaQuery().eq(Model::getNo, model.getNo()).ne(Model::getId, model.getId()).exists())
.throwMessage("机型已存在");
Model old = getById(model.getId());
VUtil.trueThrowBusinessError(Objects.isNull(old)).throwMessage("机型不存在");
updateById(model);
Model newModel = getById(model.getId());
auditLogService.addUpdate(Model.class, old, newModel, model.getUpdateBy());
}
@Transactional
@Override
public void delete(Long id) {
Model old = getById(id);
removeById(id);
auditLogService.addDelete(Model.class, old, UserUtil.getUserName());
}
@Override
public void enable(EnableQO request) {
Model old = getById(request.getId());
lambdaUpdate()
.set(Model::getEnable, request.getEnable())
.set(Model::getUpdateBy, UserUtil.getUserName())
.set(Model::getUpdateTime, LocalDateTime.now())
.eq(Model::getId, request.getId())
.update();
Model newModel = getById(request.getId());
auditLogService.addUpdate(Model.class, old, newModel, UserUtil.getUserName());
}
@Override
public IPage<Model> search(ModelSearchQO request) {
return lambdaQuery()
.like(StrUtil.isNotBlank(request.getNo()),Model::getNo, request.getNo())
.orderByDesc(Model::getId)
.page(new Page<>(request.getPage(), request.getPageSize()));
}
}

30
nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/MaterialServiceImpl.java → nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsMaterialServiceImpl.java
View File

@ -6,10 +6,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.nflg.wms.common.pojo.qo.MaterialSearchQO; import com.nflg.wms.common.pojo.qo.MaterialSearchQO;
import com.nflg.wms.common.pojo.vo.MaterialVO; import com.nflg.wms.common.pojo.vo.MaterialVO;
import com.nflg.wms.common.util.VUtil; import com.nflg.wms.common.util.VUtil;
import com.nflg.wms.repository.entity.Material; import com.nflg.wms.repository.entity.WmsMaterial;
import com.nflg.wms.repository.mapper.MaterialMapper; import com.nflg.wms.repository.mapper.WmsMaterialMapper;
import com.nflg.wms.repository.service.IAuditLogService; import com.nflg.wms.repository.service.IAuditLogService;
import com.nflg.wms.repository.service.IMaterialService; import com.nflg.wms.repository.service.IWmsMaterialService;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -24,26 +24,26 @@ import java.util.List;
* @since 2025 * @since 2025
*/ */
@Service @Service
public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, Material> implements IMaterialService { public class WmsMaterialServiceImpl extends ServiceImpl<WmsMaterialMapper, WmsMaterial> implements IWmsMaterialService {
@Resource @Resource
private IAuditLogService auditLogService; private IAuditLogService auditLogService;
@Override @Override
public void add(Material material) { public void add(WmsMaterial wmsMaterial) {
VUtil.trueThrowBusinessError(lambdaQuery().eq(Material::getNo, material.getNo()).exists()) VUtil.trueThrowBusinessError(lambdaQuery().eq(WmsMaterial::getNo, wmsMaterial.getNo()).exists())
.throwMessage("SAP料号已存在"); .throwMessage("SAP料号已存在");
save(material); save(wmsMaterial);
auditLogService.addInsert(Material.class,material,material.getCreateBy()); auditLogService.addInsert(WmsMaterial.class, wmsMaterial, wmsMaterial.getCreateBy());
} }
@Override @Override
public void update(Material material) { public void update(WmsMaterial wmsMaterial) {
Material old = getById(material.getId()); WmsMaterial old = getById(wmsMaterial.getId());
material.setNo(null); wmsMaterial.setNo(null);
updateById(material); updateById(wmsMaterial);
Material newMaterial = getById(material.getId()); WmsMaterial newWmsMaterial = getById(wmsMaterial.getId());
auditLogService.addUpdate(Material.class, old, newMaterial, material.getUpdateBy()); auditLogService.addUpdate(WmsMaterial.class, old, newWmsMaterial, wmsMaterial.getUpdateBy());
} }
@Override @Override
@ -57,7 +57,7 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, Material> i
} }
@Override @Override
public List<Material> getNotSet() { public List<WmsMaterial> getNotSet() {
return baseMapper.getNotSet(); return baseMapper.getNotSet();
} }
} }

84
nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsModelServiceImpl.java Normal file
View File

@ -0,0 +1,84 @@
package com.nflg.wms.repository.service.impl;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.nflg.wms.common.pojo.qo.EnableQO;
import com.nflg.wms.common.pojo.qo.ModelSearchQO;
import com.nflg.wms.common.util.UserUtil;
import com.nflg.wms.common.util.VUtil;
import com.nflg.wms.repository.entity.WmsModel;
import com.nflg.wms.repository.mapper.WmsModelMapper;
import com.nflg.wms.repository.service.IAuditLogService;
import com.nflg.wms.repository.service.IWmsModelService;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
import java.util.Objects;
/**
* <p>
* 服务实现类
* </p>
*
* @author 代码生成器生成
* @since 2025
*/
@Service
public class WmsModelServiceImpl extends ServiceImpl<WmsModelMapper, WmsModel> implements IWmsModelService {
@Resource
private IAuditLogService auditLogService;
@Transactional
@Override
public void add(WmsModel wmsModel) {
VUtil.trueThrowBusinessError(lambdaQuery().eq(WmsModel::getNo, wmsModel.getNo()).exists()).throwMessage("机型已存在");
save(wmsModel);
auditLogService.addInsert(WmsModel.class, wmsModel, wmsModel.getCreateBy());
}
@Transactional
@Override
public void update(WmsModel wmsModel) {
VUtil.trueThrowBusinessError(lambdaQuery().eq(WmsModel::getNo, wmsModel.getNo()).ne(WmsModel::getId, wmsModel.getId()).exists())
.throwMessage("机型已存在");
WmsModel old = getById(wmsModel.getId());
VUtil.trueThrowBusinessError(Objects.isNull(old)).throwMessage("机型不存在");
updateById(wmsModel);
WmsModel newWmsModel = getById(wmsModel.getId());
auditLogService.addUpdate(WmsModel.class, old, newWmsModel, wmsModel.getUpdateBy());
}
@Transactional
@Override
public void delete(Long id) {
WmsModel old = getById(id);
removeById(id);
auditLogService.addDelete(WmsModel.class, old, UserUtil.getUserName());
}
@Override
public void enable(EnableQO request) {
WmsModel old = getById(request.getId());
lambdaUpdate()
.set(WmsModel::getEnable, request.getEnable())
.set(WmsModel::getUpdateBy, UserUtil.getUserName())
.set(WmsModel::getUpdateTime, LocalDateTime.now())
.eq(WmsModel::getId, request.getId())
.update();
WmsModel newWmsModel = getById(request.getId());
auditLogService.addUpdate(WmsModel.class, old, newWmsModel, UserUtil.getUserName());
}
@Override
public IPage<WmsModel> search(ModelSearchQO request) {
return lambdaQuery()
.like(StrUtil.isNotBlank(request.getNo()), WmsModel::getNo, request.getNo())
.orderByDesc(WmsModel::getId)
.page(new Page<>(request.getPage(), request.getPageSize()));
}
}

46
nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WarehouseServiceImpl.java → nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsWarehouseServiceImpl.java
View File

@ -8,10 +8,10 @@ import com.nflg.wms.common.pojo.qo.WarehouseSearchQO;
import com.nflg.wms.common.pojo.vo.WarehouseVO; import com.nflg.wms.common.pojo.vo.WarehouseVO;
import com.nflg.wms.common.util.UserUtil; import com.nflg.wms.common.util.UserUtil;
import com.nflg.wms.common.util.VUtil; import com.nflg.wms.common.util.VUtil;
import com.nflg.wms.repository.entity.Warehouse; import com.nflg.wms.repository.entity.WmsWarehouse;
import com.nflg.wms.repository.mapper.WarehouseMapper; import com.nflg.wms.repository.mapper.WmsWarehouseMapper;
import com.nflg.wms.repository.service.IAuditLogService; import com.nflg.wms.repository.service.IAuditLogService;
import com.nflg.wms.repository.service.IWarehouseService; import com.nflg.wms.repository.service.IWmsWarehouseService;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@ -29,54 +29,54 @@ import java.util.Objects;
* @since 2025 * @since 2025
*/ */
@Service @Service
public class WarehouseServiceImpl extends ServiceImpl<WarehouseMapper, Warehouse> implements IWarehouseService { public class WmsWarehouseServiceImpl extends ServiceImpl<WmsWarehouseMapper, WmsWarehouse> implements IWmsWarehouseService {
@Resource @Resource
private IAuditLogService auditLogService; private IAuditLogService auditLogService;
@Transactional @Transactional
@Override @Override
public void add(Warehouse warehouse) { public void add(WmsWarehouse wmsWarehouse) {
VUtil.trueThrowBusinessError(lambdaQuery().eq(Warehouse::getNo, warehouse.getNo()).exists()) VUtil.trueThrowBusinessError(lambdaQuery().eq(WmsWarehouse::getNo, wmsWarehouse.getNo()).exists())
.throwMessage("仓库编码已存在"); .throwMessage("仓库编码已存在");
save(warehouse); save(wmsWarehouse);
auditLogService.addInsert(Warehouse.class,warehouse, warehouse.getCreateBy()); auditLogService.addInsert(WmsWarehouse.class, wmsWarehouse, wmsWarehouse.getCreateBy());
} }
@Transactional @Transactional
@Override @Override
public void update(Warehouse warehouse) { public void update(WmsWarehouse wmsWarehouse) {
VUtil.trueThrowBusinessError(lambdaQuery().eq(Warehouse::getNo, warehouse.getNo()).ne(Warehouse::getId, warehouse.getId()).exists()) VUtil.trueThrowBusinessError(lambdaQuery().eq(WmsWarehouse::getNo, wmsWarehouse.getNo()).ne(WmsWarehouse::getId, wmsWarehouse.getId()).exists())
.throwMessage("仓库编码已存在"); .throwMessage("仓库编码已存在");
Warehouse old = getById(warehouse.getId()); WmsWarehouse old = getById(wmsWarehouse.getId());
VUtil.trueThrowBusinessError(Objects.isNull(old)).throwMessage("仓库不存在"); VUtil.trueThrowBusinessError(Objects.isNull(old)).throwMessage("仓库不存在");
updateById(warehouse); updateById(wmsWarehouse);
Warehouse newModel = getById(warehouse.getId()); WmsWarehouse newModel = getById(wmsWarehouse.getId());
auditLogService.addUpdate(Warehouse.class, old, newModel, warehouse.getUpdateBy()); auditLogService.addUpdate(WmsWarehouse.class, old, newModel, wmsWarehouse.getUpdateBy());
} }
@Transactional @Transactional
@Override @Override
public void delete(Long id) { public void delete(Long id) {
// TODO 删除仓库，判断是否绑定了储位 // TODO 删除仓库，判断是否绑定了储位
Warehouse old = getById(id); WmsWarehouse old = getById(id);
VUtil.trueThrowBusinessError(Objects.isNull(old)).throwMessage("仓库不存在"); VUtil.trueThrowBusinessError(Objects.isNull(old)).throwMessage("仓库不存在");
removeById(id); removeById(id);
auditLogService.addDelete(Warehouse.class, old, UserUtil.getUserName()); auditLogService.addDelete(WmsWarehouse.class, old, UserUtil.getUserName());
} }
@Override @Override
public void enable(EnableQO request) { public void enable(EnableQO request) {
Warehouse old = getById(request.getId()); WmsWarehouse old = getById(request.getId());
VUtil.trueThrowBusinessError(Objects.isNull(old)).throwMessage("仓库不存在"); VUtil.trueThrowBusinessError(Objects.isNull(old)).throwMessage("仓库不存在");
lambdaUpdate() lambdaUpdate()
.set(Warehouse::getEnable, request.getEnable()) .set(WmsWarehouse::getEnable, request.getEnable())
.set(Warehouse::getUpdateBy, UserUtil.getUserName()) .set(WmsWarehouse::getUpdateBy, UserUtil.getUserName())
.set(Warehouse::getUpdateTime, LocalDateTime.now()) .set(WmsWarehouse::getUpdateTime, LocalDateTime.now())
.eq(Warehouse::getId, request.getId()) .eq(WmsWarehouse::getId, request.getId())
.update(); .update();
Warehouse newModel = getById(request.getId()); WmsWarehouse newModel = getById(request.getId());
auditLogService.addUpdate(Warehouse.class, old, newModel, UserUtil.getUserName()); auditLogService.addUpdate(WmsWarehouse.class, old, newModel, UserUtil.getUserName());
} }
@Override @Override

84
nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsWorkbenchServiceImpl.java Normal file
View File

@ -0,0 +1,84 @@
package com.nflg.wms.repository.service.impl;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.nflg.wms.common.pojo.qo.EnableQO;
import com.nflg.wms.common.pojo.qo.ModelSearchQO;
import com.nflg.wms.common.util.UserUtil;
import com.nflg.wms.common.util.VUtil;
import com.nflg.wms.repository.entity.WmsWorkbench;
import com.nflg.wms.repository.mapper.WmsWorkbenchMapper;
import com.nflg.wms.repository.service.IAuditLogService;
import com.nflg.wms.repository.service.IWmsWorkbenchService;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
import java.util.Objects;
/**
* <p>
* 机台 服务实现类
* </p>
*
* @author 代码生成器生成
* @since 2025
*/
@Service
public class WmsWorkbenchServiceImpl extends ServiceImpl<WmsWorkbenchMapper, WmsWorkbench> implements IWmsWorkbenchService {
@Resource
private IAuditLogService auditLogService;
@Transactional
@Override
public void add(WmsWorkbench wmsWorkbench) {
VUtil.trueThrowBusinessError(lambdaQuery().eq(WmsWorkbench::getNo, wmsWorkbench.getNo()).exists()).throwMessage("机台已存在");
save(wmsWorkbench);
auditLogService.addInsert(WmsWorkbench.class, wmsWorkbench, wmsWorkbench.getCreateBy());
}
@Transactional
@Override
public void update(WmsWorkbench wmsWorkbench) {
VUtil.trueThrowBusinessError(lambdaQuery().eq(WmsWorkbench::getNo, wmsWorkbench.getNo()).ne(WmsWorkbench::getId, wmsWorkbench.getId()).exists())
.throwMessage("机型已存在");
WmsWorkbench old = getById(wmsWorkbench.getId());
VUtil.trueThrowBusinessError(Objects.isNull(old)).throwMessage("机台不存在");
updateById(wmsWorkbench);
WmsWorkbench ninfo = getById(wmsWorkbench.getId());
auditLogService.addUpdate(WmsWorkbench.class, old, ninfo, wmsWorkbench.getUpdateBy());
}
@Transactional
@Override
public void delete(Long id) {
WmsWorkbench old = getById(id);
removeById(id);
auditLogService.addDelete(WmsWorkbench.class, old, UserUtil.getUserName());
}
@Override
public void enable(EnableQO request) {
WmsWorkbench old = getById(request.getId());
lambdaUpdate()
.set(WmsWorkbench::getEnable, request.getEnable())
.set(WmsWorkbench::getUpdateBy, UserUtil.getUserName())
.set(WmsWorkbench::getUpdateTime, LocalDateTime.now())
.eq(WmsWorkbench::getId, request.getId())
.update();
WmsWorkbench newModel = getById(request.getId());
auditLogService.addUpdate(WmsWorkbench.class, old, newModel, UserUtil.getUserName());
}
@Override
public IPage<WmsWorkbench> search(ModelSearchQO request) {
return lambdaQuery()
.like(StrUtil.isNotBlank(request.getNo()), WmsWorkbench::getNo, request.getNo())
.orderByDesc(WmsWorkbench::getId)
.page(new Page<>(request.getPage(), request.getPageSize()));
}
}

84
nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WorkbenchServiceImpl.java
View File

@ -1,84 +0,0 @@
package com.nflg.wms.repository.service.impl;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.nflg.wms.common.pojo.qo.EnableQO;
import com.nflg.wms.common.pojo.qo.ModelSearchQO;
import com.nflg.wms.common.util.UserUtil;
import com.nflg.wms.common.util.VUtil;
import com.nflg.wms.repository.entity.Workbench;
import com.nflg.wms.repository.mapper.WorkbenchMapper;
import com.nflg.wms.repository.service.IAuditLogService;
import com.nflg.wms.repository.service.IWorkbenchService;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
import java.util.Objects;
/**
* <p>
* 机台 服务实现类
* </p>
*
* @author 代码生成器生成
* @since 2025
*/
@Service
public class WorkbenchServiceImpl extends ServiceImpl<WorkbenchMapper, Workbench> implements IWorkbenchService {
@Resource
private IAuditLogService auditLogService;
@Transactional
@Override
public void add(Workbench workbench) {
VUtil.trueThrowBusinessError(lambdaQuery().eq(Workbench::getNo, workbench.getNo()).exists()).throwMessage("机台已存在");
save(workbench);
auditLogService.addInsert(Workbench.class,workbench,workbench.getCreateBy());
}
@Transactional
@Override
public void update(Workbench workbench) {
VUtil.trueThrowBusinessError(lambdaQuery().eq(Workbench::getNo, workbench.getNo()).ne(Workbench::getId, workbench.getId()).exists())
.throwMessage("机型已存在");
Workbench old = getById(workbench.getId());
VUtil.trueThrowBusinessError(Objects.isNull(old)).throwMessage("机台不存在");
updateById(workbench);
Workbench ninfo = getById(workbench.getId());
auditLogService.addUpdate(Workbench.class, old, ninfo, workbench.getUpdateBy());
}
@Transactional
@Override
public void delete(Long id) {
Workbench old = getById(id);
removeById(id);
auditLogService.addDelete(Workbench.class, old, UserUtil.getUserName());
}
@Override
public void enable(EnableQO request) {
Workbench old = getById(request.getId());
lambdaUpdate()
.set(Workbench::getEnable, request.getEnable())
.set(Workbench::getUpdateBy, UserUtil.getUserName())
.set(Workbench::getUpdateTime, LocalDateTime.now())
.eq(Workbench::getId, request.getId())
.update();
Workbench newModel = getById(request.getId());
auditLogService.addUpdate(Workbench.class, old, newModel, UserUtil.getUserName());
}
@Override
public IPage<Workbench> search(ModelSearchQO request) {
return lambdaQuery()
.like(StrUtil.isNotBlank(request.getNo()),Workbench::getNo, request.getNo())
.orderByDesc(Workbench::getId)
.page(new Page<>(request.getPage(), request.getPageSize()));
}
}

10
nflg-wms-repository/src/main/resources/mapper/MaterialMapper.xml → nflg-wms-repository/src/main/resources/mapper/WmsMaterialMapper.xml
View File

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.nflg.wms.repository.mapper.MaterialMapper"> <mapper namespace="com.nflg.wms.repository.mapper.WmsMaterialMapper">
<select id="search" resultType="com.nflg.wms.common.pojo.vo.MaterialVO"> <select id="search" resultType="com.nflg.wms.common.pojo.vo.MaterialVO">
SELECT DISTINCT ON ("no") * SELECT DISTINCT ON ("no") *
FROM material FROM wmsMaterial
<where> <where>
<if test="request.no!=null and request.no!=''"> <if test="request.no!=null and request.no!=''">
and "no" like concat('%', #{request.no}, '%') and "no" like concat('%', #{request.no}, '%')
@ -15,16 +15,16 @@
<select id="getHistory" resultType="com.nflg.wms.common.pojo.vo.MaterialVO"> <select id="getHistory" resultType="com.nflg.wms.common.pojo.vo.MaterialVO">
select * select *
from material from wms_material
where no=#{no} where no=#{no}
order by id desc order by id desc
</select> </select>
<select id="getNotSet" resultType="com.nflg.wms.repository.entity.Material"> <select id="getNotSet" resultType="com.nflg.wms.repository.entity.WmsMaterial">
SELECT * SELECT *
FROM ( FROM (
SELECT DISTINCT ON ("no") * SELECT DISTINCT ON ("no") *
FROM material FROM wms_material
ORDER BY "no", id DESC ORDER BY "no", id DESC
) t ) t
where image is null or weight is null where image is null or weight is null

2
nflg-wms-repository/src/main/resources/mapper/ModelMapper.xml → nflg-wms-repository/src/main/resources/mapper/WmsModelMapper.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.nflg.wms.repository.mapper.ModelMapper"> <mapper namespace="com.nflg.wms.repository.mapper.WmsModelMapper">
</mapper> </mapper>

6
nflg-wms-repository/src/main/resources/mapper/WarehouseMapper.xml → nflg-wms-repository/src/main/resources/mapper/WmsWarehouseMapper.xml
View File

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.nflg.wms.repository.mapper.WarehouseMapper"> <mapper namespace="com.nflg.wms.repository.mapper.WmsWarehouseMapper">
<select id="search" resultType="com.nflg.wms.common.pojo.vo.WarehouseVO"> <select id="search" resultType="com.nflg.wms.common.pojo.vo.WarehouseVO">
select w.*,di.name as factory_name select w.*,di.name as factory_name
from warehouse w from wms_warehouse w
left join dictionary_item di on w.factory_id=di.id left join dictionary_item di on w.factory_id=di.id
<where> <where>
<if test="request.no != null and request.no != ''"> <if test="request.no != null and request.no != ''">
@ -18,7 +18,7 @@
<select id="getList" resultType="com.nflg.wms.common.pojo.vo.WarehouseVO"> <select id="getList" resultType="com.nflg.wms.common.pojo.vo.WarehouseVO">
select w.*,di.name as factory_name select w.*,di.name as factory_name
from warehouse w from wms_warehouse w
left join dictionary_item di on w.factory_id=di.id left join dictionary_item di on w.factory_id=di.id
where w.id in where w.id in
<foreach item="item" collection="ids" separator="," open="(" close=")"> <foreach item="item" collection="ids" separator="," open="(" close=")">

2
nflg-wms-repository/src/main/resources/mapper/WorkbenchMapper.xml → nflg-wms-repository/src/main/resources/mapper/WmsWorkbenchMapper.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.nflg.wms.repository.mapper.WorkbenchMapper"> <mapper namespace="com.nflg.wms.repository.mapper.WmsWorkbenchMapper">
</mapper> </mapper>