diff --git a/pom.xml b/pom.xml index 98728021..ed21472e 100644 --- a/pom.xml +++ b/pom.xml @@ -79,7 +79,7 @@ shiro-ehcache ${shiro.version} - + com.github.theborakompanioni diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/SelectParaAllController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/SelectParaAllController.java index 3217152c..a3608629 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/SelectParaAllController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/SelectParaAllController.java @@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import javax.servlet.http.HttpServletRequest; +import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -37,7 +38,7 @@ public class SelectParaAllController extends BaseController { { return prefix + "/ParaAllShow"; } - @RequiresPermissions("nanjing:ProRpList:list") + @RequiresPermissions("nanjing:ParaAllShow:list") @PostMapping("/paraAllShow") @ResponseBody public TableDataInfo list(HttpServletRequest request) @@ -47,22 +48,24 @@ public class SelectParaAllController extends BaseController { map.put("beginTime",null); map.put("endTime",null); map.put("semiBarcode",semiBarcode); - List list = tracestateService.selectAllPara(map); + List list = tracestateService.selectAllPara(map); return getDataTable(list); } - @RequiresPermissions("nanjing:ProRpList:export") - @Log(title = "机种切换管理", businessType = BusinessType.EXPORT) + @RequiresPermissions("nanjing:ParaAllShow:export") + @Log(title = "产品码查询", businessType = BusinessType.EXPORT) @PostMapping("/export") @ResponseBody - public AjaxResult export(ParaAllShow paraAllShow) + public AjaxResult export(HttpServletRequest request) { + String semiBarcode = request.getParameter("semiBarcode"); Map map = new HashMap(); map.put("beginTime",null); map.put("endTime",null); - map.put("semiBarcode",paraAllShow.getSemiBarcode()); - List list = tracestateService.selectAllPara(map); - ExcelUtil util = new ExcelUtil(ProRpList.class); + map.put("semiBarcode",semiBarcode); + List list = tracestateService.selectAllPara(map); + ExcelUtil util = new ExcelUtil(ParaAllShow.class); return util.exportExcel(list, "ParaAllShow"); +// return null; } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/SelectProRpListController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/SelectProRpListController.java index 67356e44..9e18268e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/SelectProRpListController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/SelectProRpListController.java @@ -56,7 +56,7 @@ public class SelectProRpListController extends BaseController } /** - * 查询机种切换管理列表 + * 查询时段统计 */ @RequiresPermissions("nanjing:ProRpList:list") @PostMapping("/list") @@ -96,10 +96,10 @@ public class SelectProRpListController extends BaseController return getDataTable(list); } /** - * 导出机种切换管理列表 + * 导出时段统计 */ @RequiresPermissions("nanjing:ProRpList:export") - @Log(title = "机种切换管理", businessType = BusinessType.EXPORT) + @Log(title = "时段统计", businessType = BusinessType.EXPORT) @PostMapping("/export") @ResponseBody public AjaxResult export(ProRpList proRpList) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/StatisticQ1ProductController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/StatisticQ1ProductController.java new file mode 100644 index 00000000..8a219729 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/StatisticQ1ProductController.java @@ -0,0 +1,74 @@ +package com.ruoyi.web.controller.nanjing; + +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.nanjing.domain.QsProduct; +import com.ruoyi.nanjing.service.ITBdProducttypeService; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Controller +@RequestMapping("/nanjing/StatisticQ1Product") +public class StatisticQ1ProductController extends BaseController { + private String prefix = "nanjing/Statistic"; + @Autowired + private ITBdProducttypeService producttypeService; + @RequiresPermissions("nanjing:Q1Product:view") + @GetMapping() + public String Q1Product() + { + return prefix + "/Q1Product"; + } + + + /** + * 一次合格率统计 + */ + @RequiresPermissions("nanjing:Q1Product:list") + @PostMapping("/Q1list") + @ResponseBody + public TableDataInfo Q1list(QsProduct qsProduct) + { +// startPage(); + Map map = new HashMap(); + map.put("beginTime",qsProduct.getBeginTime()); + map.put("endTime",qsProduct.getEndTime()); + map.put("productType",qsProduct.getProductType()); + map.put("productId",""); + List list = producttypeService.selectQsProductList(map); + return getDataTable(list); + } + + /** + * 一次合格率统计 + */ + @RequiresPermissions("nanjing:Q1Product:export") + @Log(title = "时段统计", businessType = BusinessType.EXPORT) + @PostMapping("/Q1export") + @ResponseBody + public AjaxResult Q1export(QsProduct qsProduct) + { + Map map = new HashMap(); + map.put("beginTime",qsProduct.getBeginTime()); + map.put("endTime",qsProduct.getEndTime()); + map.put("productType",qsProduct.getProductType()); + map.put("productId",""); + List list = producttypeService.selectQ1ProductList(map); + ExcelUtil util = new ExcelUtil(QsProduct.class); + return util.exportExcel(list, "QsProduct"); + } + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/StatisticQsProductController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/StatisticQsProductController.java new file mode 100644 index 00000000..7edaa800 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/StatisticQsProductController.java @@ -0,0 +1,82 @@ +package com.ruoyi.web.controller.nanjing; + +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.nanjing.domain.ProRpList; +import com.ruoyi.nanjing.domain.QsProduct; +import com.ruoyi.nanjing.domain.QtProduct; +import com.ruoyi.nanjing.domain.TBdProductinfo; +import com.ruoyi.nanjing.service.ITBdProducttypeService; +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.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Controller +@RequestMapping("/nanjing/StatisticQsProduct") +public class StatisticQsProductController extends BaseController { + private String prefix = "nanjing/Statistic"; + @Autowired + private ITBdProducttypeService producttypeService; + + @RequiresPermissions("nanjing:QsProduct:view") + @GetMapping() + public String QsProduct() + { + return prefix + "/QsProduct"; + } + + + /** + * 整机合格率统计 + */ + @RequiresPermissions("nanjing:QsProduct:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(QsProduct qsProduct) + { +// startPage(); + Map map = new HashMap(); + map.put("beginTime",qsProduct.getBeginTime()); + map.put("endTime",qsProduct.getEndTime()); + map.put("productType",qsProduct.getProductType()); + map.put("productId",""); + List list = producttypeService.selectQ1ProductList(map); + return getDataTable(list); + } + + /** + * 整机合格率统计 + */ + @RequiresPermissions("nanjing:QsProduct:export") + @Log(title = "时段统计", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(QsProduct qsProduct) + { + Map map = new HashMap(); + map.put("beginTime",qsProduct.getBeginTime()); + map.put("endTime",qsProduct.getEndTime()); + map.put("productType",qsProduct.getProductType()); + map.put("productId",""); + List list = producttypeService.selectQsProductList(map); + ExcelUtil util = new ExcelUtil(QsProduct.class); + return util.exportExcel(list, "QsProduct"); + } + + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/StatisticQtProductController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/StatisticQtProductController.java new file mode 100644 index 00000000..c4d07502 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/StatisticQtProductController.java @@ -0,0 +1,83 @@ +package com.ruoyi.web.controller.nanjing; + +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.nanjing.domain.ProRpList; +import com.ruoyi.nanjing.domain.QtProduct; +import com.ruoyi.nanjing.domain.TBdProductinfo; +import com.ruoyi.nanjing.service.ITBdProducttypeService; +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.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Controller +@RequestMapping("/nanjing/StatisticQtProduct") +public class StatisticQtProductController extends BaseController { + private String prefix = "nanjing/Statistic"; + @Autowired + private ITBdProducttypeService producttypeService; + + @RequiresPermissions("nanjing:QtProduct:view") + @GetMapping() + public String QtProduct() + { + return prefix + "/QtProduct"; + } + + /** + * 查询时段统计 + */ + @RequiresPermissions("nanjing:QtProduct:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(QtProduct qtProduct) + { +// startPage(); + Map map = new HashMap(); + map.put("beginTime",qtProduct.getBeginTime()); + map.put("endTime",qtProduct.getEndTime()); + map.put("productType",qtProduct.getProductType()); + map.put("productId",""); + map.put("shiftId",""); + map.put("groupId",""); + List list = producttypeService.selectQtProductList(map); + return getDataTable(list); + } + + /** + * 导出时段统计 + */ + @RequiresPermissions("nanjing:QtProduct:export") + @Log(title = "时段统计", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(QtProduct qtProduct) + { + Map map = new HashMap(); + map.put("beginTime",qtProduct.getBeginTime()); + map.put("endTime",qtProduct.getEndTime()); + map.put("productType",qtProduct.getProductType()); + map.put("productId",""); + map.put("shiftId",""); + map.put("groupId",""); + List list = producttypeService.selectQtProductList(map); + ExcelUtil util = new ExcelUtil(QtProduct.class); + return util.exportExcel(list, "QtProduct"); + } + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/StatisticStProductController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/StatisticStProductController.java new file mode 100644 index 00000000..4635ef15 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/StatisticStProductController.java @@ -0,0 +1,42 @@ +package com.ruoyi.web.controller.nanjing; + +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.nanjing.domain.QsProduct; +import com.ruoyi.nanjing.service.ITBdProducttypeService; +import com.ruoyi.system.domain.SysDept; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; + +@Controller +@RequestMapping("/nanjing/StatisticStation") +public class StatisticStProductController extends BaseController { + + private String prefix = "nanjing/Statistic"; + @Autowired + private ITBdProducttypeService producttypeService; + + @RequiresPermissions("nanjing:stationStatistic:view") + @GetMapping() + public String stationProduct() + { + return prefix + "/QsStation"; + } + + @RequiresPermissions("nanjing:stationStatistic:list") + @PostMapping("/list") + @ResponseBody + public List list(QsProduct qsProduct) + { +// List qsProducts = producttypeService.selectDeptList(qsProduct); +// return qsProducts; + return null; + } + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/TBdSubstationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/TBdSubstationController.java index d2266093..ce2f7819 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/TBdSubstationController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/TBdSubstationController.java @@ -5,6 +5,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import com.ruoyi.common.core.domain.Ztree; import com.ruoyi.common.core.text.Convert; import com.ruoyi.framework.util.ShiroUtils; import com.ruoyi.nanjing.domain.TBdLinetype; @@ -75,6 +76,16 @@ public class TBdSubstationController extends BaseController return getDataTable(list); } + /** + * 加载工位列表树 + */ + @GetMapping("/treeData") + @ResponseBody + public List treeData() + { + List ztrees = tBdSubstationService.selectTbdStationTree(new TBdSubstation()); + return ztrees; + } /** * 导出工位管理列表 */ diff --git a/ruoyi-admin/src/main/resources/templates/nanjing/ParaAllShow/ParaAllShow.html b/ruoyi-admin/src/main/resources/templates/nanjing/ParaAllShow/ParaAllShow.html index fff85bf9..cf473821 100644 --- a/ruoyi-admin/src/main/resources/templates/nanjing/ParaAllShow/ParaAllShow.html +++ b/ruoyi-admin/src/main/resources/templates/nanjing/ParaAllShow/ParaAllShow.html @@ -1,31 +1,31 @@ - +
-
+
-
-
-
+ + +
@@ -34,7 +34,7 @@ + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/nanjing/Statistic/QsProduct.html b/ruoyi-admin/src/main/resources/templates/nanjing/Statistic/QsProduct.html new file mode 100644 index 00000000..83a3b20b --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/nanjing/Statistic/QsProduct.html @@ -0,0 +1,79 @@ + + + + + + +
+
+
+
+
+
    +
  • + + + - + +
    • +
  • + + +
    • +
  • +  搜索 + + 导出 +
    • +
+
+
+
+
+
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/nanjing/Statistic/QsStation.html b/ruoyi-admin/src/main/resources/templates/nanjing/Statistic/QsStation.html new file mode 100644 index 00000000..b4a09dae --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/nanjing/Statistic/QsStation.html @@ -0,0 +1,149 @@ + + + + + + + + + +
+
+
+
+ 组织机构 +
+
+ + + + +
+
+
+
+
+
+
+ +
+
+
+
+
+
+
    +
  • + + + - + +
    • +
  • + + +
    • + + +
  • +  搜索 + + +
    • +
+
+
+
+
+
+
+
+
+
+ + + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/nanjing/Statistic/QtProduct.html b/ruoyi-admin/src/main/resources/templates/nanjing/Statistic/QtProduct.html new file mode 100644 index 00000000..33d99ea6 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/nanjing/Statistic/QtProduct.html @@ -0,0 +1,83 @@ + + + + + + +
+
+
+
+
+
    +
  • + + + - + +
    • +
  • + + +
    • +
  • +  搜索 + + 导出 +
    • +
+
+
+
+
+
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/ParaAllShow.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/ParaAllShow.java index a9696eec..9b9f9e18 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/ParaAllShow.java +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/ParaAllShow.java @@ -7,224 +7,243 @@ import java.util.Date; public class ParaAllShow extends BaseEntity { private static final long serialVersionUID = 1L; -// private ProParaInfo proParaInfo; -// private ProRpList proRpList; - @Excel(name = "系统条码") - private String barcode; - @Excel(name = "机种名称") - private String productName; - @Excel(name = "产品条码") - private String semiBarcode; - @Excel(name = "状态") - private String state; - @Excel(name = "当前工位") - private String currentStation; - @Excel(name = "NG工位") - private String NGStation; - @Excel(name = "完成标志") - private String finishFlag; - @Excel(name = "标签Y/N") - private String namePlateInfo; - @Excel(name = "返修Y/N") - private String isDis; - @Excel(name = "开始时间" ,width = 30,dateFormat = "yyyy-MM-dd") - private Date beginTime; - @Excel(name = "结束时间",width = 30,dateFormat = "yyyy-MM-dd") - private Date endTime; - @Excel(name = "部件码") - private String proBarcode; + private ProParaInfo proParaInfo; -// private String semiBarcode; - @Excel(name = "部件码") - private String stationCode; - @Excel(name = "记录时间") - private Date insertTime; - @Excel(name = "参数名称") - private String paraName; - @Excel(name = "实测值") - private String realVal; - @Excel(name = "最小值") - private String minVal; - @Excel(name = "最大值") - private String maxVal; - @Excel(name = "参数状态") - private String paraState; - - @Override - public String toString() { - return "ParaAllShow{" + - "barcode='" + barcode + '\'' + - ", productName='" + productName + '\'' + - ", semiBarcode='" + semiBarcode + '\'' + - ", state='" + state + '\'' + - ", currentStation='" + currentStation + '\'' + - ", NGStation='" + NGStation + '\'' + - ", finishFlag='" + finishFlag + '\'' + - ", namePlateInfo='" + namePlateInfo + '\'' + - ", isDis='" + isDis + '\'' + - ", beginTime=" + beginTime + - ", endTime=" + endTime + - ", proBarcode='" + proBarcode + '\'' + - ", stationCode='" + stationCode + '\'' + - ", insertTime=" + insertTime + - ", paraName='" + paraName + '\'' + - ", realVal='" + realVal + '\'' + - ", minVal='" + minVal + '\'' + - ", maxVal='" + maxVal + '\'' + - ", paraState='" + paraState + '\'' + - '}'; - } - - public String getBarcode() { - return barcode; - } - - public void setBarcode(String barcode) { - this.barcode = barcode; - } - - public String getProductName() { - return productName; - } - - public void setProductName(String productName) { - this.productName = productName; - } - - public String getSemiBarcode() { - return semiBarcode; - } - - public void setSemiBarcode(String semiBarcode) { - this.semiBarcode = semiBarcode; - } - - public String getState() { - return state; - } - - public void setState(String state) { - this.state = state; - } - - public String getCurrentStation() { - return currentStation; - } - - public void setCurrentStation(String currentStation) { - this.currentStation = currentStation; - } - - public String getNGStation() { - return NGStation; - } - - public void setNGStation(String NGStation) { - this.NGStation = NGStation; - } - - public String getFinishFlag() { - return finishFlag; - } - - public void setFinishFlag(String finishFlag) { - this.finishFlag = finishFlag; - } - - public String getNamePlateInfo() { - return namePlateInfo; - } - - public void setNamePlateInfo(String namePlateInfo) { - this.namePlateInfo = namePlateInfo; - } + private ProRpList proRpList; - public String getIsDis() { - return isDis; + public ProParaInfo getProParaInfo() { + return proParaInfo; } - public void setIsDis(String isDis) { - this.isDis = isDis; + public void setProParaInfo(ProParaInfo proParaInfo) { + this.proParaInfo = proParaInfo; } - public Date getBeginTime() { - return beginTime; + public ProRpList getProRpList() { + return proRpList; } - public void setBeginTime(Date beginTime) { - this.beginTime = beginTime; + public void setProRpList(ProRpList proRpList) { + this.proRpList = proRpList; } - public Date getEndTime() { - return endTime; - } - - public void setEndTime(Date endTime) { - this.endTime = endTime; - } - - public String getProBarcode() { - return proBarcode; - } - - public void setProBarcode(String proBarcode) { - this.proBarcode = proBarcode; - } - - public String getStationCode() { - return stationCode; - } - public void setStationCode(String stationCode) { - this.stationCode = stationCode; - } - - public Date getInsertTime() { - return insertTime; - } - - public void setInsertTime(Date insertTime) { - this.insertTime = insertTime; - } - - public String getParaName() { - return paraName; - } - - public void setParaName(String paraName) { - this.paraName = paraName; - } - - public String getRealVal() { - return realVal; - } - - public void setRealVal(String realVal) { - this.realVal = realVal; - } - - public String getMinVal() { - return minVal; - } - - public void setMinVal(String minVal) { - this.minVal = minVal; - } - - public String getMaxVal() { - return maxVal; - } - - public void setMaxVal(String maxVal) { - this.maxVal = maxVal; - } - - public String getParaState() { - return paraState; - } - - public void setParaState(String paraState) { - this.paraState = paraState; - } +// @Excel(name = "系统条码") +// private String barcode; +// @Excel(name = "机种类型") +// private String productName; +// @Excel(name = "产品条码") +// private String semiBarcode; +// @Excel(name = "状态") +// private String state; +// @Excel(name = "当前工位") +// private String currentStation; +// @Excel(name = "NG工位") +// private String NGStation; +// @Excel(name = "完成标志") +// private String finishFlag; +// @Excel(name = "标签Y/N") +// private String namePlateInfo; +// @Excel(name = "返修Y/N") +// private String isDis; +// @Excel(name = "开始时间" ,width = 30,dateFormat = "yyyy-MM-dd") +// private Date beginTime; +// @Excel(name = "结束时间",width = 30,dateFormat = "yyyy-MM-dd") +// private Date endTime; +// @Excel(name = "部件码") +// private String proBarcode; +// +// // private String semiBarcode; +// @Excel(name = "工位码") +// private String stationCode; +// @Excel(name = "记录时间") +// private Date insertTime; +// @Excel(name = "参数名称") +// private String paraName; +// @Excel(name = "实测值") +// private String realVal; +// @Excel(name = "最小值") +// private String minVal; +// @Excel(name = "最大值") +// private String maxVal; +// @Excel(name = "参数状态") +// private String paraState; +// +// @Override +// public String toString() { +// return "ParaAllShow{" + +// "barcode='" + barcode + '\'' + +// ", productName='" + productName + '\'' + +// ", semiBarcode='" + semiBarcode + '\'' + +// ", state='" + state + '\'' + +// ", currentStation='" + currentStation + '\'' + +// ", NGStation='" + NGStation + '\'' + +// ", finishFlag='" + finishFlag + '\'' + +// ", namePlateInfo='" + namePlateInfo + '\'' + +// ", isDis='" + isDis + '\'' + +// ", beginTime=" + beginTime + +// ", endTime=" + endTime + +// ", proBarcode='" + proBarcode + '\'' + +// ", stationCode='" + stationCode + '\'' + +// ", insertTime=" + insertTime + +// ", paraName='" + paraName + '\'' + +// ", realVal='" + realVal + '\'' + +// ", minVal='" + minVal + '\'' + +// ", maxVal='" + maxVal + '\'' + +// ", paraState='" + paraState + '\'' + +// '}'; +// } +// +// public String getBarcode() { +// return barcode; +// } +// +// public void setBarcode(String barcode) { +// this.barcode = barcode; +// } +// +// public String getProductName() { +// return productName; +// } +// +// public void setProductName(String productName) { +// this.productName = productName; +// } +// +// public String getSemiBarcode() { +// return semiBarcode; +// } +// +// public void setSemiBarcode(String semiBarcode) { +// this.semiBarcode = semiBarcode; +// } +// +// public String getState() { +// return state; +// } +// +// public void setState(String state) { +// this.state = state; +// } +// +// public String getCurrentStation() { +// return currentStation; +// } +// +// public void setCurrentStation(String currentStation) { +// this.currentStation = currentStation; +// } +// +// public String getNGStation() { +// return NGStation; +// } +// +// public void setNGStation(String NGStation) { +// this.NGStation = NGStation; +// } +// +// public String getFinishFlag() { +// return finishFlag; +// } +// +// public void setFinishFlag(String finishFlag) { +// this.finishFlag = finishFlag; +// } +// +// public String getNamePlateInfo() { +// return namePlateInfo; +// } +// +// public void setNamePlateInfo(String namePlateInfo) { +// this.namePlateInfo = namePlateInfo; +// } +// +// public String getIsDis() { +// return isDis; +// } +// +// public void setIsDis(String isDis) { +// this.isDis = isDis; +// } +// +// public Date getBeginTime() { +// return beginTime; +// } +// +// public void setBeginTime(Date beginTime) { +// this.beginTime = beginTime; +// } +// +// public Date getEndTime() { +// return endTime; +// } +// +// public void setEndTime(Date endTime) { +// this.endTime = endTime; +// } +// +// public String getProBarcode() { +// return proBarcode; +// } +// +// public void setProBarcode(String proBarcode) { +// this.proBarcode = proBarcode; +// } +// +// public String getStationCode() { +// return stationCode; +// } +// +// public void setStationCode(String stationCode) { +// this.stationCode = stationCode; +// } +// +// public Date getInsertTime() { +// return insertTime; +// } +// +// public void setInsertTime(Date insertTime) { +// this.insertTime = insertTime; +// } +// +// public String getParaName() { +// return paraName; +// } +// +// public void setParaName(String paraName) { +// this.paraName = paraName; +// } +// +// public String getRealVal() { +// return realVal; +// } +// +// public void setRealVal(String realVal) { +// this.realVal = realVal; +// } +// +// public String getMinVal() { +// return minVal; +// } +// +// public void setMinVal(String minVal) { +// this.minVal = minVal; +// } +// +// public String getMaxVal() { +// return maxVal; +// } +// +// public void setMaxVal(String maxVal) { +// this.maxVal = maxVal; +// } +// +// public String getParaState() { +// return paraState; +// } +// +// public void setParaState(String paraState) { +// this.paraState = paraState; +// } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/QsProduct.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/QsProduct.java new file mode 100644 index 00000000..bc393965 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/QsProduct.java @@ -0,0 +1,98 @@ +package com.ruoyi.nanjing.domain; + +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +import java.util.Date; + +public class QsProduct extends BaseEntity { + private static final long serialVersionUID = 1L; + + @Excel(name = "机种类型") + private String productTp; + @Excel(name = "投入量") + private String inputNum; + @Excel(name = "合格品") + private String okNum; + @Excel(name = "不合格品") + private String noNum; + @Excel(name = "异常") + private String ero; + @Excel(name = "综合合格率") + private String allRate; + private Date beginTime; + private Date endTime; + private String productType; + + public String getProductTp() { + return productTp; + } + + public void setProductTp(String productTp) { + this.productTp = productTp; + } + + public String getInputNum() { + return inputNum; + } + + public void setInputNum(String inputNum) { + this.inputNum = inputNum; + } + + public String getOkNum() { + return okNum; + } + + public void setOkNum(String okNum) { + this.okNum = okNum; + } + + public String getNoNum() { + return noNum; + } + + public void setNoNum(String noNum) { + this.noNum = noNum; + } + + public String getEro() { + return ero; + } + + public void setEro(String ero) { + this.ero = ero; + } + + public String getAllRate() { + return allRate; + } + + public void setAllRate(String allRate) { + this.allRate = allRate; + } + + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + public Date getEndTime() { + return endTime; + } + + public void setEndTime(Date endTime) { + this.endTime = endTime; + } + + public String getProductType() { + return productType; + } + + public void setProductType(String productType) { + this.productType = productType; + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/QtProduct.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/QtProduct.java new file mode 100644 index 00000000..d2849414 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/QtProduct.java @@ -0,0 +1,110 @@ +package com.ruoyi.nanjing.domain; + +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +import java.util.Date; + +public class QtProduct extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @Excel(name = "班次") + private String shiftNo; + @Excel(name = "班组") + private String groupNo; + @Excel(name = "投入量") + private String inputNum; + @Excel(name = "成品数量") + private String finNum; + @Excel(name = "合格品") + private String okNum; + @Excel(name = "不合格品") + private String noNum; + @Excel(name = "异常") + private String ero; + private Date beginTime; + private Date endTime; + private String productType; + + public String getProductType() { + return productType; + } + + public void setProductType(String productType) { + this.productType = productType; + } + + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + public Date getEndTime() { + return endTime; + } + + public void setEndTime(Date endTime) { + this.endTime = endTime; + } + + + public String getShiftNo() { + return shiftNo; + } + + public void setShiftNo(String shiftNo) { + this.shiftNo = shiftNo; + } + + public String getGroupNo() { + return groupNo; + } + + public void setGroupNo(String groupNo) { + this.groupNo = groupNo; + } + + public String getInputNum() { + return inputNum; + } + + public void setInputNum(String inputNum) { + this.inputNum = inputNum; + } + + public String getFinNum() { + return finNum; + } + + public void setFinNum(String finNum) { + this.finNum = finNum; + } + + public String getOkNum() { + return okNum; + } + + public void setOkNum(String okNum) { + this.okNum = okNum; + } + + public String getNoNum() { + return noNum; + } + + public void setNoNum(String noNum) { + this.noNum = noNum; + } + + public String getEro() { + return ero; + } + + public void setEro(String ero) { + this.ero = ero; + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/TBdProducttypeMapper.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/TBdProducttypeMapper.java index 47aefdd5..90f31113 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/TBdProducttypeMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/TBdProducttypeMapper.java @@ -4,6 +4,8 @@ import java.util.List; import java.util.Map; import com.ruoyi.nanjing.domain.ProRpList; +import com.ruoyi.nanjing.domain.QsProduct; +import com.ruoyi.nanjing.domain.QtProduct; import com.ruoyi.nanjing.domain.TBdProducttype; /** @@ -26,4 +28,10 @@ public interface TBdProducttypeMapper List selectTBdProducttype(); List selectProLists(Map map); + + List selectQtProductList(Map map); + + List selectQsProductList(Map map); + + List selectQ1ProductList(Map map); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/TSyTracestateMapper.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/TSyTracestateMapper.java index 74f34566..1c35892a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/TSyTracestateMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/TSyTracestateMapper.java @@ -3,6 +3,8 @@ package com.ruoyi.nanjing.mapper; import java.util.List; import java.util.Map; +import com.ruoyi.nanjing.domain.ParaAllShow; +import com.ruoyi.nanjing.domain.ProParaInfo; import com.ruoyi.nanjing.domain.ProRpList; import com.ruoyi.nanjing.domain.TSyTracestate; @@ -62,5 +64,8 @@ public interface TSyTracestateMapper */ public int deleteTSyTracestateByIds(String[] barcodes); - List selectAllPara(Map map); + List selectAllPara(Map map); +// List selectAllPara(Map map); + + List getInfo(Object semiBarcode); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/ITBdProducttypeService.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/ITBdProducttypeService.java index 1bc09983..86392665 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/ITBdProducttypeService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/ITBdProducttypeService.java @@ -3,9 +3,7 @@ package com.ruoyi.nanjing.service; import java.util.List; import java.util.Map; -import com.ruoyi.nanjing.domain.ProRpList; -import com.ruoyi.nanjing.domain.TBdProducttype; -import com.ruoyi.nanjing.domain.TRpProductchangeinfo; +import com.ruoyi.nanjing.domain.*; /** * 机种类型Service接口 @@ -29,4 +27,10 @@ public interface ITBdProducttypeService List selectTBdProducttype(); List selectProLists(Map map); + + List selectQtProductList(Map map); + + List selectQsProductList(Map map); + + List selectQ1ProductList(Map map); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/ITBdSubstationService.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/ITBdSubstationService.java index c738172c..18eff01c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/ITBdSubstationService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/ITBdSubstationService.java @@ -3,7 +3,9 @@ package com.ruoyi.nanjing.service; import java.util.List; import java.util.Map; +import com.ruoyi.common.core.domain.Ztree; import com.ruoyi.nanjing.domain.TBdSubstation; +import com.ruoyi.system.domain.SysDept; /** * 工位管理Service接口 @@ -71,4 +73,5 @@ public interface ITBdSubstationService void deletePara(Map map); + List selectTbdStationTree(TBdSubstation substation); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/ITSyTracestateService.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/ITSyTracestateService.java index f40fef1a..0887337e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/ITSyTracestateService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/ITSyTracestateService.java @@ -3,6 +3,7 @@ package com.ruoyi.nanjing.service; import java.util.List; import java.util.Map; +import com.ruoyi.nanjing.domain.ParaAllShow; import com.ruoyi.nanjing.domain.ProRpList; import com.ruoyi.nanjing.domain.TSyTracestate; @@ -62,5 +63,5 @@ public interface ITSyTracestateService */ public int deleteTSyTracestateById(String barcode); - List selectAllPara(Map map); + List selectAllPara(Map map); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/TBdProducttypeServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/TBdProducttypeServiceImpl.java index 19ee221d..25887d97 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/TBdProducttypeServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/TBdProducttypeServiceImpl.java @@ -4,6 +4,8 @@ import java.util.List; import java.util.Map; import com.ruoyi.nanjing.domain.ProRpList; +import com.ruoyi.nanjing.domain.QsProduct; +import com.ruoyi.nanjing.domain.QtProduct; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.nanjing.mapper.TBdProducttypeMapper; @@ -44,4 +46,19 @@ public class TBdProducttypeServiceImpl implements ITBdProducttypeService public List selectProLists(Map map) { return tBdProducttypeMapper.selectProLists(map); } + + @Override + public List selectQtProductList(Map map) { + return tBdProducttypeMapper.selectQtProductList(map); + } + + @Override + public List selectQsProductList(Map map) { + return tBdProducttypeMapper.selectQsProductList(map); + } + + @Override + public List selectQ1ProductList(Map map) { + return tBdProducttypeMapper.selectQ1ProductList(map); + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/TBdSubstationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/TBdSubstationServiceImpl.java index a3d72d09..a4d7da65 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/TBdSubstationServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/TBdSubstationServiceImpl.java @@ -1,8 +1,13 @@ package com.ruoyi.nanjing.service.impl; +import java.util.ArrayList; import java.util.List; import java.util.Map; +import com.ruoyi.common.constant.UserConstants; +import com.ruoyi.common.core.domain.Ztree; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.system.domain.SysDept; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.nanjing.mapper.TBdSubstationMapper; @@ -119,4 +124,37 @@ public class TBdSubstationServiceImpl implements ITBdSubstationService tBdSubstationMapper.deletePara(map); } + @Override + public List selectTbdStationTree(TBdSubstation substation) { + List substations= tBdSubstationMapper.selectTBdSubstationList(substation); + List ztrees = initZtree(substations); + return ztrees; + } + + private List initZtree(List substation) { + return initZtree(substation,null); + } + + public List initZtree(List substation, List roleDeptList) + { + + List ztrees = new ArrayList(); + boolean isCheck = StringUtils.isNotNull(roleDeptList); + for (TBdSubstation substation1 : substation) + { + + Ztree ztree = new Ztree(); + ztree.setId(substation1.getStationID()); +// ztree.setpId(substation1.getParentId()); + ztree.setName(substation1.getStationName()); + ztree.setTitle(substation1.getStationName()); + if (isCheck) + { + ztree.setChecked(roleDeptList.contains(substation1.getStationID() + substation1.getStationName())); + } + ztrees.add(ztree); + } + return ztrees; + } + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/TSyTracestateServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/TSyTracestateServiceImpl.java index d1adbffc..87b6c999 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/TSyTracestateServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/TSyTracestateServiceImpl.java @@ -1,8 +1,11 @@ package com.ruoyi.nanjing.service.impl; +import java.util.ArrayList; import java.util.List; import java.util.Map; +import com.ruoyi.nanjing.domain.ParaAllShow; +import com.ruoyi.nanjing.domain.ProParaInfo; import com.ruoyi.nanjing.domain.ProRpList; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -96,8 +99,21 @@ public class TSyTracestateServiceImpl implements ITSyTracestateService } @Override - public List selectAllPara(Map map) { - return tSyTracestateMapper.selectAllPara(map); + public List selectAllPara(Map map) { +// List paraAllShows = new ArrayList(); +// List list = tSyTracestateMapper.selectAllPara(map); +// List list1 = tSyTracestateMapper.getInfo(map.get("semiBarcode")); +// ParaAllShow paraAllShow = new ParaAllShow(); +// for (ProParaInfo ppi:list) { +// paraAllShow.setProParaInfo(ppi); +// paraAllShows.add(paraAllShow); +// } +// for (ProRpList prl:list1) { +// paraAllShow.setProRpList(prl); +// paraAllShows.add(paraAllShow); +// } + List paraAllShows = tSyTracestateMapper.selectAllPara(map); + return paraAllShows; } diff --git a/ruoyi-system/src/main/resources/mapper/nanjing/TBdProducttypeMapper.xml b/ruoyi-system/src/main/resources/mapper/nanjing/TBdProducttypeMapper.xml index ab08f501..4ba661e6 100644 --- a/ruoyi-system/src/main/resources/mapper/nanjing/TBdProducttypeMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/nanjing/TBdProducttypeMapper.xml @@ -24,7 +24,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + + + + + + + + + select ID, ProductTypeID, ProductTypeName from T_BD_ProductType @@ -54,27 +71,45 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" } + + + - - - - - - - - - - - - - - - - - - + diff --git a/ruoyi-system/src/main/resources/mapper/nanjing/TSyTracestateMapper.xml b/ruoyi-system/src/main/resources/mapper/nanjing/TSyTracestateMapper.xml index d4eca51d..846b3abc 100644 --- a/ruoyi-system/src/main/resources/mapper/nanjing/TSyTracestateMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/nanjing/TSyTracestateMapper.xml @@ -32,32 +32,73 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select Barcode, ProductID, BeginTime, EndTime, ShiftID, GroupID, ShiftNo, SemiBarcode_A, SemiBarcode_B, SemiBarcode_C, ProductBarcode, SemiBarcode2, shellbarcode, NameplateInfo, MarkRecord, Attr1, Attr2, ISDis, DisChecker, DisTime, State, CurrentStationID, NGStationID, FinishFlag, D9Remark from T_SY_TraceState + - { call pro_AllParaShowInfo_Net ( - #{semiBarcode,mode=IN,jdbcType=VARCHAR} - #{beginTime,mode=IN,jdbcType=VARCHAR} - #{endTime,mode=IN,jdbcType=VARCHAR} + #{semiBarcode,mode=IN,jdbcType=VARCHAR}, + #{beginTime,mode=IN,jdbcType=DATE}, + #{endTime,mode=IN,jdbcType=DATE} ) }