|
|
@@ -80,7 +80,6 @@ import java.lang.reflect.Field;
|
|
|
import java.sql.ResultSet;
|
|
|
import java.sql.SQLException;
|
|
|
import java.sql.Statement;
|
|
|
-import java.text.SimpleDateFormat;
|
|
|
import java.util.*;
|
|
|
import java.util.concurrent.ConcurrentHashMap;
|
|
|
|
|
|
@@ -1484,16 +1483,10 @@ public class ProductServiceImpl implements ProductService {
|
|
|
g.setBreakUp(Boolean.FALSE);
|
|
|
g.setReserve(product.getErpReserve());
|
|
|
String packaging = (detail == null || detail.getPackaging() == null) ? product.getPackaging(): detail.getPackaging();
|
|
|
- packaging = (packaging == null) ? StringConstant.DEFAULTPACKAGING : packaging;
|
|
|
g.setPackaging(packaging);
|
|
|
|
|
|
String produceDate = (detail == null || detail.getProduceDate() == null) ? product.getProduceDate() : detail.getProduceDate();
|
|
|
- if (produceDate == null) {
|
|
|
- String format = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
|
|
|
- g.setProduceDate(format);
|
|
|
- } else {
|
|
|
- g.setProduceDate(produceDate);
|
|
|
- }
|
|
|
+ g.setProduceDate(produceDate);
|
|
|
|
|
|
Double minPackQty = (detail == null || detail.getMinPackQty() == null) ? product.getMinPackQty() : detail.getMinPackQty();
|
|
|
Double minBuyQty = detail != null ? detail.getMinBuyQty() : null;
|