From f06f280f39f22ffbd93ae11f6c05f91d8b0faf6b Mon Sep 17 00:00:00 2001 From: anthonywj Date: Thu, 13 Jul 2023 15:00:22 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=A7=A3=E6=B1=BA=E5=85=A7=E7=B6=B2?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E4=B8=8D=E5=90=8C=E6=AD=A5=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E9=97=AE=E9=A2=98=EF=BC=8C=E5=8E=BB=E9=99=A4?= =?UTF-8?q?=E5=A4=9A=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("更新成功！"); From 52e7c1432848d805e6a0f4daaf4ee17ec362e790 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Thu, 13 Jul 2023 19:52:16 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=AF=84=E5=94=AE=E5=AE=9E=E9=99=85?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8D=95=E8=A1=A5=E5=8D=95=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/glxp/api/res/inout/IoOrderResponse.java | 2 +- .../com/glxp/api/service/inout/impl/IoOrderServiceImpl.java | 5 ++++- src/main/resources/application-dev.yml | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java index 3562d89f..771ce485 100644 --- a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java @@ -231,7 +231,7 @@ public class IoOrderResponse { private Integer deliveryStatus; private Integer processStatus; - private int inCodeStatus; + private Integer inCodeStatus; private Integer allCout; diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java index b4bd9bf4..8547e608 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java @@ -41,8 +41,10 @@ import com.glxp.api.service.inout.*; import com.glxp.api.service.inv.*; import com.glxp.api.service.system.SyncUploadDataBustypeService; import com.glxp.api.util.DateUtil; +import com.glxp.api.util.IntUtil; import com.glxp.api.util.udi.UdiCalCountUtil; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -588,7 +590,7 @@ public class IoOrderServiceImpl implements IoOrderService { && StrUtil.isEmpty(orderEntity.getSupplementNo()) ) { if (orderEntity.getFromType() == ConstantStatus.FROM_UDISP) { - if (orderEntity.getOutChangeEnable()) { + if (IntUtil.value(orderEntity.getOutChangeEnable())) { response.setEnableSupplementOrder(true); } } else @@ -597,6 +599,7 @@ public class IoOrderServiceImpl implements IoOrderService { result.add(response); } catch (Exception e) { e.printStackTrace(); + log.error(ExceptionUtils.getStackTrace(e)); log.error(orderEntity.getBillNo() + "平衡补单出错\n"); } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 49e15b9b..498c0745 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -3,9 +3,9 @@ server: spring: datasource: driver-class-name: com.p6spy.engine.spy.P6SpyDriver - jdbc-url: jdbc:p6spy:mysql://192.168.0.66:3364/udi_spms_zzzyy?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_spms_zyy?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root - password: Glxp@6066 + password: 123456 hikari: connection-timeout: 60000 maximum-pool-size: 60 From 256ea64d2546766dc4349b7b644feede80892f9a Mon Sep 17 00:00:00 2001 From: 1178634255 <1178634255@qq.com> Date: Fri, 14 Jul 2023 09:37:52 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=A2=84=E9=AA=8C=E6=94=B6=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E6=9F=A5=E8=AF=A2=20=E6=9F=A5=E8=AF=A2=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E4=BF=A1=E6=81=AF=E6=97=B6=E6=8F=90=E7=A4=BA=E6=9C=89?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/glxp/api/dao/inout/IoOrderDao.java | 2 ++ .../service/inv/impl/InvPreInProductDetailServiceImpl.java | 7 ++++++- src/main/resources/mybatis/mapper/inout/IoOrderDao.xml | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/dao/inout/IoOrderDao.java b/src/main/java/com/glxp/api/dao/inout/IoOrderDao.java index ad9882b8..f4f1f963 100644 --- a/src/main/java/com/glxp/api/dao/inout/IoOrderDao.java +++ b/src/main/java/com/glxp/api/dao/inout/IoOrderDao.java @@ -63,4 +63,6 @@ public interface IoOrderDao extends BaseMapperPlus().select("createTime").eq("billNo", response.getOrderId())); - response.setOrderTime(DateUtil.toDateStr(order.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + if (order!=null){ + response.setOrderTime(DateUtil.toDateStr(order.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + } + +// response.setOrderTime(DateUtil.toDateStr(new DateTime(), "yyyy-MM-dd HH:mm:ss")); } @Override diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml index 9ef6ab5e..a1351221 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml @@ -556,4 +556,6 @@ + +