From c50a6f7e2f2022d8c3cdd48428ccb74d4ec24e03 Mon Sep 17 00:00:00 2001 From: shenyuan Date: Fri, 5 May 2023 10:32:10 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E9=94=99=E4=B9=B1?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ant-design-vue-jeecg/src/views/process/ZyClothsModularList.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ant-design-vue-jeecg/src/views/process/ZyClothsModularList.vue b/ant-design-vue-jeecg/src/views/process/ZyClothsModularList.vue index c411e711..2d8481e9 100644 --- a/ant-design-vue-jeecg/src/views/process/ZyClothsModularList.vue +++ b/ant-design-vue-jeecg/src/views/process/ZyClothsModularList.vue @@ -300,4 +300,7 @@ export default { \ No newline at end of file From 10310a9f5e23e03a7c7dd9036b4eabc84eff9592 Mon Sep 17 00:00:00 2001 From: shenyuan Date: Sat, 6 May 2023 09:31:57 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E8=BE=85=E6=96=99=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/procedure/processFabric.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ant-design-vue-jeecg/src/components/procedure/processFabric.vue b/ant-design-vue-jeecg/src/components/procedure/processFabric.vue index 4c58a714..cdf13f9f 100644 --- a/ant-design-vue-jeecg/src/components/procedure/processFabric.vue +++ b/ant-design-vue-jeecg/src/components/procedure/processFabric.vue @@ -22,7 +22,7 @@ - {{item.picture}} + 暂无图片 @@ -91,6 +91,8 @@ //正确给 cData 赋值的 方法 model: function(newVal,oldVal){ this.tableModel= newVal + console.log('this.tableModel') + console.log(this.tableModel) // 设置默认值 if(newVal == null){ this.tableModel = [ From 43c840d9e9c0f0e9cc31f075a0f1bf87962e8c56 Mon Sep 17 00:00:00 2001 From: Gitea Date: Sat, 6 May 2023 17:13:22 +0800 Subject: [PATCH 3/6] bug --- .../src/components/procedure/processFabric.vue | 2 +- .../erp/accessories/modules/ZyAccessoriesFormDetail.vue | 7 ++----- .../accessories/controller/ZyAccessoriesController.java | 1 + 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/ant-design-vue-jeecg/src/components/procedure/processFabric.vue b/ant-design-vue-jeecg/src/components/procedure/processFabric.vue index cdf13f9f..96a52a63 100644 --- a/ant-design-vue-jeecg/src/components/procedure/processFabric.vue +++ b/ant-design-vue-jeecg/src/components/procedure/processFabric.vue @@ -6,7 +6,7 @@ 暂无数据!
-

辅料{{index+1}}信息

+

辅料信息

diff --git a/ant-design-vue-jeecg/src/views/erp/accessories/modules/ZyAccessoriesFormDetail.vue b/ant-design-vue-jeecg/src/views/erp/accessories/modules/ZyAccessoriesFormDetail.vue index 8593c18f..3e7875b9 100644 --- a/ant-design-vue-jeecg/src/views/erp/accessories/modules/ZyAccessoriesFormDetail.vue +++ b/ant-design-vue-jeecg/src/views/erp/accessories/modules/ZyAccessoriesFormDetail.vue @@ -39,11 +39,8 @@ import processFabric from '@/components/procedure/processFabric' this.visible = true; this.$http.get('/accessories/zyAccessories/queryById?id='+id).then( res=>{ - - if(this.model == ''){ - this.model.push(res.result) - console.log(1) - } + this.model=[]; + this.model.push(res.result); }) }, handleOk() { diff --git a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/controller/ZyAccessoriesController.java b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/controller/ZyAccessoriesController.java index 72146c01..b4f161aa 100644 --- a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/controller/ZyAccessoriesController.java +++ b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/controller/ZyAccessoriesController.java @@ -154,6 +154,7 @@ public class ZyAccessoriesController extends JeecgController queryById(@RequestParam(name="id",required=true) String id) { ZyAccessories zyAccessories = zyAccessoriesService.getById(id); + zyAccessories.setPicture("http://localhost:10085/jeecg-boot/sys/common/static/"+zyAccessories.getPicture()); if(zyAccessories==null) { return Result.error("未找到对应数据"); } From e8f116054e4260836b13e81b34d9f74afb5be063 Mon Sep 17 00:00:00 2001 From: zhc077 <565291854> Date: Mon, 8 May 2023 17:26:04 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E5=A4=A7=E5=B1=8F=20=E5=8A=9F=E8=83=BD=E6=B7=BB=E5=8A=A0=205.8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/jeecg/config/shiro/ShiroConfig.java | 1 + jeecg-boot/jeecg-boot-module-system/pom.xml | 4 +- .../LargeScreenController.java | 2 +- .../ProductionLargeScreenController.java | 36 +++++++++++++++ .../service/ProductionLargeService.java | 8 ++++ .../impl/ProductionLargeServiceImpl.java | 46 +++++++++++++++++++ 6 files changed, 94 insertions(+), 3 deletions(-) rename jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/largeScreen/{ => controller}/LargeScreenController.java (98%) create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/largeScreen/controller/ProductionLargeScreenController.java create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/largeScreen/service/ProductionLargeService.java create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/largeScreen/service/impl/ProductionLargeServiceImpl.java diff --git a/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java b/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java index 76b381ad..0fdc2539 100644 --- a/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java +++ b/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java @@ -128,6 +128,7 @@ public class ShiroConfig { filterChainDefinitionMap.put("/zyShopOrder/shopOrder/**","anon"); //大屏数据 filterChainDefinitionMap.put("/largeScreen/**","anon"); + filterChainDefinitionMap.put("/productionLargeScreen/**","anon"); //人员管理 filterChainDefinitionMap.put("/zyPerson/**","anon"); diff --git a/jeecg-boot/jeecg-boot-module-system/pom.xml b/jeecg-boot/jeecg-boot-module-system/pom.xml index f5d0e640..df6bef7e 100644 --- a/jeecg-boot/jeecg-boot-module-system/pom.xml +++ b/jeecg-boot/jeecg-boot-module-system/pom.xml @@ -135,11 +135,11 @@ 5.2.4.RELEASE - + com.hynnet diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/largeScreen/LargeScreenController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/largeScreen/controller/LargeScreenController.java similarity index 98% rename from jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/largeScreen/LargeScreenController.java rename to jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/largeScreen/controller/LargeScreenController.java index bd9277d1..f077dada 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/largeScreen/LargeScreenController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/largeScreen/controller/LargeScreenController.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.largeScreen; +package org.jeecg.modules.largeScreen.controller; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/largeScreen/controller/ProductionLargeScreenController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/largeScreen/controller/ProductionLargeScreenController.java new file mode 100644 index 00000000..8e452b39 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/largeScreen/controller/ProductionLargeScreenController.java @@ -0,0 +1,36 @@ +package org.jeecg.modules.largeScreen.controller; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.largeScreen.service.ProductionLargeService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.Map; + +@Api(tags = "生产设备大屏数据") +@RequestMapping("/productionLargeScreen") +@RestController +@Slf4j +public class ProductionLargeScreenController { + + @Autowired + private ProductionLargeService productionLargeService; + + /** + * 查询订单的状态 + * + * @return + */ + @ApiOperation(value = "获取生产设备大屏数据", notes = "获取生产设备大屏数据") + @GetMapping("/getData") + public Result getData() { + Map data = productionLargeService.getData(); + return Result.OK(data); + } + +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/largeScreen/service/ProductionLargeService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/largeScreen/service/ProductionLargeService.java new file mode 100644 index 00000000..cacff101 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/largeScreen/service/ProductionLargeService.java @@ -0,0 +1,8 @@ +package org.jeecg.modules.largeScreen.service; + +import java.util.Map; + +public interface ProductionLargeService { + + Map getData(); +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/largeScreen/service/impl/ProductionLargeServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/largeScreen/service/impl/ProductionLargeServiceImpl.java new file mode 100644 index 00000000..330f8f6d --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/largeScreen/service/impl/ProductionLargeServiceImpl.java @@ -0,0 +1,46 @@ +package org.jeecg.modules.largeScreen.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import org.jeecg.modules.hanger.entity.HangRecord; +import org.jeecg.modules.hanger.service.IHangRecordService; +import org.jeecg.modules.largeScreen.service.ProductionLargeService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.util.ObjectUtils; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Service +public class ProductionLargeServiceImpl implements ProductionLargeService { + + @Autowired + private IHangRecordService iHangRecordService; + + @Override + public Map getData() { + + Map resultMap = new HashMap<>(); + + //1,吊挂 分组统计，获取最新时间5条吊挂运行记录 + List recordList = iHangRecordService.list(new LambdaQueryWrapper().groupBy(HangRecord::getHangCode)); + Map diaoguaData = new HashMap<>(); + if (!ObjectUtils.isEmpty(recordList)) { + recordList.stream().forEach(e -> { + List records = iHangRecordService.list(new LambdaQueryWrapper() + .eq(HangRecord::getHangCode, e.getHangCode()) + .orderByDesc(HangRecord::getCreateTime) + .last("limit 5") + ); + diaoguaData.put(e.getHangCode(), records); + }); + } + resultMap.put("diaogua_Data", diaoguaData); + + + //2,TODO + + return resultMap; + } +} From 3a12eaa987d479f8697b6af56b7f130c3bd9662f Mon Sep 17 00:00:00 2001 From: Gitea Date: Wed, 10 May 2023 16:32:17 +0800 Subject: [PATCH 5/6] bug --- ant-design-vue-jeecg/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/ant-design-vue-jeecg/package.json b/ant-design-vue-jeecg/package.json index 783c228b..60a0548b 100644 --- a/ant-design-vue-jeecg/package.json +++ b/ant-design-vue-jeecg/package.json @@ -11,6 +11,7 @@ }, "dependencies": { "@antv/data-set": "^0.11.4", + "@jeecg/antd-online-mini": "2.4.5-RC", "@jiaminghi/data-view": "^2.10.0", "@tinymce/tinymce-vue": "2.1.0", "@toast-ui/editor": "^2.1.2", From 60036523fcf5578ac58f633d562cd5551afda8a4 Mon Sep 17 00:00:00 2001 From: zhc077 <565291854> Date: Fri, 12 May 2023 08:35:05 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E5=A4=A7=E5=B1=8F=20=E5=8A=9F=E8=83=BD=E6=B7=BB=E5=8A=A0=205.1?= =?UTF-8?q?1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProductionLargeServiceImpl.java | 30 +++++++++++++++++-- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/largeScreen/service/impl/ProductionLargeServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/largeScreen/service/impl/ProductionLargeServiceImpl.java index 330f8f6d..41fde517 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/largeScreen/service/impl/ProductionLargeServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/largeScreen/service/impl/ProductionLargeServiceImpl.java @@ -4,6 +4,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.jeecg.modules.hanger.entity.HangRecord; import org.jeecg.modules.hanger.service.IHangRecordService; import org.jeecg.modules.largeScreen.service.ProductionLargeService; +import org.jeecg.modules.productplan.entity.ZyPlanProcess; +import org.jeecg.modules.productplan.entity.ZyProductPlan; +import org.jeecg.modules.productplan.enums.ProductPlanStatusEnum; +import org.jeecg.modules.productplan.service.IZyPlanProcessService; +import org.jeecg.modules.productplan.service.IZyProductPlanService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -18,12 +23,19 @@ public class ProductionLargeServiceImpl implements ProductionLargeService { @Autowired private IHangRecordService iHangRecordService; + @Autowired + private IZyPlanProcessService iZyPlanProcessService; + + @Autowired + private IZyProductPlanService iZyProductPlanService; + @Override public Map getData() { Map resultMap = new HashMap<>(); - //1,吊挂 分组统计，获取最新时间5条吊挂运行记录 + //1,吊挂 + // 分组统计，获取最新时间5条吊挂运行记录 List recordList = iHangRecordService.list(new LambdaQueryWrapper().groupBy(HangRecord::getHangCode)); Map diaoguaData = new HashMap<>(); if (!ObjectUtils.isEmpty(recordList)) { @@ -36,10 +48,22 @@ public class ProductionLargeServiceImpl implements ProductionLargeService { diaoguaData.put(e.getHangCode(), records); }); } - resultMap.put("diaogua_Data", diaoguaData); + resultMap.put("diaogua_data", diaoguaData); - //2,TODO + //2,生产线实时状态 + // 统计生产计划状为生产中的数据 + List planList = iZyProductPlanService.list(new LambdaQueryWrapper().eq(ZyProductPlan::getStatus, ProductPlanStatusEnum.PRODUCTION.getCode())); + Map shengchanxianMap = new HashMap<>(); + if (!ObjectUtils.isEmpty(planList)) { + planList.stream().forEach(e -> { + List planProcessList = iZyPlanProcessService.list(new LambdaQueryWrapper().eq(ZyPlanProcess::getPlanId, e.getId())); + if (!ObjectUtils.isEmpty(planProcessList)) { + shengchanxianMap.put(e.getId(), planProcessList); + } + }); + } + resultMap.put("shengchanxian_data", shengchanxianMap); return resultMap; }