From 7cef8960d57d24c179577a6115cfd9d892524cf9 Mon Sep 17 00:00:00 2001 From: ling li <709673163@qq.com> Date: Mon, 22 May 2023 15:01:59 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=E5=8D=95=EF=BC=88=E5=8E=9F?= =?UTF-8?q?=E6=96=99/=E8=BE=85=E6=96=99/=E5=8D=8A=E6=88=90=E5=93=81?= =?UTF-8?q?=EF=BC=89=E3=80=81=E4=B8=8A=E7=BA=BF=E6=94=AF=E6=8C=81=E6=97=A5?= =?UTF-8?q?=E5=BF=97=EF=BC=8848=E3=80=8149=E3=80=8155=E3=80=8156=E3=80=817?= =?UTF-8?q?3=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- log.path_IS_UNDEFINED/sys-user.log | 28 + .../WarehousingCheckInfoController.java | 123 ++++ .../WarehousingSearchController.java | 126 ++++ .../domain/WarehousingCheckInfo.java | 188 +++++ .../storehouse/domain/WarehousingSearch.java | 206 ++++++ .../mapper/WarehousingCheckInfoMapper.java | 61 ++ .../mapper/WarehousingSearchMapper.java | 61 ++ .../service/IWarehousingCheckInfoService.java | 61 ++ .../service/IWarehousingSearchService.java | 61 ++ .../impl/WarehousingCheckInfoServiceImpl.java | 94 +++ .../impl/WarehousingSearchServiceImpl.java | 94 +++ .../SysProcessCategoryController.java | 123 ++++ .../system/domain/SysProcessCategory.java | 159 ++++ .../mapper/SysProcessCategoryMapper.java | 61 ++ .../service/ISysProcessCategoryService.java | 61 ++ .../impl/SysProcessCategoryServiceImpl.java | 94 +++ .../storehouse/WarehousingCheckInfoMapper.xml | 103 +++ .../storehouse/WarehousingSearchMapper.xml | 179 +++++ .../system/SysProcessCategoryMapper.xml | 87 +++ .../materialRequisitionBCP/add.html | 683 ++++++++++++++++++ .../materialRequisitionBCP/edit.html | 658 +++++++++++++++++ .../materialRequisitionBCP.html | 291 ++++++++ .../materialRequisitionFL/add.html | 683 ++++++++++++++++++ .../materialRequisitionFL/edit.html | 658 +++++++++++++++++ .../materialRequisitionFL.html | 291 ++++++++ .../materialRequisitionYL/add.html | 683 ++++++++++++++++++ .../materialRequisitionYL/edit.html | 658 +++++++++++++++++ .../materialRequisitionYL.html | 291 ++++++++ .../storehouse/warehousingCheckInfo/add.html | 88 +++ .../storehouse/warehousingCheckInfo/edit.html | 89 +++ .../warehousingCheckInfo.html | 153 ++++ .../storehouse/warehousingSearch/add.html | 105 +++ .../storehouse/warehousingSearch/edit.html | 106 +++ .../warehousingSearch/warehousingSearch.html | 178 +++++ .../templates/system/processCategory/add.html | 55 ++ .../system/processCategory/edit.html | 56 ++ .../processCategory/processCategory.html | 119 +++ .../system/SysCaptchaController.class | Bin 3711 -> 3711 bytes .../common/core/domain/entity/SysDept.java | 3 - 39 files changed, 7815 insertions(+), 3 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/storehouse/controller/WarehousingCheckInfoController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/storehouse/controller/WarehousingSearchController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/storehouse/domain/WarehousingCheckInfo.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/storehouse/domain/WarehousingSearch.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/storehouse/mapper/WarehousingCheckInfoMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/storehouse/mapper/WarehousingSearchMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/IWarehousingCheckInfoService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/IWarehousingSearchService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/impl/WarehousingCheckInfoServiceImpl.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/impl/WarehousingSearchServiceImpl.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysProcessCategoryController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysProcessCategory.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysProcessCategoryMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysProcessCategoryService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysProcessCategoryServiceImpl.java create mode 100644 ruoyi-admin/src/main/resources/mapper/storehouse/WarehousingCheckInfoMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/storehouse/WarehousingSearchMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/system/SysProcessCategoryMapper.xml create mode 100644 ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionBCP/add.html create mode 100644 ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionBCP/edit.html create mode 100644 ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionBCP/materialRequisitionBCP.html create mode 100644 ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionFL/add.html create mode 100644 ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionFL/edit.html create mode 100644 ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionFL/materialRequisitionFL.html create mode 100644 ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionYL/add.html create mode 100644 ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionYL/edit.html create mode 100644 ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionYL/materialRequisitionYL.html create mode 100644 ruoyi-admin/src/main/resources/templates/storehouse/warehousingCheckInfo/add.html create mode 100644 ruoyi-admin/src/main/resources/templates/storehouse/warehousingCheckInfo/edit.html create mode 100644 ruoyi-admin/src/main/resources/templates/storehouse/warehousingCheckInfo/warehousingCheckInfo.html create mode 100644 ruoyi-admin/src/main/resources/templates/storehouse/warehousingSearch/add.html create mode 100644 ruoyi-admin/src/main/resources/templates/storehouse/warehousingSearch/edit.html create mode 100644 ruoyi-admin/src/main/resources/templates/storehouse/warehousingSearch/warehousingSearch.html create mode 100644 ruoyi-admin/src/main/resources/templates/system/processCategory/add.html create mode 100644 ruoyi-admin/src/main/resources/templates/system/processCategory/edit.html create mode 100644 ruoyi-admin/src/main/resources/templates/system/processCategory/processCategory.html diff --git a/log.path_IS_UNDEFINED/sys-user.log b/log.path_IS_UNDEFINED/sys-user.log index 6d837b28..3a0f7ab5 100644 --- a/log.path_IS_UNDEFINED/sys-user.log +++ b/log.path_IS_UNDEFINED/sys-user.log @@ -71,3 +71,31 @@ 05:43:56.129 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池==== 05:43:56.129 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存==== 05:44:26.717 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功] +08:57:36.005 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池==== +08:57:36.006 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存==== +09:00:20.969 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功] +09:12:56.214 [Thread-41] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务==== +09:12:56.215 [Thread-41] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池==== +09:12:56.215 [Thread-41] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存==== +14:16:20.725 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功] +14:22:53.487 [Thread-53] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务==== +14:22:53.489 [Thread-53] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池==== +14:22:53.489 [Thread-53] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存==== +14:23:32.235 [Thread-66] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务==== +14:23:32.235 [Thread-66] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池==== +14:23:32.236 [Thread-66] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存==== +14:23:53.222 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功] +14:24:44.592 [Thread-79] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务==== +14:24:44.594 [Thread-79] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池==== +14:24:44.595 [Thread-79] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存==== +14:25:54.763 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功] +14:26:53.300 [Thread-92] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务==== +14:26:53.301 [Thread-92] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池==== +14:26:53.302 [Thread-92] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存==== +14:27:32.463 [Thread-108] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池==== +14:27:32.465 [Thread-108] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存==== +14:28:16.714 [schedule-pool-1] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功] +14:33:38.243 [Thread-121] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务==== +14:33:38.246 [Thread-121] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池==== +14:33:38.246 [Thread-121] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存==== +14:35:12.185 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功] diff --git a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/controller/WarehousingCheckInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/storehouse/controller/WarehousingCheckInfoController.java new file mode 100644 index 00000000..48887c6f --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/storehouse/controller/WarehousingCheckInfoController.java @@ -0,0 +1,123 @@ +package com.ruoyi.storehouse.controller; + +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.storehouse.domain.WarehousingCheckInfo; +import com.ruoyi.storehouse.service.IWarehousingCheckInfoService; +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 2023-05-16 + */ +@Controller +@RequestMapping("/storehouse/warehousingCheckInfo") +public class WarehousingCheckInfoController extends BaseController +{ + private String prefix = "storehouse/warehousingCheckInfo"; + + @Autowired + private IWarehousingCheckInfoService warehousingCheckInfoService; + + @RequiresPermissions("storehouse:warehousingCheckInfo:view") + @GetMapping() + public String warehousingCheckInfo() + { + return prefix + "/warehousingCheckInfo"; + } + + /** + * 查询盘点列表 + */ + @RequiresPermissions("storehouse:warehousingCheckInfo:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(WarehousingCheckInfo warehousingCheckInfo) + { + startPage(); + List list = warehousingCheckInfoService.selectWarehousingCheckInfoList(warehousingCheckInfo); + return getDataTable(list); + } + + /** + * 导出盘点列表 + */ + @RequiresPermissions("storehouse:warehousingCheckInfo:export") + @Log(title = "盘点", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(WarehousingCheckInfo warehousingCheckInfo) + { + List list = warehousingCheckInfoService.selectWarehousingCheckInfoList(warehousingCheckInfo); + ExcelUtil util = new ExcelUtil(WarehousingCheckInfo.class); + return util.exportExcel(list, "盘点数据"); + } + + /** + * 新增盘点 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存盘点 + */ + @RequiresPermissions("storehouse:warehousingCheckInfo:add") + @Log(title = "盘点", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(WarehousingCheckInfo warehousingCheckInfo) + { + return toAjax(warehousingCheckInfoService.insertWarehousingCheckInfo(warehousingCheckInfo)); + } + + /** + * 修改盘点 + */ + @GetMapping("/edit/{warehousingCheckInfoId}") + public String edit(@PathVariable("warehousingCheckInfoId") Long warehousingCheckInfoId, ModelMap mmap) + { + WarehousingCheckInfo warehousingCheckInfo = warehousingCheckInfoService.selectWarehousingCheckInfoById(warehousingCheckInfoId); + mmap.put("warehousingCheckInfo", warehousingCheckInfo); + return prefix + "/edit"; + } + + /** + * 修改保存盘点 + */ + @RequiresPermissions("storehouse:warehousingCheckInfo:edit") + @Log(title = "盘点", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(WarehousingCheckInfo warehousingCheckInfo) + { + return toAjax(warehousingCheckInfoService.updateWarehousingCheckInfo(warehousingCheckInfo)); + } + + /** + * 删除盘点 + */ + @RequiresPermissions("storehouse:warehousingCheckInfo:remove") + @Log(title = "盘点", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(warehousingCheckInfoService.deleteWarehousingCheckInfoByIds(ids)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/controller/WarehousingSearchController.java b/ruoyi-admin/src/main/java/com/ruoyi/storehouse/controller/WarehousingSearchController.java new file mode 100644 index 00000000..040292d4 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/storehouse/controller/WarehousingSearchController.java @@ -0,0 +1,126 @@ +package com.ruoyi.storehouse.controller; + +import java.util.List; +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.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.storehouse.domain.WarehousingSearch; +import com.ruoyi.storehouse.service.IWarehousingSearchService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 库存Controller + * + * @author ruoyi + * @date 2023-05-16 + */ +@Controller +@RequestMapping("/storehouse/warehousingSearch") +public class WarehousingSearchController extends BaseController +{ + private String prefix = "storehouse/warehousingSearch"; + + @Autowired + private IWarehousingSearchService warehousingSearchService; + + @RequiresPermissions("storehouse:warehousingSearch:view") + @GetMapping() + public String warehousingSearch() + { + return prefix + "/warehousingSearch"; + } + + /** + * 查询库存列表 + */ + @RequiresPermissions("storehouse:warehousingSearch:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(WarehousingSearch warehousingSearch) + { + startPage(); + List list = warehousingSearchService.selectWarehousingSearchList(warehousingSearch); + return getDataTable(list); + } + + /** + * 导出库存列表 + */ + @RequiresPermissions("storehouse:warehousingSearch:export") + @Log(title = "库存", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(WarehousingSearch warehousingSearch) + { + List list = warehousingSearchService.selectWarehousingSearchList(warehousingSearch); + ExcelUtil util = new ExcelUtil(WarehousingSearch.class); + return util.exportExcel(list, "库存数据"); + } + + /** + * 新增库存 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存库存 + */ + @RequiresPermissions("storehouse:warehousingSearch:add") + @Log(title = "库存", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(WarehousingSearch warehousingSearch) + { + return toAjax(warehousingSearchService.insertWarehousingSearch(warehousingSearch)); + } + + /** + * 修改库存 + */ + @GetMapping("/edit/{materialCode}") + public String edit(@PathVariable("materialCode") String materialCode, ModelMap mmap) + { + WarehousingSearch warehousingSearch = warehousingSearchService.selectWarehousingSearchById(materialCode); + mmap.put("warehousingSearch", warehousingSearch); + return prefix + "/edit"; + } + + /** + * 修改保存库存 + */ + @RequiresPermissions("storehouse:warehousingSearch:edit") + @Log(title = "库存", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(WarehousingSearch warehousingSearch) + { + return toAjax(warehousingSearchService.updateWarehousingSearch(warehousingSearch)); + } + + /** + * 删除库存 + */ + @RequiresPermissions("storehouse:warehousingSearch:remove") + @Log(title = "库存", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(warehousingSearchService.deleteWarehousingSearchByIds(ids)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/domain/WarehousingCheckInfo.java b/ruoyi-admin/src/main/java/com/ruoyi/storehouse/domain/WarehousingCheckInfo.java new file mode 100644 index 00000000..f4dd229b --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/storehouse/domain/WarehousingCheckInfo.java @@ -0,0 +1,188 @@ +package com.ruoyi.storehouse.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; + +/** + * 盘点对象 warehousing_check_info + * + * @author ruoyi + * @date 2023-05-16 + */ +public class WarehousingCheckInfo extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 盘点id */ + private Long warehousingCheckInfoId; + + /** 盘点单号 */ + @Excel(name = "盘点单号") + private String warehousingCheckNumber; + + /** 盘点人名 */ + @Excel(name = "盘点人名") + private String warehousingCheckPerson; + + /** 仓库号 */ + @Excel(name = "仓库号") + private String stockNumber; + + /** 仓库名称 */ + @Excel(name = "仓库名称") + private String stockName; + + /** 盘点日期 */ + @Excel(name = "盘点日期") + private String warehousingCheckDate; + + /** 物料种类 */ + @Excel(name = "物料种类") + private String materialType; + + /** 更新否 */ + @Excel(name = "更新否") + private String updateFlag; + + /** 录入时间 */ + private String firstAddTime; + + /** 修改时间 */ + private String updateInfoTime; + + /** 备用一 */ + private String standbyOne; + + /** 备用二 */ + private String standbyTwo; + + public void setWarehousingCheckInfoId(Long warehousingCheckInfoId) + { + this.warehousingCheckInfoId = warehousingCheckInfoId; + } + + public Long getWarehousingCheckInfoId() + { + return warehousingCheckInfoId; + } + public void setWarehousingCheckNumber(String warehousingCheckNumber) + { + this.warehousingCheckNumber = warehousingCheckNumber; + } + + public String getWarehousingCheckNumber() + { + return warehousingCheckNumber; + } + public void setWarehousingCheckPerson(String warehousingCheckPerson) + { + this.warehousingCheckPerson = warehousingCheckPerson; + } + + public String getWarehousingCheckPerson() + { + return warehousingCheckPerson; + } + public void setStockNumber(String stockNumber) + { + this.stockNumber = stockNumber; + } + + public String getStockNumber() + { + return stockNumber; + } + public void setStockName(String stockName) + { + this.stockName = stockName; + } + + public String getStockName() + { + return stockName; + } + public void setWarehousingCheckDate(String warehousingCheckDate) + { + this.warehousingCheckDate = warehousingCheckDate; + } + + public String getWarehousingCheckDate() + { + return warehousingCheckDate; + } + public void setMaterialType(String materialType) + { + this.materialType = materialType; + } + + public String getMaterialType() + { + return materialType; + } + public void setUpdateFlag(String updateFlag) + { + this.updateFlag = updateFlag; + } + + public String getUpdateFlag() + { + return updateFlag; + } + public void setFirstAddTime(String firstAddTime) + { + this.firstAddTime = firstAddTime; + } + + public String getFirstAddTime() + { + return firstAddTime; + } + public void setUpdateInfoTime(String updateInfoTime) + { + this.updateInfoTime = updateInfoTime; + } + + public String getUpdateInfoTime() + { + return updateInfoTime; + } + public void setStandbyOne(String standbyOne) + { + this.standbyOne = standbyOne; + } + + public String getStandbyOne() + { + return standbyOne; + } + public void setStandbyTwo(String standbyTwo) + { + this.standbyTwo = standbyTwo; + } + + public String getStandbyTwo() + { + return standbyTwo; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("warehousingCheckInfoId", getWarehousingCheckInfoId()) + .append("warehousingCheckNumber", getWarehousingCheckNumber()) + .append("warehousingCheckPerson", getWarehousingCheckPerson()) + .append("stockNumber", getStockNumber()) + .append("stockName", getStockName()) + .append("warehousingCheckDate", getWarehousingCheckDate()) + .append("materialType", getMaterialType()) + .append("remark", getRemark()) + .append("updateFlag", getUpdateFlag()) + .append("firstAddTime", getFirstAddTime()) + .append("updateInfoTime", getUpdateInfoTime()) + .append("standbyOne", getStandbyOne()) + .append("standbyTwo", getStandbyTwo()) + .toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/domain/WarehousingSearch.java b/ruoyi-admin/src/main/java/com/ruoyi/storehouse/domain/WarehousingSearch.java new file mode 100644 index 00000000..9afb3cd7 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/storehouse/domain/WarehousingSearch.java @@ -0,0 +1,206 @@ +package com.ruoyi.storehouse.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; + +/** + * 库存对象 warehousing_search + * + * @author ruoyi + * @date 2023-05-16 + */ +public class WarehousingSearch extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 物料代码 */ + @Excel(name = "物料代码") + private String materialCode; + + /** 物料名称 */ + @Excel(name = "物料名称") + private String materialName; + + /** 物料类型 */ + @Excel(name = "物料类型") + private String materialType; + + /** 批号 */ + @Excel(name = "批号") + private String batchNumber; + + /** 规格型号 */ + @Excel(name = "规格型号") + private String specificationModel; + + /** 机种 */ + @Excel(name = "机种") + private String typeMachine; + + /** 单位 */ + @Excel(name = "单位") + private String inventoryUnit; + + /** 库存数量 */ + @Excel(name = "库存数量") + private String stockQuantity; + + /** 仓库号 */ + @Excel(name = "仓库号") + private String stockNumber; + + /** 仓库名称 */ + @Excel(name = "仓库名称") + private String stockName; + + /** 客户编号 */ + @Excel(name = "客户编号") + private String enterpriseCode; + + /** 客户名称 */ + @Excel(name = "客户名称") + private String enterpriseName; + + /** 存放地址 */ + @Excel(name = "存放地址") + private String storageLocation; + + public void setMaterialCode(String materialCode) + { + this.materialCode = materialCode; + } + + public String getMaterialCode() + { + return materialCode; + } + public void setMaterialName(String materialName) + { + this.materialName = materialName; + } + + public String getMaterialName() + { + return materialName; + } + public void setMaterialType(String materialType) + { + this.materialType = materialType; + } + + public String getMaterialType() + { + return materialType; + } + public void setBatchNumber(String batchNumber) + { + this.batchNumber = batchNumber; + } + + public String getBatchNumber() + { + return batchNumber; + } + public void setSpecificationModel(String specificationModel) + { + this.specificationModel = specificationModel; + } + + public String getSpecificationModel() + { + return specificationModel; + } + public void setTypeMachine(String typeMachine) + { + this.typeMachine = typeMachine; + } + + public String getTypeMachine() + { + return typeMachine; + } + public void setInventoryUnit(String inventoryUnit) + { + this.inventoryUnit = inventoryUnit; + } + + public String getInventoryUnit() + { + return inventoryUnit; + } + public void setStockQuantity(String stockQuantity) + { + this.stockQuantity = stockQuantity; + } + + public String getStockQuantity() + { + return stockQuantity; + } + public void setStockNumber(String stockNumber) + { + this.stockNumber = stockNumber; + } + + public String getStockNumber() + { + return stockNumber; + } + public void setStockName(String stockName) + { + this.stockName = stockName; + } + + public String getStockName() + { + return stockName; + } + public void setEnterpriseCode(String enterpriseCode) + { + this.enterpriseCode = enterpriseCode; + } + + public String getEnterpriseCode() + { + return enterpriseCode; + } + public void setEnterpriseName(String enterpriseName) + { + this.enterpriseName = enterpriseName; + } + + public String getEnterpriseName() + { + return enterpriseName; + } + public void setStorageLocation(String storageLocation) + { + this.storageLocation = storageLocation; + } + + public String getStorageLocation() + { + return storageLocation; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("materialCode", getMaterialCode()) + .append("materialName", getMaterialName()) + .append("materialType", getMaterialType()) + .append("batchNumber", getBatchNumber()) + .append("specificationModel", getSpecificationModel()) + .append("typeMachine", getTypeMachine()) + .append("inventoryUnit", getInventoryUnit()) + .append("stockQuantity", getStockQuantity()) + .append("stockNumber", getStockNumber()) + .append("stockName", getStockName()) + .append("enterpriseCode", getEnterpriseCode()) + .append("enterpriseName", getEnterpriseName()) + .append("storageLocation", getStorageLocation()) + .toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/mapper/WarehousingCheckInfoMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/storehouse/mapper/WarehousingCheckInfoMapper.java new file mode 100644 index 00000000..2b7c8f13 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/storehouse/mapper/WarehousingCheckInfoMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.storehouse.mapper; + +import java.util.List; +import com.ruoyi.storehouse.domain.WarehousingCheckInfo; + +/** + * 盘点Mapper接口 + * + * @author ruoyi + * @date 2023-05-16 + */ +public interface WarehousingCheckInfoMapper +{ + /** + * 查询盘点 + * + * @param warehousingCheckInfoId 盘点ID + * @return 盘点 + */ + public WarehousingCheckInfo selectWarehousingCheckInfoById(Long warehousingCheckInfoId); + + /** + * 查询盘点列表 + * + * @param warehousingCheckInfo 盘点 + * @return 盘点集合 + */ + public List selectWarehousingCheckInfoList(WarehousingCheckInfo warehousingCheckInfo); + + /** + * 新增盘点 + * + * @param warehousingCheckInfo 盘点 + * @return 结果 + */ + public int insertWarehousingCheckInfo(WarehousingCheckInfo warehousingCheckInfo); + + /** + * 修改盘点 + * + * @param warehousingCheckInfo 盘点 + * @return 结果 + */ + public int updateWarehousingCheckInfo(WarehousingCheckInfo warehousingCheckInfo); + + /** + * 删除盘点 + * + * @param warehousingCheckInfoId 盘点ID + * @return 结果 + */ + public int deleteWarehousingCheckInfoById(Long warehousingCheckInfoId); + + /** + * 批量删除盘点 + * + * @param warehousingCheckInfoIds 需要删除的数据ID + * @return 结果 + */ + public int deleteWarehousingCheckInfoByIds(String[] warehousingCheckInfoIds); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/mapper/WarehousingSearchMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/storehouse/mapper/WarehousingSearchMapper.java new file mode 100644 index 00000000..ae00cf76 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/storehouse/mapper/WarehousingSearchMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.storehouse.mapper; + +import java.util.List; +import com.ruoyi.storehouse.domain.WarehousingSearch; + +/** + * 库存Mapper接口 + * + * @author ruoyi + * @date 2023-05-16 + */ +public interface WarehousingSearchMapper +{ + /** + * 查询库存 + * + * @param materialCode 库存ID + * @return 库存 + */ + public WarehousingSearch selectWarehousingSearchById(String materialCode); + + /** + * 查询库存列表 + * + * @param warehousingSearch 库存 + * @return 库存集合 + */ + public List selectWarehousingSearchList(WarehousingSearch warehousingSearch); + + /** + * 新增库存 + * + * @param warehousingSearch 库存 + * @return 结果 + */ + public int insertWarehousingSearch(WarehousingSearch warehousingSearch); + + /** + * 修改库存 + * + * @param warehousingSearch 库存 + * @return 结果 + */ + public int updateWarehousingSearch(WarehousingSearch warehousingSearch); + + /** + * 删除库存 + * + * @param materialCode 库存ID + * @return 结果 + */ + public int deleteWarehousingSearchById(String materialCode); + + /** + * 批量删除库存 + * + * @param materialCodes 需要删除的数据ID + * @return 结果 + */ + public int deleteWarehousingSearchByIds(String[] materialCodes); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/IWarehousingCheckInfoService.java b/ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/IWarehousingCheckInfoService.java new file mode 100644 index 00000000..09f34d0d --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/IWarehousingCheckInfoService.java @@ -0,0 +1,61 @@ +package com.ruoyi.storehouse.service; + +import java.util.List; +import com.ruoyi.storehouse.domain.WarehousingCheckInfo; + +/** + * 盘点Service接口 + * + * @author ruoyi + * @date 2023-05-16 + */ +public interface IWarehousingCheckInfoService +{ + /** + * 查询盘点 + * + * @param warehousingCheckInfoId 盘点ID + * @return 盘点 + */ + public WarehousingCheckInfo selectWarehousingCheckInfoById(Long warehousingCheckInfoId); + + /** + * 查询盘点列表 + * + * @param warehousingCheckInfo 盘点 + * @return 盘点集合 + */ + public List selectWarehousingCheckInfoList(WarehousingCheckInfo warehousingCheckInfo); + + /** + * 新增盘点 + * + * @param warehousingCheckInfo 盘点 + * @return 结果 + */ + public int insertWarehousingCheckInfo(WarehousingCheckInfo warehousingCheckInfo); + + /** + * 修改盘点 + * + * @param warehousingCheckInfo 盘点 + * @return 结果 + */ + public int updateWarehousingCheckInfo(WarehousingCheckInfo warehousingCheckInfo); + + /** + * 批量删除盘点 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteWarehousingCheckInfoByIds(String ids); + + /** + * 删除盘点信息 + * + * @param warehousingCheckInfoId 盘点ID + * @return 结果 + */ + public int deleteWarehousingCheckInfoById(Long warehousingCheckInfoId); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/IWarehousingSearchService.java b/ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/IWarehousingSearchService.java new file mode 100644 index 00000000..547456d9 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/IWarehousingSearchService.java @@ -0,0 +1,61 @@ +package com.ruoyi.storehouse.service; + +import java.util.List; +import com.ruoyi.storehouse.domain.WarehousingSearch; + +/** + * 库存Service接口 + * + * @author ruoyi + * @date 2023-05-16 + */ +public interface IWarehousingSearchService +{ + /** + * 查询库存 + * + * @param materialCode 库存ID + * @return 库存 + */ + public WarehousingSearch selectWarehousingSearchById(String materialCode); + + /** + * 查询库存列表 + * + * @param warehousingSearch 库存 + * @return 库存集合 + */ + public List selectWarehousingSearchList(WarehousingSearch warehousingSearch); + + /** + * 新增库存 + * + * @param warehousingSearch 库存 + * @return 结果 + */ + public int insertWarehousingSearch(WarehousingSearch warehousingSearch); + + /** + * 修改库存 + * + * @param warehousingSearch 库存 + * @return 结果 + */ + public int updateWarehousingSearch(WarehousingSearch warehousingSearch); + + /** + * 批量删除库存 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteWarehousingSearchByIds(String ids); + + /** + * 删除库存信息 + * + * @param materialCode 库存ID + * @return 结果 + */ + public int deleteWarehousingSearchById(String materialCode); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/impl/WarehousingCheckInfoServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/impl/WarehousingCheckInfoServiceImpl.java new file mode 100644 index 00000000..691eaf6b --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/impl/WarehousingCheckInfoServiceImpl.java @@ -0,0 +1,94 @@ +package com.ruoyi.storehouse.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.storehouse.mapper.WarehousingCheckInfoMapper; +import com.ruoyi.storehouse.domain.WarehousingCheckInfo; +import com.ruoyi.storehouse.service.IWarehousingCheckInfoService; +import com.ruoyi.common.core.text.Convert; + +/** + * 盘点Service业务层处理 + * + * @author ruoyi + * @date 2023-05-16 + */ +@Service +public class WarehousingCheckInfoServiceImpl implements IWarehousingCheckInfoService +{ + @Autowired + private WarehousingCheckInfoMapper warehousingCheckInfoMapper; + + /** + * 查询盘点 + * + * @param warehousingCheckInfoId 盘点ID + * @return 盘点 + */ + @Override + public WarehousingCheckInfo selectWarehousingCheckInfoById(Long warehousingCheckInfoId) + { + return warehousingCheckInfoMapper.selectWarehousingCheckInfoById(warehousingCheckInfoId); + } + + /** + * 查询盘点列表 + * + * @param warehousingCheckInfo 盘点 + * @return 盘点 + */ + @Override + public List selectWarehousingCheckInfoList(WarehousingCheckInfo warehousingCheckInfo) + { + return warehousingCheckInfoMapper.selectWarehousingCheckInfoList(warehousingCheckInfo); + } + + /** + * 新增盘点 + * + * @param warehousingCheckInfo 盘点 + * @return 结果 + */ + @Override + public int insertWarehousingCheckInfo(WarehousingCheckInfo warehousingCheckInfo) + { + return warehousingCheckInfoMapper.insertWarehousingCheckInfo(warehousingCheckInfo); + } + + /** + * 修改盘点 + * + * @param warehousingCheckInfo 盘点 + * @return 结果 + */ + @Override + public int updateWarehousingCheckInfo(WarehousingCheckInfo warehousingCheckInfo) + { + return warehousingCheckInfoMapper.updateWarehousingCheckInfo(warehousingCheckInfo); + } + + /** + * 删除盘点对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteWarehousingCheckInfoByIds(String ids) + { + return warehousingCheckInfoMapper.deleteWarehousingCheckInfoByIds(Convert.toStrArray(ids)); + } + + /** + * 删除盘点信息 + * + * @param warehousingCheckInfoId 盘点ID + * @return 结果 + */ + @Override + public int deleteWarehousingCheckInfoById(Long warehousingCheckInfoId) + { + return warehousingCheckInfoMapper.deleteWarehousingCheckInfoById(warehousingCheckInfoId); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/impl/WarehousingSearchServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/impl/WarehousingSearchServiceImpl.java new file mode 100644 index 00000000..cc4e6eba --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/impl/WarehousingSearchServiceImpl.java @@ -0,0 +1,94 @@ +package com.ruoyi.storehouse.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.storehouse.mapper.WarehousingSearchMapper; +import com.ruoyi.storehouse.domain.WarehousingSearch; +import com.ruoyi.storehouse.service.IWarehousingSearchService; +import com.ruoyi.common.core.text.Convert; + +/** + * 库存Service业务层处理 + * + * @author ruoyi + * @date 2023-05-16 + */ +@Service +public class WarehousingSearchServiceImpl implements IWarehousingSearchService +{ + @Autowired + private WarehousingSearchMapper warehousingSearchMapper; + + /** + * 查询库存 + * + * @param materialCode 库存ID + * @return 库存 + */ + @Override + public WarehousingSearch selectWarehousingSearchById(String materialCode) + { + return warehousingSearchMapper.selectWarehousingSearchById(materialCode); + } + + /** + * 查询库存列表 + * + * @param warehousingSearch 库存 + * @return 库存 + */ + @Override + public List selectWarehousingSearchList(WarehousingSearch warehousingSearch) + { + return warehousingSearchMapper.selectWarehousingSearchList(warehousingSearch); + } + + /** + * 新增库存 + * + * @param warehousingSearch 库存 + * @return 结果 + */ + @Override + public int insertWarehousingSearch(WarehousingSearch warehousingSearch) + { + return warehousingSearchMapper.insertWarehousingSearch(warehousingSearch); + } + + /** + * 修改库存 + * + * @param warehousingSearch 库存 + * @return 结果 + */ + @Override + public int updateWarehousingSearch(WarehousingSearch warehousingSearch) + { + return warehousingSearchMapper.updateWarehousingSearch(warehousingSearch); + } + + /** + * 删除库存对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteWarehousingSearchByIds(String ids) + { + return warehousingSearchMapper.deleteWarehousingSearchByIds(Convert.toStrArray(ids)); + } + + /** + * 删除库存信息 + * + * @param materialCode 库存ID + * @return 结果 + */ + @Override + public int deleteWarehousingSearchById(String materialCode) + { + return warehousingSearchMapper.deleteWarehousingSearchById(materialCode); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysProcessCategoryController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysProcessCategoryController.java new file mode 100644 index 00000000..edf35557 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysProcessCategoryController.java @@ -0,0 +1,123 @@ +package com.ruoyi.system.controller; + +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.system.domain.SysProcessCategory; +import com.ruoyi.system.service.ISysProcessCategoryService; +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 2023-05-22 + */ +@Controller +@RequestMapping("/system/processCategory") +public class SysProcessCategoryController extends BaseController +{ + private String prefix = "system/processCategory"; + + @Autowired + private ISysProcessCategoryService sysProcessCategoryService; + + @RequiresPermissions("system:processCategory:view") + @GetMapping() + public String processCategory() + { + return prefix + "/processCategory"; + } + + /** + * 查询制程类别明细列表 + */ + @RequiresPermissions("system:processCategory:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(SysProcessCategory sysProcessCategory) + { + startPage(); + List list = sysProcessCategoryService.selectSysProcessCategoryList(sysProcessCategory); + return getDataTable(list); + } + + /** + * 导出制程类别明细列表 + */ + @RequiresPermissions("system:processCategory:export") + @Log(title = "制程类别明细", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(SysProcessCategory sysProcessCategory) + { + List list = sysProcessCategoryService.selectSysProcessCategoryList(sysProcessCategory); + ExcelUtil util = new ExcelUtil(SysProcessCategory.class); + return util.exportExcel(list, "制程类别明细数据"); + } + + /** + * 新增制程类别明细 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存制程类别明细 + */ + @RequiresPermissions("system:processCategory:add") + @Log(title = "制程类别明细", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(SysProcessCategory sysProcessCategory) + { + return toAjax(sysProcessCategoryService.insertSysProcessCategory(sysProcessCategory)); + } + + /** + * 修改制程类别明细 + */ + @GetMapping("/edit/{processCategoryId}") + public String edit(@PathVariable("processCategoryId") Long processCategoryId, ModelMap mmap) + { + SysProcessCategory sysProcessCategory = sysProcessCategoryService.selectSysProcessCategoryById(processCategoryId); + mmap.put("sysProcessCategory", sysProcessCategory); + return prefix + "/edit"; + } + + /** + * 修改保存制程类别明细 + */ + @RequiresPermissions("system:processCategory:edit") + @Log(title = "制程类别明细", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(SysProcessCategory sysProcessCategory) + { + return toAjax(sysProcessCategoryService.updateSysProcessCategory(sysProcessCategory)); + } + + /** + * 删除制程类别明细 + */ + @RequiresPermissions("system:processCategory:remove") + @Log(title = "制程类别明细", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(sysProcessCategoryService.deleteSysProcessCategoryByIds(ids)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysProcessCategory.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysProcessCategory.java new file mode 100644 index 00000000..28e56dd2 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysProcessCategory.java @@ -0,0 +1,159 @@ +package com.ruoyi.system.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; + +/** + * 制程类别明细对象 sys_process_category + * + * @author ruoyi + * @date 2023-05-22 + */ +public class SysProcessCategory extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 制程类别id */ + private Long processCategoryId; + + /** 制程类别编号 */ + @Excel(name = "制程类别编号") + private String processCategoryCode; + + /** 制程描述 */ + @Excel(name = "制程描述") + private String processDescription; + + /** 工时产量 */ + @Excel(name = "工时产量") + private String workHourOutput; + + /** 标准加工费 */ + @Excel(name = "标准加工费") + private String standardConversionCost; + + /** 财务实际加工费 */ + @Excel(name = "财务实际加工费") + private String actualProcessingCost; + + /** 录入时间 */ + private String firstAddTime; + + /** 修改时间 */ + private String updateInfoTime; + + /** 备用一 */ + private String standbyOne; + + /** 备用二 */ + private String standbyTwo; + + public void setProcessCategoryId(Long processCategoryId) + { + this.processCategoryId = processCategoryId; + } + + public Long getProcessCategoryId() + { + return processCategoryId; + } + public void setProcessCategoryCode(String processCategoryCode) + { + this.processCategoryCode = processCategoryCode; + } + + public String getProcessCategoryCode() + { + return processCategoryCode; + } + public void setProcessDescription(String processDescription) + { + this.processDescription = processDescription; + } + + public String getProcessDescription() + { + return processDescription; + } + public void setWorkHourOutput(String workHourOutput) + { + this.workHourOutput = workHourOutput; + } + + public String getWorkHourOutput() + { + return workHourOutput; + } + public void setStandardConversionCost(String standardConversionCost) + { + this.standardConversionCost = standardConversionCost; + } + + public String getStandardConversionCost() + { + return standardConversionCost; + } + public void setActualProcessingCost(String actualProcessingCost) + { + this.actualProcessingCost = actualProcessingCost; + } + + public String getActualProcessingCost() + { + return actualProcessingCost; + } + public void setFirstAddTime(String firstAddTime) + { + this.firstAddTime = firstAddTime; + } + + public String getFirstAddTime() + { + return firstAddTime; + } + public void setUpdateInfoTime(String updateInfoTime) + { + this.updateInfoTime = updateInfoTime; + } + + public String getUpdateInfoTime() + { + return updateInfoTime; + } + public void setStandbyOne(String standbyOne) + { + this.standbyOne = standbyOne; + } + + public String getStandbyOne() + { + return standbyOne; + } + public void setStandbyTwo(String standbyTwo) + { + this.standbyTwo = standbyTwo; + } + + public String getStandbyTwo() + { + return standbyTwo; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("processCategoryId", getProcessCategoryId()) + .append("processCategoryCode", getProcessCategoryCode()) + .append("processDescription", getProcessDescription()) + .append("workHourOutput", getWorkHourOutput()) + .append("standardConversionCost", getStandardConversionCost()) + .append("actualProcessingCost", getActualProcessingCost()) + .append("firstAddTime", getFirstAddTime()) + .append("updateInfoTime", getUpdateInfoTime()) + .append("standbyOne", getStandbyOne()) + .append("standbyTwo", getStandbyTwo()) + .toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysProcessCategoryMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysProcessCategoryMapper.java new file mode 100644 index 00000000..c7d18fb1 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysProcessCategoryMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.system.mapper; + +import java.util.List; +import com.ruoyi.system.domain.SysProcessCategory; + +/** + * 制程类别明细Mapper接口 + * + * @author ruoyi + * @date 2023-05-22 + */ +public interface SysProcessCategoryMapper +{ + /** + * 查询制程类别明细 + * + * @param processCategoryId 制程类别明细ID + * @return 制程类别明细 + */ + public SysProcessCategory selectSysProcessCategoryById(Long processCategoryId); + + /** + * 查询制程类别明细列表 + * + * @param sysProcessCategory 制程类别明细 + * @return 制程类别明细集合 + */ + public List selectSysProcessCategoryList(SysProcessCategory sysProcessCategory); + + /** + * 新增制程类别明细 + * + * @param sysProcessCategory 制程类别明细 + * @return 结果 + */ + public int insertSysProcessCategory(SysProcessCategory sysProcessCategory); + + /** + * 修改制程类别明细 + * + * @param sysProcessCategory 制程类别明细 + * @return 结果 + */ + public int updateSysProcessCategory(SysProcessCategory sysProcessCategory); + + /** + * 删除制程类别明细 + * + * @param processCategoryId 制程类别明细ID + * @return 结果 + */ + public int deleteSysProcessCategoryById(Long processCategoryId); + + /** + * 批量删除制程类别明细 + * + * @param processCategoryIds 需要删除的数据ID + * @return 结果 + */ + public int deleteSysProcessCategoryByIds(String[] processCategoryIds); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysProcessCategoryService.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysProcessCategoryService.java new file mode 100644 index 00000000..c0f8f18c --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysProcessCategoryService.java @@ -0,0 +1,61 @@ +package com.ruoyi.system.service; + +import java.util.List; +import com.ruoyi.system.domain.SysProcessCategory; + +/** + * 制程类别明细Service接口 + * + * @author ruoyi + * @date 2023-05-22 + */ +public interface ISysProcessCategoryService +{ + /** + * 查询制程类别明细 + * + * @param processCategoryId 制程类别明细ID + * @return 制程类别明细 + */ + public SysProcessCategory selectSysProcessCategoryById(Long processCategoryId); + + /** + * 查询制程类别明细列表 + * + * @param sysProcessCategory 制程类别明细 + * @return 制程类别明细集合 + */ + public List selectSysProcessCategoryList(SysProcessCategory sysProcessCategory); + + /** + * 新增制程类别明细 + * + * @param sysProcessCategory 制程类别明细 + * @return 结果 + */ + public int insertSysProcessCategory(SysProcessCategory sysProcessCategory); + + /** + * 修改制程类别明细 + * + * @param sysProcessCategory 制程类别明细 + * @return 结果 + */ + public int updateSysProcessCategory(SysProcessCategory sysProcessCategory); + + /** + * 批量删除制程类别明细 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteSysProcessCategoryByIds(String ids); + + /** + * 删除制程类别明细信息 + * + * @param processCategoryId 制程类别明细ID + * @return 结果 + */ + public int deleteSysProcessCategoryById(Long processCategoryId); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysProcessCategoryServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysProcessCategoryServiceImpl.java new file mode 100644 index 00000000..d9e34da4 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysProcessCategoryServiceImpl.java @@ -0,0 +1,94 @@ +package com.ruoyi.system.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.system.mapper.SysProcessCategoryMapper; +import com.ruoyi.system.domain.SysProcessCategory; +import com.ruoyi.system.service.ISysProcessCategoryService; +import com.ruoyi.common.core.text.Convert; + +/** + * 制程类别明细Service业务层处理 + * + * @author ruoyi + * @date 2023-05-22 + */ +@Service +public class SysProcessCategoryServiceImpl implements ISysProcessCategoryService +{ + @Autowired + private SysProcessCategoryMapper sysProcessCategoryMapper; + + /** + * 查询制程类别明细 + * + * @param processCategoryId 制程类别明细ID + * @return 制程类别明细 + */ + @Override + public SysProcessCategory selectSysProcessCategoryById(Long processCategoryId) + { + return sysProcessCategoryMapper.selectSysProcessCategoryById(processCategoryId); + } + + /** + * 查询制程类别明细列表 + * + * @param sysProcessCategory 制程类别明细 + * @return 制程类别明细 + */ + @Override + public List selectSysProcessCategoryList(SysProcessCategory sysProcessCategory) + { + return sysProcessCategoryMapper.selectSysProcessCategoryList(sysProcessCategory); + } + + /** + * 新增制程类别明细 + * + * @param sysProcessCategory 制程类别明细 + * @return 结果 + */ + @Override + public int insertSysProcessCategory(SysProcessCategory sysProcessCategory) + { + return sysProcessCategoryMapper.insertSysProcessCategory(sysProcessCategory); + } + + /** + * 修改制程类别明细 + * + * @param sysProcessCategory 制程类别明细 + * @return 结果 + */ + @Override + public int updateSysProcessCategory(SysProcessCategory sysProcessCategory) + { + return sysProcessCategoryMapper.updateSysProcessCategory(sysProcessCategory); + } + + /** + * 删除制程类别明细对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteSysProcessCategoryByIds(String ids) + { + return sysProcessCategoryMapper.deleteSysProcessCategoryByIds(Convert.toStrArray(ids)); + } + + /** + * 删除制程类别明细信息 + * + * @param processCategoryId 制程类别明细ID + * @return 结果 + */ + @Override + public int deleteSysProcessCategoryById(Long processCategoryId) + { + return sysProcessCategoryMapper.deleteSysProcessCategoryById(processCategoryId); + } +} diff --git a/ruoyi-admin/src/main/resources/mapper/storehouse/WarehousingCheckInfoMapper.xml b/ruoyi-admin/src/main/resources/mapper/storehouse/WarehousingCheckInfoMapper.xml new file mode 100644 index 00000000..7b838f0a --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/storehouse/WarehousingCheckInfoMapper.xml @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + + + + + + + select warehousing_check_info_id, warehousing_check_number, warehousing_check_person, stock_number, stock_name, warehousing_check_date, material_type, remark, update_flag, first_add_time, update_info_time, standby_one, standby_two from warehousing_check_info + + + + + + + + insert into warehousing_check_info + + warehousing_check_number, + warehousing_check_person, + stock_number, + stock_name, + warehousing_check_date, + material_type, + remark, + update_flag, + standby_one, + standby_two, + first_add_time, + + + #{warehousingCheckNumber}, + #{warehousingCheckPerson}, + #{stockNumber}, + #{stockName}, + #{warehousingCheckDate}, + #{materialType}, + #{remark}, + #{updateFlag}, + #{standbyOne}, + #{standbyTwo}, + now(), + + + + + update warehousing_check_info + + warehousing_check_number = #{warehousingCheckNumber}, + warehousing_check_person = #{warehousingCheckPerson}, + stock_number = #{stockNumber}, + stock_name = #{stockName}, + warehousing_check_date = #{warehousingCheckDate}, + material_type = #{materialType}, + remark = #{remark}, + update_flag = #{updateFlag}, + standby_one = #{standbyOne}, + standby_two = #{standbyTwo}, + update_info_time = CONCAT_WS(',',NOW(),update_info_time), + + where warehousing_check_info_id = #{warehousingCheckInfoId} + + + + delete from warehousing_check_info where warehousing_check_info_id = #{warehousingCheckInfoId} + + + + delete from warehousing_check_info where warehousing_check_info_id in + + #{warehousingCheckInfoId} + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/storehouse/WarehousingSearchMapper.xml b/ruoyi-admin/src/main/resources/mapper/storehouse/WarehousingSearchMapper.xml new file mode 100644 index 00000000..aa21af91 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/storehouse/WarehousingSearchMapper.xml @@ -0,0 +1,179 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + SELECT + material_code, + material_name, + material_type, + batch_number, + specification_model, + type_machine, + inventory_unit, + sum( count ) AS stock_quantity, + stock_number, + stock_name, + enterprise_code, + enterprise_name, + storage_location + FROM + ( + SELECT + warehousing_in_detail.material_code AS material_code, + warehousing_in_detail.material_name AS material_name, + warehousing_in_detail.material_type AS material_type, + warehousing_in_detail.batch_number AS batch_number, + warehousing_in_detail.specification_model AS specification_model, + warehousing_in_detail.type_machine AS type_machine, + warehousing_in_detail.inventory_unit AS inventory_unit, + SUM( warehousing_in_detail.warehousing_quantity ) AS `count`, + warehousing_in_info.stock_number AS stock_number, + warehousing_in_info.stock_name AS stock_name, + warehousing_in_info.enterprise_code AS enterprise_code, + warehousing_in_info.enterprise_name AS enterprise_name, + warehousing_in_detail.storage_location AS storage_location + FROM + warehousing_in_detail, + warehousing_in_info + WHERE + warehousing_in_detail.warehousing_number = warehousing_in_info.warehousing_number + GROUP BY + warehousing_in_detail.material_code UNION ALL + SELECT + outbound_detail.material_code AS material_code, + outbound_detail.material_name AS material_name, + outbound_info.material_type AS material_type, + outbound_detail.batch_number AS batch_number, + outbound_detail.specification_model AS specification_model, + outbound_detail.type_machine AS type_machine, + outbound_detail.inventory_unit AS inventory_unit, + - SUM( outbound_detail.actual_count ) AS `count`, + outbound_info.stock_no AS stock_number, + outbound_info.stock_name AS stock_name, + outbound_info.enterprise_code AS enterprise_code, + outbound_info.enterprise_name AS enterprise_name, + outbound_detail.storage_location AS storage_location + FROM + outbound_detail, + outbound_info + WHERE + outbound_detail.outbound_no = outbound_info.outbound_no + GROUP BY + outbound_detail.material_code + ) AS tabletemp + GROUP BY + material_code + + + + + + + + insert into warehousing_search + + material_code, + material_name, + material_type, + batch_number, + specification_model, + type_machine, + inventory_unit, + stock_quantity, + stock_number, + stock_name, + enterprise_code, + enterprise_name, + storage_location, + + + #{materialCode}, + #{materialName}, + #{materialType}, + #{batchNumber}, + #{specificationModel}, + #{typeMachine}, + #{inventoryUnit}, + #{stockQuantity}, + #{stockNumber}, + #{stockName}, + #{enterpriseCode}, + #{enterpriseName}, + #{storageLocation}, + + + + + update warehousing_search + + material_name = #{materialName}, + material_type = #{materialType}, + batch_number = #{batchNumber}, + specification_model = #{specificationModel}, + type_machine = #{typeMachine}, + inventory_unit = #{inventoryUnit}, + stock_quantity = #{stockQuantity}, + stock_number = #{stockNumber}, + stock_name = #{stockName}, + enterprise_code = #{enterpriseCode}, + enterprise_name = #{enterpriseName}, + storage_location = #{storageLocation}, + + where material_code = #{materialCode} + + + + delete from warehousing_search where material_code = #{materialCode} + + + + delete from warehousing_search where material_code in + + #{materialCode} + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysProcessCategoryMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysProcessCategoryMapper.xml new file mode 100644 index 00000000..0dbbcd8e --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/system/SysProcessCategoryMapper.xml @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + select process_category_id, process_category_code, process_description, work_hour_output, standard_conversion_cost, actual_processing_cost, first_add_time, update_info_time, standby_one, standby_two from sys_process_category + + + + + + + + insert into sys_process_category + + process_category_code, + process_description, + work_hour_output, + standard_conversion_cost, + actual_processing_cost, + standby_one, + standby_two, + first_add_time, + + + #{processCategoryCode}, + #{processDescription}, + #{workHourOutput}, + #{standardConversionCost}, + #{actualProcessingCost}, + #{standbyOne}, + #{standbyTwo}, + NOW(), + + + + + update sys_process_category + + process_category_code = #{processCategoryCode}, + process_description = #{processDescription}, + work_hour_output = #{workHourOutput}, + standard_conversion_cost = #{standardConversionCost}, + actual_processing_cost = #{actualProcessingCost}, + standby_one = #{standbyOne}, + standby_two = #{standbyTwo}, + update_info_time = CONCAT_WS(',',NOW(),update_info_time), + + where process_category_id = #{processCategoryId} + + + + delete from sys_process_category where process_category_id = #{processCategoryId} + + + + delete from sys_process_category where process_category_id in + + #{processCategoryId} + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionBCP/add.html b/ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionBCP/add.html new file mode 100644 index 00000000..a1013243 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionBCP/add.html @@ -0,0 +1,683 @@ + + + + + + + + + + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ + +
+
+
+ +
+ + + + +
+
+
+ +
+ + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+
+ +
+
+
+

物料信息

+ + + + + + + + + + + + + + + + + + +
+
+
+
+ + + +
+ + + + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionBCP/edit.html b/ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionBCP/edit.html new file mode 100644 index 00000000..3e6aa313 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionBCP/edit.html @@ -0,0 +1,658 @@ + + + + + + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ + +
+
+
+ +
+ + + + +
+
+
+ +
+ + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+
+
+

物料信息

+ + + + + + + + + + + + + + + + + + +
+
+
+
+ + + +
+ + + + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionBCP/materialRequisitionBCP.html b/ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionBCP/materialRequisitionBCP.html new file mode 100644 index 00000000..defdca12 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionBCP/materialRequisitionBCP.html @@ -0,0 +1,291 @@ + + + + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + + - + +
    • +
  • + + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionFL/add.html b/ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionFL/add.html new file mode 100644 index 00000000..0d1eae53 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionFL/add.html @@ -0,0 +1,683 @@ + + + + + + + + + + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ + +
+
+
+ +
+ + + + +
+
+
+ +
+ + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+
+ +
+
+
+

物料信息

+ + + + + + + + + + + + + + + + + + +
+
+
+
+ + + +
+ + + + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionFL/edit.html b/ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionFL/edit.html new file mode 100644 index 00000000..f161eb64 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionFL/edit.html @@ -0,0 +1,658 @@ + + + + + + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ + +
+
+
+ +
+ + + + +
+
+
+ +
+ + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+
+
+

物料信息

+ + + + + + + + + + + + + + + + + + +
+
+
+
+ + + +
+ + + + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionFL/materialRequisitionFL.html b/ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionFL/materialRequisitionFL.html new file mode 100644 index 00000000..a50ce80a --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionFL/materialRequisitionFL.html @@ -0,0 +1,291 @@ + + + + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + + - + +
    • +
  • + + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionYL/add.html b/ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionYL/add.html new file mode 100644 index 00000000..2f52c4e6 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionYL/add.html @@ -0,0 +1,683 @@ + + + + + + + + + + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ + +
+
+
+ +
+ + + + +
+
+
+ +
+ + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+
+ +
+
+
+

物料信息

+ + + + + + + + + + + + + + + + + + +
+
+
+
+ + + +
+ + + + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionYL/edit.html b/ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionYL/edit.html new file mode 100644 index 00000000..f0150946 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionYL/edit.html @@ -0,0 +1,658 @@ + + + + + + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ + +
+
+
+ +
+ + + + +
+
+
+ +
+ + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+
+
+

物料信息

+ + + + + + + + + + + + + + + + + + +
+
+
+
+ + + +
+ + + + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionYL/materialRequisitionYL.html b/ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionYL/materialRequisitionYL.html new file mode 100644 index 00000000..bb1fe611 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionYL/materialRequisitionYL.html @@ -0,0 +1,291 @@ + + + + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + + - + +
    • +
  • + + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingCheckInfo/add.html b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingCheckInfo/add.html new file mode 100644 index 00000000..43c19cb2 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingCheckInfo/add.html @@ -0,0 +1,88 @@ + + + + + + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingCheckInfo/edit.html b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingCheckInfo/edit.html new file mode 100644 index 00000000..3376583f --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingCheckInfo/edit.html @@ -0,0 +1,89 @@ + + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingCheckInfo/warehousingCheckInfo.html b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingCheckInfo/warehousingCheckInfo.html new file mode 100644 index 00000000..151e230b --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingCheckInfo/warehousingCheckInfo.html @@ -0,0 +1,153 @@ + + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + + - + +
    • +
  • + + +
    • +
  • + + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingSearch/add.html b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingSearch/add.html new file mode 100644 index 00000000..78b2ecb3 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingSearch/add.html @@ -0,0 +1,105 @@ + + + + + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingSearch/edit.html b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingSearch/edit.html new file mode 100644 index 00000000..21b08b8d --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingSearch/edit.html @@ -0,0 +1,106 @@ + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingSearch/warehousingSearch.html b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingSearch/warehousingSearch.html new file mode 100644 index 00000000..69ec314a --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingSearch/warehousingSearch.html @@ -0,0 +1,178 @@ + + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ +
+ + + + + + + + + + + + +
+
+
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/processCategory/add.html b/ruoyi-admin/src/main/resources/templates/system/processCategory/add.html new file mode 100644 index 00000000..edd1fe84 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/processCategory/add.html @@ -0,0 +1,55 @@ + + + + + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/processCategory/edit.html b/ruoyi-admin/src/main/resources/templates/system/processCategory/edit.html new file mode 100644 index 00000000..27e71cb7 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/processCategory/edit.html @@ -0,0 +1,56 @@ + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/processCategory/processCategory.html b/ruoyi-admin/src/main/resources/templates/system/processCategory/processCategory.html new file mode 100644 index 00000000..9b188a1c --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/processCategory/processCategory.html @@ -0,0 +1,119 @@ + + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/target/classes/com/ruoyi/web/controller/system/SysCaptchaController.class b/ruoyi-admin/target/classes/com/ruoyi/web/controller/system/SysCaptchaController.class index 929c2ccd1793198117a4be4d4dcb884a562e7545..1309872b237bd90f0d81d4fe131eb432da2c4ddd 100644 GIT binary patch delta 14 Vcmew_^Iv9zE-z!mW