rsf-open-api/src/main/resources/application-dev.yml
@@ -63,6 +63,6 @@ port: 8088 wms: #链接 host: http://127.0.0.1 host: http://127.0.0.1 #端口 port: 8085 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java
@@ -437,11 +437,11 @@ .setRow(dto.getRow()) .setLev(dto.getLev()) .setId(null) .setAreaId(41L) .setWarehouseId(27L) .setAreaId(42L) .setWarehouseId(29L) .setBarcode(string) .setCol(dto.getBay()) .setType(dto.getLocType()) .setType(dto.getLocType().equals("16") ? "17" : "15") .setStatus(dto.getStatusBool()) .setUseStatus(LocStsType.getLocSts(dto.getLocSts())); if (!locService.save(loc)) { rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasStationController.java
@@ -72,8 +72,6 @@ station.setContainerTypes(longs1); } return R.ok().add(station); }
@@ -16,7 +16,7 @@ private Integer endNo; @ApiModelProperty("容器类型") private Long containerType; private Long containerType = 3L; @ApiModelProperty("长度") private Integer length = 6; rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AutoRunSchedules.java
@@ -58,7 +58,7 @@ * 自动生成库位明细 */ @Transactional(rollbackFor = Exception.class) @Scheduled(cron = "0/25 * * * * ?") // @Scheduled(cron = "0/25 * * * * ?") public void insertRandomMats() { List<Loc> list = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_F.type)); for (Loc loc : list) { rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
@@ -270,7 +270,7 @@ * @description: 光电站点任务下发 * @version 1.0 */ @Scheduled(cron = "0/5 * * * * ? ") // @Scheduled(cron = "0/5 * * * * ? ") @Transactional(rollbackFor = Exception.class) public void taskToWCS() throws Exception { Long loginUserId = SystemAuthUtils.getLoginUserId(); rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/BasContainerServiceImpl.java
@@ -58,7 +58,9 @@ for (int i = params.getStartNo(); i <= params.getEndNo() ; i++) { BasContainer container = new BasContainer(); String code = StringUtils.leftPad(i + "", params.getLength(), "0"); if (!params.getContainerType().equals(3L)) { params.setPrefix("81"); } container.setAreas(areas.getName()) .setCodeType(QRCodeType.QRCODE_TYPE_BARCODE.desc) .setCode(params.getPrefix() + code) @@ -74,6 +76,6 @@ throw new CoolException("容器保存失败,请检查编码是否有重复！！"); } return R.ok(); return R.ok("新增成功！！").add(containerList); } } rsf-server/src/main/resources/application-dev.yml
@@ -14,9 +14,9 @@ # url: jdbc:mysql://47.76.147.249:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai # username: rsf username: root # url: jdbc:mysql://10.10.10.200:3306/rsf-xiri?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai # url: jdbc:mysql://10.10.10.200:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai # password: xltys1995 url: jdbc:mysql://127.0.0.1:3306/rsf-xiri?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai url: jdbc:mysql://127.0.0.1:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai password: 34821015 type: com.alibaba.druid.pool.DruidDataSource druid: @@ -30,7 +30,7 @@ test-on-borrow: true test-on-return: false remove-abandoned: true remove-abandoned-timeout: 18 remove-abandoned-timeout: 1800 #pool-prepared-statements: false #max-pool-prepared-statement-per-connection-size: 20 filters: stat, wall rsf-server/src/main/resources/application.yml
@@ -25,7 +25,7 @@ # global-config: # field-strategy: 0 configuration: log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl map-underscore-to-camel-case: true cache-enabled: true call-setters-on-nulls: true
