From 00b451e374b644f03cc5dfaaa13181be7189552d Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Tue, 22 Oct 2024 13:30:28 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A7=E7=89=88?= =?UTF-8?q?=E6=97=A0=E7=94=A8=E7=9A=84rf=E6=B5=8B=E8=AF=95=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=E7=BB=93=E6=9E=9C=E5=AF=B9=E8=B1=A1=20vna=5Fraw=5Fdat?= =?UTF-8?q?a=E5=92=8C=E7=B3=BB=E7=BB=9F=E4=B8=AD=E5=AF=B9=E5=BA=94?= =?UTF-8?q?=E7=9A=84=E5=89=8D=E7=AB=AF=E6=89=80=E6=9C=89=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E5=92=8C=E5=90=8E=E7=AB=AF=E6=89=80=E6=9C=89=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=20=E5=92=8C=E5=AF=B9=E5=BA=94=E7=9A=84=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/VnaRawDataController.java | 170 -------------- .../com/ruoyi/rfMsg/domain/VnaRawData.java | 133 ----------- .../ruoyi/rfMsg/mapper/VnaRawDataMapper.java | 62 ----- .../rfMsg/service/IVnaRawDataService.java | 61 ----- .../service/impl/VnaRawDataServiceImpl.java | 94 -------- .../mapper/rfMsg/VnaRawDataMapper.xml | 85 ------- .../templates/rfMsg/vnaRawData/add.html | 69 ------ .../templates/rfMsg/vnaRawData/edit.html | 70 ------ .../rfMsg/vnaRawData/vnaRawData.html | 219 ------------------ 9 files changed, 963 deletions(-) delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/rfMsg/controller/VnaRawDataController.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/rfMsg/domain/VnaRawData.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/rfMsg/mapper/VnaRawDataMapper.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/rfMsg/service/IVnaRawDataService.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/rfMsg/service/impl/VnaRawDataServiceImpl.java delete mode 100644 ruoyi-admin/src/main/resources/mapper/rfMsg/VnaRawDataMapper.xml delete mode 100644 ruoyi-admin/src/main/resources/templates/rfMsg/vnaRawData/add.html delete mode 100644 ruoyi-admin/src/main/resources/templates/rfMsg/vnaRawData/edit.html delete mode 100644 ruoyi-admin/src/main/resources/templates/rfMsg/vnaRawData/vnaRawData.html diff --git a/ruoyi-admin/src/main/java/com/ruoyi/rfMsg/controller/VnaRawDataController.java b/ruoyi-admin/src/main/java/com/ruoyi/rfMsg/controller/VnaRawDataController.java deleted file mode 100644 index 955c782e..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/rfMsg/controller/VnaRawDataController.java +++ /dev/null @@ -1,170 +0,0 @@ -package com.ruoyi.rfMsg.controller; - -import com.alibaba.fastjson.JSONObject; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.rfMsg.domain.VnaRawData; -import com.ruoyi.rfMsg.service.IVnaRawDataService; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -import org.springframework.web.bind.annotation.*; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -/** - * rf测试历史结果Controller - * - * @author ruoyi - * @date 2023-06-28 - */ -@Controller -@RequestMapping("/rfMsg/vnaRawData") -public class VnaRawDataController extends BaseController -{ - private String prefix = "rfMsg/vnaRawData"; - - @Autowired - private IVnaRawDataService vnaRawDataService; - - @RequiresPermissions("rfMsg:vnaRawData:view") - @GetMapping() - public String vnaRawData() - { - return prefix + "/vnaRawData"; - } - - /** - * 查询rf测试历史结果列表 - */ - @RequiresPermissions("rfMsg:vnaRawData:list") - @PostMapping("/list") - @ResponseBody - public TableDataInfo list(VnaRawData vnaRawData) - { - startPage(); - List list = vnaRawDataService.selectVnaRawDataList(vnaRawData); - return getDataTable(list); - } - - @PostMapping("/getDataById/{id}") - @ResponseBody - public List getDataById(@PathVariable("id") Long id) - { - startPage(); - VnaRawData vnaRawData = vnaRawDataService.selectVnaRawDataById(id); - String frequency = vnaRawData.getFrequency(); - System.out.println(frequency); - Map mapObj = JSONObject.parseObject(frequency,Map.class); - List listKey = new ArrayList(); - List listValue = new ArrayList(); - List listValueList = new ArrayList(); -// System.out.println("这个是用JSONObject的parseObject方法并执行返回类型来解析JSON字符串!!!"); -// for (Object map: mapObj.entrySet()){ -// System.out.println(((Map.Entry)map).getKey()+":"+((Map.Entry)map).getValue()); -// listKey.add(((Map.Entry)map).getKey()); -// listValue.add(((Map.Entry)map).getValue()); -// } -// LinkedHashMap map = JSONUtil.toBean(frequency, new TypeReference>() {}, true); -// for (Map.Entry entry : map.entrySet()) { -// System.out.println(entry.getKey() + ": " + entry.getValue()); -// listKey.add((entry.getKey())); -// listValue.add((entry.getValue())); -// } - try { - ObjectMapper objectMapper = new ObjectMapper(); - com.fasterxml.jackson.core.type.TypeReference> typeRef = new com.fasterxml.jackson.core.type.TypeReference>() {}; - LinkedHashMap map = objectMapper.readValue(frequency, typeRef); - for (Map.Entry entry : map.entrySet()) { - System.out.println(entry.getKey() + ": " + entry.getValue()); - listKey.add((entry.getKey())); - listValue.add((entry.getValue())); - } - } catch (Exception e) { - System.out.println("序列化出错"); - } - listValueList.add(listKey); - listValueList.add(listValue); - System.out.println(listValueList); - return listValueList; - } - - /** - * 导出rf测试历史结果列表 - */ - @RequiresPermissions("rfMsg:vnaRawData:export") - @Log(title = "rf测试历史结果", businessType = BusinessType.EXPORT) - @PostMapping("/export") - @ResponseBody - public AjaxResult export(VnaRawData vnaRawData) - { - List list = vnaRawDataService.selectVnaRawDataList(vnaRawData); - ExcelUtil util = new ExcelUtil(VnaRawData.class); - return util.exportExcel(list, "rf测试历史结果数据"); - } - - /** - * 新增rf测试历史结果 - */ - @GetMapping("/add") - public String add() - { - return prefix + "/add"; - } - - /** - * 新增保存rf测试历史结果 - */ - @RequiresPermissions("rfMsg:vnaRawData:add") - @Log(title = "rf测试历史结果", businessType = BusinessType.INSERT) - @PostMapping("/add") - @ResponseBody - public AjaxResult addSave(VnaRawData vnaRawData) - { - return toAjax(vnaRawDataService.insertVnaRawData(vnaRawData)); - } - - /** - * 修改rf测试历史结果 - */ - @GetMapping("/edit/{id}") - public String edit(@PathVariable("id") Long id, ModelMap mmap) - { - VnaRawData vnaRawData = vnaRawDataService.selectVnaRawDataById(id); - mmap.put("vnaRawData", vnaRawData); - return prefix + "/edit"; - } - - /** - * 修改保存rf测试历史结果 - */ - @RequiresPermissions("rfMsg:vnaRawData:edit") - @Log(title = "rf测试历史结果", businessType = BusinessType.UPDATE) - @PostMapping("/edit") - @ResponseBody - public AjaxResult editSave(VnaRawData vnaRawData) - { - return toAjax(vnaRawDataService.updateVnaRawData(vnaRawData)); - } - - /** - * 删除rf测试历史结果 - */ - @RequiresPermissions("rfMsg:vnaRawData:remove") - @Log(title = "rf测试历史结果", businessType = BusinessType.DELETE) - @PostMapping( "/remove") - @ResponseBody - public AjaxResult remove(String ids) - { - return toAjax(vnaRawDataService.deleteVnaRawDataByIds(ids)); - } -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/rfMsg/domain/VnaRawData.java b/ruoyi-admin/src/main/java/com/ruoyi/rfMsg/domain/VnaRawData.java deleted file mode 100644 index f40e029e..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/rfMsg/domain/VnaRawData.java +++ /dev/null @@ -1,133 +0,0 @@ -package com.ruoyi.rfMsg.domain; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; - -/** - * rf测试历史结果对象 vna_raw_data - * - * @author ruoyi - * @date 2023-06-28 - */ -public class VnaRawData extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** id */ - private Long id; - - /** 时间 */ - @Excel(name = "时间") - private String date; - - /** 序列号（设备） */ - @Excel(name = "序列号", readConverterExp = "设=备") - private String serialNumber; - - /** 操作人 */ - @Excel(name = "操作人") - private String operator; - - /** 是否通过，0为NG，1为PASS */ - @Excel(name = "是否通过，0为NG，1为PASS") - private Integer status; - - /** 端口号，例：PORT1 */ - @Excel(name = "端口号，例：PORT1") - private String port; - - /** 频率 */ - private String frequency; - - /** 数值，必须对应频率 */ - private String value; - - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - public void setDate(String date) - { - this.date = date; - } - - public String getDate() - { - return date; - } - public void setSerialNumber(String serialNumber) - { - this.serialNumber = serialNumber; - } - - public String getSerialNumber() - { - return serialNumber; - } - public void setOperator(String operator) - { - this.operator = operator; - } - - public String getOperator() - { - return operator; - } - public void setStatus(Integer status) - { - this.status = status; - } - - public Integer getStatus() - { - return status; - } - public void setPort(String port) - { - this.port = port; - } - - public String getPort() - { - return port; - } - public void setFrequency(String frequency) - { - this.frequency = frequency; - } - - public String getFrequency() - { - return frequency; - } - public void setValue(String value) - { - this.value = value; - } - - public String getValue() - { - return value; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("date", getDate()) - .append("serialNumber", getSerialNumber()) - .append("operator", getOperator()) - .append("status", getStatus()) - .append("port", getPort()) - .append("frequency", getFrequency()) - .append("value", getValue()) - .toString(); - } -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/rfMsg/mapper/VnaRawDataMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/rfMsg/mapper/VnaRawDataMapper.java deleted file mode 100644 index c4bf7757..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/rfMsg/mapper/VnaRawDataMapper.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.ruoyi.rfMsg.mapper; - -import com.ruoyi.rfMsg.domain.VnaRawData; - -import java.util.List; - -/** - * rf测试历史结果Mapper接口 - * - * @author ruoyi - * @date 2023-06-28 - */ -public interface VnaRawDataMapper -{ - /** - * 查询rf测试历史结果 - * - * @param id rf测试历史结果ID - * @return rf测试历史结果 - */ - public VnaRawData selectVnaRawDataById(Long id); - - /** - * 查询rf测试历史结果列表 - * - * @param vnaRawData rf测试历史结果 - * @return rf测试历史结果集合 - */ - public List selectVnaRawDataList(VnaRawData vnaRawData); - - /** - * 新增rf测试历史结果 - * - * @param vnaRawData rf测试历史结果 - * @return 结果 - */ - public int insertVnaRawData(VnaRawData vnaRawData); - - /** - * 修改rf测试历史结果 - * - * @param vnaRawData rf测试历史结果 - * @return 结果 - */ - public int updateVnaRawData(VnaRawData vnaRawData); - - /** - * 删除rf测试历史结果 - * - * @param id rf测试历史结果ID - * @return 结果 - */ - public int deleteVnaRawDataById(Long id); - - /** - * 批量删除rf测试历史结果 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - public int deleteVnaRawDataByIds(String[] ids); -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/rfMsg/service/IVnaRawDataService.java b/ruoyi-admin/src/main/java/com/ruoyi/rfMsg/service/IVnaRawDataService.java deleted file mode 100644 index 10570fa0..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/rfMsg/service/IVnaRawDataService.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.ruoyi.rfMsg.service; - -import java.util.List; -import com.ruoyi.rfMsg.domain.VnaRawData; - -/** - * rf测试历史结果Service接口 - * - * @author ruoyi - * @date 2023-06-28 - */ -public interface IVnaRawDataService -{ - /** - * 查询rf测试历史结果 - * - * @param id rf测试历史结果ID - * @return rf测试历史结果 - */ - public VnaRawData selectVnaRawDataById(Long id); - - /** - * 查询rf测试历史结果列表 - * - * @param vnaRawData rf测试历史结果 - * @return rf测试历史结果集合 - */ - public List selectVnaRawDataList(VnaRawData vnaRawData); - - /** - * 新增rf测试历史结果 - * - * @param vnaRawData rf测试历史结果 - * @return 结果 - */ - public int insertVnaRawData(VnaRawData vnaRawData); - - /** - * 修改rf测试历史结果 - * - * @param vnaRawData rf测试历史结果 - * @return 结果 - */ - public int updateVnaRawData(VnaRawData vnaRawData); - - /** - * 批量删除rf测试历史结果 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - public int deleteVnaRawDataByIds(String ids); - - /** - * 删除rf测试历史结果信息 - * - * @param id rf测试历史结果ID - * @return 结果 - */ - public int deleteVnaRawDataById(Long id); -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/rfMsg/service/impl/VnaRawDataServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/rfMsg/service/impl/VnaRawDataServiceImpl.java deleted file mode 100644 index fee03c38..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/rfMsg/service/impl/VnaRawDataServiceImpl.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.ruoyi.rfMsg.service.impl; - -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.ruoyi.rfMsg.mapper.VnaRawDataMapper; -import com.ruoyi.rfMsg.domain.VnaRawData; -import com.ruoyi.rfMsg.service.IVnaRawDataService; -import com.ruoyi.common.core.text.Convert; - -/** - * rf测试历史结果Service业务层处理 - * - * @author ruoyi - * @date 2023-06-28 - */ -@Service -public class VnaRawDataServiceImpl implements IVnaRawDataService -{ - @Autowired - private VnaRawDataMapper vnaRawDataMapper; - - /** - * 查询rf测试历史结果 - * - * @param id rf测试历史结果ID - * @return rf测试历史结果 - */ - @Override - public VnaRawData selectVnaRawDataById(Long id) - { - return vnaRawDataMapper.selectVnaRawDataById(id); - } - - /** - * 查询rf测试历史结果列表 - * - * @param vnaRawData rf测试历史结果 - * @return rf测试历史结果 - */ - @Override - public List selectVnaRawDataList(VnaRawData vnaRawData) - { - return vnaRawDataMapper.selectVnaRawDataList(vnaRawData); - } - - /** - * 新增rf测试历史结果 - * - * @param vnaRawData rf测试历史结果 - * @return 结果 - */ - @Override - public int insertVnaRawData(VnaRawData vnaRawData) - { - return vnaRawDataMapper.insertVnaRawData(vnaRawData); - } - - /** - * 修改rf测试历史结果 - * - * @param vnaRawData rf测试历史结果 - * @return 结果 - */ - @Override - public int updateVnaRawData(VnaRawData vnaRawData) - { - return vnaRawDataMapper.updateVnaRawData(vnaRawData); - } - - /** - * 删除rf测试历史结果对象 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - @Override - public int deleteVnaRawDataByIds(String ids) - { - return vnaRawDataMapper.deleteVnaRawDataByIds(Convert.toStrArray(ids)); - } - - /** - * 删除rf测试历史结果信息 - * - * @param id rf测试历史结果ID - * @return 结果 - */ - @Override - public int deleteVnaRawDataById(Long id) - { - return vnaRawDataMapper.deleteVnaRawDataById(id); - } -} diff --git a/ruoyi-admin/src/main/resources/mapper/rfMsg/VnaRawDataMapper.xml b/ruoyi-admin/src/main/resources/mapper/rfMsg/VnaRawDataMapper.xml deleted file mode 100644 index 2f0abb45..00000000 --- a/ruoyi-admin/src/main/resources/mapper/rfMsg/VnaRawDataMapper.xml +++ /dev/null @@ -1,85 +0,0 @@ - - - - - - - - - - - - - - - - - select id, Date, Serial_Number, Operator, Status, Port, Frequency, Value from vna_raw_data - - - - - - - - insert into vna_raw_data - - Date, - Serial_Number, - Operator, - Status, - Port, - Frequency, - Value, - - - #{date}, - #{serialNumber}, - #{operator}, - #{status}, - #{port}, - #{frequency}, - #{value}, - - - - - update vna_raw_data - - Date = #{date}, - Serial_Number = #{serialNumber}, - Operator = #{operator}, - Status = #{status}, - Port = #{port}, - Frequency = #{frequency}, - Value = #{value}, - - where id = #{id} - - - - delete from vna_raw_data where id = #{id} - - - - delete from vna_raw_data where id in - - #{id} - - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/rfMsg/vnaRawData/add.html b/ruoyi-admin/src/main/resources/templates/rfMsg/vnaRawData/add.html deleted file mode 100644 index 106a4826..00000000 --- a/ruoyi-admin/src/main/resources/templates/rfMsg/vnaRawData/add.html +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - -
-
-
- -
-
- - -
-
-
-
- -
- -
-
-
- -
- -
-
-
- -
-
- - -
-
-
-
- -
- -
-
-
-
- - - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/rfMsg/vnaRawData/edit.html b/ruoyi-admin/src/main/resources/templates/rfMsg/vnaRawData/edit.html deleted file mode 100644 index 69239cf3..00000000 --- a/ruoyi-admin/src/main/resources/templates/rfMsg/vnaRawData/edit.html +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - -
-
- -
- -
-
- - -
-
-
-
- -
- -
-
-
- -
- -
-
-
- -
-
- - -
-
-
-
- -
- -
-
-
-
- - - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/rfMsg/vnaRawData/vnaRawData.html b/ruoyi-admin/src/main/resources/templates/rfMsg/vnaRawData/vnaRawData.html deleted file mode 100644 index da62ce54..00000000 --- a/ruoyi-admin/src/main/resources/templates/rfMsg/vnaRawData/vnaRawData.html +++ /dev/null @@ -1,219 +0,0 @@ - - - - - - - -
-
-
-
-
-
    -
  • - - - - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • -  搜索 -  重置 -
    • -
-
-
-
- -
- - - - - - - - - - - - -
-
-
-
-
-
- - - - \ No newline at end of file From b94d7381ae5f58361348f2529af89ce3204796f1 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Tue, 22 Oct 2024 13:44:45 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A7=E7=89=88?= =?UTF-8?q?=E6=97=A0=E7=94=A8=E7=9A=84=E5=BA=93=E5=AD=98=E5=AF=B9=E8=B1=A1?= =?UTF-8?q?=20warehouse=E5=92=8C=E7=B3=BB=E7=BB=9F=E4=B8=AD=E5=AF=B9?= =?UTF-8?q?=E5=BA=94=E7=9A=84=E5=89=8D=E7=AB=AF=E6=89=80=E6=9C=89=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E5=92=8C=E5=90=8E=E7=AB=AF=E6=89=80=E6=9C=89=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=20=E5=92=8C=E5=AF=B9=E5=BA=94=E7=9A=84=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E8=8F=9C=E5=8D=95=E6=95=B0=E6=8D=AE=20=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E6=97=A7=E7=89=88=E6=97=A0=E7=94=A8=E7=9A=84=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E8=A1=A8=E5=85=B3=E8=81=94=E6=9F=A5=E8=AF=A2=20Wareho?= =?UTF-8?q?usingOutHeadWithList=E5=92=8C=E7=B3=BB=E7=BB=9F=E4=B8=AD?= =?UTF-8?q?=E5=AF=B9=E5=BA=94=E7=9A=84=E5=89=8D=E7=AB=AF=E6=89=80=E6=9C=89?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=92=8C=E5=90=8E=E7=AB=AF=E6=89=80=E6=9C=89?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=20=E5=92=8C=E5=AF=B9=E5=BA=94=E7=9A=84?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E8=8F=9C=E5=8D=95=E6=95=B0=E6=8D=AE=20?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A7=E7=89=88=E6=97=A0=E7=94=A8=E7=9A=84?= =?UTF-8?q?CheckHeadWithList=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stock/controller/WarehouseController.java | 140 -------- .../ruoyi/stock/domain/CheckHeadWithList.java | 154 --------- .../com/ruoyi/stock/domain/Warehouse.java | 311 ------------------ .../domain/WarehousingOutHeadWithList.java | 259 --------------- .../ruoyi/stock/mapper/WarehouseMapper.java | 72 ---- .../WarehousingOutHeadWithListMapper.java | 17 - .../stock/service/IWarehouseService.java | 70 ---- .../service/impl/WarehouseServiceImpl.java | 119 ------- .../mapper/stock/CheckHeadWithListMapper.xml | 38 --- .../mapper/stock/WarehouseMapper.xml | 166 ---------- .../WarehousingOutHeadWithListMapper.xml | 54 --- .../templates/stock/warehouse/add.html | 136 -------- .../templates/stock/warehouse/edit.html | 137 -------- .../stock/warehouse/slowMovingItem.html | 190 ----------- .../templates/stock/warehouse/warehouse.html | 288 ---------------- 15 files changed, 2151 deletions(-) delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/stock/controller/WarehouseController.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/stock/domain/CheckHeadWithList.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/stock/domain/Warehouse.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/stock/domain/WarehousingOutHeadWithList.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/stock/mapper/WarehouseMapper.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/stock/mapper/WarehousingOutHeadWithListMapper.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/stock/service/IWarehouseService.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/stock/service/impl/WarehouseServiceImpl.java delete mode 100644 ruoyi-admin/src/main/resources/mapper/stock/CheckHeadWithListMapper.xml delete mode 100644 ruoyi-admin/src/main/resources/mapper/stock/WarehouseMapper.xml delete mode 100644 ruoyi-admin/src/main/resources/mapper/stock/WarehousingOutHeadWithListMapper.xml delete mode 100644 ruoyi-admin/src/main/resources/templates/stock/warehouse/add.html delete mode 100644 ruoyi-admin/src/main/resources/templates/stock/warehouse/edit.html delete mode 100644 ruoyi-admin/src/main/resources/templates/stock/warehouse/slowMovingItem.html delete mode 100644 ruoyi-admin/src/main/resources/templates/stock/warehouse/warehouse.html diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/controller/WarehouseController.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/controller/WarehouseController.java deleted file mode 100644 index adb7a78c..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/stock/controller/WarehouseController.java +++ /dev/null @@ -1,140 +0,0 @@ -package com.ruoyi.stock.controller; - -import com.ruoyi.ck.utils.Result; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.stock.domain.Warehouse; -import com.ruoyi.stock.service.IWarehouseService; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - * 库存Controller - * - * @author ruoyi - * @date 2021-12-02 - */ -@Controller -@RequestMapping("/stock/warehouse") -public class WarehouseController extends BaseController { - private String prefix = "stock/warehouse"; - - @Autowired - private IWarehouseService warehouseService; - - @RequiresPermissions("stock:warehouse:view") - @GetMapping() - public String warehouse() { - return prefix + "/warehouse"; - } - - @GetMapping("/toSlowMovingItem") - public String slowMovingItem() { - return prefix + "/slowMovingItem"; - } - - /** - * 查询库存列表 - */ - @RequiresPermissions("stock:warehouse:list") - @PostMapping("/list") - @ResponseBody - public TableDataInfo list(Warehouse warehouse) { - startPage(); - List list = warehouseService.selectWarehouseList(warehouse); - return getDataTable(list); - } - - /** - * 导出库存列表 - */ - @RequiresPermissions("stock:warehouse:export") - @Log(title = "库存", businessType = BusinessType.EXPORT) - @PostMapping("/export") - @ResponseBody - public AjaxResult export(Warehouse warehouse) { - List list = warehouseService.selectWarehouseList(warehouse); - ExcelUtil util = new ExcelUtil(Warehouse.class); - return util.exportExcel(list, "库存数据"); - } - - /** - * 新增库存 - */ - @GetMapping("/add") - public String add() { - return prefix + "/add"; - } - - /** - * 新增保存库存 - */ - @RequiresPermissions("stock:warehouse:add") - @Log(title = "库存", businessType = BusinessType.INSERT) - @PostMapping("/add") - @ResponseBody - public AjaxResult addSave(Warehouse warehouse) { - return toAjax(warehouseService.insertWarehouse(warehouse)); - } - - /** - * 修改库存 - */ - @GetMapping("/edit/{id}") - public String edit(@PathVariable("id") Long id, ModelMap mmap) { - Warehouse warehouse = warehouseService.selectWarehouseById(id); - mmap.put("warehouse", warehouse); - return prefix + "/edit"; - } - - /** - * 修改保存库存 - */ - @RequiresPermissions("stock:warehouse:edit") - @Log(title = "库存", businessType = BusinessType.UPDATE) - @PostMapping("/edit") - @ResponseBody - public AjaxResult editSave(Warehouse warehouse) { - return toAjax(warehouseService.updateWarehouse(warehouse)); - } - - /** - * 删除库存 - */ - @RequiresPermissions("stock:warehouse:remove") - @Log(title = "库存", businessType = BusinessType.DELETE) - @PostMapping("/remove") - @ResponseBody - public AjaxResult remove(String ids) { - return toAjax(warehouseService.deleteWarehouseByIds(ids)); - } - - //根据代码查询 只能查一条！ - @ResponseBody - @PostMapping("/code") - public Result selectByCode(Warehouse warehouse) throws Exception { - Warehouse findWarehouse = warehouseService.selectByCode(warehouse); - if (findWarehouse == null) { - return Result.getFailResult("库存无此物料！", null); - } - return Result.getSuccessResult(findWarehouse); - } - - //搜索呆滞物料列表 - @ResponseBody - @PostMapping("/getSlowMovingItemList") - public TableDataInfo selectSlowMovingItem(Warehouse warehouse,String slowMovingType){ - startPage(); - List list = warehouseService.selectSlowMovingItemList(warehouse, slowMovingType); - return getDataTable(list); - } -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/domain/CheckHeadWithList.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/domain/CheckHeadWithList.java deleted file mode 100644 index 9b2e557b..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/stock/domain/CheckHeadWithList.java +++ /dev/null @@ -1,154 +0,0 @@ -package com.ruoyi.stock.domain; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; - -import java.util.Date; - -/** - * @author ：pyy - * @date ：Created in 2021/12/20 10:32 - * @description： - * @modified By： - * @version: $ - */ -public class CheckHeadWithList extends BaseEntity { - - /** 盘底单号 */ - @Excel(name = "盘底单号") - private String checkId; - - /** 仓库名称 */ - @Excel(name = "仓库名称") - private String stockName; - - /** 盘底日期 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "盘底日期", width = 30, dateFormat = "yyyy-MM-dd") - private Date checkDate; - - /** 物料代码 */ - @Excel(name = "物料代码") - private String itemCode; - - /** 物料名称 */ - @Excel(name = "物料名称") - private String itemName; - - /** 物料规格 */ - @Excel(name = "物料规格") - private String itemSpecification; - - /** 单位 */ - @Excel(name = "单位") - private String unit; - - /** 盘底数量 */ - @Excel(name = "盘底数量") - private String checkQty; - - /** 批号 */ - @Excel(name = "批号") - private String batchNumber; - - /** 更新否 */ - @Excel(name = "更新否") - private String isUpdate; - - public String getCheckId() { - return checkId; - } - - public void setCheckId(String checkId) { - this.checkId = checkId; - } - - public String getStockName() { - return stockName; - } - - public void setStockName(String stockName) { - this.stockName = stockName; - } - - public Date getCheckDate() { - return checkDate; - } - - public void setCheckDate(Date checkDate) { - this.checkDate = checkDate; - } - - public String getItemCode() { - return itemCode; - } - - public void setItemCode(String itemCode) { - this.itemCode = itemCode; - } - - public String getItemName() { - return itemName; - } - - public void setItemName(String itemName) { - this.itemName = itemName; - } - - public String getItemSpecification() { - return itemSpecification; - } - - public void setItemSpecification(String itemSpecification) { - this.itemSpecification = itemSpecification; - } - - public String getUnit() { - return unit; - } - - public void setUnit(String unit) { - this.unit = unit; - } - - public String getCheckQty() { - return checkQty; - } - - public void setCheckQty(String checkQty) { - this.checkQty = checkQty; - } - - public String getBatchNumber() { - return batchNumber; - } - - public void setBatchNumber(String batchNumber) { - this.batchNumber = batchNumber; - } - - public String getIsUpdate() { - return isUpdate; - } - - public void setIsUpdate(String isUpdate) { - this.isUpdate = isUpdate; - } - - @Override - public String toString() { - return "CheckHeadWithList{" + - "checkId='" + checkId + '\'' + - ", stockName='" + stockName + '\'' + - ", checkDate=" + checkDate + - ", itemCode='" + itemCode + '\'' + - ", itemName='" + itemName + '\'' + - ", itemSpecification='" + itemSpecification + '\'' + - ", unit='" + unit + '\'' + - ", checkQty='" + checkQty + '\'' + - ", batchNumber='" + batchNumber + '\'' + - ", isUpdate='" + isUpdate + '\'' + - '}'; - } -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/domain/Warehouse.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/domain/Warehouse.java deleted file mode 100644 index 6b8329e0..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/stock/domain/Warehouse.java +++ /dev/null @@ -1,311 +0,0 @@ -package com.ruoyi.stock.domain; - -import com.fasterxml.jackson.annotation.JsonFormat; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; - -import java.util.Date; - -/** - * 库存对象 warehouse - * - * @author ruoyi - * @date 2021-12-02 - */ -public class Warehouse extends BaseEntity { - private static final long serialVersionUID = 1L; - - /** - * 编号 - */ - private Long id; - - /** - * 物料代码 - */ - @Excel(name = "物料代码") - private String wlCode; - - /** - * 物料名称 - */ - @Excel(name = "物料名称") - private String itemName; - - /** - * 规格 - */ - @Excel(name = "规格") - private String itemStandard; - - /** - * 机种 - */ - @Excel(name = "机种") - private String machineNo; - - /** - * 单位 - */ - @Excel(name = "单位") - private String stockDw; - - /** - * 数量 - */ - @Excel(name = "数量") - private Long qty; - - /** - * 仓库名称 - */ - @Excel(name = "仓库名称") - private String warehouseName; - - /** - * 仓库号 - */ - @Excel(name = "仓库号") - private String warehouseNo; - - /** - * 存放位置 - */ - @Excel(name = "存放位置") - private String depositPosition; - - /** - * 物料类别 - */ - @Excel(name = "物料类别") - private String inClass; - - /** - * 最后入库日期 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "最后入库日期") - private Date spare1; - - /** - * 最后出库日期 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "最后出库日期") - private Date spare2; - - /** - * - */ - @Excel(name = "") - private String spare3; - - /** - * - */ - @Excel(name = "") - private String spare4; - - /** - * - */ - @Excel(name = "") - private String spare5; - - /** - * - */ - @Excel(name = "") - private String spare6; - - /** - * 物料种类 - */ - @Excel(name = "物料种类") - private String wlType; - - /** - * 批号 - */ - @Excel(name = "批号") - private String batchNumber; - - public void setId(Long id) { - this.id = id; - } - - public Long getId() { - return id; - } - - public void setWlCode(String wlCode) { - this.wlCode = wlCode; - } - - public String getWlCode() { - return wlCode; - } - - public void setItemName(String itemName) { - this.itemName = itemName; - } - - public String getItemName() { - return itemName; - } - - public void setItemStandard(String itemStandard) { - this.itemStandard = itemStandard; - } - - public String getItemStandard() { - return itemStandard; - } - - public void setMachineNo(String machineNo) { - this.machineNo = machineNo; - } - - public String getMachineNo() { - return machineNo; - } - - public void setStockDw(String stockDw) { - this.stockDw = stockDw; - } - - public String getStockDw() { - return stockDw; - } - - public void setQty(Long qty) { - this.qty = qty; - } - - public Long getQty() { - return qty; - } - - public void setWarehouseName(String warehouseName) { - this.warehouseName = warehouseName; - } - - public String getWarehouseName() { - return warehouseName; - } - - public void setWarehouseNo(String warehouseNo) { - this.warehouseNo = warehouseNo; - } - - public String getWarehouseNo() { - return warehouseNo; - } - - public void setDepositPosition(String depositPosition) { - this.depositPosition = depositPosition; - } - - public String getDepositPosition() { - return depositPosition; - } - - public void setInClass(String inClass) { - this.inClass = inClass; - } - - public String getInClass() { - return inClass; - } - - public Date getSpare1() { - return spare1; - } - - public void setSpare1(Date spare1) { - this.spare1 = spare1; - } - - public Date getSpare2() { - return spare2; - } - - public void setSpare2(Date spare2) { - this.spare2 = spare2; - } - - public void setSpare3(String spare3) { - this.spare3 = spare3; - } - - public String getSpare3() { - return spare3; - } - - public void setSpare4(String spare4) { - this.spare4 = spare4; - } - - public String getSpare4() { - return spare4; - } - - public void setSpare5(String spare5) { - this.spare5 = spare5; - } - - public String getSpare5() { - return spare5; - } - - public void setSpare6(String spare6) { - this.spare6 = spare6; - } - - public String getSpare6() { - return spare6; - } - - public void setWlType(String wlType) { - this.wlType = wlType; - } - - public String getWlType() { - return wlType; - } - - public void setBatchNumber(String batchNumber) { - this.batchNumber = batchNumber; - } - - public String getBatchNumber() { - return batchNumber; - } - - @Override - public String toString() { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("wlCode", getWlCode()) - .append("itemName", getItemName()) - .append("itemStandard", getItemStandard()) - .append("machineNo", getMachineNo()) - .append("stockDw", getStockDw()) - .append("qty", getQty()) - .append("warehouseName", getWarehouseName()) - .append("warehouseNo", getWarehouseNo()) - .append("depositPosition", getDepositPosition()) - .append("inClass", getInClass()) - .append("spare1", getSpare1()) - .append("spare2", getSpare2()) - .append("spare3", getSpare3()) - .append("spare4", getSpare4()) - .append("spare5", getSpare5()) - .append("spare6", getSpare6()) - .append("wlType", getWlType()) - .append("batchNumber", getBatchNumber()) - .toString(); - } -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/domain/WarehousingOutHeadWithList.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/domain/WarehousingOutHeadWithList.java deleted file mode 100644 index 73773349..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/stock/domain/WarehousingOutHeadWithList.java +++ /dev/null @@ -1,259 +0,0 @@ -package com.ruoyi.stock.domain; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; - -import java.util.Date; - -/** - * @author ：pyy - * @date ：Created in 2021/12/16 9:24 - * @description：出库表联结查询 - * @modified By： - * @version: $ - */ -public class WarehousingOutHeadWithList extends BaseEntity { - - /** 出库单号 */ - @Excel(name = "出库单号") - private String warehousingOutNo; - - /** 制工单号 */ - @Excel(name = "制工单号") - private String workOrderNo; - - /** 订单号 */ - @Excel(name = "订单号") - private String buyOrderNo; - - /** 出库日期 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "出库日期", width = 30, dateFormat = "yyyy-MM-dd") - private Date warehousingOutDate; - - /** 项次 */ - @Excel(name = "项次") - private String itemNo; - - /** 物料代码 */ - @Excel(name = "物料代码") - private String itemCode; - - /** 物料名称 */ - @Excel(name = "物料名称") - private String itemName; - - /** 物料规格 */ - @Excel(name = "物料规格") - private String itemSpecification; - - /** 单位 */ - @Excel(name = "单位") - private String unit; - - /** 计划数量 */ - @Excel(name = "计划数量") - private Long planQty; - - /** 实际数量 */ - @Excel(name = "实际数量") - private Long realQty; - - /** 退回数量 */ - @Excel(name = "退回数量") - private Long returnQty; - - @Excel(name = "备注") - private String remark; - - /** 部门编号 */ - @Excel(name = "部门编号") - private String deptNo; - - /** 部门名称 */ - @Excel(name = "部门名称") - private String deptName; - - /** 仓库名称 */ - @Excel(name = "仓库名称") - private String stockName; - - /** 出库类别 */ - @Excel(name = "出库类别") - private String outputClass; - - /** 物料类别 */ - @Excel(name = "物料类别") - private String itemClass; - - public String getWarehousingOutNo() { - return warehousingOutNo; - } - - public void setWarehousingOutNo(String warehousingOutNo) { - this.warehousingOutNo = warehousingOutNo; - } - - public String getWorkOrderNo() { - return workOrderNo; - } - - public void setWorkOrderNo(String workOrderNo) { - this.workOrderNo = workOrderNo; - } - - public String getBuyOrderNo() { - return buyOrderNo; - } - - public void setBuyOrderNo(String buyOrderNo) { - this.buyOrderNo = buyOrderNo; - } - - public Date getWarehousingOutDate() { - return warehousingOutDate; - } - - public void setWarehousingOutDate(Date warehousingOutDate) { - this.warehousingOutDate = warehousingOutDate; - } - - public String getItemNo() { - return itemNo; - } - - public void setItemNo(String itemNo) { - this.itemNo = itemNo; - } - - public String getItemCode() { - return itemCode; - } - - public void setItemCode(String itemCode) { - this.itemCode = itemCode; - } - - public String getItemName() { - return itemName; - } - - public void setItemName(String itemName) { - this.itemName = itemName; - } - - public String getItemSpecification() { - return itemSpecification; - } - - public void setItemSpecification(String itemSpecification) { - this.itemSpecification = itemSpecification; - } - - public String getUnit() { - return unit; - } - - public void setUnit(String unit) { - this.unit = unit; - } - - public Long getPlanQty() { - return planQty; - } - - public void setPlanQty(Long planQty) { - this.planQty = planQty; - } - - public Long getRealQty() { - return realQty; - } - - public void setRealQty(Long realQty) { - this.realQty = realQty; - } - - public Long getReturnQty() { - return returnQty; - } - - public void setReturnQty(Long returnQty) { - this.returnQty = returnQty; - } - - @Override - public String getRemark() { - return remark; - } - - @Override - public void setRemark(String remark) { - this.remark = remark; - } - - public String getDeptNo() { - return deptNo; - } - - public void setDeptNo(String deptNo) { - this.deptNo = deptNo; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getStockName() { - return stockName; - } - - public void setStockName(String stockName) { - this.stockName = stockName; - } - - public String getOutputClass() { - return outputClass; - } - - public void setOutputClass(String outputClass) { - this.outputClass = outputClass; - } - - public String getItemClass() { - return itemClass; - } - - public void setItemClass(String itemClass) { - this.itemClass = itemClass; - } - - @Override - public String toString() { - return "WarehousingOutHeadWithList{" + - "warehousingOutNo='" + warehousingOutNo + '\'' + - ", workOrderNo='" + workOrderNo + '\'' + - ", buyOrderNo='" + buyOrderNo + '\'' + - ", warehousingOutDate=" + warehousingOutDate + - ", itemNo='" + itemNo + '\'' + - ", itemCode='" + itemCode + '\'' + - ", itemName='" + itemName + '\'' + - ", itemSpecification='" + itemSpecification + '\'' + - ", unit='" + unit + '\'' + - ", planQty=" + planQty + - ", realQty=" + realQty + - ", returnQty=" + returnQty + - ", remark='" + remark + '\'' + - ", deptNo='" + deptNo + '\'' + - ", deptName='" + deptName + '\'' + - ", stockName='" + stockName + '\'' + - ", outputClass='" + outputClass + '\'' + - ", itemClass='" + itemClass + '\'' + - '}'; - } -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/mapper/WarehouseMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/mapper/WarehouseMapper.java deleted file mode 100644 index 8b914af1..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/stock/mapper/WarehouseMapper.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.ruoyi.stock.mapper; - -import com.ruoyi.stock.domain.Warehouse; - -import java.util.List; - -/** - * 库存Mapper接口 - * - * @author ruoyi - * @date 2021-12-02 - */ -public interface WarehouseMapper -{ - /** - * 查询库存 - * - * @param id 库存ID - * @return 库存 - */ - public Warehouse selectWarehouseById(Long id); - - /** - * 查询库存列表 - * - * @param warehouse 库存 - * @return 库存集合 - */ - public List selectWarehouseList(Warehouse warehouse); - - /** - * 新增库存 - * - * @param warehouse 库存 - * @return 结果 - */ - public int insertWarehouse(Warehouse warehouse); - - /** - * 修改库存 - * - * @param warehouse 库存 - * @return 结果 - */ - public int updateWarehouse(Warehouse warehouse); - - /** - * 删除库存 - * - * @param id 库存ID - * @return 结果 - */ - public int deleteWarehouseById(Long id); - - /** - * 批量删除库存 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - public int deleteWarehouseByIds(String[] ids); - - public int addQty(Warehouse warehouse); - - public int minusQty(Warehouse warehouse); - - public Warehouse selectByCode(Warehouse warehouse); - - public List selectSlowMovingItemByPut(Warehouse warehouse); - - public List selectSlowMovingItemByOut(Warehouse warehouse); -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/mapper/WarehousingOutHeadWithListMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/mapper/WarehousingOutHeadWithListMapper.java deleted file mode 100644 index 90ce367b..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/stock/mapper/WarehousingOutHeadWithListMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.ruoyi.stock.mapper; - -import com.ruoyi.stock.domain.WarehousingOutHeadWithList; - -import java.util.List; - -/** - * @author ：pyy - * @date ：Created in 2021/12/16 10:31 - * @description： - * @modified By： - * @version: $ - */ -public interface WarehousingOutHeadWithListMapper { - - public List selectWarehousingOutHeadWithList(WarehousingOutHeadWithList warehousingOutHeadWithList); -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/service/IWarehouseService.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/service/IWarehouseService.java deleted file mode 100644 index edd47287..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/stock/service/IWarehouseService.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.ruoyi.stock.service; - -import com.ruoyi.stock.domain.Warehouse; - -import java.util.List; - -/** - * 库存Service接口 - * - * @author ruoyi - * @date 2021-12-02 - */ -public interface IWarehouseService -{ - /** - * 查询库存 - * - * @param id 库存ID - * @return 库存 - */ - public Warehouse selectWarehouseById(Long id); - - /** - * 查询库存列表 - * - * @param warehouse 库存 - * @return 库存集合 - */ - public List selectWarehouseList(Warehouse warehouse); - - /** - * 新增库存 - * - * @param warehouse 库存 - * @return 结果 - */ - public int insertWarehouse(Warehouse warehouse); - - /** - * 修改库存 - * - * @param warehouse 库存 - * @return 结果 - */ - public int updateWarehouse(Warehouse warehouse); - - /** - * 批量删除库存 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - public int deleteWarehouseByIds(String ids); - - /** - * 删除库存信息 - * - * @param id 库存ID - * @return 结果 - */ - public int deleteWarehouseById(Long id); - - public int warehouseMinus(Warehouse warehouse); - - public int warehouseAdd(Warehouse warehouse); - - public Warehouse selectByCode(Warehouse warehouse); - - public List selectSlowMovingItemList(Warehouse warehouse,String slowMovingType); -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/service/impl/WarehouseServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/service/impl/WarehouseServiceImpl.java deleted file mode 100644 index 73b7bd4e..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/stock/service/impl/WarehouseServiceImpl.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.ruoyi.stock.service.impl; - -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.stock.domain.Warehouse; -import com.ruoyi.stock.mapper.WarehouseMapper; -import com.ruoyi.stock.service.IWarehouseService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 库存Service业务层处理 - * - * @author ruoyi - * @date 2021-12-02 - */ -@Service -public class WarehouseServiceImpl implements IWarehouseService -{ - @Autowired - private WarehouseMapper warehouseMapper; - - /** - * 查询库存 - * - * @param id 库存ID - * @return 库存 - */ - @Override - public Warehouse selectWarehouseById(Long id) - { - return warehouseMapper.selectWarehouseById(id); - } - - /** - * 查询库存列表 - * - * @param warehouse 库存 - * @return 库存 - */ - @Override - public List selectWarehouseList(Warehouse warehouse) - { - return warehouseMapper.selectWarehouseList(warehouse); - } - - /** - * 新增库存 - * - * @param warehouse 库存 - * @return 结果 - */ - @Override - public int insertWarehouse(Warehouse warehouse) - { - return warehouseMapper.insertWarehouse(warehouse); - } - - /** - * 修改库存 - * - * @param warehouse 库存 - * @return 结果 - */ - @Override - public int updateWarehouse(Warehouse warehouse) - { - return warehouseMapper.updateWarehouse(warehouse); - } - - /** - * 删除库存对象 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - @Override - public int deleteWarehouseByIds(String ids) - { - return warehouseMapper.deleteWarehouseByIds(Convert.toStrArray(ids)); - } - - /** - * 删除库存信息 - * - * @param id 库存ID - * @return 结果 - */ - @Override - public int deleteWarehouseById(Long id) - { - return warehouseMapper.deleteWarehouseById(id); - } - - @Override - public int warehouseMinus(Warehouse warehouse) { - return 0; - } - - @Override - public int warehouseAdd(Warehouse warehouse) { - return 0; - } - - @Override - public Warehouse selectByCode(Warehouse warehouse) { - return warehouseMapper.selectByCode(warehouse); - } - - @Override - public List selectSlowMovingItemList(Warehouse warehouse, String slowMovingType) { - if ("入库".equals(slowMovingType)){ - return warehouseMapper.selectSlowMovingItemByPut(warehouse); - }else { - return warehouseMapper.selectSlowMovingItemByOut(warehouse); - } - } -} diff --git a/ruoyi-admin/src/main/resources/mapper/stock/CheckHeadWithListMapper.xml b/ruoyi-admin/src/main/resources/mapper/stock/CheckHeadWithListMapper.xml deleted file mode 100644 index 9b8c8b16..00000000 --- a/ruoyi-admin/src/main/resources/mapper/stock/CheckHeadWithListMapper.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/stock/WarehouseMapper.xml b/ruoyi-admin/src/main/resources/mapper/stock/WarehouseMapper.xml deleted file mode 100644 index 4511d86a..00000000 --- a/ruoyi-admin/src/main/resources/mapper/stock/WarehouseMapper.xml +++ /dev/null @@ -1,166 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - select id, wlCode, itemName, itemStandard, machineNo, stockDw, qty, warehouseName, warehouseNo, depositPosition, inClass, spare1, spare2, spare3, spare4, spare5, spare6, wlType, batchNumber from warehouse - - - - - - - - insert into warehouse - - wlCode, - itemName, - itemStandard, - machineNo, - stockDw, - qty, - warehouseName, - warehouseNo, - depositPosition, - inClass, - spare1, - spare2, - spare3, - spare4, - spare5, - spare6, - wlType, - batchNumber, - - - #{wlCode}, - #{itemName}, - #{itemStandard}, - #{machineNo}, - #{stockDw}, - #{qty}, - #{warehouseName}, - #{warehouseNo}, - #{depositPosition}, - #{inClass}, - now(), - now(), - #{spare3}, - #{spare4}, - #{spare5}, - #{spare6}, - #{wlType}, - #{batchNumber}, - - - - - update warehouse - - wlCode = #{wlCode}, - itemName = #{itemName}, - itemStandard = #{itemStandard}, - machineNo = #{machineNo}, - stockDw = #{stockDw}, - qty = #{qty}, - warehouseName = #{warehouseName}, - warehouseNo = #{warehouseNo}, - depositPosition = #{depositPosition}, - inClass = #{inClass}, - spare1 = #{spare1}, - spare2 = #{spare2}, - spare3 = #{spare3}, - spare4 = #{spare4}, - spare5 = #{spare5}, - spare6 = #{spare6}, - wlType = #{wlType}, - batchNumber = #{batchNumber}, - - where id = #{id} - - - - delete from warehouse where id = #{id} - - - - delete from warehouse where id in - - #{id} - - - - - update warehouse set qty=qty+#{qty},spare1=now() where wlCode=#{wlCode} - - - - update warehouse set qty=qty-#{qty},spare2=now() where wlCode=#{wlCode} - - - - - - - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/stock/WarehousingOutHeadWithListMapper.xml b/ruoyi-admin/src/main/resources/mapper/stock/WarehousingOutHeadWithListMapper.xml deleted file mode 100644 index 0bf99bd6..00000000 --- a/ruoyi-admin/src/main/resources/mapper/stock/WarehousingOutHeadWithListMapper.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/stock/warehouse/add.html b/ruoyi-admin/src/main/resources/templates/stock/warehouse/add.html deleted file mode 100644 index 053123ad..00000000 --- a/ruoyi-admin/src/main/resources/templates/stock/warehouse/add.html +++ /dev/null @@ -1,136 +0,0 @@ - - - - - - -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- - 代码生成请选择字典属性 -
-
-
- -
- -
-
-
-
- - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/stock/warehouse/edit.html b/ruoyi-admin/src/main/resources/templates/stock/warehouse/edit.html deleted file mode 100644 index 61838c03..00000000 --- a/ruoyi-admin/src/main/resources/templates/stock/warehouse/edit.html +++ /dev/null @@ -1,137 +0,0 @@ - - - - - - -
-
- -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- - 代码生成请选择字典属性 -
-
-
- -
- -
-
-
-
- - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/stock/warehouse/slowMovingItem.html b/ruoyi-admin/src/main/resources/templates/stock/warehouse/slowMovingItem.html deleted file mode 100644 index 6051bb12..00000000 --- a/ruoyi-admin/src/main/resources/templates/stock/warehouse/slowMovingItem.html +++ /dev/null @@ -1,190 +0,0 @@ - - - - - - - - -
-
-
-
-
-
    -
  • - - -
    • -
  • - - -
    • -
  • -  搜索 -  重置 -
    • -
-
-
-
- - -
-
-
-
-
- - - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/stock/warehouse/warehouse.html b/ruoyi-admin/src/main/resources/templates/stock/warehouse/warehouse.html deleted file mode 100644 index f836cef7..00000000 --- a/ruoyi-admin/src/main/resources/templates/stock/warehouse/warehouse.html +++ /dev/null @@ -1,288 +0,0 @@ - - - - - - - - -
-
-
-
-
-
    -
  • - - -
    • -
  • - - -
    • - - - - -
  • - - -
    • - - - - - - - - - - - - -
  • - - -
    • - - - - - - - - - - - - -
  • - - -
    • - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  • -  搜索 -  重置 -
    • -
-
-
-
- - -
-
-
-
-
- - - - - \ No newline at end of file