| src/main/java/com/zy/asrs/controller/BasContainerController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/service/BasContainerService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/service/impl/BasContainerServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/task/LocMoveAllScheduler.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/system/controller/LicenseCreatorController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/resources/application-dev.yml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/resources/application-prod.yml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/resources/application.yml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/controller/BasContainerController.java
@@ -67,14 +67,7 @@ return R.ok(); } @RequestMapping(value = "/basContainer/init/auth") @ManagerAuth public R init(@RequestBody ContainerParams container) { if (Objects.isNull(container)) { throw new RuntimeException("能数不能为空！！"); } return basContainerService.init(container); } @RequestMapping(value = "/basContainer/update/auth") src/main/java/com/zy/asrs/service/BasContainerService.java
@@ -7,11 +7,5 @@ public interface BasContainerService extends IService<BasContainer> { /** * @author Ryan * @date 2025/9/26 * @description: TODO * @version 1.0 */ R init(ContainerParams container); } src/main/java/com/zy/asrs/service/impl/BasContainerServiceImpl.java
@@ -10,7 +10,6 @@ import com.zy.asrs.entity.BasContainer; import com.zy.asrs.service.BasContainerService; import com.baomidou.mybatisplus.service.impl.ServiceImpl; import org.apache.tika.utils.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -23,49 +22,4 @@ @Service("basContainerService") public class BasContainerServiceImpl extends ServiceImpl<BasContainerMapper, BasContainer> implements BasContainerService { /** * @author Ryan * @date 2025/9/26 * @description: 容器初始化 * @version 1.0 */ @Override @Transactional(rollbackFor = Exception.class) public R init(ContainerParams container) { Integer length = 7; if (Objects.isNull(container.getType())) { throw new CoolException("容器类型不能为空！"); } if (!Objects.isNull(container.getLength())) { length = container.getLength(); } if (!Objects.isNull(container.getFlagInit()) && container.getFlagInit().equals(CommonEnum.COMMON_ENUM_Y.type)) { this.delete(new EntityWrapper<>()); } for (int i = container.getStart(); i <= container.getEnd(); i++) { BasContainer basContainer = new BasContainer(); String prefix = "", ruleCode = ""; if (container.getType().equals(ContainerType.CONTAINER_TYPE_BOX.type)) { prefix = "LX2"; basContainer.setMixMax(3); } else if (container.getType().equals(ContainerType.CONTAINER_TYPE_CAGE.type)) { prefix = "LK3"; basContainer.setMixMax(2); } else if (container.getType().equals(ContainerType.CONTAINER_TYPE_SALVER.type)) { prefix = "TP4"; basContainer.setMixMax(2); } ruleCode = prefix + StringUtils.leftPad(i + "", length, "0"); basContainer.setType(container.getType()) .setCreateTime(new Date()) .setUpdateTime(new Date()) .setId(null) .setFlagMix(1) .setBarcode(ruleCode); if (!this.insert(basContainer)) { throw new CoolException("容器保存失败！！"); } } return R.ok(); } } src/main/java/com/zy/asrs/task/LocMoveAllScheduler.java
@@ -28,12 +28,12 @@ @Component public class LocMoveAllScheduler { @Value("${loc-move.enable}") private boolean enable; @Value("${loc-move.crn1}") private boolean crn1; @Value("${loc-move.crn2}") private boolean crn2; //@Value("${loc-move.enable}") private boolean enable =false; //@Value("${loc-move.crn1}") private boolean crn1=false; //@Value("${loc-move.crn2}") private boolean crn2=false; @Autowired src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -31,8 +31,6 @@ @Autowired private ApiLogService apiLogService; @Value("${erp.switch.ErpReportOld}") private boolean ErpReportOld; @Scheduled(cron = "0 0 1 * * ? ") public void clearApiLog() { @@ -104,9 +102,7 @@ // @Scheduled(cron = "0/30 * * * * ? ") @Async("orderThreadPool") public void completeAndReportOrderReport() { if (!ErpReportOld){ return; } String erpReport = Parameter.get().getErpReport(); if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) { List<Order> orders = orderService.selectComplete(); src/main/java/com/zy/system/controller/LicenseCreatorController.java
@@ -103,10 +103,6 @@ } @RequestMapping(value = "/activate") public R activate() { licenseTimer.timer(); return R.ok(); } } src/main/resources/application-dev.yml
@@ -11,8 +11,8 @@ datasource: driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver username: sa password: Skyouc#23 url: jdbc:sqlserver://192.168.4.24:1433;databasename=jsxswms password: sa@123 url: jdbc:sqlserver://127.0.0.1:1433;databasename=wms2.0 mvc: static-path-pattern: /** redis: @@ -35,12 +35,9 @@ cache-enabled: true call-setters-on-nulls: true logging: file: path: /stock/out/@pom.build.finalName@/logs super: pwd: asrs2023 pwd: xltys1995 swagger: enable: false @@ -65,48 +62,6 @@ doubleLocsLeft: 1,5,9,13 # 右深库位排号 doubleLocsRight: 4,8,12,16 # wms参数配置 wms-parameter: # 自动补空板功能开关 automaticFillingBoardStaNosBoolean: false # 自动补空板站点 automaticFillingBoardStaNos: 112,101 # 自动移库功能开关 autoLocMoveBoolean: false # 自动移库功能开关 穿梭 autoLocMoveUnilateralBoolean: false comb: limit: 5000 #erp对接 erp: # 开关 switch: #计时器上报开关 ErpReportOld: false #获取单据开关 InboundOrderSwitch: false #登录接口开关 LoginAuthenticationSwitch: false #上报、审核单据开关 ReviewOrderSwitch: false # 地址 address: URL: http://58.210.10.90:28090 #登录地址 loginaddress: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.AuthService.ValidateUser.common.kdsvc #单据，商品档案地址 inaddress: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.ExecuteBillQuery.common.kdsvc #结果上报（保存）单地址 outaddressSave: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Save.common.kdsvc #结果上报（提交）单地址 outaddressSubmit: K3Cloud/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit.common.kdsvc #结果上报（审核）单地址 outaddressAudit: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit.common.kdsvc # 登录账号管理 login : acctID: "647e849ab6fa0f" username: "llw" password: "666666" lcid: 2052
@@ -78,48 +78,4 @@ doubleLocsLeft: 1,5,9,13 # 右深库位排号 doubleLocsRight: 4,8,12,16 # wms参数配置 wms-parameter: # 自动补空板功能开关 automaticFillingBoardStaNosBoolean: false # 自动补空板站点 automaticFillingBoardStaNos: 112,101 # 自动移库功能开关 autoLocMoveBoolean: false # 自动移库功能开关 穿梭 autoLocMoveUnilateralBoolean: false comb: limit: 5000 #erp对接 erp: # 开关 switch: #计时器上报开关 ErpReportOld: false #获取单据开关 InboundOrderSwitch: false #登录接口开关 LoginAuthenticationSwitch: false #上报、审核单据开关 ReviewOrderSwitch: false # 地址 address: URL: http://58.210.10.90:28090 #登录地址 loginaddress: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.AuthService.ValidateUser.common.kdsvc #单据，商品档案地址 inaddress: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.ExecuteBillQuery.common.kdsvc #结果上报（保存）单地址 outaddressSave: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Save.common.kdsvc #结果上报（提交）单地址 outaddressSubmit: K3Cloud/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit.common.kdsvc #结果上报（审核）单地址 outaddressAudit: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit.common.kdsvc # 登录账号管理 login : acctID: "647e849ab6fa0f" username: "llw" password: "666666" lcid: 2052 src/main/resources/application.yml
@@ -1,3 +1,6 @@ spring: profiles: active: dev logging: file: path: /stock/out/@pom.build.finalName@/logs
