From f5f0050f2ae7d2e3eade1ce20c450d1753d51b11 Mon Sep 17 00:00:00 2001 From: wangh <123456> Date: Fri, 22 Jul 2022 16:24:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=80=BB=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/broad/ZZJXBroadController.java | 12 ++ .../BaseOneUnquqlifiedRateController.java | 127 ++++++++++++++++++ .../controller/BaseProductQtyController.java | 1 + .../system/controller/BaseTeamController.java | 4 +- .../system/domain/BaseOneUnquqlifiedRate.java | 50 +++++++ .../com/ruoyi/system/domain/BaseTeam.java | 6 +- .../mapper/BaseOneUnquqlifiedRateMapper.java | 61 +++++++++ .../ruoyi/system/mapper/BroadDataMapper.java | 4 + .../IBaseOneUnquqlifiedRateService.java | 61 +++++++++ .../system/service/IBroadDataService.java | 4 + .../system/service/IBroadDruidService.java | 2 + .../BaseOneUnquqlifiedRateServiceImpl.java | 94 +++++++++++++ .../service/impl/BroadDataServiceImpl.java | 10 ++ .../resources/createsql/base_rateMenu.sql | 20 +++ .../system/BaseOneUnquqlifiedRateMapper.xml | 57 ++++++++ .../mapper/system/BroadDataMapper.xml | 31 ++++- .../templates/system/base_rate/add.html | 37 +++++ .../templates/system/base_rate/base_rate.html | 77 +++++++++++ .../templates/system/base_rate/edit.html | 32 +++++ 19 files changed, 684 insertions(+), 6 deletions(-) create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/controller/BaseOneUnquqlifiedRateController.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseOneUnquqlifiedRate.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/mapper/BaseOneUnquqlifiedRateMapper.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseOneUnquqlifiedRateService.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseOneUnquqlifiedRateServiceImpl.java create mode 100644 ruoyi-system/src/main/resources/createsql/base_rateMenu.sql create mode 100644 ruoyi-system/src/main/resources/mapper/system/BaseOneUnquqlifiedRateMapper.xml create mode 100644 ruoyi-system/src/main/resources/templates/system/base_rate/add.html create mode 100644 ruoyi-system/src/main/resources/templates/system/base_rate/base_rate.html create mode 100644 ruoyi-system/src/main/resources/templates/system/base_rate/edit.html diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/ZZJXBroadController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/ZZJXBroadController.java index 5731f38..3c7aa43 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/ZZJXBroadController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/ZZJXBroadController.java @@ -64,11 +64,23 @@ public class ZZJXBroadController { return JSONArray.toJSONString(service.selectOneBadRateByDay()); } } + @PostMapping("/selectOneBadRateMb") + @ApiOperation("一次不合格率目标") + private String selectOneBadRateMb( ){ + return JSONArray.toJSONString(service.zz_selectOneBadRateMb()); + + } @PostMapping("/selectInStoreTag") @ApiOperation("入库节拍") private String selectInStoreTag(){ return JSONObject.toJSONString(BroadDruidServiceImpl.zz_selectInStoreTag()); } + @PostMapping("/selectInStoreOrderInfo") + @ApiOperation("入库执行订单") + private String selectInStoreOrderInfo(){ + return JSONObject.toJSONString(service.zz_selectInStoreOrderInfo()); + } + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/BaseOneUnquqlifiedRateController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/BaseOneUnquqlifiedRateController.java new file mode 100644 index 0000000..da78ec9 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/BaseOneUnquqlifiedRateController.java @@ -0,0 +1,127 @@ +package com.ruoyi.system.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.system.domain.BaseOneUnquqlifiedRate; +import com.ruoyi.system.service.IBaseOneUnquqlifiedRateService; +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 2022-07-22 + */ +@Controller +@RequestMapping("/system/base_rate") +public class BaseOneUnquqlifiedRateController extends BaseController +{ + private String prefix = "system/base_rate"; + + @Autowired + private IBaseOneUnquqlifiedRateService baseOneUnquqlifiedRateService; + + @RequiresPermissions("system:base_rate:view") + @GetMapping() + public String base_rate() + { + return prefix + "/base_rate"; + } + + /** + * 查询一次不合格率维护列表 + */ + @RequiresPermissions("system:base_rate:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(BaseOneUnquqlifiedRate baseOneUnquqlifiedRate) + { + startPage(); + List list = baseOneUnquqlifiedRateService.selectBaseOneUnquqlifiedRateList(baseOneUnquqlifiedRate); + return getDataTable(list); + } + + /** + * 导出一次不合格率维护列表 + */ + @RequiresPermissions("system:base_rate:export") + @Log(title = "一次不合格率维护", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(BaseOneUnquqlifiedRate baseOneUnquqlifiedRate) + { + List list = baseOneUnquqlifiedRateService.selectBaseOneUnquqlifiedRateList(baseOneUnquqlifiedRate); + ExcelUtil util = new ExcelUtil(BaseOneUnquqlifiedRate.class); + return util.exportExcel(list, "一次不合格率维护数据"); + } + + /** + * 新增一次不合格率维护 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存一次不合格率维护 + */ + @RequiresPermissions("system:base_rate:add") + @Log(title = "一次不合格率维护", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(BaseOneUnquqlifiedRate baseOneUnquqlifiedRate) + { + return toAjax(baseOneUnquqlifiedRateService.insertBaseOneUnquqlifiedRate(baseOneUnquqlifiedRate)); + } + + /** + * 修改一次不合格率维护 + */ + @RequiresPermissions("system:base_rate:edit") + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Long id, ModelMap mmap) + { + BaseOneUnquqlifiedRate baseOneUnquqlifiedRate = baseOneUnquqlifiedRateService.selectBaseOneUnquqlifiedRateById(id); + mmap.put("baseOneUnquqlifiedRate", baseOneUnquqlifiedRate); + return prefix + "/edit"; + } + + /** + * 修改保存一次不合格率维护 + */ + @RequiresPermissions("system:base_rate:edit") + @Log(title = "一次不合格率维护", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(BaseOneUnquqlifiedRate baseOneUnquqlifiedRate) + { + return toAjax(baseOneUnquqlifiedRateService.updateBaseOneUnquqlifiedRate(baseOneUnquqlifiedRate)); + } + + /** + * 删除一次不合格率维护 + */ + @RequiresPermissions("system:base_rate:remove") + @Log(title = "一次不合格率维护", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(baseOneUnquqlifiedRateService.deleteBaseOneUnquqlifiedRateByIds(ids)); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/BaseProductQtyController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/BaseProductQtyController.java index 97ca09a..2d15564 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/controller/BaseProductQtyController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/BaseProductQtyController.java @@ -128,4 +128,5 @@ public class BaseProductQtyController extends BaseController { public AjaxResult remove(String ids) { return toAjax(baseProductQtyService.deleteBaseProductQtyByIds(ids)); } + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/BaseTeamController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/BaseTeamController.java index 4ac7729..9793c83 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/controller/BaseTeamController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/BaseTeamController.java @@ -101,9 +101,9 @@ public class BaseTeamController extends BaseController try { String pathName = FileUploadUtils.upload(filePath, file); List list = baseTeamService.selectBaseTeamList(null); - int id=0; + int id=1; if (list!=null||!list.isEmpty()){ - id=list.size(); + id=list.size()+1; } baseTeam.setId(Long.valueOf(id)); baseTeam.setPath(pathName); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseOneUnquqlifiedRate.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseOneUnquqlifiedRate.java new file mode 100644 index 0000000..ee95294 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseOneUnquqlifiedRate.java @@ -0,0 +1,50 @@ +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; + +/** + * 一次不合格率维护对象 base_one_unquqlified_rate + * + * @author ruoyi + * @date 2022-07-22 + */ +public class BaseOneUnquqlifiedRate extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + private Long id; + + /** 不合格率 */ + @Excel(name = "不合格率") + private double rate; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + + public double getRate() { + return rate; + } + + public void setRate(double rate) { + this.rate = rate; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("rate", getRate()) + .toString(); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseTeam.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseTeam.java index fee28e3..5385a05 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseTeam.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseTeam.java @@ -24,7 +24,7 @@ public class BaseTeam extends BaseEntity /** 分数 */ @Excel(name = "分数") - private Long teamNumber; + private double teamNumber; /** 图片 */ @Excel(name = "图片") @@ -48,12 +48,12 @@ public class BaseTeam extends BaseEntity { return teamName; } - public void setTeamNumber(Long teamNumber) + public void setTeamNumber(double teamNumber) { this.teamNumber = teamNumber; } - public Long getTeamNumber() + public double getTeamNumber() { return teamNumber; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BaseOneUnquqlifiedRateMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BaseOneUnquqlifiedRateMapper.java new file mode 100644 index 0000000..719172d --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BaseOneUnquqlifiedRateMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.system.mapper; + +import java.util.List; +import com.ruoyi.system.domain.BaseOneUnquqlifiedRate; + +/** + * 一次不合格率维护Mapper接口 + * + * @author ruoyi + * @date 2022-07-22 + */ +public interface BaseOneUnquqlifiedRateMapper +{ + /** + * 查询一次不合格率维护 + * + * @param id 一次不合格率维护主键 + * @return 一次不合格率维护 + */ + public BaseOneUnquqlifiedRate selectBaseOneUnquqlifiedRateById(Long id); + + /** + * 查询一次不合格率维护列表 + * + * @param baseOneUnquqlifiedRate 一次不合格率维护 + * @return 一次不合格率维护集合 + */ + public List selectBaseOneUnquqlifiedRateList(BaseOneUnquqlifiedRate baseOneUnquqlifiedRate); + + /** + * 新增一次不合格率维护 + * + * @param baseOneUnquqlifiedRate 一次不合格率维护 + * @return 结果 + */ + public int insertBaseOneUnquqlifiedRate(BaseOneUnquqlifiedRate baseOneUnquqlifiedRate); + + /** + * 修改一次不合格率维护 + * + * @param baseOneUnquqlifiedRate 一次不合格率维护 + * @return 结果 + */ + public int updateBaseOneUnquqlifiedRate(BaseOneUnquqlifiedRate baseOneUnquqlifiedRate); + + /** + * 删除一次不合格率维护 + * + * @param id 一次不合格率维护主键 + * @return 结果 + */ + public int deleteBaseOneUnquqlifiedRateById(Long id); + + /** + * 批量删除一次不合格率维护 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteBaseOneUnquqlifiedRateByIds(String[] ids); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BroadDataMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BroadDataMapper.java index 680c7bf..b6b4d8c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BroadDataMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BroadDataMapper.java @@ -81,4 +81,8 @@ public interface BroadDataMapper { List zz_selectProductInTarget(); BoxOutput zz_selectInStoreTag(); + + List zz_selectInStoreOrderInfo(); + + BoxOutput zz_selectOneBadRateMb(); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseOneUnquqlifiedRateService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseOneUnquqlifiedRateService.java new file mode 100644 index 0000000..4cfe6f2 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseOneUnquqlifiedRateService.java @@ -0,0 +1,61 @@ +package com.ruoyi.system.service; + +import java.util.List; +import com.ruoyi.system.domain.BaseOneUnquqlifiedRate; + +/** + * 一次不合格率维护Service接口 + * + * @author ruoyi + * @date 2022-07-22 + */ +public interface IBaseOneUnquqlifiedRateService +{ + /** + * 查询一次不合格率维护 + * + * @param id 一次不合格率维护主键 + * @return 一次不合格率维护 + */ + public BaseOneUnquqlifiedRate selectBaseOneUnquqlifiedRateById(Long id); + + /** + * 查询一次不合格率维护列表 + * + * @param baseOneUnquqlifiedRate 一次不合格率维护 + * @return 一次不合格率维护集合 + */ + public List selectBaseOneUnquqlifiedRateList(BaseOneUnquqlifiedRate baseOneUnquqlifiedRate); + + /** + * 新增一次不合格率维护 + * + * @param baseOneUnquqlifiedRate 一次不合格率维护 + * @return 结果 + */ + public int insertBaseOneUnquqlifiedRate(BaseOneUnquqlifiedRate baseOneUnquqlifiedRate); + + /** + * 修改一次不合格率维护 + * + * @param baseOneUnquqlifiedRate 一次不合格率维护 + * @return 结果 + */ + public int updateBaseOneUnquqlifiedRate(BaseOneUnquqlifiedRate baseOneUnquqlifiedRate); + + /** + * 批量删除一次不合格率维护 + * + * @param ids 需要删除的一次不合格率维护主键集合 + * @return 结果 + */ + public int deleteBaseOneUnquqlifiedRateByIds(String ids); + + /** + * 删除一次不合格率维护信息 + * + * @param id 一次不合格率维护主键 + * @return 结果 + */ + public int deleteBaseOneUnquqlifiedRateById(Long id); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IBroadDataService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBroadDataService.java index 4d11140..44b0843 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IBroadDataService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBroadDataService.java @@ -63,4 +63,8 @@ public interface IBroadDataService { List zz_selectProductInTarget(); + + List zz_selectInStoreOrderInfo(); + + BoxOutput zz_selectOneBadRateMb(); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IBroadDruidService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBroadDruidService.java index a23b92e..cba0f64 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IBroadDruidService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBroadDruidService.java @@ -17,4 +17,6 @@ public interface IBroadDruidService { int selectNowXkOutPut(); BoxOutput zz_selectInStoreTag(); + + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseOneUnquqlifiedRateServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseOneUnquqlifiedRateServiceImpl.java new file mode 100644 index 0000000..679b611 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseOneUnquqlifiedRateServiceImpl.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.BaseOneUnquqlifiedRateMapper; +import com.ruoyi.system.domain.BaseOneUnquqlifiedRate; +import com.ruoyi.system.service.IBaseOneUnquqlifiedRateService; +import com.ruoyi.common.core.text.Convert; + +/** + * 一次不合格率维护Service业务层处理 + * + * @author ruoyi + * @date 2022-07-22 + */ +@Service +public class BaseOneUnquqlifiedRateServiceImpl implements IBaseOneUnquqlifiedRateService +{ + @Autowired + private BaseOneUnquqlifiedRateMapper baseOneUnquqlifiedRateMapper; + + /** + * 查询一次不合格率维护 + * + * @param id 一次不合格率维护主键 + * @return 一次不合格率维护 + */ + @Override + public BaseOneUnquqlifiedRate selectBaseOneUnquqlifiedRateById(Long id) + { + return baseOneUnquqlifiedRateMapper.selectBaseOneUnquqlifiedRateById(id); + } + + /** + * 查询一次不合格率维护列表 + * + * @param baseOneUnquqlifiedRate 一次不合格率维护 + * @return 一次不合格率维护 + */ + @Override + public List selectBaseOneUnquqlifiedRateList(BaseOneUnquqlifiedRate baseOneUnquqlifiedRate) + { + return baseOneUnquqlifiedRateMapper.selectBaseOneUnquqlifiedRateList(baseOneUnquqlifiedRate); + } + + /** + * 新增一次不合格率维护 + * + * @param baseOneUnquqlifiedRate 一次不合格率维护 + * @return 结果 + */ + @Override + public int insertBaseOneUnquqlifiedRate(BaseOneUnquqlifiedRate baseOneUnquqlifiedRate) + { + return baseOneUnquqlifiedRateMapper.insertBaseOneUnquqlifiedRate(baseOneUnquqlifiedRate); + } + + /** + * 修改一次不合格率维护 + * + * @param baseOneUnquqlifiedRate 一次不合格率维护 + * @return 结果 + */ + @Override + public int updateBaseOneUnquqlifiedRate(BaseOneUnquqlifiedRate baseOneUnquqlifiedRate) + { + return baseOneUnquqlifiedRateMapper.updateBaseOneUnquqlifiedRate(baseOneUnquqlifiedRate); + } + + /** + * 批量删除一次不合格率维护 + * + * @param ids 需要删除的一次不合格率维护主键 + * @return 结果 + */ + @Override + public int deleteBaseOneUnquqlifiedRateByIds(String ids) + { + return baseOneUnquqlifiedRateMapper.deleteBaseOneUnquqlifiedRateByIds(Convert.toStrArray(ids)); + } + + /** + * 删除一次不合格率维护信息 + * + * @param id 一次不合格率维护主键 + * @return 结果 + */ + @Override + public int deleteBaseOneUnquqlifiedRateById(Long id) + { + return baseOneUnquqlifiedRateMapper.deleteBaseOneUnquqlifiedRateById(id); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDataServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDataServiceImpl.java index bd4de1c..97e41e3 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDataServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDataServiceImpl.java @@ -149,4 +149,14 @@ public class BroadDataServiceImpl implements IBroadDataService public List zz_selectProductInTarget() { return mapper.zz_selectProductInTarget(); } + + @Override + public List zz_selectInStoreOrderInfo() { + return mapper.zz_selectInStoreOrderInfo(); + } + + @Override + public BoxOutput zz_selectOneBadRateMb() { + return mapper.zz_selectOneBadRateMb(); + } } diff --git a/ruoyi-system/src/main/resources/createsql/base_rateMenu.sql b/ruoyi-system/src/main/resources/createsql/base_rateMenu.sql new file mode 100644 index 0000000..9209e01 --- /dev/null +++ b/ruoyi-system/src/main/resources/createsql/base_rateMenu.sql @@ -0,0 +1,20 @@ +-- 菜单 SQL +insert into sys_menu (menu_id, menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values(2048, '一次不合格率维护', '5', '1', '/system/base_rate', 'C', '0', 'system:base_rate:view', '#', 'admin', sysdate, '', null, '一次不合格率维护菜单'); + +-- 按钮 SQL +insert into sys_menu (menu_id, menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values(seq_sys_menu.nextval, '一次不合格率维护查询', 2048, '1', '#', 'F', '0', 'system:base_rate:list', '#', 'admin', sysdate, '', null, ''); + +insert into sys_menu (menu_id, menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values(seq_sys_menu.nextval, '一次不合格率维护新增', 2048, '2', '#', 'F', '0', 'system:base_rate:add', '#', 'admin', sysdate, '', null, ''); + +insert into sys_menu (menu_id, menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values(seq_sys_menu.nextval, '一次不合格率维护修改', 2048, '3', '#', 'F', '0', 'system:base_rate:edit', '#', 'admin', sysdate, '', null, ''); + +insert into sys_menu (menu_id, menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values(seq_sys_menu.nextval, '一次不合格率维护删除', 2048, '4', '#', 'F', '0', 'system:base_rate:remove', '#', 'admin', sysdate, '', null, ''); + +insert into sys_menu (menu_id, menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values(seq_sys_menu.nextval, '一次不合格率维护导出', 2048, '5', '#', 'F', '0', 'system:base_rate:export', '#', 'admin', sysdate, '', null, ''); + diff --git a/ruoyi-system/src/main/resources/mapper/system/BaseOneUnquqlifiedRateMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BaseOneUnquqlifiedRateMapper.xml new file mode 100644 index 0000000..85fd0a5 --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/system/BaseOneUnquqlifiedRateMapper.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + select id, rate from base_one_unquqlified_rate + + + + + + + + insert into base_one_unquqlified_rate + + id, + rate, + + + #{id}, + #{rate}, + + + + + update base_one_unquqlified_rate + + rate = #{rate}, + + where id = #{id} + + + + delete from base_one_unquqlified_rate where id = #{id} + + + + delete from base_one_unquqlified_rate where id in + + #{id} + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml index 96558ed..8be14c5 100644 --- a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml @@ -589,7 +589,7 @@ from ( from haiwei.BASE_PRODUCT_QTY where DAY between (TRUNC(sysdate, 'D') + 1) and (TRUNC(sysdate, 'D') + 7) union - select sum(QTY) as qty, '目标' as name + select sum(QTY) as qty, '进度目标' as name from haiwei.BASE_PRODUCT_QTY where to_char(DAY, 'yyyy-MM-dd') = to_char(sysdate, 'yyyy-MM-dd') union @@ -597,4 +597,33 @@ from ( from IMOS.IMOS_PR_PRODUCT_BARCODE where to_char(PRODUCTION_DATE, 'yyyy-MM-dd') = to_char(sysdate, 'yyyy-MM-dd') + + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/templates/system/base_rate/add.html b/ruoyi-system/src/main/resources/templates/system/base_rate/add.html new file mode 100644 index 0000000..5ea9a67 --- /dev/null +++ b/ruoyi-system/src/main/resources/templates/system/base_rate/add.html @@ -0,0 +1,37 @@ + + + + + + +
+
+ + + + + + +
+ +
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/templates/system/base_rate/base_rate.html b/ruoyi-system/src/main/resources/templates/system/base_rate/base_rate.html new file mode 100644 index 0000000..49fb888 --- /dev/null +++ b/ruoyi-system/src/main/resources/templates/system/base_rate/base_rate.html @@ -0,0 +1,77 @@ + + + + + + +
+
+
+
+
+ +
+
+
+ +
+ + + + + 修改 + + + + + + + +
+
+
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/templates/system/base_rate/edit.html b/ruoyi-system/src/main/resources/templates/system/base_rate/edit.html new file mode 100644 index 0000000..6b55f90 --- /dev/null +++ b/ruoyi-system/src/main/resources/templates/system/base_rate/edit.html @@ -0,0 +1,32 @@ + + + + + + +
+
+ +
+ +
+ +
+
+
+
+ + + + \ No newline at end of file