diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsController.java index 357147b8..457e6995 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsController.java @@ -71,14 +71,13 @@ public class AppPmsController extends BaseController { } // 判断数据是否缺失 - String orderId= OrderCodeFactory.getOrderCode("RK", ""); for(PmsOrderInRequest orderInRequest : orderInRequestList) { if (StringUtils.isEmpty(orderInRequest.getGoodsId()) || StringUtils.isEmpty(orderInRequest.getGoodsDesc()) || orderInRequest.getGoodsNum() == null || orderInRequest.getGoodsNum() <=0) { return error("缺少请求数据。"); } - + String orderId= OrderCodeFactory.getOrderCode("RK", ""); AppPmsOrderIn appPmsOrderIn = new AppPmsOrderIn(); BeanUtils.copyProperties(orderInRequest, appPmsOrderIn); appPmsOrderIn.setId(OrderCodeFactory.getOrderCode("","")); diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/TaskExecutor.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/TaskExecutor.java index c0d82dc1..9b6274bb 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/TaskExecutor.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/TaskExecutor.java @@ -389,15 +389,20 @@ public class TaskExecutor { } if (flag.get()) { //删除订单 - AppPmsOrderOut appPmsOrderOut1 = new AppPmsOrderOut(); - appPmsOrderOut1.setOrderId(k); - appPmsOrderOutMapper.deleteAppPmsOrderOutByOrderId(appPmsOrderOut1); //并存入bak表 for (AppPmsOrderOut appPmsOrderOut2 : v) { AppPmsOrderOutBak appPmsOrderOutBak = new AppPmsOrderOutBak(); BeanUtils.copyProperties(appPmsOrderOut2, appPmsOrderOutBak); - appPmsOrderOutBakService.insertAppPmsOrderOutBak(appPmsOrderOutBak); + try { + appPmsOrderOutBakService.insertAppPmsOrderOutBak(appPmsOrderOutBak); + }catch (Exception e){ + e.printStackTrace(); + logger.error("pms订单数据归档失败。{}", e); + } } + AppPmsOrderOut appPmsOrderOut1 = new AppPmsOrderOut(); + appPmsOrderOut1.setOrderId(k); + appPmsOrderOutMapper.deleteAppPmsOrderOutByOrderId(appPmsOrderOut1); } }); diff --git a/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppPmsOrderOutBak.java b/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppPmsOrderOutBak.java index 7013be5c..877f49ae 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppPmsOrderOutBak.java +++ b/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppPmsOrderOutBak.java @@ -29,7 +29,7 @@ public class AppPmsOrderOutBak extends BaseEntity /** 出库单类型 */ @Excel(name = "出库单类型") - private Long orderType; + private Integer orderType; /** 客户名称 */ @Excel(name = "客户名称") @@ -73,7 +73,7 @@ public class AppPmsOrderOutBak extends BaseEntity /** 订单状态 0:未出库 1:部分出库 2:全部出库 */ @Excel(name = "订单状态 0:未出库 1:部分出库 2:全部出库") - private Long orderStatus; + private Integer orderStatus; /** 是否锁定 */ @Excel(name = "是否锁定") @@ -106,15 +106,7 @@ public class AppPmsOrderOutBak extends BaseEntity { return listId; } - public void setOrderType(Long orderType) - { - this.orderType = orderType; - } - public Long getOrderType() - { - return orderType; - } public void setCustomerId(String customerId) { this.customerId = customerId; @@ -205,15 +197,23 @@ public class AppPmsOrderOutBak extends BaseEntity { return spare2; } - public void setOrderStatus(Long orderStatus) - { + + public Integer getOrderType() { + return orderType; + } + + public void setOrderType(Integer orderType) { + this.orderType = orderType; + } + + public Integer getOrderStatus() { + return orderStatus; + } + + public void setOrderStatus(Integer orderStatus) { this.orderStatus = orderStatus; } - public Long getOrderStatus() - { - return orderStatus; - } public void setIsLock(String isLock) { this.isLock = isLock; diff --git a/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppPmsOrderOutBakServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppPmsOrderOutBakServiceImpl.java index c4017e71..ff674c1c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppPmsOrderOutBakServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppPmsOrderOutBakServiceImpl.java @@ -53,7 +53,7 @@ public class AppPmsOrderOutBakServiceImpl implements IAppPmsOrderOutBakService @Override public int insertAppPmsOrderOutBak(AppPmsOrderOutBak appPmsOrderOutBak) { - appPmsOrderOutBak.setCreateTime(DateUtils.getNowDate()); +// appPmsOrderOutBak.setCreateTime(DateUtils.getNowDate()); return appPmsOrderOutBakMapper.insertAppPmsOrderOutBak(appPmsOrderOutBak); }