仓库报表

platform-dao/src/main/resources/mapper/store/InStoreFormMapper.xml

@@ -129,7 +129,7 @@
             resultType="com.platform.dao.vo.query.store.InStoreFormVO">
         select instoreform.*, store.name storeName
         from t_in_store_form as instoreform
-        left join t_store store on store.id = instoreform.store_id
+         join t_store store on store.id = instoreform.store_id
         <where>
             <include refid="List_Condition"/>
             <if test="useCompany != null and useCompany != ''">
@@ -168,9 +168,8 @@
 
     <select id="getInStoreDetailVOs" parameterType="com.platform.dao.dto.store.InStoreFormDTO"
             resultType="com.platform.dao.vo.query.store.InStoreFormVO">
-        SELECT form.type, COUNT(*) instorenum FROM `t_in_store_form` form JOIN `t_in_store_detail` detail
-ON form.id=detail.`in_id`
-        join t_store store on store.id=form.store_id
+        SELECT form.type,COUNT(*) instorenum FROM `t_in_store_form` form
+         join t_store store on store.id=form.store_id
         <where>
 
                  status=1

platform-dao/src/main/resources/mapper/store/OutStoreFormMapper.xml

@@ -109,7 +109,7 @@
             resultType="com.platform.dao.vo.query.store.OutStoreFormVO">
         select outstoreform.*, store.name storeName
         from t_out_store_form as outstoreform
-        left join t_store store on store.id = outstoreform.store_id
+        join t_store store on store.id = outstoreform.store_id
         <where>
             <include refid="List_Condition"/>
             <if test="useCompany != null and useCompany != ''">
@@ -147,11 +147,9 @@
 
     <select id="selectOutStoreList" parameterType="com.platform.dao.dto.store.OutStoreFormDTO"
             resultType="com.platform.dao.vo.query.store.OutStoreFormVO">
- SELECT form.type, COUNT(*) outstorenum FROM `t_out_store_form` form JOIN `t_out_store_detail` detail
-    ON form.id=detail.`out_id`
-    join t_store store on store.id=form.store_id
+ SELECT form.type, COUNT(*) outstorenum FROM `t_out_store_form` form
+     join t_store store on store.id=form.store_id
     <where>
-
              status=1
 
         <if test="userId!=null">

platform-dao/src/main/resources/mapper/store/SpareStoreMapper.xml

@@ -94,6 +94,7 @@
             and spareinfo.is_special=#{isSpecial}
         </if>
 
+
     </sql>
 
     <select id="selectCurrentStock" resultType="java.lang.Integer">

platform-rest/src/main/java/com/platform/rest/controller/bigScreen/BigScreenController.java

@@ -23,6 +23,8 @@ import java.util.List;
 public class BigScreenController {
 
 
+
+
     private final SysFileService sysFileService;
 
 

platform-rest/src/main/java/com/platform/rest/controller/report/StoreReportController.java

@@ -94,33 +94,11 @@ public class StoreReportController {
               ExcelUtil.exportResponseDict(response, ExportOutStoreDetailVO.class, BeanConverterUtil.copyListProperties(detailList, ExportOutStoreDetailVO.class), fileName);
             }
           }
-
         }
       }
     }
   }
 
-//  @GetMapping("/export/out/month")
-//  @SysLog("仓库每月出库明细导出")
-//  public void exportOut(HttpServletResponse response, InStoreFormDTO dto, @RequestParam(required = false) Integer year,
-//                     @RequestParam(required = false) LocalDate startMonth, @RequestParam(required = false) LocalDate endMonth,
-//                     @RequestParam(required = false) Integer month) {
-//    List<StoreInAndOutReportVO> list = storeMonthReportService.getMonthReport(dto, year, startMonth, endMonth);
-//    String fileName = "";
-//    fileName = year + "-" + month + "-出库数据统计明细";
-//    if (CollectionUtil.isNotEmpty(list)) {
-//      for (StoreInAndOutReportVO vo : list) {
-//        if (vo.getMonth() == month) {
-//          List<OutStoreDetailVO> detailList = vo.getOutDetailList();
-//          if (CollectionUtil.isNotEmpty(detailList)) {
-//            ExcelUtil.exportResponseDict(response, ExportOutStoreDetailVO.class, BeanConverterUtil.copyListProperties(detailList, ExportOutStoreDetailVO.class), fileName);
-//          }
-//        }
-//      }
-//    }
-//  }
-
-
   /**
    * 仓库每月入库总数量以及金额报表
    *

platform-rest/src/main/java/com/platform/rest/controller/sb/SbModelSpareBomController.java

@@ -91,6 +91,7 @@ public class SbModelSpareBomController {
           d.setSbId(sbModelSpareBomDTO.getSbId());
       }
       int count = sbModelSpareBomService.getCountByDTO(d);
+
       if(count != 0){
           throw new BusinessException("已经存在该备件BOM，请重新选择，备件名称: " + sbModelSpareBomDTO.getSpareName());
       }

platform-service/src/main/java/com/platform/service/store/impl/StoreServiceImpl.java

@@ -244,8 +244,6 @@ public class StoreServiceImpl extends BaseServiceImpl<StoreMapper, Store, StoreD
         ExecuteSql.executeNotEmpty(model.getId(), () -> weekendCriteria.andNotEqualTo(Store::getId, model.getId()));
         ExecuteSql.executeNotEmpty(model.getUseProject(), () -> weekendCriteria.andEqualTo(Store::getUseProject, model.getUseProject()));
         ExecuteSql.executeNotNull(model.getLevel(), () -> weekendCriteria.andEqualTo(Store::getLevel, model.getLevel()));
-//        System.out.println(model.getUserId());
-//        System.out.println(SecurityUtils.getUserInfo().getUserId());
         String userNames = ConfigCache.getLabelByValueAllowNull(SysConfigEnum.STORE_SUPER_USERS.name());
         UserInfo userInfo1=SecurityUtils.getUserInfo();
         if(StringUtils.isBlank(userNames)){