接收入库修改

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

@@ -148,10 +148,10 @@ public class YpBaseYfServiceImpl implements YpBaseYfService {
             ypInDetlYf.setAcctType("1");
             ypInDetlYf.setFixPrice(fixPrice);
             ypInDetlYf.setGroupNo(ypOutDetlVo.getGroupNoOut());
-            ypInDetlYf.setCurrentStock(amount+yp.getStockAmount());
+            ypInDetlYf.setCurrentStock(amount+(yp.getStockAmount()==null?0:yp.getStockAmount()));
             ypInDetlYf.setSysDate(new Date());
             ypInDetlYf.setInputId(user.getUserIdCode());
-            ypInDetlYf.setStockAmount(yp.getStockAmount());
+            ypInDetlYf.setStockAmount(yp.getStockAmount()==null?0:yp.getStockAmount());
             ypInDetlYf.setGroupOut(ypOutDetlVo.getGroupNo());
             ypInDetlYf.setOutDrawNo(ypOutDetlVo.getDrawNo());
             ypInDetlYf.setInComment(inComment);