From 8f7b99b0a3d53f4410e8b1f2f209ce2743f0a944 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 08 Apr 2021 20:14:44 +0800
Subject: [PATCH] 20210408 核销
---
zq-erp/src/main/java/com/matrix/system/hive/service/imp/ShoppingGoodsServiceImpl.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/ShoppingGoodsServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/ShoppingGoodsServiceImpl.java
index dc235c4..299361c 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/ShoppingGoodsServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/ShoppingGoodsServiceImpl.java
@@ -438,6 +438,10 @@
return DateUtil.stringToDate("9999-12-31", DateUtil.DATE_FORMAT_DD);
}
+ if (type == 2 && shoppingGoods.getUseDateNum() == null && StringUtils.isNotBlank(shoppingGoods.getBuyDateUnit())) {
+ return DateUtil.stringToDate("9999-12-31", DateUtil.DATE_FORMAT_DD);
+ }
+
if (type == 2 && buyDate == null) {
throw new GlobleException("购买日期不能为空");
}
@@ -518,7 +522,7 @@
ShoppingGoodsDetailVo goodsDetailVo = new ShoppingGoodsDetailVo();
goodsDetailVo.setImg(shoppingGoods.getImg());
goodsDetailVo.setGoodsName(shoppingGoods.getName());
- goodsDetailVo.setGoodsNo(shoppingGoods.getGoodsNo());
+ goodsDetailVo.setGoodsNo(shoppingGoods.getCode());
goodsDetailVo.setGoodsType(shoppingGoods.getGoodType());
goodsDetailVo.setDesc(shoppingGoods.getDescription());
goodsDetailVo.setMaxSaleCnt(shoppingGoods.getCarMaxSaleCount());
--
Gitblit v1.9.1