From 29012daacdf7c545f282e1adcd360d9d23e17c2d Mon Sep 17 00:00:00 2001 From: zhangzhiqiang Date: Tue, 6 Jun 2023 19:33:09 +0800 Subject: [PATCH] =?UTF-8?q?add:=E6=B7=BB=E5=8A=A0=E6=B7=B1=E5=9D=91?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=89=A9=E6=96=99=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/common/domain/query/PageQuery.java | 11 ++--- .../java/org/nl/common/enums/AcsTaskEnum.java | 2 + .../org/nl/config/mybatis/CodeGenerator.java | 4 +- .../PdmBiPersoncorrdeviceController.java | 21 ++++++++++ .../IPdmBiPersoncorrdeviceService.java | 16 ++++++++ .../userdevice/dao/PdmBiPersoncorrdevice.java | 34 +++++++++++++++ .../mapper/PdmBiPersoncorrdeviceMapper.java | 16 ++++++++ .../xml/PdmBiPersoncorrdeviceMapper.xml | 5 +++ .../PdmBiPersoncorrdeviceServiceImpl.java | 20 +++++++++ .../device/SpecialDeviceController.java | 30 ++++++-------- .../ProduceshiftorderController.java | 8 ++++ .../IPdmProduceWorkorderService.java | 3 +- .../impl/IPdmProduceWorkorderServiceImpl.java | 41 ++++++++----------- .../resources/config/application-dev3.yml | 5 ++- .../product_manage/workorder/UploadDialog.vue | 2 +- .../wms/scheduler_manage/scheduler/index.vue | 2 +- 16 files changed, 164 insertions(+), 56 deletions(-) create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/controller/userdevice/PdmBiPersoncorrdeviceController.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/IPdmBiPersoncorrdeviceService.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/dao/PdmBiPersoncorrdevice.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/dao/mapper/PdmBiPersoncorrdeviceMapper.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/dao/mapper/xml/PdmBiPersoncorrdeviceMapper.xml create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/impl/PdmBiPersoncorrdeviceServiceImpl.java diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/common/domain/query/PageQuery.java b/mes/hd/nladmin-system/src/main/java/org/nl/common/domain/query/PageQuery.java index 61e88cc9..cf0af3b1 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/common/domain/query/PageQuery.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/common/domain/query/PageQuery.java @@ -45,15 +45,15 @@ public class PageQuery implements Serializable { /** * 当前记录起始索引 默认值 */ - public static final int DEFAULT_PAGE_NUM = 1; + public static final int DEFAULT_PAGE_NUM = 0; /** * 每页显示记录数 默认值 默认查全部 */ - public static final int DEFAULT_PAGE_SIZE = Integer.MAX_VALUE; + public static final int DEFAULT_PAGE_SIZE = 10; public Page build() { - Integer pageNum = ObjectUtil.defaultIfNull(getPage(), DEFAULT_PAGE_NUM) + 1; + Integer pageNum = ObjectUtil.defaultIfNull(getPage(), DEFAULT_PAGE_NUM); Integer pageSize = ObjectUtil.defaultIfNull(getSize(), DEFAULT_PAGE_SIZE); if (pageNum <= 0) { pageNum = DEFAULT_PAGE_NUM; @@ -75,10 +75,7 @@ public class PageQuery implements Serializable { public Page build(Class r) { Integer pageNum = ObjectUtil.defaultIfNull(getPage(), DEFAULT_PAGE_NUM); Integer pageSize = ObjectUtil.defaultIfNull(getSize(), DEFAULT_PAGE_SIZE); - if (pageNum <= 0) { - pageNum = DEFAULT_PAGE_NUM; - } - Page page = new Page<>(pageNum, pageSize); + Page page = new Page<>(pageNum+1, pageSize); if (StringUtils.isNotBlank(sort)){ String[] split = sort.split(","); for (int i = 0; i < (split.length & ~1); i=i+2) { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/common/enums/AcsTaskEnum.java b/mes/hd/nladmin-system/src/main/java/org/nl/common/enums/AcsTaskEnum.java index f575be13..c8a3f919 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/common/enums/AcsTaskEnum.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/common/enums/AcsTaskEnum.java @@ -58,7 +58,9 @@ public enum AcsTaskEnum { ACS_TASK_TYPE_NOBLE_SINGLE_TASK("2","诺宝单工任务"), ACS_TASK_TYPE_NOBLE_SINGLE_ENTRY_TASK("3","诺宝单入-单任务"), ACS_TASK_TYPE_NOBLE_DOUBLE_ENTRY_TASK("4","诺宝双入-双任务"), + ACS_TASK_TYPE_NOBLE_POINT_POINT_TASK("5","诺宝点对点任务"), + ACS_TASK_TYPE_WEIGHING_TASK_OF_PS20("6","PS20称重任务（刻字-包装）"), ACS_TASK_TYPE_NON_WEIGHING_TASK_OF_PS20("7","PS20不称重任务（刻字-包装）"), diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/config/mybatis/CodeGenerator.java b/mes/hd/nladmin-system/src/main/java/org/nl/config/mybatis/CodeGenerator.java index 960f43a4..91d8e99a 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/config/mybatis/CodeGenerator.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/config/mybatis/CodeGenerator.java @@ -57,10 +57,10 @@ public class CodeGenerator { mpg.setGlobalConfig(gc); // 数据源配置 DataSourceConfig dsc = new DataSourceConfig(); - dsc.setUrl("jdbc:mysql://192.168.81.252:3306/hl_one_mes_xc?serverTimezone=GMT&setUnicode=true&characterEncoding=utf8"); + dsc.setUrl("jdbc:mysql://192.168.46.5:3306/hl_one_mes_test?serverTimezone=GMT&setUnicode=true&characterEncoding=utf8"); dsc.setDriverName("com.mysql.cj.jdbc.Driver"); dsc.setUsername("root"); - dsc.setPassword("Root.123456"); + dsc.setPassword("123456"); mpg.setDataSource(dsc); // 包配置 PackageConfig pc = new PackageConfig(); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/controller/userdevice/PdmBiPersoncorrdeviceController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/controller/userdevice/PdmBiPersoncorrdeviceController.java new file mode 100644 index 00000000..f0853c09 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/controller/userdevice/PdmBiPersoncorrdeviceController.java @@ -0,0 +1,21 @@ +package org.nl.wms.device_manage.controller.userdevice; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.web.bind.annotation.RestController; + +/** + *

+ * 人员设备关系表 前端控制器 + *

+ * + * @author generator + * @since 2023-06-06 + */ +@RestController +@RequestMapping("/pdmBiPersoncorrdevice") +public class PdmBiPersoncorrdeviceController { + +} + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/IPdmBiPersoncorrdeviceService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/IPdmBiPersoncorrdeviceService.java new file mode 100644 index 00000000..559e3fd2 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/IPdmBiPersoncorrdeviceService.java @@ -0,0 +1,16 @@ +package org.nl.wms.device_manage.service.userdevice; + +import org.nl.wms.device_manage.service.userdevice.dao.PdmBiPersoncorrdevice; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 人员设备关系表 服务类 + *

+ * + * @author generator + * @since 2023-06-06 + */ +public interface IPdmBiPersoncorrdeviceService extends IService { + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/dao/PdmBiPersoncorrdevice.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/dao/PdmBiPersoncorrdevice.java new file mode 100644 index 00000000..077276b5 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/dao/PdmBiPersoncorrdevice.java @@ -0,0 +1,34 @@ +package org.nl.wms.device_manage.service.userdevice.dao; + +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *

+ * 人员设备关系表 + *

+ * + * @author generator + * @since 2023-06-06 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("pdm_bi_personcorrdevice") +public class PdmBiPersoncorrdevice implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 用户id + */ + private String user_id; + + /** + * 设备标识 + */ + private String device_code; + + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/dao/mapper/PdmBiPersoncorrdeviceMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/dao/mapper/PdmBiPersoncorrdeviceMapper.java new file mode 100644 index 00000000..ce8c5c96 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/dao/mapper/PdmBiPersoncorrdeviceMapper.java @@ -0,0 +1,16 @@ +package org.nl.wms.device_manage.service.userdevice.dao.mapper; + +import org.nl.wms.device_manage.service.userdevice.dao.PdmBiPersoncorrdevice; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 人员设备关系表 Mapper 接口 + *

+ * + * @author generator + * @since 2023-06-06 + */ +public interface PdmBiPersoncorrdeviceMapper extends BaseMapper { + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/dao/mapper/xml/PdmBiPersoncorrdeviceMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/dao/mapper/xml/PdmBiPersoncorrdeviceMapper.xml new file mode 100644 index 00000000..f0e0fc83 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/dao/mapper/xml/PdmBiPersoncorrdeviceMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/impl/PdmBiPersoncorrdeviceServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/impl/PdmBiPersoncorrdeviceServiceImpl.java new file mode 100644 index 00000000..bc9ebd44 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/impl/PdmBiPersoncorrdeviceServiceImpl.java @@ -0,0 +1,20 @@ +package org.nl.wms.device_manage.service.userdevice.impl; + +import org.nl.wms.device_manage.service.userdevice.dao.PdmBiPersoncorrdevice; +import org.nl.wms.device_manage.service.userdevice.dao.mapper.PdmBiPersoncorrdeviceMapper; +import org.nl.wms.device_manage.service.userdevice.IPdmBiPersoncorrdeviceService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 人员设备关系表 服务实现类 + *

+ * + * @author generator + * @since 2023-06-06 + */ +@Service +public class PdmBiPersoncorrdeviceServiceImpl extends ServiceImpl implements IPdmBiPersoncorrdeviceService { + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/device/SpecialDeviceController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/device/SpecialDeviceController.java index cb21270e..18519171 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/device/SpecialDeviceController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/device/SpecialDeviceController.java @@ -23,6 +23,7 @@ import org.nl.wms.product_manage.备份pdm.service.DeviceService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.util.CollectionUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -43,26 +44,21 @@ public class SpecialDeviceController { @Autowired private IPdmBiDeviceService iDeviceService; - @PostMapping("/query") + @GetMapping("/query") @ApiOperation("查询生产设备") @SaIgnore - public ResponseEntity query(@RequestBody DeviceQuery query) { - List list = iDeviceService.list(query.build()); - Set materials = list.stream().map(PdmBiDevice::getMaterial_id).collect(Collectors.toSet()); - Map materialMap = materialbaseService.list(new QueryWrapper().in("material_id", materials)).stream().collect(HashMap::new, (k, v) -> k.put(v.getMaterial_id(), v), HashMap::putAll); - List result = new ArrayList<>(); - for (PdmBiDevice pdmBiDevice : list) { - Map map = new HashMap<>(); - map.put("device_code",pdmBiDevice.getDevice_code()); - map.put("product_area",pdmBiDevice.getProduct_area()); - map.put("material_id",pdmBiDevice.getMaterial_id()); - MdMeMaterialbase materialbase = materialMap.get("pdmBiDevice.getMaterial_id()"); - map.put("material_name",materialbase!=null?materialbase.getMaterial_name():""); - map.put("material_spec",materialbase!=null?materialbase.getMaterial_spec():""); - map.put("deviceinstor_qty",pdmBiDevice.getDeviceinstor_qty()); - result.add(map); + public ResponseEntity query(DeviceQuery query,PageQuery page) { + Page> list = iDeviceService.pageMaps(page.build(PdmBiDevice.class), query.build()); + if (!CollectionUtils.isEmpty(list.getRecords())){ + Set materials = list.getRecords().stream().map(a->a.get("material_id")).collect(Collectors.toSet()); + Map materialMap = materialbaseService.list(new QueryWrapper().in("material_id", materials)).stream().collect(HashMap::new, (k, v) -> k.put(v.getMaterial_id(), v), HashMap::putAll); + for (Map pdmBiDevice : list.getRecords()) { + MdMeMaterialbase materialbase = materialMap.get(pdmBiDevice.get("material_id")); + pdmBiDevice.put("material_name",materialbase!=null?materialbase.getMaterial_name():""); + pdmBiDevice.put("material_spec",materialbase!=null?materialbase.getMaterial_spec():""); + } } - return new ResponseEntity<>(TableDataInfo.build(result), HttpStatus.OK); + return new ResponseEntity<>(TableDataInfo.build(list), HttpStatus.OK); } @PostMapping("/update") diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/ProduceshiftorderController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/ProduceshiftorderController.java index 39a97d37..1be3d857 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/ProduceshiftorderController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/ProduceshiftorderController.java @@ -108,6 +108,14 @@ public class ProduceshiftorderController{ public ResponseEntity saveReport(@RequestBody JSONObject param) { return new ResponseEntity<>(iPdmProduceWorkorderService.report(param), HttpStatus.OK); } + @PostMapping("/unqualReport") + @Log("工单不合格报工") + @ApiOperation("工单不合格报工") + public ResponseEntity unqualReport(@RequestBody JSONObject param) { + iPdmProduceWorkorderService.unqualReport(param); + return new ResponseEntity<>(HttpStatus.OK); + } + @PostMapping("/finish") @Log("看板强制完成") diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/IPdmProduceWorkorderService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/IPdmProduceWorkorderService.java index f64326d4..d3f3f26d 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/IPdmProduceWorkorderService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/IPdmProduceWorkorderService.java @@ -108,12 +108,13 @@ public interface IPdmProduceWorkorderService extends IService().eq("workorder_id", param.getString("workorder_id"))); // if (workorder.getWorkorder_status().equals(WorkerOrderEnum.COMPLETE.getCode()) || workorder.getWorkorder_status().equals(WorkerOrderEnum.FORCE_COMPLETE.getCode())) { // throw new BadRequestException(param.getString("workorder_id") + "当前工单已经完工不允许报工"); // } + Assert.notNull(workorder,"当前工单不存在"); PdmProduceWorkorderrecord one = reportRecordService.getOne(new QueryWrapper() .eq("workorder_id", param.getString("workorder_id")).eq("report_status", ReportEnum.REPORT_STATUS.code("生成"))); - if (one == null) { - throw new BadRequestException(param.getString("workorder_id") + "当前工单没有生成状态的报工记录"); - } + Assert.notNull(one,param.getString("workorder_id") + "当前工单没有生成状态的报工记录"); workorder.setReport_qty(workorder.getReport_qty().add(param.getBigDecimal("report_qty"))); - workorder.setNok_qty(workorder.getReport_qty().add(param.getBigDecimal("nok_qty"))); - workorder.setRepare_qty(workorder.getReport_qty().add(param.getBigDecimal("repare_qty"))); if (workorder.getPlan_qty().doubleValue() <= workorder.getReport_qty().doubleValue()) { workorder.setWorkorder_status(WorkerOrderEnum.COMPLETE.getCode()); } @@ -609,14 +606,22 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl() .set("report_qty", param.getBigDecimal("report_qty")) - .set("nok_qty", param.getBigDecimal("nok_qty")) - .set("repare_qty", param.getBigDecimal("repare_qty")) .set("report_status", ReportEnum.REPORT_STATUS.code("报工")) .set("needproduct_qty", Math.max(0,workorder.getPlan_qty().intValue() - workorder.getReport_qty().intValue())) .eq("macoperate_id", one.getMacoperate_id())); return one.getMacoperate_id(); } + @Override + public void unqualReport(JSONObject param) { + Assert.notNull(new Object[]{param, param.get("report_qty"),param.getString("workorder_id")}, "请求参数不能为空"); + PdmProduceWorkorder workorder = this.getOne(new QueryWrapper().eq("workorder_id", param.getString("workorder_id"))); + Assert.notNull(workorder,"当前工单不存在"); + workorder.setRepare_qty(param.getBigDecimal("nok_qty")); + workorder.setRepare_qty(param.getBigDecimal("repare_qty")); + workorder.setReal_qty(null); + this.updateById(workorder); + } @Override @Transactional @@ -647,23 +652,9 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl packageWorkorderQty(List record, List itemRecord) { List ids = itemRecord.stream().map(PdmProduceWorkorderrecord::getMacoperate_id).collect(Collectors.toList()); List oldRecord = record.stream().filter(item -> ids.contains(item.getMacoperate_id())).collect(Collectors.toList()); - long old_nok_qty = oldRecord.stream().mapToLong(a->a.getNok_qty().longValue()).sum(); - long new_nok_qty = itemRecord.stream().mapToLong(a->a.getNok_qty().longValue()).sum(); - long old_repare_qty = oldRecord.stream().mapToLong(a->a.getRepare_qty().longValue()).sum(); - long new_repare_qty = itemRecord.stream().mapToLong(a->a.getRepare_qty().longValue()).sum(); long old_report_qty = oldRecord.stream().mapToLong(a->a.getReport_qty().longValue()).sum(); long new_report_qty = itemRecord.stream().mapToLong(a->a.getReport_qty().longValue()).sum(); - List list = new ArrayList<>(); - Map nok_qty = new HashMap<>(); - nok_qty.put("field", "nok_qty"); - nok_qty.put("value", Math.abs(new_nok_qty - old_nok_qty)); - nok_qty.put("add", new_nok_qty > old_nok_qty); - list.add(nok_qty); - Map repare_qty = new HashMap<>(); - repare_qty.put("field", "repare_qty"); - repare_qty.put("value", Math.abs(new_repare_qty - old_repare_qty)); - repare_qty.put("add", new_repare_qty > old_repare_qty); - list.add(repare_qty); + List list = new ArrayList<>(); Map report_qty = new HashMap<>(); report_qty.put("field", "report_qty"); report_qty.put("value", Math.abs(new_report_qty - old_report_qty)); diff --git a/mes/hd/nladmin-system/src/main/resources/config/application-dev3.yml b/mes/hd/nladmin-system/src/main/resources/config/application-dev3.yml index 4a195bc6..934d0dbd 100644 --- a/mes/hd/nladmin-system/src/main/resources/config/application-dev3.yml +++ b/mes/hd/nladmin-system/src/main/resources/config/application-dev3.yml @@ -23,10 +23,11 @@ spring: db-type: com.alibaba.druid.pool.DruidDataSource driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy # url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.46.5}:${DB_PORT:3306}/${DB_NAME:hl_one_mes_test}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false - url: jdbc:log4jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:hl_one_mes}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false + url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.46.5}:${DB_PORT:3306}/${DB_NAME:hl_one_mes_test}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false + # url: jdbc:log4jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:hl_one_mes}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false username: ${DB_USER:root} # password: ${DB_PWD:123456} - password: ${DB_PWD:942464Yy} + password: ${DB_PWD:123456} # 初始连接数 initial-size: 5 diff --git a/mes/qd/src/views/wms/product_manage/workorder/UploadDialog.vue b/mes/qd/src/views/wms/product_manage/workorder/UploadDialog.vue index da5672f9..d7526503 100644 --- a/mes/qd/src/views/wms/product_manage/workorder/UploadDialog.vue +++ b/mes/qd/src/views/wms/product_manage/workorder/UploadDialog.vue @@ -38,7 +38,7 @@