From 786e03b25c7a4ec3b13b2a74a9272d58b9274d5c Mon Sep 17 00:00:00 2001 From: zhangsiqi <2825463979@qq.com> Date: Sun, 7 Jan 2024 17:47:56 +0800 Subject: [PATCH] =?UTF-8?q?[UPDATE]=20=E4=BF=AE=E6=94=B9=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E6=8A=A5=E4=BB=B7=E4=BF=A1=E6=81=AF=EF=BC=8C=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E8=B5=84=E6=96=99=E5=88=97=E8=A1=A8=E4=BF=A1=E6=81=AF=EF=BC=8C?= =?UTF-8?q?bom=E4=BF=A1=E6=81=AF=E5=88=97=E8=A1=A8=EF=BC=8C=E7=89=A9?= =?UTF-8?q?=E6=96=99=E4=BF=A1=E6=81=AF=E6=A8=A1=E5=9D=97=EF=BC=8C=E4=BB=AA?= =?UTF-8?q?=E8=A1=A8=E7=9B=98=E4=BF=A1=E6=81=AF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/controller/ErpBomController.java | 51 +- .../com/ruoyi/erp/mapper/ErpBomMapper.java | 3 + .../com/ruoyi/erp/service/IErpBomService.java | 1 + .../erp/service/impl/ErpBomServiceImpl.java | 6 +- .../impl/SalesOrderDetailServiceImpl.java | 21 +- .../controller/SysMakeOrderController.java | 13 +- .../system/mapper/SysMakeOrderMapper.java | 10 + .../system/service/ISysMakeOrderService.java | 10 + .../impl/SysCustomerQuoteServiceImpl.java | 3 + .../service/impl/SysCustomerServiceImpl.java | 6 + .../service/impl/SysMakeOrderServiceImpl.java | 28 + .../service/impl/SysPickingServiceImpl.java | 6 +- .../impl/SysProductModelServiceImpl.java | 6 +- .../resources/mapper/erp/ErpBomMapper.xml | 10 +- .../system/SysCustomerQuoteChildMapper.xml | 1 + .../mapper/system/SysMakeOrderMapper.xml | 6 + .../main/resources/templates/dashboard2.html | 1990 ++++++++++++++++- .../main/resources/templates/erp/bom/add.html | 12 +- .../main/resources/templates/erp/bom/bom.html | 2 +- .../resources/templates/erp/bom/edit.html | 2 +- .../resources/templates/erp/bom/equals.html | 170 +- .../src/main/resources/templates/index.html | 8 +- .../src/main/resources/templates/main.html | 416 +++- .../ruoyi/common/core/redis/RedisCache.java | 29 +- 24 files changed, 2586 insertions(+), 224 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpBomController.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpBomController.java index bfbeefac..eff6abb5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpBomController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpBomController.java @@ -5,6 +5,7 @@ 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.DateUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.erp.domain.ErpBom; import com.ruoyi.erp.service.IErpBomService; @@ -176,12 +177,22 @@ public class ErpBomController extends BaseController { return prefix + "/equals"; } - @RequiresPermissions("erp:bom:equals") - @GetMapping("/euqalsBom") - public ModelMap equalsBom(@RequestBody String bomNo1,String bomNo2){ + @PostMapping( "/equalsBomList") + @ResponseBody + public TableDataInfo bomEqulasList() + { + startPage(); + ErpBom erpBom = new ErpBom(); + List list = erpBomService.selectErpBomList(erpBom); + return getDataTable(list); + } + @RequiresPermissions("erp:bom:equals") + @PostMapping("/equalsBom") + @ResponseBody + public ModelMap equalsBom(@RequestParam("bomNo1") String bomNo1,@RequestParam("bomNo2") String bomNo2){ ModelMap map = new ModelMap(); - System.out.println("bomNo1：" + bomNo1+ " bomNo2：" +bomNo2); + System.out.println("时间: "+ DateUtils.getTime() +" bomNo1：" + bomNo1+ " bomNo2：" +bomNo2); //获取要比对的两个bom 获取下面的1物料信息 ErpBom erpBom = erpBomService.selectBomByBomNo(bomNo1); ErpBom erpbom1 = erpBomService.selectBomByBomNo(bomNo2); @@ -193,29 +204,37 @@ public class ErpBomController extends BaseController List bom1list = new ArrayList<>(); List bom2list = new ArrayList<>(); for (ErpBom erpBom3:list){ + Long useNum1 = erpBom3.getUseNum(); + if (useNum1==null){ + useNum1 = 0L; + } + String bom1 = erpBom3.getMaterialNo()+"-"+erpBom3.getMaterialName()+"-"+ useNum1; for (ErpBom erpBom4:list1){ - String bom1 = erpBom3.getMaterialNo()+"-"+erpBom3.getMaterialName()+"-"+erpBom3.getUseNum(); - String bom2 = erpBom4.getMaterialNo()+"-"+erpBom4.getMaterialName()+"-"+erpBom4.getUseNum(); - if (bom1 == bom2){ - boolean contains = tongList.stream().anyMatch(item-> item.equals(bom1)); - if (!contains){ + Long useNum2 = erpBom4.getUseNum(); + if (useNum2==null){ + useNum2 = 0L; + } + String bom2 = erpBom4.getMaterialNo()+"-"+erpBom4.getMaterialName()+"-"+ useNum2; + if (bom1.equals(bom2)){ + boolean contains1 = tongList.stream().anyMatch(item-> item==(bom1)); + if (!contains1){ tongList.add(bom1); } }else{ - boolean contains = bom1list.stream().anyMatch(item-> item.equals(bom1)); - if (!contains){ + boolean contains2 = bom1list.stream().anyMatch(item-> item==(bom1)); + if (!contains2){ bom1list.add(bom1); } - boolean contains1 = bom2list.stream().anyMatch(item-> item.equals(bom2)); - if (!contains1){ - bom2list.add(bom1); + boolean contains3 = bom2list.stream().anyMatch(item-> item==(bom2)); + if (!contains3){ + bom2list.add(bom2); } } } } map.put("tongList",tongList); - map.put("bom1list",bom1list); - map.put("bom2list",bom2list); + map.put("bom1List",bom1list); + map.put("bom2List",bom2list); return map; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/mapper/ErpBomMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/mapper/ErpBomMapper.java index 6ba99b57..de2bc3b9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/erp/mapper/ErpBomMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/mapper/ErpBomMapper.java @@ -121,4 +121,7 @@ public interface ErpBomMapper public ErpBom selectBomByBomNo(String bomNo); + + + public List selectErpBomList1(); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/service/IErpBomService.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/service/IErpBomService.java index f9748e28..171ce7f3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/erp/service/IErpBomService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/service/IErpBomService.java @@ -96,4 +96,5 @@ public interface IErpBomService * bom对象查询，以bomNo作为条件 */ public ErpBom selectBomByBomNo(String bomNo); + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpBomServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpBomServiceImpl.java index 8e2b3f5b..aa59f075 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpBomServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpBomServiceImpl.java @@ -23,7 +23,7 @@ import java.util.List; * @author ruoyi * @date 2023-11-21 */ -@Service +@Service("erpBomL") public class ErpBomServiceImpl implements IErpBomService { @Autowired @@ -239,4 +239,8 @@ public class ErpBomServiceImpl implements IErpBomService // } } } + public List selectErpBomList1(){ + List bomList = erpBomMapper.selectErpBomList1(); + return bomList; + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/sales/service/impl/SalesOrderDetailServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/sales/service/impl/SalesOrderDetailServiceImpl.java index 5732afad..e61e033c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/sales/service/impl/SalesOrderDetailServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/sales/service/impl/SalesOrderDetailServiceImpl.java @@ -1,12 +1,16 @@ package com.ruoyi.sales.service.impl; -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.ruoyi.sales.mapper.SalesOrderDetailMapper; +import com.ruoyi.common.core.redis.RedisCache; +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.ShiroUtils; import com.ruoyi.sales.domain.SalesOrderDetail; +import com.ruoyi.sales.mapper.SalesOrderDetailMapper; import com.ruoyi.sales.service.ISalesOrderDetailService; -import com.ruoyi.common.core.text.Convert; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; /** * 销售订单查询Service业务层处理 @@ -19,6 +23,8 @@ public class SalesOrderDetailServiceImpl implements ISalesOrderDetailService { @Autowired private SalesOrderDetailMapper salesOrderDetailMapper; + @Autowired + private RedisCache redisCache; /** * 查询销售订单查询 @@ -53,6 +59,11 @@ public class SalesOrderDetailServiceImpl implements ISalesOrderDetailService @Override public int insertSalesOrderDetail(SalesOrderDetail salesOrderDetail) { + String loginName = ShiroUtils.getLoginName(); + salesOrderDetail.setUpdateBy(loginName); + salesOrderDetail.setUpdateTime(DateUtils.getNowDate()); + String saleNo = redisCache.generateBillNo("XS"); + salesOrderDetail.setSalesOrderCode(saleNo); return salesOrderDetailMapper.insertSalesOrderDetail(salesOrderDetail); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysMakeOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysMakeOrderController.java index 0d71461a..f0c1d3ac 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysMakeOrderController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysMakeOrderController.java @@ -144,5 +144,16 @@ public class SysMakeOrderController extends BaseController return toAjax(sysMakeOrderService.restoreSysMakeOrderById(id)); } - + @GetMapping( "/ByNoFinsh") + @ResponseBody + public AjaxResult ByNOFinsh() + { + return toAjax(sysMakeOrderService.selectSysMakeOrderByNOFinsh()); + } + @GetMapping( "/ByFinsh") + @ResponseBody + public AjaxResult ByFinsh() + { + return toAjax(sysMakeOrderService.selectSysMakeOrderByFinsh()); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysMakeOrderMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysMakeOrderMapper.java index a55cda11..5fe49fc0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysMakeOrderMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysMakeOrderMapper.java @@ -75,4 +75,14 @@ public interface SysMakeOrderMapper * @return 结果 */ public int restoreSysMakeOrderById(Long id); + + /** + * 生产订单进行中的订单 + */ + public Integer selectSysMakeOrderByNOFinsh(); + + /** + * 生产订单完成的订单 + */ + public Integer selectSysMakeOrderByFinsh(); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysMakeOrderService.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysMakeOrderService.java index f4405326..b4e7b997 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysMakeOrderService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysMakeOrderService.java @@ -73,4 +73,14 @@ public interface ISysMakeOrderService * @return */ int restoreSysMakeOrderById(Long id); + + /** + * 生产订单进行中的订单 + */ + public Integer selectSysMakeOrderByNOFinsh(); + + /** + * 生产订单完成的订单 + */ + public Integer selectSysMakeOrderByFinsh(); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerQuoteServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerQuoteServiceImpl.java index 5c24f498..1f06c473 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerQuoteServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerQuoteServiceImpl.java @@ -1,5 +1,6 @@ package com.ruoyi.system.service.impl; +import com.ruoyi.common.utils.ShiroUtils; import com.ruoyi.system.domain.SysCustomerQuote; import com.ruoyi.system.mapper.SysCustomerQuoteMapper; import com.ruoyi.system.service.ISysCustomerQuoteService; @@ -25,6 +26,8 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService { @Override public int insertSysCustomerQuote(SysCustomerQuote sysCustomerQuote) { + String loginName = ShiroUtils.getLoginName(); + sysCustomerQuote.setCreateBy(loginName); return sysCustomerQuoteMapper.insertSysCustomerQuote(sysCustomerQuote); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerServiceImpl.java index 35faf790..1b7b58ed 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerServiceImpl.java @@ -1,6 +1,8 @@ package com.ruoyi.system.service.impl; import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.ShiroUtils; import com.ruoyi.system.domain.SysCustomer; import com.ruoyi.system.mapper.SysCustomerMapper; import com.ruoyi.system.service.ISysCustomerService; @@ -22,6 +24,7 @@ public class SysCustomerServiceImpl implements ISysCustomerService @Autowired private SysCustomerMapper sysCustomerMapper; + @Override public SysCustomer selectSysCustomerById(Long customerId) { return sysCustomerMapper.selectSysCustomerById(customerId); @@ -48,6 +51,9 @@ public class SysCustomerServiceImpl implements ISysCustomerService @Override public int insertSysCustomer(SysCustomer sysCustomer) { + String loginName = ShiroUtils.getLoginName(); + sysCustomer.setCreateBy(loginName); + sysCustomer.setCreateTime(DateUtils.getNowDate()); return sysCustomerMapper.insertSysCustomer(sysCustomer); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeOrderServiceImpl.java index 063370ad..46cf0584 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeOrderServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeOrderServiceImpl.java @@ -1,5 +1,6 @@ package com.ruoyi.system.service.impl; +import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.core.text.Convert; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.ShiroUtils; @@ -23,6 +24,9 @@ public class SysMakeOrderServiceImpl implements ISysMakeOrderService @Autowired private SysMakeOrderMapper sysMakeOrderMapper; + @Autowired + private RedisCache redisCache; + /** * 查询生产订单 * @@ -59,6 +63,12 @@ public class SysMakeOrderServiceImpl implements ISysMakeOrderService String loginName = ShiroUtils.getLoginName(); sysMakeOrder.setCreateBy(loginName); sysMakeOrder.setCreateTime(DateUtils.getNowDate()); + String makeNo = redisCache.generateBillNo("PO"); + sysMakeOrder.setMakeNo(makeNo); + sysMakeOrder.setUseStatus("0"); + sysMakeOrder.setMakeStatus("0"); + sysMakeOrder.setEceiptStatus("0"); + sysMakeOrder.setQualityStatus("0"); return sysMakeOrderMapper.insertSysMakeOrder(sysMakeOrder); } @@ -124,4 +134,22 @@ public class SysMakeOrderServiceImpl implements ISysMakeOrderService { return sysMakeOrderMapper.restoreSysMakeOrderById(id); } + + + /** + * 生产订单进行中的订单 + */ + @Override + public Integer selectSysMakeOrderByNOFinsh() { + return sysMakeOrderMapper.selectSysMakeOrderByNOFinsh(); + } + + /** + * 生产订单完成的订单 + */ + + @Override + public Integer selectSysMakeOrderByFinsh() { + return sysMakeOrderMapper.selectSysMakeOrderByFinsh(); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysPickingServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysPickingServiceImpl.java index feaeb20a..f2d5b905 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysPickingServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysPickingServiceImpl.java @@ -1,5 +1,6 @@ package com.ruoyi.system.service.impl; +import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.core.text.Convert; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.ShiroUtils; @@ -22,7 +23,8 @@ public class SysPickingServiceImpl implements ISysPickingService { @Autowired private SysPickingMapper sysPickingMapper; - + @Autowired + private RedisCache redisCache; /** * 查询开发修改单领料列表 * @@ -74,6 +76,8 @@ public class SysPickingServiceImpl implements ISysPickingService String loginName = ShiroUtils.getLoginName(); sysPicking.setUpdateBy(loginName); sysPicking.setUpdateTime(DateUtils.getNowDate()); + String scllNo = redisCache.generateBillNo("SCLL"); + sysPicking.setPickNo(scllNo); return sysPickingMapper.updateSysPicking(sysPicking); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysProductModelServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysProductModelServiceImpl.java index 94d92436..9f26f151 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysProductModelServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysProductModelServiceImpl.java @@ -1,5 +1,6 @@ package com.ruoyi.system.service.impl; +import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.core.text.Convert; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.ShiroUtils; @@ -22,7 +23,8 @@ public class SysProductModelServiceImpl implements ISysProductModelService { @Autowired private SysProductModelMapper sysProductModelMapper; - + @Autowired + private RedisCache redisCache; /** * 查询产品型号管理 * @@ -58,6 +60,8 @@ public class SysProductModelServiceImpl implements ISysProductModelService { String loginName = ShiroUtils.getLoginName(); sysProductModel.setCreateBy(loginName); + String cpxh = redisCache.generateNo("CPXH"); + sysProductModel.setPcode(cpxh); sysProductModel.setCreateTime(DateUtils.getNowDate()); return sysProductModelMapper.insertSysProductModel(sysProductModel); } diff --git a/ruoyi-admin/src/main/resources/mapper/erp/ErpBomMapper.xml b/ruoyi-admin/src/main/resources/mapper/erp/ErpBomMapper.xml index 22f339fb..e03920e0 100644 --- a/ruoyi-admin/src/main/resources/mapper/erp/ErpBomMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/erp/ErpBomMapper.xml @@ -90,7 +90,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and use_status = #{useStatus} - + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysCustomerQuoteChildMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysCustomerQuoteChildMapper.xml index 6625fca1..cc838b6f 100644 --- a/ruoyi-admin/src/main/resources/mapper/system/SysCustomerQuoteChildMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/system/SysCustomerQuoteChildMapper.xml @@ -39,6 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select id, quoteId, materialId, materialCode, materialName, materialType, processMethod, brand, photoUrl, `describe`, countTax, usdTax, materialNum, materialRmb, materialNoRmb, materialNoUsd, materialUsd, materialUsdSum, materialNoUsdSum, materialNoRmbSum, materialRmbSum, create_by, create_time, update_by, update_time, remark, degin_flag, del_flag from sys_customer_quotechild + + select * from sys_makeorder where makeStatus = '5' and useStatus = 0 + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/dashboard2.html b/ruoyi-admin/src/main/resources/templates/dashboard2.html index f3e3498d..1276277c 100644 --- a/ruoyi-admin/src/main/resources/templates/dashboard2.html +++ b/ruoyi-admin/src/main/resources/templates/dashboard2.html @@ -134,47 +134,145 @@ } - +
-
+
-
-
- 项目总数
- 10 -
+

检测数量-来料(采购+委外+委内)

+

+ - +

+
-
+
-
-
- 完工项目
- 10 -
+

不良数量-来料(采购+委外+委内)

+

+ - +

+
-
+
-
-
- 在建项目
- 10 -
+

不良率-来料(采购+委外+委内)

+

+ - +

+
+
+ +
+
+
+

检测数量-成品

+

+ - +

+
-
+
-
-
- 计划项目
- 10 -
+

不良数量-成品

+

+ - +

+
+
+
+
+
+

不良率-成品

+

+ - +

+
+
+ +
+
+
+

检测数量-制程

+

+ - +

+
+
+
+
+
+

不良数量-制程

+

+ - +

+
+
+
+
+
+

不良率-制程

+

+ - +

+
+
+ +
+
+
+

检测数量-制程

+

+ - +

+
+
+
+
+
+

不良数量-制程

+

+ - +

+
+
+
+
+
+

不良率-制程

+

+ - +

+
+
+ +
+
+
+

物料退检数量

+

+ - +

+
+
+
+
+
+

客诉数量

+

+ - +

+
+ +
+
+
-
+
@@ -314,7 +412,8 @@ - + + - - + + + + + + + + + + + + + + + + + + + diff --git a/ruoyi-admin/src/main/resources/templates/erp/bom/add.html b/ruoyi-admin/src/main/resources/templates/erp/bom/add.html index e717c976..d83b102b 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/bom/add.html +++ b/ruoyi-admin/src/main/resources/templates/erp/bom/add.html @@ -30,6 +30,7 @@
+ +
+
-
- + +
- - + +
-
-
- -
-
- -
+
+
-
- +
+
+
-
-
相同项
-
-
+
+ +
+

相同项

+
+
+ +
-
不同项
-
- 左列内容 -
-
- 右列内容 +

不同项

+
+
+ +
+
+ +
+
- - - +
- - diff --git a/ruoyi-admin/src/main/resources/templates/index.html b/ruoyi-admin/src/main/resources/templates/index.html index ca000b86..6620ae30 100644 --- a/ruoyi-admin/src/main/resources/templates/index.html +++ b/ruoyi-admin/src/main/resources/templates/index.html @@ -57,12 +57,12 @@