From c1885b1805674cb9ec1110bae14b1407e145acf7 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Tue, 5 Sep 2023 14:19:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E6=8C=81=E8=B4=A8=E9=87=8F=E6=A3=80?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/MesReportWorkController.java | 2 +- .../controller/WCSInterfaceController.java | 12 ++ .../impl/MesReportWorkServiceImpl.java | 104 +++++++++--------- .../op/quality/controller/QuaController.java | 32 +++++- .../com/op/quality/domain/QcProCheck.java | 41 ++++++- .../op/quality/mapper/QcProCheckMapper.java | 6 +- .../op/quality/service/QcProCheckService.java | 6 +- .../serviceImpl/QcProCheckServiceImpl.java | 37 ++----- .../resources/mapper/QcProCheckMapper.xml | 49 ++++++++- .../system/controller/SysUserController.java | 19 ++++ 10 files changed, 211 insertions(+), 97 deletions(-) diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java index 3b5849c2..ef171e3d 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java @@ -109,7 +109,7 @@ public class MesReportWorkController extends BaseController { startPage(); List list = mesReportWorkService.getProcessFinishList(mesReportWork); TableDataInfo tableDataInfo = getDataTable(list); - tableDataInfo.setTotal(4);//TODO;zxl;测试用 + //tableDataInfo.setTotal(4);//TODO;zxl;测试用 return tableDataInfo; } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/WCSInterfaceController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/WCSInterfaceController.java index 383b0e2c..d2eb1b8c 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/controller/WCSInterfaceController.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/WCSInterfaceController.java @@ -120,4 +120,16 @@ public class WCSInterfaceController extends BaseController { } return WCInterfaceService.requestDestinationStations(wcsdto); } + + /**********************手持接口**********************/ + @Log(title = "手持获取当前登陆人信息", businessType = BusinessType.GRANT) + @PostMapping("/handGetUserInfo") + public WCSDTO handGetUserInfo(@RequestBody WCSDTO wcsdto) { + if(StringUtils.isBlank(wcsdto.getFactory())){ + wcsdto.setCode("1"); + wcsdto.setMessage("factory is not null"); + return wcsdto; + } + return WCInterfaceService.requestDestinationStations(wcsdto); + } } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java index 10850f24..03d9e4f4 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java @@ -105,58 +105,58 @@ public class MesReportWorkServiceImpl implements IMesReportWorkService { public List getProcessFinishList(MesProcessReport mesReportWork) { List dtos = new ArrayList<>(); dtos = mesReportWorkMapper.getProcessFinishList(mesReportWork); - MesProcessReport dto = null; - if(CollectionUtils.isEmpty(dtos)){ - dto = new MesProcessReport(); - dto.setProductDate("2023-08-31"); - dto.setOrderCode("000100220788"); - dto.setWorkorderCode("000100220788-1"); - dto.setProductCode("000000020000004232"); - dto.setProductName("榄菊小盘艾草型蚊香3+1家庭特惠装(1901)"); - dto.setProductSpc("23mm"); - dto.setProcessCode("ProdGX01"); - dto.setProcessName("包装线工序01"); - dto.setQuantityFeedback(new BigDecimal("500")); - dto.setQuantity(new BigDecimal("1000")); - dto.setUnit("KAR"); - dtos.add(dto); - dto = new MesProcessReport(); - dto.setProductDate("2023-08-31"); - dto.setOrderCode("000100220789"); - dto.setWorkorderCode("000100220789-1"); - dto.setProductCode("000000020000004234"); - dto.setProductName("白坯"); - dto.setProductSpc("23mm"); - dto.setProcessCode("BPGX01"); - dto.setProcessName("收胚机工序"); - dto.setQuantityFeedback(new BigDecimal("80")); - dto.setUnit("车"); - dtos.add(dto); - dto = new MesProcessReport(); - dto.setProductDate("2023-08-31"); - dto.setOrderCode("000100220789"); - dto.setWorkorderCode("000100220789-1"); - dto.setProductCode("000000020000004234"); - dto.setProductName("白坯"); - dto.setProductSpc("23mm"); - dto.setProcessCode("BPGX02"); - dto.setProcessName("烘房工序"); - dto.setQuantityFeedback(new BigDecimal("70")); - dto.setUnit("车"); - dtos.add(dto); - dto = new MesProcessReport(); - dto.setProductDate("2023-08-31"); - dto.setOrderCode("000100220789"); - dto.setWorkorderCode("000100220789-1"); - dto.setProductCode("000000020000004234"); - dto.setProductName("白坯"); - dto.setProductSpc("23mm"); - dto.setProcessCode("BPGX02"); - dto.setProcessName("收坯工序"); - dto.setQuantityFeedback(new BigDecimal("100")); - dto.setUnit("车"); - dtos.add(dto); - } +// MesProcessReport dto = null; +// if(CollectionUtils.isEmpty(dtos)){ +// dto = new MesProcessReport(); +// dto.setProductDate("2023-08-31"); +// dto.setOrderCode("000100220788"); +// dto.setWorkorderCode("000100220788-1"); +// dto.setProductCode("000000020000004232"); +// dto.setProductName("榄菊小盘艾草型蚊香3+1家庭特惠装(1901)"); +// dto.setProductSpc("23mm"); +// dto.setProcessCode("ProdGX01"); +// dto.setProcessName("包装线工序01"); +// dto.setQuantityFeedback(new BigDecimal("500")); +// dto.setQuantity(new BigDecimal("1000")); +// dto.setUnit("KAR"); +// dtos.add(dto); +// dto = new MesProcessReport(); +// dto.setProductDate("2023-08-31"); +// dto.setOrderCode("000100220789"); +// dto.setWorkorderCode("000100220789-1"); +// dto.setProductCode("000000020000004234"); +// dto.setProductName("白坯"); +// dto.setProductSpc("23mm"); +// dto.setProcessCode("BPGX01"); +// dto.setProcessName("收胚机工序"); +// dto.setQuantityFeedback(new BigDecimal("80")); +// dto.setUnit("车"); +// dtos.add(dto); +// dto = new MesProcessReport(); +// dto.setProductDate("2023-08-31"); +// dto.setOrderCode("000100220789"); +// dto.setWorkorderCode("000100220789-1"); +// dto.setProductCode("000000020000004234"); +// dto.setProductName("白坯"); +// dto.setProductSpc("23mm"); +// dto.setProcessCode("BPGX02"); +// dto.setProcessName("烘房工序"); +// dto.setQuantityFeedback(new BigDecimal("70")); +// dto.setUnit("车"); +// dtos.add(dto); +// dto = new MesProcessReport(); +// dto.setProductDate("2023-08-31"); +// dto.setOrderCode("000100220789"); +// dto.setWorkorderCode("000100220789-1"); +// dto.setProductCode("000000020000004234"); +// dto.setProductName("白坯"); +// dto.setProductSpc("23mm"); +// dto.setProcessCode("BPGX02"); +// dto.setProcessName("收坯工序"); +// dto.setQuantityFeedback(new BigDecimal("100")); +// dto.setUnit("车"); +// dtos.add(dto); +// } return dtos; } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java index 893ce664..71546200 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java @@ -1,6 +1,10 @@ package com.op.quality.controller; +import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; import com.op.common.core.domain.R; +import com.op.common.core.web.controller.BaseController; +import com.op.common.core.web.domain.AjaxResult; +import com.op.common.core.web.page.TableDataInfo; import com.op.quality.domain.QcProCheck; import com.op.quality.service.QcProCheckService; import com.op.system.api.RemoteMesService; @@ -8,6 +12,8 @@ import com.op.system.api.domain.dto.WCSDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * @ClassName : quaController * @Description : @@ -15,7 +21,8 @@ import org.springframework.web.bind.annotation.*; * @Date: 2023-08-17 10:28 */ @RestController -public class QuaController { +@RequestMapping("/handCheck") +public class QuaController extends BaseController { @Autowired private QcProCheckService qcProCheckService; @@ -24,16 +31,33 @@ public class QuaController { @PostMapping("/saveQcProCheck") public R saveQcProCheck(@RequestBody QcProCheck qcProCheck) { - - //qcProCheckService.saveQcProCheck(qcProCheck); + DynamicDataSourceContextHolder.push("ds_"+qcProCheck.getFactoryCode()); + qcProCheckService.saveQcProCheck(qcProCheck); if (qcProCheck.getIsqua()=="1") { WCSDTO wcsdto = new WCSDTO(); wcsdto.setFactory(qcProCheck.getFactoryCode()); wcsdto.setRfidNo(qcProCheck.getRfid()); remoteMesService.requestDestinationStations(wcsdto); + return R.ok(); } - return R.fail(); + return R.fail(); } + /** + * 查询列表 + */ + @GetMapping("/list") + public TableDataInfo list(QcProCheck qcProCheck) { + startPage(); + List list = qcProCheckService.selectQcProCheckList(qcProCheck); + return getDataTable(list); + } + /** + * 获取【请填写功能名称】详细信息 + */ + @GetMapping(value = "getInfoByRfid/{rfid}") + public AjaxResult getInfo(QcProCheck qcProCheck) { + return success(qcProCheckService.getInfoByRfid(qcProCheck)); + } } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcProCheck.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcProCheck.java index 74567406..a3763d05 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcProCheck.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcProCheck.java @@ -28,21 +28,21 @@ public class QcProCheck extends BaseEntity { @Excel(name = "工单id") private String workorderId; - @Excel(name = "工厂编码") + @Excel(name = "工单编码") private String workorderCode; - @Excel(name = "工厂名称") + private String workorderName; @Excel(name = "订单id") private String orderId; @Excel(name = "订单编码") private String orderCode; - + private String workBatchCode; @Excel(name = "机台id") private String machineId; @Excel(name = "机台编码") private String machineCode; - + private String machineName; @Excel(name = "不良描述") private String badMeg; @@ -50,6 +50,9 @@ public class QcProCheck extends BaseEntity { private String productId; private String productCode; + private String productName; + private String productSpc; + @Excel(name = "是否合格") private String isqua; @@ -73,6 +76,30 @@ public class QcProCheck extends BaseEntity { private String attr3; private String attr4; + public String getWorkBatchCode() { + return workBatchCode; + } + + public void setWorkBatchCode(String workBatchCode) { + this.workBatchCode = workBatchCode; + } + + public String getProductSpc() { + return productSpc; + } + + public void setProductSpc(String productSpc) { + this.productSpc = productSpc; + } + + public String getProductName() { + return productName; + } + + public void setProductName(String productName) { + this.productName = productName; + } + public String getFactoryId() { return factoryId; } @@ -193,7 +220,13 @@ public class QcProCheck extends BaseEntity { this.isqua = isqua; } + public String getMachineName() { + return machineName; + } + public void setMachineName(String machineName) { + this.machineName = machineName; + } @Override public String getCreateBy() { diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcProCheckMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcProCheckMapper.java index 743cd343..a422aace 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcProCheckMapper.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcProCheckMapper.java @@ -17,15 +17,13 @@ public interface QcProCheckMapper { - List selectQcProCheckList(); - int insertQcProCheck(QcProCheck qcProCheck); int updateQcProCheckById(String rfid); int deleteQcProCheckById(String rfid); + List selectQcProCheckList(QcProCheck qcProCheck); - - + QcProCheck getInfoByRfid(QcProCheck qcProCheck); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/QcProCheckService.java b/op-modules/op-quality/src/main/java/com/op/quality/service/QcProCheckService.java index cee4b148..a31644f8 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/QcProCheckService.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/QcProCheckService.java @@ -14,11 +14,13 @@ import java.util.List; */ public interface QcProCheckService { - List selectQcProCheck(); - R saveQcProCheck(QcProCheck qcProCheck); int updateQcProCheck(String rfid); int deleteQcProCheck(String rfid); + + List selectQcProCheckList(QcProCheck qcProCheck); + + QcProCheck getInfoByRfid(QcProCheck qcProCheck); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcProCheckServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcProCheckServiceImpl.java index aa8130ea..76ab2667 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcProCheckServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcProCheckServiceImpl.java @@ -32,14 +32,6 @@ public class QcProCheckServiceImpl implements QcProCheckService { @Autowired private BaseFileMapper baseFileMapper; - - @Override -// @DS("#header.poolName") - public List selectQcProCheck() { - DynamicDataSourceContextHolder.push("ds_1000"); - return qcProCheckMapper.selectQcProCheckList(); - } - @Override public R saveQcProCheck(QcProCheck qcProCheck) { DynamicDataSourceContextHolder.push("ds_1000"); @@ -83,22 +75,17 @@ public class QcProCheckServiceImpl implements QcProCheckService { return qcProCheckMapper.deleteQcProCheckById(id); } -// public static void main(String[] args)throws JCoException{ -// QcProCheck qcProCheck = new QcProCheck(); -// qcProCheck.setId("1111"); -// qcProCheck.setMachineId("2222"); -// BaseFile baseFile = new BaseFile(); -// baseFile.setFileId("11112"); -// Map map = new HashMap(); -//// map.put(qcProCheck,baseFile); -// QcProCheck qc2 = new QcProCheck(); -// BaseFile b2 = new BaseFile(); -//// qc2 = map.keySet().iterator().next(); -//// b2 = map.get(qc2); -// map.put(qc2,null); -// System.out.println(map); -// -// -// } + @Override + public List selectQcProCheckList(QcProCheck qcProCheck) { + DynamicDataSourceContextHolder.push("ds_"+qcProCheck.getFactoryCode()); + return qcProCheckMapper.selectQcProCheckList(qcProCheck); + } + + @Override + public QcProCheck getInfoByRfid(QcProCheck qcProCheck) { + DynamicDataSourceContextHolder.push("ds_"+qcProCheck.getFactoryCode()); + return qcProCheckMapper.getInfoByRfid(qcProCheck); + } + } diff --git a/op-modules/op-quality/src/main/resources/mapper/QcProCheckMapper.xml b/op-modules/op-quality/src/main/resources/mapper/QcProCheckMapper.xml index 1b3553b8..3ae9dba4 100644 --- a/op-modules/op-quality/src/main/resources/mapper/QcProCheckMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/QcProCheckMapper.xml @@ -16,9 +16,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + @@ -29,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -41,11 +44,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -64,9 +75,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order_code, machine_id, machine_code, + machine_name, bad_meg, product_id, product_code, + product_name, + product_spc, attr1, attr2, attr3, @@ -91,9 +105,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{orderCode}, #{machineId}, #{machineCode}, + #{machineName}, #{badMeg}, #{productId}, #{productCode}, + #{productName}, + #{productSpc}, #{attr1}, #{attr2}, #{attr3}, @@ -144,5 +161,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" delete from qc_pro_check where id = #{id} - + + diff --git a/op-modules/op-system/src/main/java/com/op/system/controller/SysUserController.java b/op-modules/op-system/src/main/java/com/op/system/controller/SysUserController.java index e133d43c..790b2e0b 100644 --- a/op-modules/op-system/src/main/java/com/op/system/controller/SysUserController.java +++ b/op-modules/op-system/src/main/java/com/op/system/controller/SysUserController.java @@ -179,6 +179,25 @@ public class SysUserController extends BaseController { return ajax; } + @PostMapping("/mobileGetInfo") + public AjaxResult mobileGetInfo(@RequestBody SysUser user) { + // 角色集合 + Set roles = permissionService.getRolePermission(user); + // 权限集合 + Set permissions = permissionService.getMenuPermission(user); + // 工厂数据源集合 + List> poolNameList = permissionService.getPoolNameList(user); + // 缓存用户工厂数据源 + String poolName = redisService.getCacheObject(CacheConstants.USER_POOL_NAME_CURRENT + user.getUserName()); + user.setPoolName(poolName); + AjaxResult ajax = AjaxResult.success(); + ajax.put("user", user); + ajax.put("roles", roles); + ajax.put("permissions", permissions); + ajax.put("poolNameList", poolNameList); + return ajax; + } + /** * 根据用户编号获取详细信息 */