Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/BoxBroadController.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.ruoyi.system.domain.*;
 import com.ruoyi.system.service.IBroadDataService;
+import com.ruoyi.system.service.IBroadDruidService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,6 +24,8 @@ import java.util.List;
 public class BoxBroadController {
     @Autowired
     private IBroadDataService service;
+    @Autowired
+    private IBroadDruidService BroadDruidServiceImpl;
     
     @PostMapping("/planCompletion")
     @ApiOperation("箱壳查询计划数量完成情况")
@@ -65,12 +68,30 @@ public class BoxBroadController {
     @ApiOperation("箱壳按小时查询产量")
     public String selectOutputByTime() {
         List<BoxOutput> info = service.selectOutputByTime();
+        BoxOutput boxOutput= info.get(0);
+        info.remove(0);
+        int qty = BroadDruidServiceImpl.selectNowXkOutPut();//实时的数量
+        if (info.isEmpty()){//只有7.30
+            boxOutput.setName("7:30");
+            boxOutput.setQty(qty);
+        }else {
+            BoxOutput boxOutputSize = info.get(info.size() - 1);
+            String hName=boxOutputSize.getName();
+            String newName=hName.substring(0,hName.indexOf(":"));
+            BoxOutput boxOutputNow=new BoxOutput();
+
+            boxOutputNow.setName((Integer.parseInt(newName)+1)+":30");
+            boxOutputNow.setQty(qty-boxOutputSize.getRecord_qty());
+            info.add(boxOutputNow);
+        }
         String jsonInfo = JSONArray.toJSONString(info);
         System.out.println("根据型号统计产量：" + jsonInfo);
         return jsonInfo;
     }
 
 
+
+
     @PostMapping("/getProductPlanInfo")
     @ApiOperation("箱壳工单详情")
     public String getProductPlanInfo() {

ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/ZZJXBroadController.java

@@ -41,7 +41,11 @@ public class ZZJXBroadController {
         } else {
             return JSONArray.toJSONString(service.zz_selectProductInByDay());
         }
-
+    }
+    @PostMapping("/selectProductInTarget")
+    @ApiOperation("成品入库统计-目标")
+    private String selectProductInTarget() {
+        return JSONArray.toJSONString(service.zz_selectProductInTarget());
     }
 
     @PostMapping("/selectLossInfo")
@@ -60,5 +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());
+    }
+
 
 }

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<BaseOneUnquqlifiedRate> 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<BaseOneUnquqlifiedRate> list = baseOneUnquqlifiedRateService.selectBaseOneUnquqlifiedRateList(baseOneUnquqlifiedRate);
+        ExcelUtil<BaseOneUnquqlifiedRate> util = new ExcelUtil<BaseOneUnquqlifiedRate>(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));
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/controller/BaseProductQtyController.java

@@ -0,0 +1,132 @@
+package com.ruoyi.system.controller;
+
+import java.util.List;
+
+import com.ruoyi.common.utils.ShiroUtils;
+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.BaseProductQty;
+import com.ruoyi.system.service.IBaseProductQtyService;
+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_productqty")
+public class BaseProductQtyController extends BaseController {
+    private String prefix = "system/base_productqty";
+
+    @Autowired
+    private IBaseProductQtyService baseProductQtyService;
+
+    @RequiresPermissions("system:base_productqty:view")
+    @GetMapping()
+    public String base_productqty() {
+        return prefix + "/base_productqty";
+    }
+
+    /**
+     * 查询成品产量目标维护列表
+     */
+    @RequiresPermissions("system:base_productqty:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(BaseProductQty baseProductQty) {
+        startPage();
+        List<BaseProductQty> list = baseProductQtyService.selectBaseProductQtyList(baseProductQty);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出成品产量目标维护列表
+     */
+    @RequiresPermissions("system:base_productqty:export")
+    @Log(title = "成品产量目标维护", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(BaseProductQty baseProductQty) {
+        List<BaseProductQty> list = baseProductQtyService.selectBaseProductQtyList(baseProductQty);
+        ExcelUtil<BaseProductQty> util = new ExcelUtil<BaseProductQty>(BaseProductQty.class);
+        return util.exportExcel(list, "成品产量目标维护数据");
+    }
+
+    /**
+     * 新增成品产量目标维护
+     */
+    @GetMapping("/add")
+    public String add() {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存成品产量目标维护
+     */
+    @RequiresPermissions("system:base_productqty:add")
+    @Log(title = "成品产量目标维护", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(BaseProductQty baseProductQty) {
+        Integer tag = baseProductQtyService.countDay(baseProductQty.getDay());
+        if (tag > 0) {
+            return error("本天 '" + baseProductQty.getDay() + "' 已经存在");
+        }
+        List<BaseProductQty> list = baseProductQtyService.selectBaseProductQtyList(null);
+        int id = 1;
+        if (list != null || !list.isEmpty()) {
+            id = list.size();
+        }
+        baseProductQty.setId(Long.valueOf(id));
+        baseProductQty.setCreateBy(ShiroUtils.getLoginName());
+        return toAjax(baseProductQtyService.insertBaseProductQty(baseProductQty));
+    }
+
+    /**
+     * 修改成品产量目标维护
+     */
+    @RequiresPermissions("system:base_productqty:edit")
+    @GetMapping("/edit/{id}")
+    public String edit(@PathVariable("id") Long id, ModelMap mmap) {
+        BaseProductQty baseProductQty = baseProductQtyService.selectBaseProductQtyById(id);
+        mmap.put("baseProductQty", baseProductQty);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存成品产量目标维护
+     */
+    @RequiresPermissions("system:base_productqty:edit")
+    @Log(title = "成品产量目标维护", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(BaseProductQty baseProductQty) {
+        return toAjax(baseProductQtyService.updateBaseProductQty(baseProductQty));
+    }
+
+    /**
+     * 删除成品产量目标维护
+     */
+    @RequiresPermissions("system:base_productqty:remove")
+    @Log(title = "成品产量目标维护", businessType = BusinessType.DELETE)
+    @PostMapping("/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids) {
+        return toAjax(baseProductQtyService.deleteBaseProductQtyByIds(ids));
+    }
+
+}

ruoyi-system/src/main/java/com/ruoyi/system/controller/BaseRhythmController.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.BaseRhythm;
+import com.ruoyi.system.service.IBaseRhythmService;
+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_rhythm")
+public class BaseRhythmController extends BaseController
+{
+    private String prefix = "system/base_rhythm";
+
+    @Autowired
+    private IBaseRhythmService baseRhythmService;
+
+    @RequiresPermissions("system:base_rhythm:view")
+    @GetMapping()
+    public String base_rhythm()
+    {
+        return prefix + "/base_rhythm";
+    }
+
+    /**
+     * 查询入库节拍维护列表
+     */
+    @RequiresPermissions("system:base_rhythm:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(BaseRhythm baseRhythm)
+    {
+        startPage();
+        List<BaseRhythm> list = baseRhythmService.selectBaseRhythmList(baseRhythm);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出入库节拍维护列表
+     */
+    @RequiresPermissions("system:base_rhythm:export")
+    @Log(title = "入库节拍维护", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(BaseRhythm baseRhythm)
+    {
+        List<BaseRhythm> list = baseRhythmService.selectBaseRhythmList(baseRhythm);
+        ExcelUtil<BaseRhythm> util = new ExcelUtil<BaseRhythm>(BaseRhythm.class);
+        return util.exportExcel(list, "入库节拍维护数据");
+    }
+
+    /**
+     * 新增入库节拍维护
+     */
+    @GetMapping("/add")
+    public String add()
+    {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存入库节拍维护
+     */
+    @RequiresPermissions("system:base_rhythm:add")
+    @Log(title = "入库节拍维护", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(BaseRhythm baseRhythm)
+    {
+        return toAjax(baseRhythmService.insertBaseRhythm(baseRhythm));
+    }
+
+    /**
+     * 修改入库节拍维护
+     */
+    @RequiresPermissions("system:base_rhythm:edit")
+    @GetMapping("/edit/{id}")
+    public String edit(@PathVariable("id") Long id, ModelMap mmap)
+    {
+        BaseRhythm baseRhythm = baseRhythmService.selectBaseRhythmById(id);
+        mmap.put("baseRhythm", baseRhythm);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存入库节拍维护
+     */
+    @RequiresPermissions("system:base_rhythm:edit")
+    @Log(title = "入库节拍维护", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(BaseRhythm baseRhythm)
+    {
+        return toAjax(baseRhythmService.updateBaseRhythm(baseRhythm));
+    }
+
+    /**
+     * 删除入库节拍维护
+     */
+    @RequiresPermissions("system:base_rhythm:remove")
+    @Log(title = "入库节拍维护", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(baseRhythmService.deleteBaseRhythmByIds(ids));
+    }
+}

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<BaseTeam> list = baseTeamService.selectBaseTeamList(null);
-            int id=0;
+            int id=1;
             if (list!=null||!list.isEmpty()){
-                id= Math.toIntExact(list.get(list.size() - 1).getId())+1;
+                id=list.size()+1;
             }
             baseTeam.setId(Long.valueOf(id));
             baseTeam.setPath(pathName);

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();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseProductQty.java

@@ -0,0 +1,70 @@
+package com.ruoyi.system.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 成品产量目标维护对象 base_product_qty
+ * 
+ * @author ruoyi
+ * @date 2022-07-22
+ */
+public class BaseProductQty extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long id;
+
+    /** 天 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "天", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date day;
+
+    /** 目标数量 */
+    @Excel(name = "目标数量")
+    private Long qty;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setDay(Date day) 
+    {
+        this.day = day;
+    }
+
+    public Date getDay() 
+    {
+        return day;
+    }
+    public void setQty(Long qty) 
+    {
+        this.qty = qty;
+    }
+
+    public Long getQty() 
+    {
+        return qty;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("day", getDay())
+            .append("qty", getQty())
+            .append("createTime", getCreateTime())
+            .append("createBy", getCreateBy())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseRhythm.java

@@ -0,0 +1,51 @@
+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_rhythm
+ * 
+ * @author ruoyi
+ * @date 2022-07-22
+ */
+public class BaseRhythm extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long id;
+
+    /** 节拍 */
+    @Excel(name = "节拍")
+    private Long rhythm;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setRhythm(Long rhythm) 
+    {
+        this.rhythm = rhythm;
+    }
+
+    public Long getRhythm() 
+    {
+        return rhythm;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("rhythm", getRhythm())
+            .toString();
+    }
+}

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;
     }

ruoyi-system/src/main/java/com/ruoyi/system/domain/BoxOutput.java

@@ -7,6 +7,7 @@ package com.ruoyi.system.domain;
 public class BoxOutput {
     private String name;
     private int qty;
+    private int record_qty;
     private double rate;
 
     public String getName() {
@@ -32,4 +33,12 @@ public class BoxOutput {
     public void setRate(double rate) {
         this.rate = rate;
     }
+
+    public int getRecord_qty() {
+        return record_qty;
+    }
+
+    public void setRecord_qty(int record_qty) {
+        this.record_qty = record_qty;
+    }
 }

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<BaseOneUnquqlifiedRate> 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);
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/BaseProductQtyMapper.java

@@ -0,0 +1,64 @@
+package com.ruoyi.system.mapper;
+
+import java.util.Date;
+import java.util.List;
+import com.ruoyi.system.domain.BaseProductQty;
+
+/**
+ * 成品产量目标维护Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2022-07-22
+ */
+public interface BaseProductQtyMapper 
+{
+    /**
+     * 查询成品产量目标维护
+     * 
+     * @param id 成品产量目标维护主键
+     * @return 成品产量目标维护
+     */
+    public BaseProductQty selectBaseProductQtyById(Long id);
+
+    /**
+     * 查询成品产量目标维护列表
+     * 
+     * @param baseProductQty 成品产量目标维护
+     * @return 成品产量目标维护集合
+     */
+    public List<BaseProductQty> selectBaseProductQtyList(BaseProductQty baseProductQty);
+
+    /**
+     * 新增成品产量目标维护
+     * 
+     * @param baseProductQty 成品产量目标维护
+     * @return 结果
+     */
+    public int insertBaseProductQty(BaseProductQty baseProductQty);
+
+    /**
+     * 修改成品产量目标维护
+     * 
+     * @param baseProductQty 成品产量目标维护
+     * @return 结果
+     */
+    public int updateBaseProductQty(BaseProductQty baseProductQty);
+
+    /**
+     * 删除成品产量目标维护
+     * 
+     * @param id 成品产量目标维护主键
+     * @return 结果
+     */
+    public int deleteBaseProductQtyById(Long id);
+
+    /**
+     * 批量删除成品产量目标维护
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteBaseProductQtyByIds(String[] ids);
+
+    Integer countDay(Date day);
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/BaseRhythmMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.system.domain.BaseRhythm;
+
+/**
+ * 入库节拍维护Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2022-07-22
+ */
+public interface BaseRhythmMapper 
+{
+    /**
+     * 查询入库节拍维护
+     * 
+     * @param id 入库节拍维护主键
+     * @return 入库节拍维护
+     */
+    public BaseRhythm selectBaseRhythmById(Long id);
+
+    /**
+     * 查询入库节拍维护列表
+     * 
+     * @param baseRhythm 入库节拍维护
+     * @return 入库节拍维护集合
+     */
+    public List<BaseRhythm> selectBaseRhythmList(BaseRhythm baseRhythm);
+
+    /**
+     * 新增入库节拍维护
+     * 
+     * @param baseRhythm 入库节拍维护
+     * @return 结果
+     */
+    public int insertBaseRhythm(BaseRhythm baseRhythm);
+
+    /**
+     * 修改入库节拍维护
+     * 
+     * @param baseRhythm 入库节拍维护
+     * @return 结果
+     */
+    public int updateBaseRhythm(BaseRhythm baseRhythm);
+
+    /**
+     * 删除入库节拍维护
+     * 
+     * @param id 入库节拍维护主键
+     * @return 结果
+     */
+    public int deleteBaseRhythmById(Long id);
+
+    /**
+     * 批量删除入库节拍维护
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteBaseRhythmByIds(String[] ids);
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/BroadDataMapper.java

@@ -74,4 +74,15 @@ public interface BroadDataMapper {
     List<BoxOutput> selectOneBadRate();
 
     List<BoxOutput> selectOneBadRateByDay();
+
+    BoxOutput selectOutputByTimeDY();
+
+
+    List<BoxOutput> zz_selectProductInTarget();
+
+    BoxOutput zz_selectInStoreTag();
+
+    List<OrderInfo> zz_selectInStoreOrderInfo();
+
+    BoxOutput zz_selectOneBadRateMb();
 }

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<BaseOneUnquqlifiedRate> 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);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseProductQtyService.java

@@ -0,0 +1,64 @@
+package com.ruoyi.system.service;
+
+import java.util.Date;
+import java.util.List;
+import com.ruoyi.system.domain.BaseProductQty;
+
+/**
+ * 成品产量目标维护Service接口
+ * 
+ * @author ruoyi
+ * @date 2022-07-22
+ */
+public interface IBaseProductQtyService 
+{
+    /**
+     * 查询成品产量目标维护
+     * 
+     * @param id 成品产量目标维护主键
+     * @return 成品产量目标维护
+     */
+    public BaseProductQty selectBaseProductQtyById(Long id);
+
+    /**
+     * 查询成品产量目标维护列表
+     * 
+     * @param baseProductQty 成品产量目标维护
+     * @return 成品产量目标维护集合
+     */
+    public List<BaseProductQty> selectBaseProductQtyList(BaseProductQty baseProductQty);
+
+    /**
+     * 新增成品产量目标维护
+     * 
+     * @param baseProductQty 成品产量目标维护
+     * @return 结果
+     */
+    public int insertBaseProductQty(BaseProductQty baseProductQty);
+
+    /**
+     * 修改成品产量目标维护
+     * 
+     * @param baseProductQty 成品产量目标维护
+     * @return 结果
+     */
+    public int updateBaseProductQty(BaseProductQty baseProductQty);
+
+    /**
+     * 批量删除成品产量目标维护
+     * 
+     * @param ids 需要删除的成品产量目标维护主键集合
+     * @return 结果
+     */
+    public int deleteBaseProductQtyByIds(String ids);
+
+    /**
+     * 删除成品产量目标维护信息
+     * 
+     * @param id 成品产量目标维护主键
+     * @return 结果
+     */
+    public int deleteBaseProductQtyById(Long id);
+
+    Integer countDay(Date day);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseRhythmService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.system.service;
+
+import java.util.List;
+import com.ruoyi.system.domain.BaseRhythm;
+
+/**
+ * 入库节拍维护Service接口
+ * 
+ * @author ruoyi
+ * @date 2022-07-22
+ */
+public interface IBaseRhythmService 
+{
+    /**
+     * 查询入库节拍维护
+     * 
+     * @param id 入库节拍维护主键
+     * @return 入库节拍维护
+     */
+    public BaseRhythm selectBaseRhythmById(Long id);
+
+    /**
+     * 查询入库节拍维护列表
+     * 
+     * @param baseRhythm 入库节拍维护
+     * @return 入库节拍维护集合
+     */
+    public List<BaseRhythm> selectBaseRhythmList(BaseRhythm baseRhythm);
+
+    /**
+     * 新增入库节拍维护
+     * 
+     * @param baseRhythm 入库节拍维护
+     * @return 结果
+     */
+    public int insertBaseRhythm(BaseRhythm baseRhythm);
+
+    /**
+     * 修改入库节拍维护
+     * 
+     * @param baseRhythm 入库节拍维护
+     * @return 结果
+     */
+    public int updateBaseRhythm(BaseRhythm baseRhythm);
+
+    /**
+     * 批量删除入库节拍维护
+     * 
+     * @param ids 需要删除的入库节拍维护主键集合
+     * @return 结果
+     */
+    public int deleteBaseRhythmByIds(String ids);
+
+    /**
+     * 删除入库节拍维护信息
+     * 
+     * @param id 入库节拍维护主键
+     * @return 结果
+     */
+    public int deleteBaseRhythmById(Long id);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/IBroadDataService.java

@@ -58,4 +58,13 @@ public interface IBroadDataService {
     List<BoxOutput>  selectOneBadRate();
 
     List<BoxOutput>  selectOneBadRateByDay();
+
+    BoxOutput selectOutputByTimeDY();
+
+
+    List<BoxOutput>  zz_selectProductInTarget();
+
+    List<OrderInfo> zz_selectInStoreOrderInfo();
+
+    BoxOutput zz_selectOneBadRateMb();
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/IBroadDruidService.java

@@ -13,4 +13,10 @@ public interface IBroadDruidService {
     int  selectTeamGroups();
 
     List<BoxOutput> zz_selectLossInfo();
+
+    int selectNowXkOutPut();
+
+    BoxOutput zz_selectInStoreTag();
+
+
 }

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<BaseOneUnquqlifiedRate> 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);
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseProductQtyServiceImpl.java

@@ -0,0 +1,102 @@
+package com.ruoyi.system.service.impl;
+
+import java.util.Date;
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.system.mapper.BaseProductQtyMapper;
+import com.ruoyi.system.domain.BaseProductQty;
+import com.ruoyi.system.service.IBaseProductQtyService;
+import com.ruoyi.common.core.text.Convert;
+
+/**
+ * 成品产量目标维护Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2022-07-22
+ */
+@Service
+public class BaseProductQtyServiceImpl implements IBaseProductQtyService 
+{
+    @Autowired
+    private BaseProductQtyMapper baseProductQtyMapper;
+
+    /**
+     * 查询成品产量目标维护
+     * 
+     * @param id 成品产量目标维护主键
+     * @return 成品产量目标维护
+     */
+    @Override
+    public BaseProductQty selectBaseProductQtyById(Long id)
+    {
+        return baseProductQtyMapper.selectBaseProductQtyById(id);
+    }
+
+    /**
+     * 查询成品产量目标维护列表
+     * 
+     * @param baseProductQty 成品产量目标维护
+     * @return 成品产量目标维护
+     */
+    @Override
+    public List<BaseProductQty> selectBaseProductQtyList(BaseProductQty baseProductQty)
+    {
+        return baseProductQtyMapper.selectBaseProductQtyList(baseProductQty);
+    }
+
+    /**
+     * 新增成品产量目标维护
+     * 
+     * @param baseProductQty 成品产量目标维护
+     * @return 结果
+     */
+    @Override
+    public int insertBaseProductQty(BaseProductQty baseProductQty)
+    {
+        baseProductQty.setCreateTime(DateUtils.getNowDate());
+        return baseProductQtyMapper.insertBaseProductQty(baseProductQty);
+    }
+
+    /**
+     * 修改成品产量目标维护
+     * 
+     * @param baseProductQty 成品产量目标维护
+     * @return 结果
+     */
+    @Override
+    public int updateBaseProductQty(BaseProductQty baseProductQty)
+    {
+        return baseProductQtyMapper.updateBaseProductQty(baseProductQty);
+    }
+
+    /**
+     * 批量删除成品产量目标维护
+     * 
+     * @param ids 需要删除的成品产量目标维护主键
+     * @return 结果
+     */
+    @Override
+    public int deleteBaseProductQtyByIds(String ids)
+    {
+        return baseProductQtyMapper.deleteBaseProductQtyByIds(Convert.toStrArray(ids));
+    }
+
+    /**
+     * 删除成品产量目标维护信息
+     * 
+     * @param id 成品产量目标维护主键
+     * @return 结果
+     */
+    @Override
+    public int deleteBaseProductQtyById(Long id)
+    {
+        return baseProductQtyMapper.deleteBaseProductQtyById(id);
+    }
+
+    @Override
+    public Integer countDay(Date day) {
+        return baseProductQtyMapper.countDay(day);
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseRhythmServiceImpl.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.BaseRhythmMapper;
+import com.ruoyi.system.domain.BaseRhythm;
+import com.ruoyi.system.service.IBaseRhythmService;
+import com.ruoyi.common.core.text.Convert;
+
+/**
+ * 入库节拍维护Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2022-07-22
+ */
+@Service
+public class BaseRhythmServiceImpl implements IBaseRhythmService 
+{
+    @Autowired
+    private BaseRhythmMapper baseRhythmMapper;
+
+    /**
+     * 查询入库节拍维护
+     * 
+     * @param id 入库节拍维护主键
+     * @return 入库节拍维护
+     */
+    @Override
+    public BaseRhythm selectBaseRhythmById(Long id)
+    {
+        return baseRhythmMapper.selectBaseRhythmById(id);
+    }
+
+    /**
+     * 查询入库节拍维护列表
+     * 
+     * @param baseRhythm 入库节拍维护
+     * @return 入库节拍维护
+     */
+    @Override
+    public List<BaseRhythm> selectBaseRhythmList(BaseRhythm baseRhythm)
+    {
+        return baseRhythmMapper.selectBaseRhythmList(baseRhythm);
+    }
+
+    /**
+     * 新增入库节拍维护
+     * 
+     * @param baseRhythm 入库节拍维护
+     * @return 结果
+     */
+    @Override
+    public int insertBaseRhythm(BaseRhythm baseRhythm)
+    {
+        return baseRhythmMapper.insertBaseRhythm(baseRhythm);
+    }
+
+    /**
+     * 修改入库节拍维护
+     * 
+     * @param baseRhythm 入库节拍维护
+     * @return 结果
+     */
+    @Override
+    public int updateBaseRhythm(BaseRhythm baseRhythm)
+    {
+        return baseRhythmMapper.updateBaseRhythm(baseRhythm);
+    }
+
+    /**
+     * 批量删除入库节拍维护
+     * 
+     * @param ids 需要删除的入库节拍维护主键
+     * @return 结果
+     */
+    @Override
+    public int deleteBaseRhythmByIds(String ids)
+    {
+        return baseRhythmMapper.deleteBaseRhythmByIds(Convert.toStrArray(ids));
+    }
+
+    /**
+     * 删除入库节拍维护信息
+     * 
+     * @param id 入库节拍维护主键
+     * @return 结果
+     */
+    @Override
+    public int deleteBaseRhythmById(Long id)
+    {
+        return baseRhythmMapper.deleteBaseRhythmById(id);
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDataServiceImpl.java

@@ -38,6 +38,8 @@ public class BroadDataServiceImpl implements IBroadDataService
         return mapper.selectOutputByType();
     }
 
+
+
     @Override
     public List<OrderInfo> getUHullPlanInfo(String id) {
         return mapper.getUHullPlanInfo(id);
@@ -61,6 +63,11 @@ public class BroadDataServiceImpl implements IBroadDataService
         return mapper.fp_selectOrderExecution();
     }
 
+    @Override
+    public BoxOutput selectOutputByTimeDY() {
+        return mapper.selectOutputByTimeDY();
+    }
+
     @Override
     public List<DeviceStation> fp_selectDeviceStation() {
         return mapper.fp_selectDeviceStation();
@@ -137,4 +144,19 @@ public class BroadDataServiceImpl implements IBroadDataService
     public List<BoxOutput> selectOneBadRateByDay() {
         return mapper.selectOneBadRateByDay();
     }
+
+    @Override
+    public List<BoxOutput> zz_selectProductInTarget() {
+        return mapper.zz_selectProductInTarget();
+    }
+
+    @Override
+    public List<OrderInfo> zz_selectInStoreOrderInfo() {
+        return mapper.zz_selectInStoreOrderInfo();
+    }
+
+    @Override
+    public BoxOutput zz_selectOneBadRateMb() {
+        return mapper.zz_selectOneBadRateMb();
+    }
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDruidServiceImpl.java

@@ -18,13 +18,19 @@ import java.util.List;
 public class BroadDruidServiceImpl implements IBroadDruidService {
     @Autowired
     private BroadDataMapper mapper;
-
+//定时生成产量
     public void createWork(){
         BoxOutput boxOutput=mapper.selectNowXkOutPut();
         int nowOut=boxOutput.getQty();
-        int qty=mapper.selectXK_H_QTY();
+        int qty=mapper.selectXK_H_QTY(); //上一条
         int zsQty=mapper.selectNowXkOutPut1();
-        mapper.insertXK_H_QTY(boxOutput.getName(),nowOut,nowOut-qty,zsQty);
+        int cha=nowOut-qty;
+        mapper.insertXK_H_QTY(boxOutput.getName(),zsQty,cha<0?0:cha,nowOut);
+    }
+
+    @Override
+    public int selectNowXkOutPut() {
+        return mapper.selectNowXkOutPut1();
     }
 
     @Override
@@ -38,4 +44,9 @@ public class BroadDruidServiceImpl implements IBroadDruidService {
         mapper.insertTimp1();
         return mapper.zz_selectLossInfo();
     }
+
+    @Override
+    public BoxOutput zz_selectInStoreTag() {
+        return mapper.zz_selectInStoreTag();
+    }
 }

ruoyi-system/src/main/resources/createsql/base_productqtyMenu.sql

@@ -0,0 +1,27 @@
+-- 菜单 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(2040, '成品产量目标维护', '5', '1', '/system/base_productqty', 'C', '0', 'system:base_productqty: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, '成品产量目标维护查询', 2040, '1',  '#',  'F', '0', 'system:base_productqty: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, '成品产量目标维护新增', 2040, '2',  '#',  'F', '0', 'system:base_productqty: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, '成品产量目标维护修改', 2040, '3',  '#',  'F', '0', 'system:base_productqty: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, '成品产量目标维护删除', 2040, '4',  '#',  'F', '0', 'system:base_productqty: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, '成品产量目标维护导出', 2040, '5',  '#',  'F', '0', 'system:base_productqty:export',       '#', 'admin', sysdate, '', null, '');
+
+-- base_product_qty主键序列
+create sequence seq_base_product_qty
+increment by 1
+start with 10
+nomaxvalue
+nominvalue
+cache 20;

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, '');
+

ruoyi-system/src/main/resources/createsql/base_rhythmMenu.sql

@@ -0,0 +1,27 @@
+-- 菜单 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(2045, '入库节拍维护', '5', '1', '/system/base_rhythm', 'C', '0', 'system:base_rhythm: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, '入库节拍维护查询', 2045, '1',  '#',  'F', '0', 'system:base_rhythm: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, '入库节拍维护新增', 2045, '2',  '#',  'F', '0', 'system:base_rhythm: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, '入库节拍维护修改', 2045, '3',  '#',  'F', '0', 'system:base_rhythm: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, '入库节拍维护删除', 2045, '4',  '#',  'F', '0', 'system:base_rhythm: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, '入库节拍维护导出', 2045, '5',  '#',  'F', '0', 'system:base_rhythm:export',       '#', 'admin', sysdate, '', null, '');
+
+-- base_rhythm主键序列
+create sequence seq_base_rhythm
+increment by 1
+start with 10
+nomaxvalue
+nominvalue
+cache 20;

ruoyi-system/src/main/resources/mapper/system/BaseOneUnquqlifiedRateMapper.xml

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper.BaseOneUnquqlifiedRateMapper">
+    
+    <resultMap type="BaseOneUnquqlifiedRate" id="BaseOneUnquqlifiedRateResult">
+        <result property="id"    column="id"    />
+        <result property="rate"    column="rate"    />
+    </resultMap>
+
+    <sql id="selectBaseOneUnquqlifiedRateVo">
+        select id, rate from base_one_unquqlified_rate
+    </sql>
+
+    <select id="selectBaseOneUnquqlifiedRateList" parameterType="BaseOneUnquqlifiedRate" resultMap="BaseOneUnquqlifiedRateResult">
+        <include refid="selectBaseOneUnquqlifiedRateVo"/>
+        <where>  
+        </where>
+    </select>
+    
+    <select id="selectBaseOneUnquqlifiedRateById" parameterType="Long" resultMap="BaseOneUnquqlifiedRateResult">
+        <include refid="selectBaseOneUnquqlifiedRateVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertBaseOneUnquqlifiedRate" parameterType="BaseOneUnquqlifiedRate">
+        insert into base_one_unquqlified_rate
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="rate != null">rate,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="rate != null">#{rate},</if>
+         </trim>
+    </insert>
+
+    <update id="updateBaseOneUnquqlifiedRate" parameterType="BaseOneUnquqlifiedRate">
+        update base_one_unquqlified_rate
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="rate != null">rate = #{rate},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteBaseOneUnquqlifiedRateById" parameterType="Long">
+        delete from base_one_unquqlified_rate where id = #{id}
+    </delete>
+
+    <delete id="deleteBaseOneUnquqlifiedRateByIds" parameterType="String">
+        delete from base_one_unquqlified_rate where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

ruoyi-system/src/main/resources/mapper/system/BaseProductQtyMapper.xml

@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper.BaseProductQtyMapper">
+    
+    <resultMap type="BaseProductQty" id="BaseProductQtyResult">
+        <result property="id"    column="id"    />
+        <result property="day"    column="day"    />
+        <result property="qty"    column="qty"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="createBy"    column="create_by"    />
+    </resultMap>
+
+    <sql id="selectBaseProductQtyVo">
+        select id, day, qty, create_time, create_by from base_product_qty
+    </sql>
+    <select id="countDay" resultType="integer">
+        select count(1) from base_product_qty where day=#{day}
+    </select>
+    <select id="selectBaseProductQtyList" parameterType="BaseProductQty" resultMap="BaseProductQtyResult">
+        <include refid="selectBaseProductQtyVo"/>
+        <where>  
+            <if test="day!= null and day != '' and
+             params.beginDay != null and params.beginDay != '' and params.endDay != null and params.endDay != ''"> and day between #{params.beginDay} and #{params.endDay}</if>
+        </where>
+        order by day
+    </select>
+    
+    <select id="selectBaseProductQtyById" parameterType="Long" resultMap="BaseProductQtyResult">
+        <include refid="selectBaseProductQtyVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertBaseProductQty" parameterType="BaseProductQty">
+        <selectKey keyProperty="id" resultType="long" order="BEFORE">
+            SELECT seq_base_product_qty.NEXTVAL as id FROM DUAL
+        </selectKey>
+        insert into base_product_qty
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="day != null">day,</if>
+            <if test="qty != null">qty,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="createBy != null">create_by,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="day != null">#{day},</if>
+            <if test="qty != null">#{qty},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="createBy != null">#{createBy},</if>
+         </trim>
+    </insert>
+
+    <update id="updateBaseProductQty" parameterType="BaseProductQty">
+        update base_product_qty
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="day != null">day = #{day},</if>
+            <if test="qty != null">qty = #{qty},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteBaseProductQtyById" parameterType="Long">
+        delete from base_product_qty where id = #{id}
+    </delete>
+
+    <delete id="deleteBaseProductQtyByIds" parameterType="String">
+        delete from base_product_qty where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

ruoyi-system/src/main/resources/mapper/system/BaseRhythmMapper.xml

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper.BaseRhythmMapper">
+    
+    <resultMap type="BaseRhythm" id="BaseRhythmResult">
+        <result property="id"    column="id"    />
+        <result property="rhythm"    column="rhythm"    />
+    </resultMap>
+
+    <sql id="selectBaseRhythmVo">
+        select id, rhythm from base_rhythm
+    </sql>
+
+    <select id="selectBaseRhythmList" parameterType="BaseRhythm" resultMap="BaseRhythmResult">
+        <include refid="selectBaseRhythmVo"/>
+        <where>  
+            <if test="rhythm != null "> and rhythm = #{rhythm}</if>
+        </where>
+    </select>
+    
+    <select id="selectBaseRhythmById" parameterType="Long" resultMap="BaseRhythmResult">
+        <include refid="selectBaseRhythmVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertBaseRhythm" parameterType="BaseRhythm">
+        <selectKey keyProperty="id" resultType="long" order="BEFORE">
+            SELECT seq_base_rhythm.NEXTVAL as id FROM DUAL
+        </selectKey>
+        insert into base_rhythm
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="rhythm != null">rhythm,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="rhythm != null">#{rhythm},</if>
+         </trim>
+    </insert>
+
+    <update id="updateBaseRhythm" parameterType="BaseRhythm">
+        update base_rhythm
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="rhythm != null">rhythm = #{rhythm},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteBaseRhythmById" parameterType="Long">
+        delete from base_rhythm where id = #{id}
+    </delete>
+
+    <delete id="deleteBaseRhythmByIds" parameterType="String">
+        delete from base_rhythm where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml

@@ -12,11 +12,17 @@
     </resultMap>
 
     <select id="selectplanCompletion" resultType="com.ruoyi.system.domain.BoxPlanCompletion">
-        select (SELECT *
+        select
-                FROM (select PLAN_NUMBER
+--         (SELECT *
-                      from haiwei.BASE_BOX_PLAN
+--                 FROM (select PLAN_NUMBER
-                      where rownum = 1
+--                       from haiwei.BASE_BOX_PLAN
-                      ORDER BY CREATE_TIME DESC)) AS planned_number,
+--                       where rownum = 1
+--                       ORDER BY CREATE_TIME DESC)) AS planned_number,
+ (SELECT *
+FROM (select PLAN_NUMBER
+      from haiwei.BASE_BOX_PLAN
+      where rownum = 1
+      ORDER BY CREATE_TIME DESC))  AS planned_number,
                nvl(sum(actual_qty), 0)            AS quantity_number
 
         from IMOS_PR_PLAN
@@ -137,46 +143,51 @@
         order by START_TIME desc
     </select>
 
-    <select id="selectOutputByTime" resultType="com.ruoyi.system.domain.BoxOutput">
+    <select id="selectOutputByTimeDY" resultType="com.ruoyi.system.domain.BoxOutput">
---           select TO_CHAR(CREATION_DATE, 'hh24')||':30' as name  ,Count(TASK_ID) as qty
+        select TO_CHAR(CREATION_DATE, 'hh24') || ':30' as name,
---           from IMOS_LO_TASK_HISTORY
+               sum(ACTUAL_QTY)                         as qty
---           where detial_type_code = '1002'
+        from IMOS_PR_PLAN t
---             and TASK_TYPE != 'O'
+        where process_code = 1002
---             and TO_CHAR(CREATION_DATE, 'YYYY-MM-DD') = TO_CHAR(SYSDATE, 'YYYY-MM-DD')
+          and delete_flag = '0'
---             and TO_CHAR(CREATION_DATE, 'hh24') > 7
+          and CREATION_DATE > (select *
---           group by TO_CHAR(CREATION_DATE, 'hh24')
+                               from (select CREATE_TIME from HAIWEI.XK_H_QTY order by CREATE_TIME desc)
---           order by name
+                               where ROWNUM = 1)
-        select TO_CHAR(CREATION_DATE, 'hh24') || ':30' as name, Count(TASK_ID) as qty
-        from (
-                 select CREATION_DATE, TASK_ID
-                 from IMOS_LO_TASK_HISTORY
-                 where  detial_type_code = '1002'
-                   and TASK_TYPE != 'O'
-        and CREATION_DATE &gt;
-        case
-        when to_char(sysdate, 'hh24') &gt; 7 and to_char(sysdate, 'hh24') &lt; 20 then to_date(
-        to_char(SYSDATE, 'yyyy-MM-dd') || '07:30:00',
-        'yyyy-MM-dd hh24:mi:ss')
-        when to_char(sysdate, 'hh24') &lt; 7 then to_date(to_char(SYSDATE - 1, 'yyyy-MM-dd') || '19:30:00',
-        'yyyy-MM-dd hh24:mi:ss')
-        else to_date(to_char(SYSDATE - 1, 'yyyy-MM-dd') || '19:30:00', 'yyyy-MM-dd hh24:mi:ss')
-        end
-        and CREATION_DATE &lt;
-            case
-            when to_char(sysdate, 'hh24') &gt; 7 and to_char(sysdate, 'hh24') &lt; 20 then to_date(
-        to_char(SYSDATE, 'yyyy-MM-dd') || '19:30:00',
-        'yyyy-MM-dd hh24:mi:ss')
-        when to_char(sysdate, 'hh24') &lt; 7 then to_date(to_char(SYSDATE, 'yyyy-MM-dd') || '07:30:00',
-        'yyyy-MM-dd hh24:mi:ss')
-        else to_date(to_char(SYSDATE, 'yyyy-MM-dd') || '24:00:00', 'yyyy-MM-dd hh24:mi:ss')
-        end
---                    and CREATION_DATE between
---                      to_date(to_char(SYSDATE, 'yyyy-MM-dd') || '07:30:00', 'yyyy-MM-dd hh24:mi:ss')
---                      and
---                      to_date(to_char(SYSDATE, 'yyyy-MM-dd') || '19:30:00', 'yyyy-MM-dd hh24:mi:ss')
-             )
         group by TO_CHAR(CREATION_DATE, 'hh24')
-        order by name
+    </select>
+
+    <select id="selectOutputByTime" resultType="com.ruoyi.system.domain.BoxOutput">
+        select H_NAME as name ,QTY_C as qty,ZS_C as record_qty from HAIWEI.XK_H_QTY xhq
+        left join (select * from haiwei.BASE_DAY_WBTIME where ROWNUM = 1 order by CREATE_TIME desc) wb on 1 = 1
+        where xhq.CREATE_TIME between case when sysdate &lt;= wb.W_END then W_START else W_END end
+        and case when sysdate &lt;= wb.W_END then W_END else B_END end
+        order by xhq.CREATE_TIME
+--         select TO_CHAR(CREATION_DATE, 'hh24') || ':30' as name, Count(TASK_ID) as qty
+--         from (
+--                  select CREATION_DATE, TASK_ID
+--                  from IMOS_LO_TASK_HISTORY
+--                  where  detial_type_code = '1002'
+--                    and TASK_TYPE != 'O'
+--         and CREATION_DATE &gt;
+--         case
+--         when to_char(sysdate, 'hh24') &gt; 7 and to_char(sysdate, 'hh24') &lt; 20 then to_date(
+--         to_char(SYSDATE, 'yyyy-MM-dd') || '07:30:00',
+--         'yyyy-MM-dd hh24:mi:ss')
+--         when to_char(sysdate, 'hh24') &lt; 7 then to_date(to_char(SYSDATE - 1, 'yyyy-MM-dd') || '19:30:00',
+--         'yyyy-MM-dd hh24:mi:ss')
+--         else to_date(to_char(SYSDATE - 1, 'yyyy-MM-dd') || '19:30:00', 'yyyy-MM-dd hh24:mi:ss')
+--         end
+--         and CREATION_DATE &lt;
+--             case
+--             when to_char(sysdate, 'hh24') &gt; 7 and to_char(sysdate, 'hh24') &lt; 20 then to_date(
+--         to_char(SYSDATE, 'yyyy-MM-dd') || '19:30:00',
+--         'yyyy-MM-dd hh24:mi:ss')
+--         when to_char(sysdate, 'hh24') &lt; 7 then to_date(to_char(SYSDATE, 'yyyy-MM-dd') || '07:30:00',
+--         'yyyy-MM-dd hh24:mi:ss')
+--         else to_date(to_char(SYSDATE, 'yyyy-MM-dd') || '24:00:00', 'yyyy-MM-dd hh24:mi:ss')
+--         end
+--              )
+--         group by TO_CHAR(CREATION_DATE, 'hh24')
+--         order by name
     </select>
 
 
@@ -369,10 +380,10 @@
                            on ta.name = ipr.MATERIAL_NAME
         order by to_number(STATION_NO)
     </select>
-<insert id="deleteTimp1">
+    <insert id="deleteTimp1">
     delete from haiwei.temp1
     </insert>
-<insert id="insertTimp1">
+    <insert id="insertTimp1">
       insert into haiwei.temp1 (
         select row_number() over (order by PRODUCTION_DATE) as row_number,
         PRODUCTION_DATE                              as day,
@@ -386,27 +397,45 @@
 </insert>
 
     <select id="zz_selectLossInfo" resultType="com.ruoyi.system.domain.BoxOutput">
-        select ROUND(sum(ROUND(TO_NUMBER(t1.day - t2.day) * 24 * 60 * 60) - 20) / 60, 2) as qty, 1 as name
+    select case
+               when sysdate > to_date(to_char(SYSDATE, 'yyyy-MM-dd') || '09:30:00', 'yyyy-MM-dd hh24:mi:ss')
+                   then
+                   case
+                       when sysdate > to_date(to_char(SYSDATE, 'yyyy-MM-dd') || '14:30:00', 'yyyy-MM-dd hh24:mi:ss')
+                           then qty - 60
+                       else qty - 30 end
+               end as qty ,name
+    from (
+        select ROUND(sum(ROUND(TO_NUMBER(t1.day - t2.day) * 24 * 60 * 60) - t1.rhy) / 60, 2) as qty, 1 as name
         from temp1 t1
         left join TEMP1 t2 on t1.row_numbre = t2.row_numbre + 1
-        where ROUND(TO_NUMBER(t1.day - t2.day) * 24 * 60 * 60) - 20 &gt; 0
+        where ROUND(TO_NUMBER(t1.day - t2.day) * 24 * 60 * 60) - t1.rhy &gt; 0)
         union
         select count(1) as qty, 2 as name
         from temp1 t1
         left join TEMP1 t2 on t1.row_numbre = t2.row_numbre + 2
-        where ROUND(TO_NUMBER(t1.day - t2.day) * 24 * 60 * 60) - 20 &gt; 0
+        where ROUND(TO_NUMBER(t1.day - t2.day) * 24 * 60 * 60) - t1.rhy &gt; 0
-        and ROUND(TO_NUMBER(t1.day - t2.day) * 24 * 60 * 60) - 20 &lt;= 180
+        and ROUND(TO_NUMBER(t1.day - t2.day) * 24 * 60 * 60) - t1.rhy &lt;= 180
         union
         select count(1) as qty, 3 as name
         from temp1 t1
         left join TEMP1 t2 on t1.row_numbre = t2.row_numbre + 2
-        where ROUND(TO_NUMBER(t1.day - t2.day) * 24 * 60 * 60) - 20 &gt; 180
+        where ROUND(TO_NUMBER(t1.day - t2.day) * 24 * 60 * 60) - t1.rhy &gt; 180
-        and ROUND(TO_NUMBER(t1.day - t2.day) * 24 * 60 * 60) - 20 &lt;= 600
+        and ROUND(TO_NUMBER(t1.day - t2.day) * 24 * 60 * 60) - t1.rhy &lt;= 600
         union
-        select count(1) as qty, 4 as name
+        select case
+           when sysdate > to_date(to_char(SYSDATE, 'yyyy-MM-dd') || '09:30:00', 'yyyy-MM-dd hh24:mi:ss')
+               then
+               case
+                   when sysdate > to_date(to_char(SYSDATE, 'yyyy-MM-dd') || '14:30:00', 'yyyy-MM-dd hh24:mi:ss')
+                       then qty - 2
+                   else qty - 1 end
+           end as qty,name
+from (
+        select nvl(count(1)-2,0) as qty, 4 as name
         from temp1 t1
         left join TEMP1 t2 on t1.row_numbre = t2.row_numbre + 2
-        where ROUND(TO_NUMBER(t1.day - t2.day) * 24 * 60 * 60) - 20 &gt; 600
+        where ROUND(TO_NUMBER(t1.day - t2.day) * 24 * 60 * 60) - t1.rhy &gt; 600)
     </select>
 
     <select id="mtk_selectInStore3d" resultType="com.ruoyi.system.domain.BoxOutput">
@@ -432,14 +461,15 @@
 
 
     <select id="selectNowXkOutPut" resultType="com.ruoyi.system.domain.BoxOutput">
-        select (TO_CHAR(SYSDATE, 'hh24') || ':30') as name,
+        select (TO_CHAR(SYSDATE, 'hh24')-1 || ':30') as name,
-               nvl(sum(actual_qty), 0) as qty
+        nvl(sum(actual_qty), 0)             as qty
-        from IMOS.IMOS_PR_PLAN
+        from IMOS.IMOS_PR_PLAN xhq
-        where plan_date is not null
+        left join (select * from haiwei.BASE_DAY_WBTIME where ROWNUM = 1 order by CREATE_TIME desc) wb on 1 = 1
-          and process_code = 1002
+        where xhq.CREATION_DATE between case when sysdate &lt;= wb.W_END then W_START else W_END end
-          and delete_flag = '0'
+        and case when sysdate &lt;= wb.W_END then W_END else B_END end
-          and (to_char(plan_date, 'yyyy-MM-dd') = to_char(sysdate, 'yyyy-MM-dd') or
+        and plan_date is not null
-               to_char(plan_date, 'yyyy-MM-dd') = to_char(sysdate-1, 'yyyy-MM-dd'))
+        and process_code = 1002
+        and delete_flag = '0'
     </select>
 
     <select id="selectNowXkOutPut1" resultType="int">
@@ -478,7 +508,7 @@
     </select>
 
     <select id="selectXK_H_QTY" resultType="int">
-              select * from (  select nvl(QTY, 0) from XK_H_QTY order by CREATE_TIME desc) where   ROWNUM=1
+       select * from (  select nvl(ZS_C, 0) from haiwei.XK_H_QTY order by CREATE_TIME desc) where   ROWNUM=1
     </select>
 
     <insert id="insertXK_H_QTY">
@@ -550,4 +580,50 @@
         order by name
     </select>
 
+
+    <select id="zz_selectInStoreTag" resultType="com.ruoyi.system.domain.BoxOutput">
+           select * from (select RHYTHM as  qty, '节拍' as name from haiwei.BASE_RHYTHM where ROWNUM = 1 order by ID desc)
+    </select>
+    <select id="zz_selectProductInTarget" resultType="com.ruoyi.system.domain.BoxOutput">
+        select sum(QTY) as qty, '目标' as name
+        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
+        from haiwei.BASE_PRODUCT_QTY
+        where to_char(DAY, 'yyyy-MM-dd') = to_char(sysdate, 'yyyy-MM-dd')
+        union
+        select  count(1) as qty,'实际' as name
+        from IMOS.IMOS_PR_PRODUCT_BARCODE
+        where to_char(PRODUCTION_DATE, 'yyyy-MM-dd') = to_char(sysdate, 'yyyy-MM-dd')
+    </select>
+
+    <select id="zz_selectInStoreOrderInfo" resultType="com.ruoyi.system.domain.OrderInfo">
+        select ippi.ORDER_NO as plan_code,
+               ippi.IN_QTY as actual_number,
+               substr(ippi.MATERIAL_NAME,
+                      case
+                          when instr(ippi.MATERIAL_NAME, '/', 1, 1) = 0 then 0
+                          else instr(ippi.MATERIAL_NAME, '/', 1, 1) + 1
+                          end,
+                      case
+                          when instr(ippi.MATERIAL_NAME, ',', 1, 1) = 0 then Length(ippi.MATERIAL_NAME)
+                          else instr(ippi.MATERIAL_NAME, ',', 1, 1)
+                          end
+                          -
+                      case
+                          when instr(ippi.MATERIAL_NAME, '/', 1, 1) = 0 then 1
+                          else instr(ippi.MATERIAL_NAME, '/', 1, 1) + 1
+                          end) as name,
+               ORDER_QTY as plan_number ,
+               round( ippi.IN_QTY/ORDER_QTY *100,2) as  reat,
+               ippi.CREATION_DATE as day
+        from IMOS_PR_PRODUCT_IN ippi
+                 left join IMOS.IMOS_PR_ORDER po on ippi.ORDER_NO = po.ORDER_NO
+        where to_char(ippi.CREATION_DATE, 'yyyy-MM-dd') = to_char(sysdate, 'yyyy-MM-dd')
+    </select>
+
+    <select id="zz_selectOneBadRateMb" resultType="com.ruoyi.system.domain.BoxOutput">
+        select * from (select rate,'不合格率目标' from haiwei.BASE_ONE_UNQUQLIFIED_RATE order by CREATE_TIME desc) where ROWNUM=1
+    </select>
 </mapper>

ruoyi-system/src/main/resources/templates/system/base_planqty/base_planqty.html

@@ -20,18 +20,18 @@
             </div>
 
             <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:base_planqty:add">
+<!--                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:base_planqty:add">-->
-                    <i class="fa fa-plus"></i> 添加
+<!--                    <i class="fa fa-plus"></i> 添加-->
-                </a>
+<!--                </a>-->
                 <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:base_planqty:edit">
                     <i class="fa fa-edit"></i> 修改
                 </a>
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:base_planqty:remove">
+<!--                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:base_planqty:remove">-->
-                    <i class="fa fa-remove"></i> 删除
+<!--                    <i class="fa fa-remove"></i> 删除-->
-                </a>
+<!--                </a>-->
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:base_planqty:export">
+<!--                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:base_planqty:export">-->
-                    <i class="fa fa-download"></i> 导出
+<!--                    <i class="fa fa-download"></i> 导出-->
-                </a>
+<!--                </a>-->
             </div>
             <div class="col-sm-12 select-table table-striped">
                 <table id="bootstrap-table"></table>

ruoyi-system/src/main/resources/templates/system/base_productqty/add.html

@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增成品产量目标维护')" />
+    <th:block th:include="include :: datetimepicker-css" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-base_productqty-add">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">天：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <input name="day" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">目标数量：</label>
+                <div class="col-sm-8">
+                    <input name="qty" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: datetimepicker-js" />
+    <script th:inline="javascript">
+        var prefix = ctx + "system/base_productqty"
+        $("#form-base_productqty-add").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/add", $('#form-base_productqty-add').serialize());
+            }
+        }
+
+        $("input[name='day']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+    </script>
+</body>
+</html>

ruoyi-system/src/main/resources/templates/system/base_productqty/base_productqty.html

@@ -0,0 +1,100 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('成品产量目标维护列表')" />
+</head>
+<body class="gray-bg">
+     <div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="formId">
+                    <div class="select-list">
+                        <ul>
+                            <li class="select-time">
+                                <label>天：</label>
+                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginDay]"/>
+                                <span>-</span>
+                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endDay]"/>
+                            </li>
+                            <li>
+                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                            </li>
+                        </ul>
+                    </div>
+                </form>
+            </div>
+
+            <div class="btn-group-sm" id="toolbar" role="group">
+                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:base_productqty:add">
+                    <i class="fa fa-plus"></i> 添加
+                </a>
+                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:base_productqty:edit">
+                    <i class="fa fa-edit"></i> 修改
+                </a>
+                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:base_productqty:remove">
+                    <i class="fa fa-remove"></i> 删除
+                </a>
+<!--                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:base_productqty:export">-->
+<!--                    <i class="fa fa-download"></i> 导出-->
+<!--                </a>-->
+            </div>
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('system:base_productqty:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('system:base_productqty:remove')}]];
+        var prefix = ctx + "system/base_productqty";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                exportUrl: prefix + "/export",
+                modalName: "成品产量目标维护",
+                columns: [{
+                    checkbox: true
+                },
+                {
+                    field: 'id',
+                    title: '主键',
+                    visible: false
+                },
+                {
+                    field: 'day',
+                    title: '天'
+                },
+                {
+                    field: 'qty',
+                    title: '目标数量'
+                },
+                {
+                    field: 'createTime',
+                    title: '创建时间'
+                },
+                {
+                    field: 'createBy',
+                    title: '创建人'
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        return actions.join('');
+                    }
+                }]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>

ruoyi-system/src/main/resources/templates/system/base_productqty/edit.html

@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改成品产量目标维护')" />
+    <th:block th:include="include :: datetimepicker-css" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-base_productqty-edit" th:object="${baseProductQty}">
+            <input name="id" th:field="*{id}" type="hidden">
+<!--            <div class="form-group">    -->
+<!--                <label class="col-sm-3 control-label">天：</label>-->
+<!--                <div class="col-sm-8">-->
+<!--                    <div class="input-group date">-->
+<!--                        <input name="day" th:value="${#dates.format(baseProductQty.day, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">-->
+<!--                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>-->
+<!--                    </div>-->
+<!--                </div>-->
+<!--            </div>-->
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">目标数量：</label>
+                <div class="col-sm-8">
+                    <input name="qty" th:field="*{qty}" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: datetimepicker-js" />
+    <script th:inline="javascript">
+        var prefix = ctx + "system/base_productqty";
+        $("#form-base_productqty-edit").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/edit", $('#form-base_productqty-edit').serialize());
+            }
+        }
+
+        $("input[name='day']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+    </script>
+</body>
+</html>

ruoyi-system/src/main/resources/templates/system/base_rate/add.html

@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增一次不合格率维护')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-base_rate-add">
+<!--            <div class="form-group">    -->
+<!--                <label class="col-sm-3 control-label">主键：</label>-->
+<!--                <div class="col-sm-8">-->
+<!--                    <input name="id" class="form-control" type="text">-->
+<!--                </div>-->
+<!--            </div>-->
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">不合格率：</label>
+                <div class="col-sm-8">
+                    <input name="rate" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var prefix = ctx + "system/base_rate"
+        $("#form-base_rate-add").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/add", $('#form-base_rate-add').serialize());
+            }
+        }
+    </script>
+</body>
+</html>

ruoyi-system/src/main/resources/templates/system/base_rate/base_rate.html

@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('一次不合格率维护列表')" />
+</head>
+<body class="gray-bg">
+     <div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="formId">
+                    <div class="select-list">
+                        <ul>
+                            <li>
+                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                            </li>
+                        </ul>
+                    </div>
+                </form>
+            </div>
+
+            <div class="btn-group-sm" id="toolbar" role="group">
+<!--                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:base_rate:add">-->
+<!--                    <i class="fa fa-plus"></i> 添加-->
+<!--                </a>-->
+                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:base_rate:edit">
+                    <i class="fa fa-edit"></i> 修改
+                </a>
+<!--                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:base_rate:remove">-->
+<!--                    <i class="fa fa-remove"></i> 删除-->
+<!--                </a>-->
+<!--                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:base_rate:export">-->
+<!--                    <i class="fa fa-download"></i> 导出-->
+<!--                </a>-->
+            </div>
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('system:base_rate:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('system:base_rate:remove')}]];
+        var prefix = ctx + "system/base_rate";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                exportUrl: prefix + "/export",
+                modalName: "一次不合格率维护",
+                columns: [{
+                    checkbox: true
+                },
+                {
+                    field: 'rate',
+                    title: '不合格率'
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        // actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        return actions.join('');
+                    }
+                }]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>

ruoyi-system/src/main/resources/templates/system/base_rate/edit.html

@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改一次不合格率维护')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-base_rate-edit" th:object="${baseOneUnquqlifiedRate}">
+            <input name="id" th:field="*{id}" type="hidden">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">不合格率：</label>
+                <div class="col-sm-8">
+                    <input name="rate" th:field="*{rate}" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var prefix = ctx + "system/base_rate";
+        $("#form-base_rate-edit").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/edit", $('#form-base_rate-edit').serialize());
+            }
+        }
+    </script>
+</body>
+</html>

ruoyi-system/src/main/resources/templates/system/base_rhythm/add.html

@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增入库节拍维护')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-base_rhythm-add">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">节拍：</label>
+                <div class="col-sm-8">
+                    <input name="rhythm" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var prefix = ctx + "system/base_rhythm"
+        $("#form-base_rhythm-add").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/add", $('#form-base_rhythm-add').serialize());
+            }
+        }
+    </script>
+</body>
+</html>

ruoyi-system/src/main/resources/templates/system/base_rhythm/base_rhythm.html

@@ -0,0 +1,86 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('入库节拍维护列表')" />
+</head>
+<body class="gray-bg">
+     <div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="formId">
+                    <div class="select-list">
+                        <ul>
+                            <li>
+                                <label>节拍：</label>
+                                <input type="text" name="rhythm"/>
+                            </li>
+                            <li>
+                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                            </li>
+                        </ul>
+                    </div>
+                </form>
+            </div>
+
+            <div class="btn-group-sm" id="toolbar" role="group">
+                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:base_rhythm:add">
+                    <i class="fa fa-plus"></i> 添加
+                </a>
+                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:base_rhythm:edit">
+                    <i class="fa fa-edit"></i> 修改
+                </a>
+                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:base_rhythm:remove">
+                    <i class="fa fa-remove"></i> 删除
+                </a>
+                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:base_rhythm:export">
+                    <i class="fa fa-download"></i> 导出
+                </a>
+            </div>
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('system:base_rhythm:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('system:base_rhythm:remove')}]];
+        var prefix = ctx + "system/base_rhythm";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                exportUrl: prefix + "/export",
+                modalName: "入库节拍维护",
+                columns: [{
+                    checkbox: true
+                },
+                {
+                    field: 'id',
+                    title: '主键',
+                    visible: false
+                },
+                {
+                    field: 'rhythm',
+                    title: '节拍'
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        return actions.join('');
+                    }
+                }]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>

ruoyi-system/src/main/resources/templates/system/base_rhythm/edit.html

@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改入库节拍维护')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-base_rhythm-edit" th:object="${baseRhythm}">
+            <input name="id" th:field="*{id}" type="hidden">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">节拍：</label>
+                <div class="col-sm-8">
+                    <input name="rhythm" th:field="*{rhythm}" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var prefix = ctx + "system/base_rhythm";
+        $("#form-base_rhythm-edit").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/edit", $('#form-base_rhythm-edit').serialize());
+            }
+        }
+    </script>
+</body>
+</html>