|
@@ -67,7 +67,10 @@ public class GoodsDao {
|
|
|
* @return 批次信息
|
|
|
*/
|
|
|
public Goods findByTradeGoods(TradeGoods tradeGoods) {
|
|
|
- Component component = componentDao.findByUuid(tradeGoods.getCmpUuid());
|
|
|
+ Component component = null;
|
|
|
+ if(tradeGoods.getCmpUuid() != null){
|
|
|
+ component = componentDao.findByUuid(tradeGoods.getCmpUuid());
|
|
|
+ }
|
|
|
Store store = null;
|
|
|
Products products = null;
|
|
|
if (tradeGoods.getStoreId() != null) {
|
|
@@ -100,7 +103,7 @@ public class GoodsDao {
|
|
|
* @return 批次信息
|
|
|
*/
|
|
|
public List<Goods> findByComponent(Component component) {
|
|
|
- if (component == null) {
|
|
|
+ if (component == null || component.getUuid() == null) {
|
|
|
return null;
|
|
|
}
|
|
|
List<TradeGoods> tradeGoodsesList = tradeGoodsDao.findByCmpUuid(component.getUuid());
|