From 2f3d91bdb79235cd9c3dcbfed2493adf1bd94d6a Mon Sep 17 00:00:00 2001
From: houjie <714924425@qq.com>
Date: 星期五, 01 九月 2023 17:26:45 +0800
Subject: [PATCH] 备件库存/备件信息 导入 字典值转移
---
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/ConstructorMapper.xml | 9 +
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/ConstructorMapper.java | 9 +
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IWarehouseService.java | 133 +++++++++++--------
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/WarehouseLocationServiceImpl.java | 9 +
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IUnitService.java | 7
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IConstructorService.java | 2
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/ConstructorServiceImpl.java | 8 +
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/WarehouseAreaMapper.xml | 4
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/WarehouseMapper.xml | 6
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/UnitMapper.xml | 5
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/SupplierMapper.java | 9 +
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/WarehouseLocationMapper.xml | 3
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/SupplierServiceImpl.java | 9 +
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/SupplierMapper.xml | 5
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IWarehouseLocationService.java | 9 +
lxzn-module-eam/src/main/java/org/jeecg/modules/spare/controller/SparePartController.java | 25 +++
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/UnitMapper.java | 7 +
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/WarehouseAreaMapper.java | 14 +
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/ISupplierService.java | 2
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/WarehouseLocationMapper.java | 11 +
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/WarehouseAreaServiceImpl.java | 11 +
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/UnitServiceImpl.java | 9 +
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IWarehouseAreaService.java | 8 +
lxzn-module-eam/src/main/java/org/jeecg/modules/spare/controller/SparesPartInventoryController.java | 41 +++++
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/WarehouseMapper.java | 11 +
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/WarehouseServiceImpl.java | 5
26 files changed, 295 insertions(+), 76 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/controller/SparePartController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/controller/SparePartController.java
index 1a28779..a3ed76e 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/controller/SparePartController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/controller/SparePartController.java
@@ -11,6 +11,10 @@
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.base.entity.Constructor;
+import org.jeecg.modules.base.entity.Unit;
+import org.jeecg.modules.base.service.IConstructorService;
+import org.jeecg.modules.base.service.IUnitService;
import org.jeecg.modules.spare.entity.SparePart;
import org.jeecg.modules.spare.entity.SparesPartInventory;
import org.jeecg.modules.spare.service.ISparePartService;
@@ -48,7 +52,10 @@
@Autowired
private ISparesPartInventoryService sparesPartInventoryService;
-
+ @Autowired
+ private IConstructorService constructorService;
+ @Autowired
+ private IUnitService unitService;
/**
* 鍒嗛〉鍒楄〃鏌ヨ
*
@@ -225,6 +232,19 @@
long start = System.currentTimeMillis();
for (int i = 0; i < list.size(); i++) {
SparePart sparePart = list.get(i);
+
+ String constructorName=sparePart.getConstructorId();
+ String mainUnitName = sparePart.getMainUnitId();
+ String validityPeriodUnitName= sparePart.getValidityPeriodUnitId();
+ Constructor constructor = constructorService.getByName(constructorName);
+ Unit unit = unitService.getUnitByName(mainUnitName);
+ Unit validityPeriodUnit = unitService.getUnitByName(validityPeriodUnitName);
+ if (!StringUtils.isNotEmpty(validityPeriodUnit.getId()))
+ return Result.error("鏂囦欢瀵煎叆澶辫触: 绗�" + (i + 1) + "琛屾湁鏁堟湡鍗曚綅涓嶅瓨鍦�");
+ if (!StringUtils.isNotEmpty(constructor.getId()))
+ return Result.error("鏂囦欢瀵煎叆澶辫触: 绗�" + (i + 1) + "琛屽埗閫犲晢涓嶅瓨鍦�");
+ if (!StringUtils.isNotEmpty(unit.getId()))
+ return Result.error("鏂囦欢瀵煎叆澶辫触: 绗�" + (i + 1) + "琛屽崟浣嶄笉瀛樺湪");
if (!StringUtils.isNotEmpty(sparePart.getName()))
return Result.error("鏂囦欢瀵煎叆澶辫触: 绗�" + (i + 1) + "琛屽浠跺悕绉颁笉鑳戒负绌�");
if (!StringUtils.isNotEmpty(sparePart.getNum()))
@@ -233,6 +253,9 @@
return Result.error("鏂囦欢瀵煎叆澶辫触: 绗�" + (i + 1) + "琛屽浠惰鏍间笉鑳戒负绌�");
if (!StringUtils.isNotEmpty(sparePart.getModel()))
return Result.error("鏂囦欢瀵煎叆澶辫触: 绗�" + (i + 1) + "琛屽浠跺瀷鍙蜂笉鑳戒负绌�");
+ list.get(i).setConstructorId(constructor.getId());
+ list.get(i).setMainUnitId(unit.getId());
+ list.get(i).setValidityPeriodUnitId(validityPeriodUnit.getId());
}
sparePartService.saveBatch(list);
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/controller/SparesPartInventoryController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/controller/SparesPartInventoryController.java
index 751e5e4..859cc9f 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/controller/SparesPartInventoryController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/controller/SparesPartInventoryController.java
@@ -11,6 +11,8 @@
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.base.entity.*;
+import org.jeecg.modules.base.service.*;
import org.jeecg.modules.spare.entity.SparePart;
import org.jeecg.modules.spare.entity.SparesPartInventory;
import org.jeecg.modules.spare.service.ISparePartService;
@@ -45,6 +47,20 @@
private ISparesPartInventoryService sparesPartInventoryService;
@Autowired
private ISparePartService sparePartService;
+ @Autowired
+ private IUnitService unitService;
+ @Autowired
+ private ISupplierService supplierService;
+
+ @Autowired
+ private IWarehouseService warehouseService;
+
+ @Autowired
+ private IWarehouseAreaService warehouseAreaService;
+
+ @Autowired
+ private IWarehouseLocationService warehouseLocationService;
+
/**
* 鍒嗛〉鍒楄〃鏌ヨ
@@ -192,6 +208,31 @@
for (int i = 0; i < list.size(); i++) {
SparesPartInventory sparesPartInventory = list.get(i);
sparesPartInventory.setSparePartId(mainId);
+ String mainUnitName = sparesPartInventory.getMainUnitId();
+ String supplierName = sparesPartInventory.getSupplierId();
+ String warehouseName = sparesPartInventory.getWarehouseId();
+ String warehouseAreaName = sparesPartInventory.getWarehouseAreaId();
+ String warehouseLocationName = sparesPartInventory.getWarehouseLocationId();
+ Supplier supplierId = supplierService.getByName(supplierName);
+ Unit unitById = unitService.getUnitByName(mainUnitName);
+ Warehouse warehouseId = warehouseService.getByName(warehouseName);
+ WarehouseArea warehouseAreaId = warehouseAreaService.getByName(warehouseAreaName);
+ WarehouseLocation warehouseLocationId = warehouseLocationService.getByName(warehouseLocationName);
+ if (!StringUtils.isNotEmpty(unitById.getId()))
+ return Result.error("鏂囦欢瀵煎叆澶辫触: 绗�" + (i + 1) + "琛屽崟浣嶄笉瀛樺湪");
+ if (!StringUtils.isNotEmpty(supplierId.getId()))
+ return Result.error("鏂囦欢瀵煎叆澶辫触: 绗�" + (i + 1) + "琛屼緵搴斿晢涓嶅瓨鍦�");
+ if (!StringUtils.isNotEmpty(warehouseId.getId()))
+ return Result.error("鏂囦欢瀵煎叆澶辫触: 绗�" + (i + 1) + "琛屼粨搴撲笉瀛樺湪");
+ if (!StringUtils.isNotEmpty(warehouseAreaId.getId()))
+ return Result.error("鏂囦欢瀵煎叆澶辫触: 绗�" + (i + 1) + "琛屽簱鍖轰笉瀛樺湪");
+ if (!StringUtils.isNotEmpty(warehouseLocationId.getId()))
+ return Result.error("鏂囦欢瀵煎叆澶辫触: 绗�" + (i + 1) + "琛屽簱浣嶄笉瀛樺湪");
+ list.get(i).setMainUnitId(unitById.getId());
+ list.get(i).setSupplierId(supplierId.getId());
+ list.get(i).setSupplierId(warehouseId.getId());
+ list.get(i).setSupplierId(warehouseAreaId.getId());
+ list.get(i).setSupplierId(warehouseLocationId.getId());
if (!StringUtils.isNotEmpty(sparesPartInventory.getBatchNum()))
return Result.error("鏂囦欢瀵煎叆澶辫触: 绗�" + (i + 1) + "琛屾壒娆″彿涓嶈兘涓虹┖");
if (sparesPartInventory.getMainQuantity() <= 0)
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/ConstructorMapper.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/ConstructorMapper.java
index ee274d5..84df68f 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/ConstructorMapper.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/ConstructorMapper.java
@@ -1,8 +1,17 @@
package org.jeecg.modules.base.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.base.entity.Constructor;
+import org.jeecg.modules.base.entity.Supplier;
public interface ConstructorMapper extends BaseMapper<Constructor> {
+ /**
+ * 閫氳繃鍒堕�犲晢鍚嶇О鏌ヨ鍒堕�犲晢淇℃伅
+ *
+ * @param name
+ * @return
+ */
+ public Constructor getByName(@Param("name") String name);
}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/SupplierMapper.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/SupplierMapper.java
index 0b890ae..4376bd1 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/SupplierMapper.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/SupplierMapper.java
@@ -1,9 +1,16 @@
package org.jeecg.modules.base.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.base.entity.Constructor;
import org.jeecg.modules.base.entity.Supplier;
+import org.jeecg.modules.base.entity.Unit;
public interface SupplierMapper extends BaseMapper<Supplier> {
-
+ /**
+ * 閫氳繃渚涘簲鍟嗗悕绉版煡璇緵搴斿晢淇℃伅
+ * @param name
+ * @return
+ */
+ public Supplier getByName(@Param("name") String name);
}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/UnitMapper.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/UnitMapper.java
index 6bae842..99bec21 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/UnitMapper.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/UnitMapper.java
@@ -1,6 +1,7 @@
package org.jeecg.modules.base.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.base.entity.Unit;
import java.util.List;
@@ -8,4 +9,10 @@
public interface UnitMapper extends BaseMapper<Unit> {
public List<Unit> getListByUnitCategoryId(String unitCategoryId);
public List<Unit> getTreeList();
+ /**
+ * 閫氳繃鍗曚綅鍚嶇О鏌ヨ鍗曚綅淇℃伅
+ * @param name
+ * @return
+ */
+ public Unit getUnitByName(@Param("name") String name);
}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/WarehouseAreaMapper.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/WarehouseAreaMapper.java
index 9d567af..44012ec 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/WarehouseAreaMapper.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/WarehouseAreaMapper.java
@@ -1,17 +1,23 @@
package org.jeecg.modules.base.mapper;
-import java.util.List;
-
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.base.entity.WarehouseArea;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: mom_base_warehouse_area
* @Author: jeecg-boot
- * @Date: 2023-07-06
+ * @Date: 2023-07-06
* @Version: V1.0
*/
public interface WarehouseAreaMapper extends BaseMapper<WarehouseArea> {
+
+ /**
+ * 閫氳繃搴撳尯鍚嶇О鏌ヨ搴撳尯淇℃伅
+ *
+ * @param name
+ * @return
+ */
+ public WarehouseArea getByName(@Param("name") String name);
}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/WarehouseLocationMapper.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/WarehouseLocationMapper.java
index d58a1c7..3eecfef 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/WarehouseLocationMapper.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/WarehouseLocationMapper.java
@@ -1,10 +1,8 @@
package org.jeecg.modules.base.mapper;
-import java.util.List;
-
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.base.entity.WarehouseLocation;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: mom_base_warehouse_location
@@ -13,5 +11,10 @@
* @Version: V1.0
*/
public interface WarehouseLocationMapper extends BaseMapper<WarehouseLocation> {
-
+ /**
+ * 閫氳繃搴撲綅鍚嶇О鏌ヨ搴撲綅淇℃伅
+ * @param name
+ * @return
+ */
+ public WarehouseLocation getByName(@Param("name") String name);
}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/WarehouseMapper.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/WarehouseMapper.java
index 69804a0..4ce0824 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/WarehouseMapper.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/WarehouseMapper.java
@@ -1,11 +1,9 @@
package org.jeecg.modules.base.mapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.base.entity.Enterprise;
-import org.jeecg.modules.base.entity.FactoryModel;
import org.jeecg.modules.base.entity.Warehouse;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository;
import java.util.List;
@@ -51,4 +49,11 @@
* @return
*/
List<String> getVersionStatusByVersion(Integer veison);
+
+ /**
+ * 閫氳繃浠撳簱鍚嶇О鏌ヨ浠撳簱淇℃伅
+ * @param name
+ * @return
+ */
+ public Warehouse getByName(@Param("name") String name);
}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/ConstructorMapper.xml b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/ConstructorMapper.xml
new file mode 100644
index 0000000..4f6b679
--- /dev/null
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/ConstructorMapper.xml
@@ -0,0 +1,9 @@
+<?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">
+<mapper namespace="org.jeecg.modules.base.mapper.ConstructorMapper">
+
+
+ <select id="getByName" resultType="org.jeecg.modules.base.entity.Constructor">
+ select * from mom_base_constructor where name = #{name} and del_flag = 0
+ </select>
+</mapper>
\ No newline at end of file
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/SupplierMapper.xml b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/SupplierMapper.xml
index 600fb84..fefd408 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/SupplierMapper.xml
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/SupplierMapper.xml
@@ -2,4 +2,9 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.base.mapper.SupplierMapper">
+
+ <!-- 鏍规嵁渚涘簲鍟嗗悕绉版煡璇� -->
+ <select id="getByName" resultType="org.jeecg.modules.base.entity.Supplier">
+ select * from mom_base_supplier where name = #{name} and del_flag = 0
+ </select>
</mapper>
\ No newline at end of file
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/UnitMapper.xml b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/UnitMapper.xml
index 1e5612f..34fe8de 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/UnitMapper.xml
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/UnitMapper.xml
@@ -29,4 +29,9 @@
select concat(m.code,m.name) categoryName,concat(u.num,u.name) unitName,m.id,m.pid,u.id,
u.unit_category_id from mom_base_unit_category m LEFT join mom_base_unit u on m.id=u.unit_category_id
</select>
+
+ <!-- 鏍规嵁鍗曚綅鍚嶇О鏌ヨ -->
+ <select id="getUnitByName" resultType="org.jeecg.modules.base.entity.Unit">
+ select * from mom_base_unit where name = #{name} and del_flag = 0
+ </select>
</mapper>
\ No newline at end of file
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/WarehouseAreaMapper.xml b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/WarehouseAreaMapper.xml
index 00f6e33..62f5063 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/WarehouseAreaMapper.xml
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/WarehouseAreaMapper.xml
@@ -2,4 +2,8 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.base.mapper.WarehouseAreaMapper">
+
+ <select id="getByName" resultType="org.jeecg.modules.base.entity.WarehouseArea">
+ select * from mom_base_warehouse_area where name = #{name} and del_flag = 0
+ </select>
</mapper>
\ No newline at end of file
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/WarehouseLocationMapper.xml b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/WarehouseLocationMapper.xml
index ffa2898..e419c84 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/WarehouseLocationMapper.xml
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/WarehouseLocationMapper.xml
@@ -2,4 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.base.mapper.WarehouseLocationMapper">
+ <select id="getByName" resultType="org.jeecg.modules.base.entity.WarehouseLocation">
+ select * from mom_base_warehouse_location where name = #{name} and del_flag = 0
+ </select>
</mapper>
\ No newline at end of file
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/WarehouseMapper.xml b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/WarehouseMapper.xml
index 7989adc..e222023 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/WarehouseMapper.xml
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/WarehouseMapper.xml
@@ -83,4 +83,10 @@
where t1.version = #{version}
and t1.del_flag=0
</select>
+
+
+
+ <select id="getByName" resultType="org.jeecg.modules.base.entity.Warehouse">
+ select * from mom_base_warehouse where name = #{name} and del_flag = 0
+ </select>
</mapper>
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IConstructorService.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IConstructorService.java
index 2289397..d3d42a9 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IConstructorService.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IConstructorService.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.base.entity.Constructor;
+import org.jeecg.modules.base.entity.Supplier;
/**
* @Description: 鍒堕�犲晢
@@ -11,4 +12,5 @@
*/
public interface IConstructorService extends IService<Constructor> {
+ public Constructor getByName(String name);
}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/ISupplierService.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/ISupplierService.java
index de8a5e1..073e3be 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/ISupplierService.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/ISupplierService.java
@@ -12,4 +12,6 @@
*/
public interface ISupplierService extends IService<Supplier> {
+
+ public Supplier getByName(String name);
}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IUnitService.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IUnitService.java
index 85d48ad..6a90f08 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IUnitService.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IUnitService.java
@@ -8,5 +8,10 @@
public interface IUnitService extends IService<Unit> {
List<Unit> getListByUnitCategoryId(String unitCategoryId);
List<Unit> getTreeList();
-
+ /**
+ * 鏍规嵁鍗曚綅鍚嶇О鏌ヨ
+ * @param name 鍚嶇О
+ * @return Unit
+ */
+ public Unit getUnitByName(String name);
}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IWarehouseAreaService.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IWarehouseAreaService.java
index 8561a33..11d046a 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IWarehouseAreaService.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IWarehouseAreaService.java
@@ -1,5 +1,6 @@
package org.jeecg.modules.base.service;
+import org.jeecg.modules.base.entity.Warehouse;
import org.jeecg.modules.base.entity.WarehouseArea;
import com.baomidou.mybatisplus.extension.service.IService;
@@ -11,4 +12,11 @@
*/
public interface IWarehouseAreaService extends IService<WarehouseArea> {
+ /**
+ * 鏍规嵁搴撳尯鍚嶇О鏌ヨ
+ *
+ * @param name 鍚嶇О
+ * @return WarehouseArea
+ */
+ public WarehouseArea getByName(String name);
}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IWarehouseLocationService.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IWarehouseLocationService.java
index 06b94c2..afc3fc3 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IWarehouseLocationService.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IWarehouseLocationService.java
@@ -1,5 +1,6 @@
package org.jeecg.modules.base.service;
+import org.jeecg.modules.base.entity.WarehouseArea;
import org.jeecg.modules.base.entity.WarehouseLocation;
import com.baomidou.mybatisplus.extension.service.IService;
@@ -10,5 +11,11 @@
* @Version: V1.0
*/
public interface IWarehouseLocationService extends IService<WarehouseLocation> {
-
+ /**
+ * 鏍规嵁搴撲綅鍚嶇О鏌ヨ
+ *
+ * @param name 鍚嶇О
+ * @return WarehouseLocation
+ */
+ public WarehouseLocation getByName(String name);
}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IWarehouseService.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IWarehouseService.java
index 857cab2..bff2d51 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IWarehouseService.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IWarehouseService.java
@@ -1,8 +1,8 @@
package org.jeecg.modules.base.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.jeecg.modules.base.entity.Warehouse;
import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.base.entity.Warehouse;
import java.io.Serializable;
import java.util.Collection;
@@ -13,65 +13,86 @@
/**
* @Description: 浠撳簱
* @Author: jeecg-boot
- * @Date: 2022-11-07
+ * @Date: 2022-11-07
* @Version: V1.0
*/
public interface IWarehouseService extends IService<Warehouse> {
- /**
- * 鑾峰彇鐗堟湰鍒楄〃
- * @param page
- * @param enterpriseId
- * @param version
- * @return
- */
- Page<Map<String, Object>> getWarehouseList(Page<Map<String,Object>> page,
- Integer version,
- String enterpriseId);
- /**
- * 鑾峰彇鍒濆鐗堟湰鍙�
- * @return
- */
- public Integer getInitVersion();
+ /**
+ * 鑾峰彇鐗堟湰鍒楄〃
+ *
+ * @param page
+ * @param enterpriseId
+ * @param version
+ * @return
+ */
+ Page<Map<String, Object>> getWarehouseList(Page<Map<String, Object>> page,
+ Integer version,
+ String enterpriseId);
- /**
- * 鍒犻櫎涓�瀵瑰
- *
- * @param id
- */
- public void delMain (String id);
+ /**
+ * 鑾峰彇鍒濆鐗堟湰鍙�
+ *
+ * @return
+ */
+ public Integer getInitVersion();
- /**
- * 鎵归噺鍒犻櫎涓�瀵瑰
- *
- * @param idList
- */
- public void delBatchMain (Collection<? extends Serializable> idList);
- /**
- * 鑾峰彇鎵�鏈夌増鏈彿
- * @param
- * @return
- */
- public Set<Integer> getVersionList();
- /**
- * 鑾峰彇鏈�鍚庝竴娆＄敓鏁堝垪琛�
- * @return
- */
- List<Warehouse> getLastUsableList();
- /**
- * 鑾峰彇褰撳墠鐢熸晥鍒楄〃
- * @return
- */
- List<Warehouse> getUsableList();
- /**
- * 鏌ュ綋鍓嶇敓鏁堢増鏈拰涓婃鐢熸晥鐗堟湰
- * @return
- */
- Map<String,Object> getNowAndLastUsableVersion();
- /**
- * 鑾峰彇鐗堟湰鐘舵�佹牴鎹増鏈彿
- * @param version
- * @return
- */
- List<String> getVersionStatusByVersion(Integer version);
+ /**
+ * 鍒犻櫎涓�瀵瑰
+ *
+ * @param id
+ */
+ public void delMain(String id);
+ /**
+ * 鎵归噺鍒犻櫎涓�瀵瑰
+ *
+ * @param idList
+ */
+ public void delBatchMain(Collection<? extends Serializable> idList);
+
+ /**
+ * 鑾峰彇鎵�鏈夌増鏈彿
+ *
+ * @param
+ * @return
+ */
+ public Set<Integer> getVersionList();
+
+ /**
+ * 鑾峰彇鏈�鍚庝竴娆＄敓鏁堝垪琛�
+ *
+ * @return
+ */
+ List<Warehouse> getLastUsableList();
+
+ /**
+ * 鑾峰彇褰撳墠鐢熸晥鍒楄〃
+ *
+ * @return
+ */
+ List<Warehouse> getUsableList();
+
+ /**
+ * 鏌ュ綋鍓嶇敓鏁堢増鏈拰涓婃鐢熸晥鐗堟湰
+ *
+ * @return
+ */
+ Map<String, Object> getNowAndLastUsableVersion();
+
+ /**
+ * 鑾峰彇鐗堟湰鐘舵�佹牴鎹増鏈彿
+ *
+ * @param version
+ * @return
+ */
+ List<String> getVersionStatusByVersion(Integer version);
+
+
+ /**
+ * 鏍规嵁浠撳簱鍚嶇О鏌ヨ
+ *
+ * @param name 鍚嶇О
+ * @return Warehouse
+ */
+ public Warehouse getByName(String name);
}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/ConstructorServiceImpl.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/ConstructorServiceImpl.java
index c8aaea8..8763421 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/ConstructorServiceImpl.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/ConstructorServiceImpl.java
@@ -6,7 +6,15 @@
import org.jeecg.modules.base.service.IConstructorService;
import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+
@Service
public class ConstructorServiceImpl extends ServiceImpl<ConstructorMapper, Constructor> implements IConstructorService {
+ @Resource
+ private ConstructorMapper constructorMapper;
+ @Override
+ public Constructor getByName(String name) {
+ return constructorMapper.getByName(name);
+ }
}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/SupplierServiceImpl.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/SupplierServiceImpl.java
index 493ac27..97883f8 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/SupplierServiceImpl.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/SupplierServiceImpl.java
@@ -3,8 +3,11 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.base.entity.Supplier;
import org.jeecg.modules.base.mapper.SupplierMapper;
+import org.jeecg.modules.base.mapper.UnitMapper;
import org.jeecg.modules.base.service.ISupplierService;
import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
/**
* @Description: mom_base_supplier
@@ -15,4 +18,10 @@
@Service
public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, Supplier> implements ISupplierService {
+ @Resource
+ private SupplierMapper supplierMapper;
+ @Override
+ public Supplier getByName(String name) {
+ return supplierMapper.getByName(name);
+ }
}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/UnitServiceImpl.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/UnitServiceImpl.java
index 4648a94..bf47192 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/UnitServiceImpl.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/UnitServiceImpl.java
@@ -2,8 +2,8 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.base.entity.Unit;
-import org.jeecg.modules.base.mapper.UnitMapper;
import org.jeecg.modules.base.mapper.UnitCategoryMapper;
+import org.jeecg.modules.base.mapper.UnitMapper;
import org.jeecg.modules.base.service.IUnitService;
import org.springframework.stereotype.Service;
@@ -31,4 +31,11 @@
List<Unit> list = unitMapper.getTreeList();
return list;
}
+
+ @Override
+ public Unit getUnitByName(String name) {
+ return unitMapper.getUnitByName(name);
+ }
+
+
}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/WarehouseAreaServiceImpl.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/WarehouseAreaServiceImpl.java
index 77872db..948994c 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/WarehouseAreaServiceImpl.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/WarehouseAreaServiceImpl.java
@@ -1,11 +1,11 @@
package org.jeecg.modules.base.service.impl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.base.entity.WarehouseArea;
import org.jeecg.modules.base.mapper.WarehouseAreaMapper;
import org.jeecg.modules.base.service.IWarehouseAreaService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: mom_base_warehouse_area
@@ -15,5 +15,10 @@
*/
@Service
public class WarehouseAreaServiceImpl extends ServiceImpl<WarehouseAreaMapper, WarehouseArea> implements IWarehouseAreaService {
-
+ @Autowired
+ private WarehouseAreaMapper warehouseAreaMapper;
+ @Override
+ public WarehouseArea getByName(String name) {
+ return warehouseAreaMapper.getByName(name);
+ }
}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/WarehouseLocationServiceImpl.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/WarehouseLocationServiceImpl.java
index f5e70dc..256b2bf 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/WarehouseLocationServiceImpl.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/WarehouseLocationServiceImpl.java
@@ -2,7 +2,9 @@
import org.jeecg.modules.base.entity.WarehouseLocation;
import org.jeecg.modules.base.mapper.WarehouseLocationMapper;
+import org.jeecg.modules.base.mapper.WarehouseMapper;
import org.jeecg.modules.base.service.IWarehouseLocationService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -15,5 +17,10 @@
*/
@Service
public class WarehouseLocationServiceImpl extends ServiceImpl<WarehouseLocationMapper, WarehouseLocation> implements IWarehouseLocationService {
-
+ @Autowired
+ private WarehouseLocationMapper warehouseLocationMapper;
+ @Override
+ public WarehouseLocation getByName(String name) {
+ return warehouseLocationMapper.getByName(name);
+ }
}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/WarehouseServiceImpl.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/WarehouseServiceImpl.java
index b3a266a..d9e1038 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/WarehouseServiceImpl.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/WarehouseServiceImpl.java
@@ -97,5 +97,10 @@
return warehouseMapper.getVersionStatusByVersion(version);
}
+ @Override
+ public Warehouse getByName(String name) {
+ return warehouseMapper.getByName(name);
+ }
+
}
--
Gitblit v1.9.3