pom.xml
@@ -57,12 +57,12 @@ <dependency> <groupId>com.baomidou</groupId> <artifactId>mybatis-plus-boot-starter</artifactId> <version>3.4.1</version> <version>3.5.7</version> </dependency> <dependency> <groupId>com.baomidou</groupId> <artifactId>mybatis-plus-generator</artifactId> <version>3.4.1</version> <version>3.5.7</version> </dependency> <!-- swagger --> <dependency> zy-asrs-common/pom.xml
@@ -39,12 +39,12 @@ <dependency> <groupId>com.baomidou</groupId> <artifactId>mybatis-plus-boot-starter</artifactId> <version>3.4.1</version> <version>3.5.7</version> </dependency> <dependency> <groupId>com.baomidou</groupId> <artifactId>mybatis-plus-generator</artifactId> <version>3.4.1</version> <version>3.5.7</version> </dependency> <dependency> <groupId>io.springfox</groupId> zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/DetlDto.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/LocDetlDto.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/LocDto.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/LocRangeDto.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/LocTypeDto.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/OrderDto.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/OutLocDto.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/QueryStockPreDo.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/ReportStockDto.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/SafeStoDo.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/SafeStoDto.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/StartupDto.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/TaskDto.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/WrkDto.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/WrkTraceVo.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/MatExcel.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/MatPrint.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/MobileAdjustResult.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/SafeStoExport.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/Shelves.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/StaDesc.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/domain/enums/ApiType.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/domain/enums/IoWorkType.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/domain/enums/OrderSettleType.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/domain/enums/WorkNoType.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/domain/param/FullStoreParam.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/domain/param/LocDetlAdjustParam.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/domain/param/LocMastInitParam.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/domain/param/MobileAdjustParam.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/domain/param/OpenOrderPakinParam.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/domain/param/OpenOrderPakoutParam.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/domain/param/OrderDomainParam.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/domain/param/SearchLocParam.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/ApiList.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/ApiLog.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/HostKey.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/dto/OrderListDto.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/CombParam.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/CreateMatParam.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/GenerateOrderMatParam.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/GenerateOrderPakInParam.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/GenerateOrderPakOutParam.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/MatParam.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/OrderListParam.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/mapper/ApiListMapper.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/mapper/ApiLogMapper.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/mapper/HostKeyMapper.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/ApiListService.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/ApiLogService.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/ApiService.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/HostKeyService.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/impl/ApiListServiceImpl.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/impl/ApiLogServiceImpl.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/impl/ApiServiceImpl.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/impl/HostKeyServiceImpl.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/properties/SystemProperties.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/StaDescService.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/StaDescServiceImpl.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/utils/MatExcelListener.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/utils/NodeUtils.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/utils/TreeUtils.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/utils/Utils.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/utils/VersionUtils.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/web/AuthController.java
@@ -7,15 +7,11 @@ import com.zy.asrs.common.domain.entity.Parameter; import com.zy.asrs.common.domain.enums.HtmlNavIconType; import com.zy.asrs.common.domain.enums.LoginSystemType; import com.zy.asrs.common.properties.OSinfo; import com.zy.asrs.common.properties.SystemProperties; import com.zy.asrs.common.sys.entity.*; import com.zy.asrs.common.sys.service.*; import com.zy.asrs.common.utils.RandomValidateCodeUtil; import com.zy.asrs.framework.annotations.ManagerAuth; import com.zy.asrs.framework.common.AesUtils; import com.zy.asrs.framework.common.Cools; import com.zy.asrs.framework.common.DateUtils; import com.zy.asrs.framework.common.R; import com.zy.asrs.framework.exception.CoolException; import org.springframework.beans.factory.annotation.Autowired; @@ -339,27 +335,6 @@ return R.ok(resources); } @GetMapping(value = "/system/activation/auth") public R activation() { if (SystemProperties.SYSTEM_ACTIVATION) { String activationCode = SystemProperties.getActivationCode(OSinfo.getOSname().getActivationCodePath()); String timeStr = AesUtils.decrypt(activationCode, SystemProperties.SALT); if (null == timeStr) { SystemProperties.SYSTEM_ACTIVATION = Boolean.FALSE; return R.error(); } Date exprTime = DateUtils.convert(timeStr, DateUtils.yyyyMMddHHmmss); if (new Date().getTime() < exprTime.getTime()) { return R.ok().add(DateUtils.convert(exprTime)); } else { SystemProperties.SYSTEM_ACTIVATION = Boolean.FALSE; return R.error(); } } else { return R.error(); } } @RequestMapping("/loginInformation") public R getLoginPageInformation() { Config loginLogo = configService.selectByCode("loginLogo"); @@ -372,29 +347,6 @@ map.put("loginCopyrightImg1", loginCopyrightImg1.getStatus() == 1 ? loginCopyrightImg1.getValue() : ""); return R.ok().add(map); } @PostMapping(value = "/system/secret/auth") @ManagerAuth public R systemSecret(@RequestParam(value = "secret") String secret) { if (Cools.isEmpty(secret)) { return R.error("请输入激活码"); } // 验证激活码 String timeStr = AesUtils.decrypt(secret, SystemProperties.SALT); if (null == timeStr) { return R.error("激活码错误"); } Date exprTime = DateUtils.convert(timeStr, DateUtils.yyyyMMddHHmmss); if (new Date().getTime() >= exprTime.getTime()) { return R.error("激活码已失效"); } boolean result = SystemProperties.saveActivationCode(OSinfo.getOSname().getActivationCodePath(), secret); if (!result) { return R.error("激活失败"); } SystemProperties.SYSTEM_ACTIVATION = Boolean.TRUE; return R.ok("激活成功，有效期至"+DateUtils.convert(exprTime)); } } zy-asrs-common/src/main/java/com/zy/asrs/common/web/BaseController.java
@@ -7,8 +7,6 @@ import com.zy.asrs.common.sys.entity.UserLogin; import com.zy.asrs.common.sys.service.UserLoginService; import com.zy.asrs.common.sys.service.UserService; import com.zy.asrs.common.wms.entity.Tag; import com.zy.asrs.common.wms.service.TagService; import com.zy.asrs.framework.common.BaseRes; import com.zy.asrs.framework.common.Cools; import com.zy.asrs.framework.controller.AbstractBaseController; @@ -34,8 +32,6 @@ private UserService userService; @Autowired private UserLoginService userLoginService; @Autowired private TagService tagService; protected Long getHostId(){ if (getUserId() == 9527) { @@ -119,10 +115,6 @@ } // page.setCondition(map); return page; } protected Tag getOriginTag(){ return tagService.getTop(getHostId()); } } zy-asrs-common/src/main/java/com/zy/asrs/common/wms/controller/LocDirectionController.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/AdjDetl.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/BasBarcode.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/BasDevp.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/BasLocSts.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/BasMap.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/BasWhs.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/BasWrkIotype.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/BasWrkStatus.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Cstmr.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/DocType.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Item.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocDetl.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocDirection.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocMast.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocRule.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/MatCode.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Node.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Order.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/OrderDetl.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/OrderDetlLog.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/OrderLog.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/OrderSettle.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Prior.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/RowLastno.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Tag.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/ViewInOutBean.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/ViewStayTimeBean.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/ViewStockUseBean.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/ViewWorkInBean.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WaitPakin.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WaitPakinLog.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkDetl.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkDetlLog.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkLastno.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkMast.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkMastLog.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/AdjDetlMapper.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/BasBarcodeMapper.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/BasDevpMapper.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/BasLocStsMapper.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/BasMapMapper.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/BasWhsMapper.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/BasWrkIotypeMapper.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/BasWrkStatusMapper.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/CstmrMapper.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/DocTypeMapper.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/ItemMapper.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/LocDetlMapper.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/LocDirectionMapper.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/LocMastMapper.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/LocRuleMapper.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/MatCodeMapper.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/MatMapper.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/NodeMapper.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/OrderDetlLogMapper.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/OrderDetlMapper.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/OrderLogMapper.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/OrderMapper.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/OrderSettleMapper.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/PriorMapper.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/ReportQueryMapper.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/RowLastnoMapper.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/StaDescMapper.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/TagMapper.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/WaitPakinLogMapper.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/WaitPakinMapper.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/WrkDetlLogMapper.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/WrkDetlMapper.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/WrkLastnoMapper.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/WrkMastLogMapper.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/WrkMastMapper.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/AdjDetlService.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/BasBarcodeService.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/BasDevpService.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/BasLocStsService.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/BasMapService.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/BasWhsService.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/BasWrkIotypeService.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/BasWrkStatusService.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/CommonService.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/CstmrService.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/DocTypeService.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/ItemService.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/LocDetlService.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/LocDirectionService.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/LocMastService.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/LocRuleService.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/MatCodeService.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/MatService.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/MobileService.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/NodeService.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/OpenService.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/OrderDetlLogService.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/OrderDetlService.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/OrderLogService.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/OrderService.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/OrderSettleService.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/PriorService.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/RowLastnoService.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/TagService.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/WaitPakinLogService.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/WaitPakinService.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/WorkService.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/WrkDetlLogService.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/WrkDetlService.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/WrkLastnoService.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/WrkMastLogService.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/WrkMastService.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/AdjDetlServiceImpl.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/BasBarcodeServiceImpl.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/BasDevpServiceImpl.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/BasLocStsServiceImpl.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/BasMapServiceImpl.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/BasWhsServiceImpl.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/BasWrkIotypeServiceImpl.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/BasWrkStatusServiceImpl.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/CstmrServiceImpl.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/DocTypeServiceImpl.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/ItemServiceImpl.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/LocDetlServiceImpl.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/LocDirectionServiceImpl.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/LocMastServiceImpl.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/LocRuleServiceImpl.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/MatCodeServiceImpl.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/MatServiceImpl.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/MobileServiceImpl.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/NodeServiceImpl.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OpenServiceImpl.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OrderDetlLogServiceImpl.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OrderDetlServiceImpl.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OrderLogServiceImpl.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OrderServiceImpl.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OrderSettleServiceImpl.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/PriorServiceImpl.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/RowLastnoServiceImpl.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/TagServiceImpl.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WaitPakinLogServiceImpl.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WaitPakinServiceImpl.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WrkDetlLogServiceImpl.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WrkDetlServiceImpl.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WrkLastnoServiceImpl.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WrkMastLogServiceImpl.java
File was deleted zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WrkMastServiceImpl.java
File was deleted zy-asrs-common/src/main/resources/mapper/openapi/ApiListMapper.xml
File was deleted zy-asrs-common/src/main/resources/mapper/openapi/ApiLogMapper.xml
File was deleted zy-asrs-common/src/main/resources/mapper/openapi/HostKeyMapper.xml
File was deleted zy-asrs-common/src/main/resources/mapper/wms/AdjDetlMapper.xml
File was deleted zy-asrs-common/src/main/resources/mapper/wms/BasBarcodeMapper.xml
File was deleted zy-asrs-common/src/main/resources/mapper/wms/BasDevpMapper.xml
File was deleted zy-asrs-common/src/main/resources/mapper/wms/BasLocStsMapper.xml
File was deleted zy-asrs-common/src/main/resources/mapper/wms/BasMapMapper.xml
File was deleted zy-asrs-common/src/main/resources/mapper/wms/BasPlcerrorMapper.xml
File was deleted zy-asrs-common/src/main/resources/mapper/wms/BasWhsMapper.xml
File was deleted zy-asrs-common/src/main/resources/mapper/wms/BasWrkIotypeMapper.xml
File was deleted zy-asrs-common/src/main/resources/mapper/wms/BasWrkStatusMapper.xml
File was deleted zy-asrs-common/src/main/resources/mapper/wms/CstmrMapper.xml
File was deleted zy-asrs-common/src/main/resources/mapper/wms/DocTypeMapper.xml
File was deleted zy-asrs-common/src/main/resources/mapper/wms/ItemMapper.xml
File was deleted zy-asrs-common/src/main/resources/mapper/wms/LocDetlMapper.xml
File was deleted zy-asrs-common/src/main/resources/mapper/wms/LocDirectionMapper.xml
File was deleted zy-asrs-common/src/main/resources/mapper/wms/LocMastMapper.xml
File was deleted zy-asrs-common/src/main/resources/mapper/wms/LocRuleMapper.xml
File was deleted zy-asrs-common/src/main/resources/mapper/wms/MatCodeMapper.xml
File was deleted zy-asrs-common/src/main/resources/mapper/wms/MatMapper.xml
File was deleted zy-asrs-common/src/main/resources/mapper/wms/NodeMapper.xml
File was deleted zy-asrs-common/src/main/resources/mapper/wms/OrderDetlLogMapper.xml
File was deleted zy-asrs-common/src/main/resources/mapper/wms/OrderDetlMapper.xml
File was deleted zy-asrs-common/src/main/resources/mapper/wms/OrderLogMapper.xml
File was deleted zy-asrs-common/src/main/resources/mapper/wms/OrderMapper.xml
File was deleted zy-asrs-common/src/main/resources/mapper/wms/OrderSettleMapper.xml
File was deleted zy-asrs-common/src/main/resources/mapper/wms/PriorMapper.xml
File was deleted zy-asrs-common/src/main/resources/mapper/wms/ReportQueryMapper.xml
File was deleted zy-asrs-common/src/main/resources/mapper/wms/RowLastnoMapper.xml
File was deleted zy-asrs-common/src/main/resources/mapper/wms/StaDescMapper.xml
File was deleted zy-asrs-common/src/main/resources/mapper/wms/TagMapper.xml
File was deleted zy-asrs-common/src/main/resources/mapper/wms/ViewInOutMapper.xml
File was deleted zy-asrs-common/src/main/resources/mapper/wms/ViewStayTimeMapper.xml
File was deleted zy-asrs-common/src/main/resources/mapper/wms/ViewWorkInMapper.xml
File was deleted zy-asrs-common/src/main/resources/mapper/wms/WaitPakinLogMapper.xml
File was deleted zy-asrs-common/src/main/resources/mapper/wms/WaitPakinMapper.xml
File was deleted zy-asrs-common/src/main/resources/mapper/wms/WrkDetlLogMapper.xml
File was deleted zy-asrs-common/src/main/resources/mapper/wms/WrkDetlMapper.xml
File was deleted zy-asrs-common/src/main/resources/mapper/wms/WrkLastnoMapper.xml
File was deleted zy-asrs-common/src/main/resources/mapper/wms/WrkMastLogMapper.xml
File was deleted zy-asrs-common/src/main/resources/mapper/wms/WrkMastMapper.xml
File was deleted zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/TaskService.java
@@ -8,5 +8,4 @@ public interface TaskService extends IService<Task> { List<Task> getByOrderDetlId(Long orderDetlId); } zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/TaskServiceImpl.java
@@ -1,7 +1,6 @@ package com.zy.asrs.wms.asrs.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.zy.asrs.wms.asrs.entity.TaskDetl; import com.zy.asrs.wms.asrs.mapper.TaskMapper; import com.zy.asrs.wms.asrs.entity.Task; import com.zy.asrs.wms.asrs.service.TaskDetlService; @@ -11,7 +10,6 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.Collections; import java.util.List; @Service("taskService") @@ -29,4 +27,5 @@ } return tasks; } } zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskTimer.java
New file @@ -0,0 +1,128 @@ package com.zy.asrs.wms.asrs.timer; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.plugins.IgnoreStrategy; import com.baomidou.mybatisplus.core.plugins.InterceptorIgnoreHelper; import com.zy.asrs.framework.exception.CoolException; import com.zy.asrs.wms.asrs.entity.*; import com.zy.asrs.wms.asrs.entity.enums.LocStsType; import com.zy.asrs.wms.asrs.service.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; import java.util.Date; import java.util.List; @Component public class TaskTimer { @Autowired private TaskService taskService; @Autowired private TaskDetlService taskDetlService; @Autowired private TaskDetlFieldService taskDetlFieldService; @Autowired private LocService locService; @Autowired private LocDetlService locDetlService; @Autowired private LocDetlFieldService locDetlFieldService; @Autowired private WaitPakinService waitPakinService; @Scheduled(cron = "0/3 * * * * ? ") @Transactional public void inExecute() { InterceptorIgnoreHelper.handle(IgnoreStrategy.builder().tenantLine(true).build()); try { //获取入库完成任务 List<Task> list = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getTaskSts, 99)); if (list.isEmpty()) { return; } for (Task task : list) { //同步数据 Long hostId = task.getHostId(); switch (task.getTaskType().intValue()) { case 1://入库 Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getLocNo, task.getTargetLoc()).eq(Loc::getHostId, hostId)); if(loc == null) { throw new CoolException("库位不存在"); } if(loc.getLocStsId() != LocStsType.S.val()){ throw new CoolException("库位状态不处于S.入库预约"); } loc.setLocStsId(LocStsType.F.val()); loc.setUpdateTime(new Date()); loc.setBarcode(task.getBarcode()); if (!locService.updateById(loc)) { throw new CoolException("库位状态更新失败"); } List<TaskDetl> taskDetls = taskDetlService.getTaskDetlByTaskId(task.getId()); if(taskDetls.isEmpty()) { throw new CoolException("库存明细不存在"); } //添加库存明细 for (TaskDetl taskDetl : taskDetls) { LocDetl locDetl = new LocDetl(); locDetl.setLocId(loc.getId()); locDetl.setLocNo(loc.getLocNo()); locDetl.setMatId(taskDetl.getMatId()); locDetl.setMatnr(taskDetl.getMat$().getMatnr()); locDetl.setOrderNo(taskDetl.getOrderNo()); locDetl.setBatch(taskDetl.getBatch()); locDetl.setAnfme(taskDetl.getAnfme()); locDetl.setHostId(hostId); if (!locDetlService.save(locDetl)) { throw new CoolException("插入库存明细失败"); } //添加库存明细扩展字段 List<TaskDetlField> detlFields = taskDetlFieldService.list(new LambdaQueryWrapper<TaskDetlField>().eq(TaskDetlField::getDetlId, taskDetl.getId()).eq(TaskDetlField::getHostId, hostId)); for (TaskDetlField detlField : detlFields) { LocDetlField locDetlField = new LocDetlField(); locDetlField.setDetlId(locDetl.getId()); locDetlField.setFieldId(detlField.getFieldId()); locDetlField.setName(detlField.getName()); locDetlField.setHostId(hostId); if (!locDetlFieldService.save(locDetlField)) { throw new CoolException("插入明细扩展字段失败"); } } } //删除组托通知档 waitPakinService.remove(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, task.getBarcode()).eq(WaitPakin::getHostId, hostId)); break; } task.setTaskSts(100L);//100.库存更新完成 task.setUpdateTime(new Date()); if (!taskService.updateById(task)) { throw new CoolException("库存更新失败"); } } } catch (Exception e) { }finally { InterceptorIgnoreHelper.clearIgnoreStrategy(); } } @Scheduled(cron = "0/3 * * * * ? ") @Transactional public void outExecute() { } } zy-asrs-wms/src/main/java/com/zy/asrs/wms/common/config/MybatisPlusConfig.java
@@ -50,6 +50,10 @@ "sys_user_role", "sys_role_menu", "sys_language", "man_loc_sts", "man_task_sts", "man_task_type", "man_order_settle", "view_man_loc_detl_field" ).contains(tableName); }
