From f06f280f39f22ffbd93ae11f6c05f91d8b0faf6b Mon Sep 17 00:00:00 2001 From: anthonywj Date: Thu, 13 Jul 2023 15:00:22 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E6=B1=BA=E5=85=A7=E7=B6=B2=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E4=B8=8D=E5=90=8C=E6=AD=A5=E6=95=B0=E6=8D=AE=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E9=97=AE=E9=A2=98=EF=BC=8C=E5=8E=BB=E9=99=A4=E5=A4=9A?= =?UTF-8?q?=E4=BD=99GS1=E7=AC=A6=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/controller/inout/IoCodeTempController.java | 6 +++++- .../api/controller/sync/SpsSyncExportStatusController.java | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index a0025223..0c739ee6 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -349,7 +349,11 @@ public class IoCodeTempController extends BaseController { BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(addOrderRequest.getAction()); InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(addOrderRequest.getInvCode()); String code = addOrderRequest.getCode(); - if (StringUtils.isBlank(code)) return ResultVOUtils.error(ResultEnum.DATA_ERROR); + if (StringUtils.isBlank(code)) + return ResultVOUtils.error(ResultEnum.DATA_ERROR); + if (code.endsWith("\u001D")) { + code = code.replace("\u001D", ""); + } UdiEntity udiEntity = FilterUdiUtils.getUdi(code); if (udiEntity == null) return ResultVOUtils.error(500, "无效条码！"); diff --git a/src/main/java/com/glxp/api/controller/sync/SpsSyncExportStatusController.java b/src/main/java/com/glxp/api/controller/sync/SpsSyncExportStatusController.java index 14de0022..08df61ee 100644 --- a/src/main/java/com/glxp/api/controller/sync/SpsSyncExportStatusController.java +++ b/src/main/java/com/glxp/api/controller/sync/SpsSyncExportStatusController.java @@ -28,6 +28,7 @@ import com.glxp.api.service.sync.SpsSyncDownloadService; import com.glxp.api.service.sync.SyncDataSetService; import com.glxp.api.task.TaskExecutorConfig; import com.glxp.api.util.CustomUtil; +import com.glxp.api.util.DateUtil; import com.glxp.api.util.RedisUtil; import lombok.RequiredArgsConstructor; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; @@ -230,7 +231,7 @@ public class SpsSyncExportStatusController { @PostMapping("/spssync/basic/schedule/updateLastTime") @Log(title = "定时任务", businessType = BusinessType.UPDATE) public BaseResponse updateLastTime(@RequestBody BasicExportStatusTimeEntity basicExportStatusTimeEntity) { - + basicExportStatusTimeEntity.setLastUpdateTime(DateUtil.formatDateTime(new Date())); boolean b = basicExportTimeService.insertExportStatus(basicExportStatusTimeEntity); if (b) return ResultVOUtils.success("更新成功！");