Merge branch 'ww' into test

eladmin-system/src/main/java/cn/ysk/cashier/config/AppApiMethodAspect.java

@@ -29,6 +29,7 @@ public class AppApiMethodAspect {
             "cn.ysk.cashier.controller.* " +
             "|| cn.ysk.cashier.controller.*.* " +
             "|| cn.ysk.cashier.mnt.rest.* " +
+            "|| cn.ysk.cashier.cons.rest.* " +
             "|| cn.ysk.cashier.system.rest.* " +
             "|| cn.ysk.cashier.config.security.rest.*" +
             ").*(..))")

eladmin-system/src/main/java/cn/ysk/cashier/cons/service/dto/TbProskuConDto.java

@@ -38,6 +38,7 @@ public class TbProskuConDto implements Serializable {
     private String status;
 
     private BigDecimal lasterInStock;
+    private BigDecimal surplusStock;
 
     /** 创建时间 */
     private Timestamp createTime;

eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbProskuConServiceImpl.java

@@ -189,6 +189,9 @@ public class TbProskuConServiceImpl implements TbProskuConService {
 
         //判断
         for (TbProskuConDto resource : resources.getCons()) {
+            if (resource.getConInfoId() == null) {
+                continue;
+            }
             TbConsInfo tbConsInfo = tbConsInfoRepository.findById(resource.getConInfoId()).orElseGet(TbConsInfo::new);
             if (ObjectUtil.isNull(tbConsInfo) || ObjectUtil.isNull(tbConsInfo.getId())) {
                 throw new BadRequestException("对应的耗材信息不存在");
@@ -201,7 +204,6 @@ public class TbProskuConServiceImpl implements TbProskuConService {
             }
             TbProskuCon tbConsInfo1 = new TbProskuCon();
             BeanUtil.copyProperties(resource,tbConsInfo1, CopyOptions.create().setIgnoreNullValue(true));
-            tbConsInfo1.setSurplusStock(resource.getLasterInStock());
             newCons.add(tbConsInfo1);
         }
         if (!CollectionUtils.isEmpty(newCons)) {