Merge branch 'dev-1.1.1' of https://172.16.32.165/hurugang/thmz_system into dev-1.1.1

src/main/java/cn/hnthyy/thmz/service/impl/his/yp/YpBaseYfServiceImpl.java

@@ -19,6 +19,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
 
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
@@ -151,7 +152,7 @@ public class YpBaseYfServiceImpl implements YpBaseYfService {
             ypInDetlYf.setAcctType("1");
             ypInDetlYf.setFixPrice(fixPrice);
             ypInDetlYf.setGroupNo(ypOutDetlVo.getGroupNoOut());
-            ypInDetlYf.setCurrentStock(amount+(yp.getStockAmount()==null?0:yp.getStockAmount()));
+            ypInDetlYf.setCurrentStock(amount+(StringUtils.isEmpty(yp.getStockAmount())?0:yp.getStockAmount()));
             ypInDetlYf.setSysDate(new Date());
             ypInDetlYf.setInputId(user.getUserIdCode());
             ypInDetlYf.setStockAmount(yp.getStockAmount()==null?0:yp.getStockAmount());