diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java index 35b880df..f0d7c4e9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java @@ -6,12 +6,6 @@ import jakarta.servlet.http.Cookie; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import java.util.*; -import java.util.stream.Collectors; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import com.ruoyi.system.domain.RecordWarehousing; import com.ruoyi.system.service.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -157,14 +151,15 @@ public class SysIndexController extends BaseController { Map map =new HashMap(); //查询库存、在用轮胎数量、车辆数量 - int n = iBaseInventoryService.querytotal(); - int m = iBaseInventoryService.queryInCar(); - int k = iBaseInventoryService.queryCarTotal(); + Map tireTypeTotal = iBaseInventoryService.querytotal(); List mapList = iRecordWarehousingService.selectRecord(); - - map.put("InventoryTotal",n); - map.put("TyreInCar",m); - map.put("CarTotal",k); + //规格占比 + List mapListTyreModel = iRecordWarehousingService.selectTyreModel(); + //新胎装车统计 + List mapListInstall = iRecordWarehousingService.selectTyreInstall(); + map.put("mapListInstall",mapListInstall); + map.put("mapListTyreModel",mapListTyreModel); + map.put("tireTypeTotal",tireTypeTotal); map.put("mapList",mapList); return AjaxResult.success(map); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tyre/BaseCarController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tyre/BaseCarController.java index 88d077f5..4919f86c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tyre/BaseCarController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tyre/BaseCarController.java @@ -150,10 +150,10 @@ public class BaseCarController extends BaseController } @PostMapping("/PdaQueryCarList") @ResponseBody - public List PdaQueryCarList(BaseCar baseCar) + public AjaxResult PdaQueryCarList(BaseCar baseCar) { List list = baseCarService.selectBaseCarList(baseCar); - return list; + return AjaxResult.success(list); } @PostMapping("/PdaBingCarRfid") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tyre/BaseInventoryController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tyre/BaseInventoryController.java index 162d086d..f287f8c9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tyre/BaseInventoryController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tyre/BaseInventoryController.java @@ -123,6 +123,7 @@ public class BaseInventoryController extends BaseController return toAjax(baseInventoryService.deleteBaseInventoryByIds(ids)); } + @Log(title = "手持添加库存", businessType = BusinessType.INSERT) @PostMapping("/pdaAddInventory") @ResponseBody public AjaxResult pdaAddInventory(BaseInventory baseInventory, BaseTyre baseTyre) diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index c9830d51..95b89968 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -16,7 +16,7 @@ ruoyi: # 开发环境配置 server: # 服务器的HTTP端口，默认为80 - port: 80 + port: 8020 servlet: # 应用的访问路径 context-path: / diff --git a/ruoyi-admin/src/main/resources/static/img/img.png b/ruoyi-admin/src/main/resources/static/img/img.png new file mode 100644 index 00000000..c901b0e1 Binary files /dev/null and b/ruoyi-admin/src/main/resources/static/img/img.png differ diff --git a/ruoyi-admin/src/main/resources/templates/index-topnav.html b/ruoyi-admin/src/main/resources/templates/index-topnav.html index bee1e8ff..e7bbdc93 100644 --- a/ruoyi-admin/src/main/resources/templates/index-topnav.html +++ b/ruoyi-admin/src/main/resources/templates/index-topnav.html @@ -4,7 +4,7 @@ - 若依系统首页 + 智能轮胎管理系统 diff --git a/ruoyi-admin/src/main/resources/templates/index.html b/ruoyi-admin/src/main/resources/templates/index.html index c5883655..cb745e01 100644 --- a/ruoyi-admin/src/main/resources/templates/index.html +++ b/ruoyi-admin/src/main/resources/templates/index.html @@ -4,7 +4,7 @@ - 若依系统首页 + 智能轮胎管理系统 @@ -26,7 +26,7 @@
@@ -196,7 +196,7 @@
    -
  • 文档
    • +
  • 锁屏
  • 全屏
  • diff --git a/ruoyi-admin/src/main/resources/templates/login.html b/ruoyi-admin/src/main/resources/templates/login.html index 3e75438a..507dd170 100644 --- a/ruoyi-admin/src/main/resources/templates/login.html +++ b/ruoyi-admin/src/main/resources/templates/login.html @@ -4,84 +4,171 @@ 智能轮胎系统登录 - + + - + + - + + + + -
    -
    - - - - - - - - - - - - - - - - - -
    -
    -

    智能轮胎系统登录

    - - - -
    -
    - -
    -
    - - - -
    -
    -
    - -
    - -
    -
    - - - - - +
    +
    + +
    + +

    + 智能轮胎管理系统 +

    + + +
    + +
    + +
    + + +
    + +
    + + +
    +
    + +
    +
    + + + +
    +
    + + +
    + + +
    + + + +
    + + + +
    - - - - -
    - +
    + + + - - + - + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/main_v1.html b/ruoyi-admin/src/main/resources/templates/main_v1.html index 5cd194b2..4565491e 100644 --- a/ruoyi-admin/src/main/resources/templates/main_v1.html +++ b/ruoyi-admin/src/main/resources/templates/main_v1.html @@ -1,354 +1,636 @@ - + - - - 智能轮胎管理系统 - 首页看板 - - - - - - - - - - - - - - + - - - - - - - -
    - -
    -
    -
    -

    轮胎总库存

    -

    0

    -
    -
    - + +
    +
    +
    + +
    +
    + +
    + +
    - - - - - - -
    - -
    -
    -
    -

    在用轮胎数量

    -

    0

    -
    -
    - -
    -
    - - - - - - -
    +
    +
    +
    +
  • + + + - + +
    • + +
  • + + +
    • - - - - - - - - - - - - - - - - - - - - -
    -
    -
    -

    车辆总数

    -

    -
    -
    - -
    -
    - - - - - - -
    -
    - - -
    - -
    -
    -

    近一个月轮胎出入库统计

    - - - - - -
    -
    - + +
  • + + +
    • +
  • +  搜索 +  重置 +
    • +
+ + - -
-

轮胎类型分布

-
- +
+
+ +
+
+
+
实时库存统计
+
+
+ +
+ +
+
实时库存
+
+ +
+ + +
+
+ + +
+
+ +
+
+
+
+ + 全新胎 +
+

305

+ 在库: 305 +
+
+
+ +
+
+
+
+ + 翻新胎 +
+

35

+ 在库: 34 +
+
+
+ +
+
+
+
+ + 周转胎 +
+

1

+ 在库: 1 +
+
+
+ +
+
+
+
+ + 实验胎 +
+

1

+ 在库: 1 +
+
+
+
+
+
+ + +
+
+
+
近一个月出入库统计
+ +
+
+
+
+
+
+
+
+
+
+
轮胎入库及装车统计
+
+
+
+ + + + + +
+
+
+
全新胎
+

93

+
+
+
+
+
翻新胎
+

0

+
+
+
+
+
周转胎
+

0

+
+
+
+
+
试验胎
+

0

+
+
+
+ + +
+
+ +
+ 规格占比 +
+
+ + +
+ 新胎装车统计 +
+
+
+
+
+
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+
+ + \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseCar.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseCar.java index fa7857e2..068a323d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseCar.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseCar.java @@ -5,7 +5,10 @@ import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; /** * 车辆基础信息对象 base_car diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseTyre.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseTyre.java index f918aeaa..0489322b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseTyre.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseTyre.java @@ -5,7 +5,10 @@ import com.ruoyi.common.core.domain.BaseEntity; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; /** * 轮胎基础信息对象 base_tyre diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/BaseTyreVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/BaseTyreVo.java index ae9f848c..43b2d4d7 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/BaseTyreVo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/BaseTyreVo.java @@ -2,7 +2,10 @@ package com.ruoyi.system.domain.vo; import com.ruoyi.common.annotation.Excel; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; public class BaseTyreVo { private static final long serialVersionUID = 1L; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/InStoreSpinnerVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/InStoreSpinnerVo.java index 2b6ef724..01e3a2b4 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/InStoreSpinnerVo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/InStoreSpinnerVo.java @@ -4,7 +4,7 @@ import java.util.List; public class InStoreSpinnerVo { private List tyreBrandList; - private List tyreSizeList; + private List tyreSizeList; private List levelList; private List patternList; private List kindList; @@ -26,11 +26,11 @@ public class InStoreSpinnerVo { this.tyreBrandList = tyreBrandList; } - public List getTyreSizeList() { + public List getTyreSizeList() { return tyreSizeList; } - public void setTyreSizeList(List tyreSizeList) { + public void setTyreSizeList(List tyreSizeList) { this.tyreSizeList = tyreSizeList; } @@ -57,4 +57,5 @@ public class InStoreSpinnerVo { public void setKindList(List kindList) { this.kindList = kindList; } + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/tyreSizeVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/tyreSizeVo.java new file mode 100644 index 00000000..03bf8d94 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/tyreSizeVo.java @@ -0,0 +1,22 @@ +package com.ruoyi.system.domain.vo; + +public class tyreSizeVo { + private String label; + private String value; + + public String getLabel() { + return label; + } + + public void setLabel(String label) { + this.label = label; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BaseInventoryMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BaseInventoryMapper.java index b887c589..d895950e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BaseInventoryMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BaseInventoryMapper.java @@ -5,6 +5,7 @@ package com.ruoyi.system.mapper; import com.ruoyi.system.domain.BaseInventory; import java.util.List; +import java.util.Map; /** * 库存Mapper接口 @@ -66,7 +67,7 @@ public interface BaseInventoryMapper int updateBaseInventoryByEpc(BaseInventory baseInventory); - int querytotal(); + Map querytotal(); int queryInCar(); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/RecordWarehousingMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/RecordWarehousingMapper.java index 5010b106..147beff0 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/RecordWarehousingMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/RecordWarehousingMapper.java @@ -64,4 +64,8 @@ public interface RecordWarehousingMapper public int deleteRecordWarehousingByIds(String[] ids); List selectRecord(); + + List selectTyreModel(); + + List selectTyreInstall(); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseInventoryService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseInventoryService.java index 83182ec9..268049d1 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseInventoryService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseInventoryService.java @@ -6,6 +6,7 @@ import com.ruoyi.system.domain.BaseTyre; import java.util.List; +import java.util.Map; /** * 库存Service接口 @@ -67,7 +68,7 @@ public interface IBaseInventoryService AjaxResult OutInventoryByPda(BaseInventory baseInventory, BaseTyre baseTyre); - int querytotal(); + Map querytotal(); int queryInCar(); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IRecordWarehousingService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IRecordWarehousingService.java index 51a4d016..6e4a53d2 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IRecordWarehousingService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IRecordWarehousingService.java @@ -63,4 +63,8 @@ public interface IRecordWarehousingService public int deleteRecordWarehousingById(Long id); List selectRecord(); + + List selectTyreModel(); + + List selectTyreInstall(); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseInventoryServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseInventoryServiceImpl.java index 98bc37a4..3ef8f7bf 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseInventoryServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseInventoryServiceImpl.java @@ -14,10 +14,13 @@ import com.ruoyi.system.mapper.BaseTyreMapper; import com.ruoyi.system.mapper.RecordWarehousingMapper; import com.ruoyi.system.mapper.SysUserMapper; import com.ruoyi.system.service.IBaseInventoryService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Map; /** * 库存Service业务层处理 @@ -38,6 +41,8 @@ public class BaseInventoryServiceImpl implements IBaseInventoryService @Autowired private SysUserMapper sysUserMapper; + private static final Logger log = LoggerFactory.getLogger(BaseInventoryServiceImpl.class); + /** * 查询库存 * @@ -120,63 +125,45 @@ public class BaseInventoryServiceImpl implements IBaseInventoryService //查询登录人的部门信息 SysUser sysUser = sysUserMapper.selectUserByLoginName(baseInventory.getCreateBy()); int m=0,t=0; - if (isbaseInventory!=null){ - return AjaxResult.error("该轮胎已在仓库！"); - }else { - //插入库存表以及基础信息表 - baseInventory.setStatus("0"); - baseInventory.setNumber(1L); - baseInventory.setCreateTime(DateUtils.getNowDate()); - baseInventory.setUpdateTime(DateUtils.getNowDate()); - m = baseInventoryMapper.insertBaseInventory(baseInventory); - //添加入库记录 - RecordWarehousing recordWarehousing = new RecordWarehousing(); - recordWarehousing.setTyreRfid(baseInventory.getTyreRfid()); - recordWarehousing.setType("0"); - recordWarehousing.setCreateTime(DateUtils.getNowDate()); - recordWarehousing.setCreateBy(baseInventory.getCreateBy()); - t= recordWarehousingMapper.insertRecordWarehousing(recordWarehousing); - //查询此轮胎是否在基础信息表里面 - BaseTyre baseTyres = baseTyreMapper.selectBaseTyreByEpc(baseTyre); - //查找用户所在的车队 - String team = baseTyreMapper.getTeamByUser(baseInventory.getCreateBy()); - String patternDepth = null; - switch (baseTyre.getTyreModel().toString().trim()){ - case "215/75R17.5 16PR LFL866": - patternDepth = "20"; - break; - case "265/70R19.5-18 F820": - patternDepth = "17"; - break; - case "11R22.5 16PR LAU802": - patternDepth = "16"; - break; - case "245/70R19.5 18PR LAU609": - patternDepth = "20"; - break; - case "255/70R22.5 16PR LAU609": - patternDepth = "14"; - break; - case "275/70R22.5 18PR LAU802": - patternDepth = "15"; - break; - } - if (baseTyres==null){ - baseTyre.setTyreNo(baseInventory.getTyreOutsideId()); - baseTyre.setCreateTime(DateUtils.getNowDate()); - baseTyre.setTeam(team); - baseTyre.setCreateBy(baseInventory.getCreateBy()); - baseTyre.setDeptId(sysUser.getDeptId()); - baseTyre.setPatternDepth(patternDepth); - baseTyreMapper.insertBaseTyre(baseTyre); + try { + if (isbaseInventory!=null){ + return AjaxResult.error("该轮胎已在仓库！"); }else { - baseTyre.setTyreId(baseTyres.getTyreId()); - baseTyre.setUpdateTime(DateUtils.getNowDate()); - baseTyre.setTeam(team); - baseTyre.setUpdateBy(baseInventory.getCreateBy()); - baseTyre.setDeptId(sysUser.getDeptId()); - baseTyreMapper.updateBaseTyre(baseTyre); + //插入库存表以及基础信息表 + baseInventory.setStatus("0"); + baseInventory.setNumber(1L); + baseInventory.setCreateTime(DateUtils.getNowDate()); + baseInventory.setUpdateTime(DateUtils.getNowDate()); + m = baseInventoryMapper.insertBaseInventory(baseInventory); + //添加入库记录 + RecordWarehousing recordWarehousing = new RecordWarehousing(); + recordWarehousing.setTyreRfid(baseInventory.getTyreRfid()); + recordWarehousing.setType("0"); + recordWarehousing.setCreateTime(DateUtils.getNowDate()); + recordWarehousing.setCreateBy(baseInventory.getCreateBy()); + t= recordWarehousingMapper.insertRecordWarehousing(recordWarehousing); + //查询此轮胎是否在基础信息表里面 + BaseTyre baseTyres = baseTyreMapper.selectBaseTyreByEpc(baseTyre); + //查找用户所在的车队 + String team = baseTyreMapper.getTeamByUser(baseInventory.getCreateBy()); + if (baseTyres==null){ + baseTyre.setTyreNo(baseInventory.getTyreOutsideId()); + baseTyre.setCreateTime(DateUtils.getNowDate()); + baseTyre.setTeam(team); + baseTyre.setCreateBy(baseInventory.getCreateBy()); + baseTyre.setDeptId(sysUser.getDeptId()); + baseTyreMapper.insertBaseTyre(baseTyre); + }else { + baseTyre.setTyreId(baseTyres.getTyreId()); + baseTyre.setUpdateTime(DateUtils.getNowDate()); + baseTyre.setTeam(team); + baseTyre.setUpdateBy(baseInventory.getCreateBy()); + baseTyre.setDeptId(sysUser.getDeptId()); + baseTyreMapper.updateBaseTyre(baseTyre); + } } + }catch (Exception e){ + log.error(e.getMessage()); } if (m>0&&t>0){ return AjaxResult.success("入库成功"); @@ -221,7 +208,7 @@ public class BaseInventoryServiceImpl implements IBaseInventoryService } @Override - public int querytotal() { + public Map querytotal() { return baseInventoryMapper.querytotal(); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RecordTyreInstallServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RecordTyreInstallServiceImpl.java index bc7474d9..40fe959d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RecordTyreInstallServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RecordTyreInstallServiceImpl.java @@ -123,6 +123,7 @@ public class RecordTyreInstallServiceImpl implements IRecordTyreInstallService baseTyre.setCarNo(recordTyreInstall.getCarNo()); baseTyre.setWheelPostion(recordTyreInstall.getWheelPostion()); baseTyre.setSelfNo(recordTyreInstall.getSelfNo()); + baseTyre.setTyreNo(recordTyreInstall.getTyreNo()); int m = baseTyreMapper.updateBaseTyre(baseTyre); if (n>0&&m>0){ return AjaxResult.success("安装成功！"); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RecordWarehousingServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RecordWarehousingServiceImpl.java index 666a46ae..00288c67 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RecordWarehousingServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RecordWarehousingServiceImpl.java @@ -104,4 +104,14 @@ public class RecordWarehousingServiceImpl implements IRecordWarehousingService public List selectRecord() { return recordWarehousingMapper.selectRecord(); } + + @Override + public List selectTyreModel() { + return recordWarehousingMapper.selectTyreModel(); + } + + @Override + public List selectTyreInstall() { + return recordWarehousingMapper.selectTyreInstall(); + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java index c641ebf0..0c2c2402 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java @@ -5,6 +5,7 @@ import java.util.List; import com.ruoyi.system.domain.vo.CheckInfoSpinnerVo; import com.ruoyi.system.domain.vo.InStoreSpinnerVo; +import com.ruoyi.system.domain.vo.tyreSizeVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.common.core.domain.entity.SysDictData; @@ -133,7 +134,7 @@ public class SysDictDataServiceImpl implements ISysDictDataService List strings = new ArrayList<>(); List string_pattern = new ArrayList<>(); List string_level = new ArrayList<>(); - List string_size = new ArrayList<>(); + List string_size = new ArrayList<>(); List string_brand = new ArrayList<>(); List string_grooves = new ArrayList<>(); InStoreSpinnerVo inStoreSpinnerVo =new InStoreSpinnerVo(); @@ -154,11 +155,15 @@ public class SysDictDataServiceImpl implements ISysDictDataService } if (sizeList!=null){ for (SysDictData s: sizeList){ - string_size.add(s.getDictLabel()); + tyreSizeVo tyreSizeVo = new tyreSizeVo(); + tyreSizeVo.setLabel(s.getDictLabel()); + tyreSizeVo.setValue(s.getRemark()); + string_size.add(tyreSizeVo); } } if (brandList!=null){ for (SysDictData s:brandList){ + string_brand.add(s.getDictLabel()); } } diff --git a/ruoyi-system/src/main/resources/mapper/tyre/BaseInventoryMapper.xml b/ruoyi-system/src/main/resources/mapper/tyre/BaseInventoryMapper.xml index 7dd1a82c..3d963ab6 100644 --- a/ruoyi-system/src/main/resources/mapper/tyre/BaseInventoryMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/tyre/BaseInventoryMapper.xml @@ -54,15 +54,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and number = #{number} - + + insert into base_inventory diff --git a/ruoyi-system/src/main/resources/mapper/tyre/RecordWarehousingMapper.xml b/ruoyi-system/src/main/resources/mapper/tyre/RecordWarehousingMapper.xml index 9fb2c79b..69f16f1f 100644 --- a/ruoyi-system/src/main/resources/mapper/tyre/RecordWarehousingMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/tyre/RecordWarehousingMapper.xml @@ -54,6 +54,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" GROUP BY DATE(create_time) ORDER BY date; + + insert into record_warehousing