Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_platformV2 into develop-zhaojw

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/FetchingDataDto/EquipmentDto.java

@@ -7,13 +7,6 @@ import java.util.Date;
 //同步库存返回实体类
 @Data
 public class EquipmentDto {
-    private String id;
-    /**
-     * 装备包ID
-     */
-    private String packageId;
-
-    private Integer equipmentType;
 
     /**
      * 装备类型ID
@@ -32,10 +25,7 @@ public class EquipmentDto {
      * epc
      */
     private String epc;
-    /**
-     * 组织机构id
-     */
-    private String orgId;
+
     /**
      * 物资状态
      */
@@ -61,36 +51,16 @@ public class EquipmentDto {
 
 
     /**
-     * 维修次数
-     */
-    private int fixCount;
-
-    /**
-     * 位置类型
-     */
-    private String locationType;
-
-    /**
      * 位置
      */
     private String locationId ;
-    /**
-     * 是否遗失
-     */
-    private int lostFlag ;
+
 
     /**
      * 价格
      */
     private BigDecimal price ;
 
-    /**
-     * 备注
-     */
-    private String note ;
-
-    private Date createTime;
-    private Date updateTime;
     private String typeName;
     private String sizeName;
     private String supplierName;
@@ -98,5 +68,6 @@ public class EquipmentDto {
 
     //状态，normal正常，destory销毁，fix维修
     private String equState;
+    private Integer property;
 
 }

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/InventorySumDto.java

@@ -70,4 +70,5 @@ public class InventorySumDto {
     private Integer djgOutboundNumber;
     private Integer totalNumber;
     private Integer destructionNumber;
+    private Integer property;
 }

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/OrderDetailDto.java

@@ -77,4 +77,8 @@ public class OrderDetailDto implements Serializable {
 
     //Epc类型（0固定资产1库存物资非固定资产）
     private Integer property;
+
+    //计划子单json
+    private String eqsJson;
+
 }

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/TjDto/TjOrgEqsDto.java

@@ -7,8 +7,6 @@ import java.util.List;
 
 @Data
 public class TjOrgEqsDto {
-    @ExcelProperty("序号")
-    private Integer numId;
 
 
     private Integer level;

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/InventorySumReq.java

@@ -108,4 +108,6 @@ public class InventorySumReq extends BaseRequest {
 
     private Integer type;
 
+    private String property;
+
 }

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/LogSummaryReq.java

@@ -129,4 +129,6 @@ public class LogSummaryReq extends BaseRequest {
 
     private Date startTime;
     private Date endTime;
+
+    private String typeName;
 }

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/OrderDetailReq.java

@@ -84,4 +84,7 @@ public class OrderDetailReq extends BaseRequest {
 
     //Epc类型（0固定资产1库存物资非固定资产）
     private Integer property;
+
+    //计划子单json
+    private String eqsJson;
 }

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdateOrderDetailReq.java

@@ -92,4 +92,7 @@ public class UpdateOrderDetailReq implements Serializable {
 
     //Epc类型（0固定资产1库存物资非固定资产）
     private Integer property;
+
+    //计划子单json
+    private String eqsJson;
 }

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/vo/TjOrgEqsExportVo.java

 package com.junmp.jyzb.api.bean.vo;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.Data;
 
 @Data
 public class TjOrgEqsExportVo {
+
+    @ExcelProperty("组织机构名称")
+    private String orgName;
+
+    @ExcelProperty("组织机构简称")
+    private String dName;
+    /**
+     * 装备总数
+     */
+    @ExcelProperty("装备总数")
+    private Integer totalNumber;
+    /**
+     * 在库数（仓库数）
+     */
+    @ExcelProperty("仓库在库数")
+    private Integer ckStockNumber;
+    /**
+     * 出库数（仓库数）
+     */
+    @ExcelProperty("仓库出库数")
+    private Integer ckOutboundNumber;
+    /**
+     * 单警柜在库数
+     */
+    @ExcelProperty("单警柜在库数")
+    private Integer djgStockNumber;
+    /**
+     * 单警柜出库数
+     */
+    @ExcelProperty("单警柜出库数")
+    private Integer djgOutboundNumber;
+    /**
+     * 销毁数
+     */
+    @ExcelProperty("销毁数")
+    private Integer destructionNumber;
 }

jyzb-biz/src/main/java/com/junmp/jyzb/controller/DeviceConfigController.java

@@ -79,14 +79,14 @@ public class DeviceConfigController {
         return ApiRes.success(warehouseDevService.showWarehouseDevList(req));
     }
 
-    @PostMapping(path="/alignDeviceConfigInfo",name="同步更新通道/仓库主机配置#logType=30")
+    @PostMapping(path="/alignDeviceConfigInfo",name="同步更新通道/仓库主机配置#enable")
     @ApiOperation("同步更新通道/仓库主机配置")
     public ApiRes<List<String>> alignDeviceConfigInfo(@RequestBody UpdateDeivceConfigReq req){
         return ApiRes.success(deviceConfigService.alignDeviceConfigInfo(req));
     }
 
 
-    @PostMapping(path="/alignWarehouseDevInfo",name="同步更新除湿机配置#logType=30")
+    @PostMapping(path="/alignWarehouseDevInfo",name="同步更新除湿机配置#enable")
     @ApiOperation("同步更新除湿机配置")
     public ApiRes<List<WarehouseDevInfoDto>> alignWarehouseDevInfo(@RequestBody UpdateWarehouseDevReq req){
         return ApiRes.success(warehouseDevService.alignWarehouseDevInfo(req));

jyzb-biz/src/main/java/com/junmp/jyzb/controller/EquipmentSizeController.java

@@ -92,7 +92,7 @@ public class EquipmentSizeController {
 //        return ApiRes.success(equipmentSizeService.selectByTypeIds(req.getTypeIdsList()));
 //    }
 
-    @PostMapping(path="/alignSizeInfo",name="同步更新号型信息#logType=30")
+    @PostMapping(path="/alignSizeInfo",name="同步更新号型信息#enable")
     @ApiOperation("同步更新号型信息")
     public ApiRes<List<SizeDto>> alignSizeInfo(@RequestBody UpdateEquipmentSizeReq req){
         return ApiRes.success(equipmentSizeService.alignSizeInfo(req));

jyzb-biz/src/main/java/com/junmp/jyzb/controller/EquipmentTypeController.java

@@ -104,13 +104,13 @@ public class EquipmentTypeController {
 
 
 
-    @PostMapping(path="/alignTypeInfo",name="同步更新类型信息#logType=30")
+    @PostMapping(path="/alignTypeInfo",name="同步更新类型信息#enable")
     @ApiOperation("同步更新类型信息")
     public ApiRes<List<TypeDto>> alignTypeInfo(@RequestBody UpdateEquipmentTypeReq req){
         return ApiRes.success(equipmentTypeService.alignTypeInfo(req));
     }
 
-    @PostMapping(path = "/exportSizeAndType",name = "导出指定时间后的类型号型#logThpe=30")
+    @PostMapping(path = "/exportSizeAndType",name = "导出指定时间后的类型号型#enable")
     @ApiOperation("导出指定时间后的类型号型")
     public ApiRes<String> exportSizeAndType(@RequestBody QueryEquipmentTypeReq req){
         return ApiRes.success(equipmentTypeService.exportSizeAndType(req));

jyzb-biz/src/main/java/com/junmp/jyzb/controller/InventoryController.java

@@ -269,7 +269,7 @@ public class InventoryController {
 
     //首页上的装备统计数量
 
-    @PostMapping(path="/EquipmentStatistics",name="装备数量数据统计#logType=30")
+    @PostMapping(path="/EquipmentStatistics",name="装备数量数据统计#enable")
     @ApiOperation("装备数量数据统计")
     public ApiRes<List<InventorySummary>> EquipmentStatistics(@RequestBody InventorySumReq req){
 
@@ -278,7 +278,7 @@ public class InventoryController {
 
     //判断epc是否存在
 
-    @PostMapping(path="/checkEPCList",name="判断epc是否存在#logType=30")
+    @PostMapping(path="/checkEPCList",name="判断epc是否存在#enable")
     @ApiOperation("判断epc是否存在")
     public ApiRes<List<String>> checkEPCList(@RequestBody EpcCheckReq req){
         return ApiRes.success(inventoryService.checkEPCList(req));
@@ -306,7 +306,7 @@ public class InventoryController {
         return ApiRes.success(inventorySummaryService.selectSumByItems(req));
     }
 
-    @PostMapping(path="/alignInventoryInfo",name="同步更新装备信息#logType=30")
+    @PostMapping(path="/alignInventoryInfo",name="同步更新装备信息#enable")
     @ApiOperation("同步更新装备信息")
     public ApiRes<List<EquipmentDto>> alignInventoryInfo(@RequestBody InventoryReq req){
         return ApiRes.success(inventoryService.alignInventoryInfo(req));

jyzb-biz/src/main/java/com/junmp/jyzb/controller/OrderController.java

@@ -134,15 +134,15 @@ public class OrderController {
 //    }
 
     //入库单导出
-    @PostMapping(path="/InOrderExport",name="入库单导出#logType=30")
+    @PostMapping(path="/InOrderExport",name="入库单导出#enable")
     @ApiOperation("入库单导出")
     public void InOrderExport(@RequestBody OrderMainReq req){
         orderMainService.InOrderExport(req);
     }
 
     //出库单导出
-    @PostMapping(path="/OutOrderExport",name="入库单导出#logType=30")
-    @ApiOperation("入库单导出")
+    @PostMapping(path="/OutOrderExport",name="出库单导出#enable")
+    @ApiOperation("出库单导出")
     public void OutOrderExport(@RequestBody OrderMainReq req){
         orderMainService.OutOrderExport(req);
     }

jyzb-biz/src/main/java/com/junmp/jyzb/controller/OutAndInboundController.java

@@ -72,6 +72,12 @@ public class OutAndInboundController {
         return ApiRes.success(logSummaryService.ShowInOutRecordsByItems(req));
     }
 
+    @PostMapping(path="/ShowInOutRecordsByItemsCount",name="出入库记录条件查询展示合计#enable")
+    @ApiOperation("出入库记录条件查询展示合计")
+    public ApiRes<Integer> ShowInOutRecordsByItemsCount(@RequestBody @Validated(ValidationApi.page.class) LogSummaryReq req){
+        return ApiRes.success(logSummaryService.ShowInOutRecordsByItemsCount(req));
+    }
+
     @PostMapping(path = "/ShowInOutRecords",name = "出入库数据展示#enable")
     @ApiOperation("出入库数据展示")
     public ApiRes<PageResult<LogSummary>> ShowInOutRecords(@RequestBody LogSummaryReq req){

jyzb-biz/src/main/java/com/junmp/jyzb/controller/PoliceController.java

@@ -303,13 +303,13 @@ public class PoliceController {
     }
 
 
-    @PostMapping(path="/alignPoliceInfo",name="同步更新警员信息#logType=30")
+    @PostMapping(path="/alignPoliceInfo",name="同步更新警员信息#enable")
     @ApiOperation("同步更新警员信息")
     public ApiRes<List<PoliceDto>> alignPoliceInfo(@RequestBody PolicemanReq req){
         return ApiRes.success(policemanService.alignPoliceInfo(req));
     }
 
-    @PostMapping(path="/alignUserInfo",name="同步更新用户信息#logType=30")
+    @PostMapping(path="/alignUserInfo",name="同步更新用户信息#enable")
     @ApiOperation("同步更新用户信息")
     public ApiRes<List<UserDto>> alignUserInfo(@RequestBody PolicemanReq req){
         return ApiRes.success(policemanService.alignUserInfo(req));

jyzb-biz/src/main/java/com/junmp/jyzb/controller/SupplierController.java

@@ -72,7 +72,7 @@ public class SupplierController {
         return ApiRes.success(supplierService.ChangeSupplierState(req));
     }
 
-    @PostMapping(path="/alignSupplierInfo",name="同步更新号型信息#logType=30")
+    @PostMapping(path="/alignSupplierInfo",name="同步更新号型信息#enable")
     @ApiOperation("同步更新号型信息")
     public ApiRes<List<SupplierInfoDto>> alignSupplierInfo(@RequestBody UpdateSupplierReq req){
         return ApiRes.success(supplierService.alignSupplierInfo(req));

jyzb-biz/src/main/java/com/junmp/jyzb/controller/WarehouseController.java

@@ -144,7 +144,7 @@ public class WarehouseController {
         return ApiRes.success(shelfService.GetShelfList(req));
     }
 
-    @PostMapping(path="/alignWarehouseInfo",name="同步更新仓库信息#logType=30")
+    @PostMapping(path="/alignWarehouseInfo",name="同步更新仓库信息#enable")
     @ApiOperation("同步更新仓库信息")
     public ApiRes<List<WarehouseInfoDto>> alignWarehouseInfo(@RequestBody UpdateWarehouseReq req){
         return ApiRes.success(warehouseService.alignWarehouseInfo(req));

jyzb-biz/src/main/java/com/junmp/jyzb/entity/OrderDetail.java

@@ -115,4 +115,9 @@ import java.util.Date;
         //Epc类型（0固定资产1库存物资非固定资产）
         @TableField(value = "property")
         private Integer property;
+
+
+        @TableField(value = "eqs_json")
+        private String eqsJson;
+
 }

jyzb-biz/src/main/java/com/junmp/jyzb/mapper/InventoryMapper.java

@@ -87,7 +87,7 @@ public interface InventoryMapper extends BaseMapper<Inventory> {
                                           @Param("typeIdList")List<String> typeIdList,
                                           @Param("sizeIdList")List<String> sizeIdList);
 
-    IPage<InventoryDto> GetDetailByTerms(@Param("page") Page<Object> defaultPage, @Param("req") InventoryReq req);
+//    IPage<InventoryDto> GetDetailByTerms(@Param("page") Page<Object> defaultPage, @Param("req") InventoryReq req);
 
     void reSetInventory(@Param("summaryTableName") String baseInventorySummary,
                            @Param("sourceTableName") String baseInventory,

jyzb-biz/src/main/java/com/junmp/jyzb/service/LogSummaryService.java

@@ -23,4 +23,6 @@ public interface LogSummaryService extends IService<LogSummary> {
     Boolean processOutInRecords(CabinetLogsRecordReq req);
 
     PageResult<LogSummary> ShowInOutRecords(LogSummaryReq req);
+
+    Integer ShowInOutRecordsByItemsCount(LogSummaryReq req);
 }

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/InventoryServiceImpl.java

@@ -677,7 +677,8 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory
     @Override
     public List<EquipmentDto> alignInventoryInfo(InventoryReq req) {
         String date = DateTimeUtil.TimeLongToString(req.getUpdateTime());
-        return inventoryMapper.alignInventoryInfo(req.getOrgId(),req.getLocationId(),date,req.getTypeIdList(),req.getSizeIdList());
+        List<EquipmentDto> equipmentDtos = inventoryMapper.alignInventoryInfo(req.getOrgId(), req.getLocationId(), date, req.getTypeIdList(), req.getSizeIdList());
+        return equipmentDtos;
     }
 
 

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/LogSummaryServiceImpl.java

@@ -16,6 +16,7 @@ import com.junmp.jyzb.mapper.InventorySummaryMapper;
 import com.junmp.jyzb.service.*;
 import com.junmp.jyzb.mapper.LogSummaryMapper;
 import com.junmp.jyzb.utils.DateTimeUtil;
+import com.junmp.jyzb.utils.RequestParamUitl;
 import com.junmp.v2.common.util.BeanPlusUtil;
 import com.junmp.v2.db.api.factory.PageFactory;
 import com.junmp.v2.db.api.factory.PageResultFactory;
@@ -94,6 +95,7 @@ public class LogSummaryServiceImpl extends ServiceImpl<LogSummaryMapper, LogSumm
             req.setColumn("create_time");
             req.setOrder("desc");
         }
+
         LambdaQueryWrapper<LogSummary> eq = new LambdaQueryWrapper<LogSummary>()
                 .eq(ObjectUtil.isNotNull(req.getOrgId()),LogSummary::getOrgId,req.getOrgId())
                 .eq(LogSummary::getLocationType,req.getLocationType())
@@ -104,12 +106,41 @@ public class LogSummaryServiceImpl extends ServiceImpl<LogSummaryMapper, LogSumm
                 .eq(ObjectUtil.isNotNull(req.getUserName()),LogSummary::getUserName,req.getUserName())
                 .ge(ObjectUtil.isNotNull(req.getStartTime()),LogSummary::getUseTime,req.getStartTime())
                 .le(ObjectUtil.isNotNull(req.getEndTime()),LogSummary::getUseTime,req.getEndTime())
-                .like(ObjectUtil.isNotNull(req.getEquipmentList()),LogSummary::getEquipmentList,req.getEquipmentList())
+                .like(ObjectUtil.isNotNull(req.getTypeName()),LogSummary::getEquipmentList,req.getTypeName())
                 .last("order by " + req.getColumn() + " " + req.getOrder());
+
         Page<LogSummary> page = logSummaryService.page(PageFactory.getDefaultPage(req.getPageNo(), req.getPageSize()), eq);
         return PageResultFactory.createPageResult(page);
     }
 
+    @Override
+    public Integer ShowInOutRecordsByItemsCount(LogSummaryReq req) {
+        if (ObjectUtil.isNotNull(req.getColumn()) && !req.getColumn().trim().isEmpty() &&
+                (req.getOrder().equalsIgnoreCase("asc")|| req.getOrder().equalsIgnoreCase("desc")) &&
+                ObjectUtil.isNotNull(req.getOrder()) && !req.getOrder().trim().isEmpty()) {
+            //修改字段，和数据库字段进行统一
+            req.setColumn(req.getColumn().replaceAll("[A-Z]", "_$0").toLowerCase());
+            req.setOrder(req.getOrder().toLowerCase());
+        }else {
+            req.setColumn("create_time");
+            req.setOrder("desc");
+        }
+        LambdaQueryWrapper<LogSummary> eq = new LambdaQueryWrapper<LogSummary>()
+                .eq(ObjectUtil.isNotNull(req.getOrgId()),LogSummary::getOrgId,req.getOrgId())
+                .eq(LogSummary::getLocationType,req.getLocationType())
+                .eq(ObjectUtil.isNotNull(req.getOrderMainId()),LogSummary::getOrderMainId,req.getOrderMainId())
+                .eq(ObjectUtil.isNotNull(req.getBussinessType()) && !req.getBussinessType().trim().isEmpty(),LogSummary::getBussinessType,req.getBussinessType())
+                .eq(ObjectUtil.isNotNull(req.getOutInState()) && !req.getOutInState().trim().isEmpty(),LogSummary::getOutInState,req.getOutInState())
+                .eq(ObjectUtil.isNotNull(req.getLocationId()),LogSummary::getLocationId,req.getLocationId())
+                .eq(ObjectUtil.isNotNull(req.getUserName()),LogSummary::getUserName,req.getUserName())
+                .ge(ObjectUtil.isNotNull(req.getStartTime()),LogSummary::getUseTime,req.getStartTime())
+                .le(ObjectUtil.isNotNull(req.getEndTime()),LogSummary::getUseTime,req.getEndTime())
+                .like(ObjectUtil.isNotNull(req.getTypeName()),LogSummary::getEquipmentList,req.getTypeName())
+                .last("order by " + req.getColumn() + " " + req.getOrder());
+        return list(eq).size();
+    }
+
+
     //本地主机返回出入库结果
     @Transactional(rollbackFor = Exception.class)
     public Boolean processInventoryRecords(OutInLogsReq req) {
@@ -253,6 +284,8 @@ public class LogSummaryServiceImpl extends ServiceImpl<LogSummaryMapper, LogSumm
         return PageResultFactory.createPageResult(page);
     }
 
+
+
     //    对出入库记录进行分类汇总存储()
     public List<NormalInOutDto> saveInOutRecords(OutInLogsReq req) {
 

jyzb-biz/src/main/java/com/junmp/jyzb/utils/RequestParam.java

-package com.junmp.jyzb.utils;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * 分页
- * */
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class RequestParam {
-    public Integer page;   //页码
-    public Integer size;  //每一页的大小
-    public String keyword;    //模糊查询
-}
\ No newline at end of file

jyzb-biz/src/main/java/com/junmp/jyzb/utils/RequestParamUitl.java

+package com.junmp.jyzb.utils;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSONObject;
+
+/**
+ * 入参工具类
+ * */
+
+public class RequestParamUitl {
+
+    //处理排序字段
+    public static <T> void setRequestParam() {
+//        if (ObjectUtil.isNotNull(req.getColumn()) && !req.getColumn().trim().isEmpty() &&
+//                (req.getOrder().equalsIgnoreCase("asc") || req.getOrder().equalsIgnoreCase("desc")) &&
+//                ObjectUtil.isNotNull(req.getOrder()) && !req.getOrder().trim().isEmpty()) {
+//            // 修改字段，和数据库字段进行统一
+//            req.setColumn(req.getColumn().replaceAll("[A-Z]", "_$0").toLowerCase());
+//            req.setOrder(req.getOrder().toLowerCase());
+//        }else {
+//            req.setColumn("create_time");
+//            req.setOrder("desc");
+//        }
+//        return req;
+    }
+
+}
\ No newline at end of file

jyzb-biz/src/main/resources/mapper/EquipmentCountSummaryMapper.xml

@@ -425,7 +425,7 @@
                     </foreach>
                 </if>
                 <if test="typeParentId != null and typeParentId !=''">
-                    and vecs.type_parnet_id=#{typeParentId}
+                    and vecs.type_parent_id=#{typeParentId}
                 </if>
                 <if test="sizeNameList!=null and sizeNameList.size() > 0">
                     AND
@@ -476,7 +476,7 @@
                             </foreach>
                         </if>
                         <if test="typeParentId != null and typeParentId !=''">
-                            and vecs.type_parnet_id=#{typeParentId}
+                            and vecs.type_parent_id=#{typeParentId}
                         </if>
                         <if test="sizeNameList!=null and sizeNameList.size() > 0">
                             AND

jyzb-biz/src/main/resources/mapper/InventoryMapper.xml

@@ -556,67 +556,113 @@
             limit ${item[2]},${item[3]}
         </foreach>
     </select>
-    <select id="GetDetailByTerms" resultType="com.junmp.jyzb.api.bean.dto.InventoryDto">
+<!--    <select id="GetDetailByTerms" resultType="com.junmp.jyzb.api.bean.dto.InventoryDto">-->
+
+<!--    </select>-->
+<!--&lt;!&ndash;    <select id="alignInventoryInfo" resultType="com.junmp.jyzb.api.bean.dto.FetchingDataDto.EquipmentDto"&ndash;&gt;-->
+<!--&lt;!&ndash;            parameterType="com.junmp.jyzb.api.bean.query.InventoryReq">&ndash;&gt;-->
+<!--        SELECT i.id,i.package_id,i.type_id,i.size_id,i.supplier_id,i.epc,-->
+<!--               i.org_id_int as org_id,i.state as equ_state,i.bussiness_state,i.location_state as state,-->
+<!--               i.production_date,i.warranty_period,i.maintenance_period,i.fix_count,i.location_id,i.location_type,i.lost_flag,-->
+<!--               i.price,i.create_time,i.update_time,i.note,es.name as size_name,et.name as type_name,bs.name as supplier_name, bw.name as location_name-->
+<!--&lt;!&ndash;        FROM `base_inventory` i&ndash;&gt;-->
+<!--                   join base_equipment_size es on i.size_id=es.id-->
+<!--                   join base_equipment_type et on i.type_id=et.id-->
+<!--                   join base_warehouse bw on bw.id=i.location_id-->
+<!--                   join base_supplier bs on bs.id=i.supplier_id-->
+<!--&lt;!&ndash;        where i.org_id_int=#{orgId}&ndash;&gt;-->
+<!--          <if test="locationId!= null and locationId != ''">-->
+<!--              and i.location_id=#{locationId}-->
+<!--          </if>-->
+<!--        <if test="date!= null and date != ''">-->
+<!--            and i.update_time &gt; #{date}-->
+<!--        </if>-->
+<!--        <if test="typeIdList != null and typeIdList.size()>0">-->
+<!--            and type_id in-->
+<!--            <foreach collection="typeIdList" item="item" open="(" separator="," close=")">-->
+<!--                #{item}-->
+<!--            </foreach>-->
+<!--        </if>-->
+<!--        <if test="sizeIdList != null and sizeIdList.size()>0">-->
+<!--            and size_id in-->
+<!--            <foreach collection="sizeIdList" item="item" open="(" separator="," close=")">-->
+<!--                #{item}-->
+<!--            </foreach>-->
+<!--        </if>-->
+<!--    </select>-->
 
-    </select>
     <select id="alignInventoryInfo" resultType="com.junmp.jyzb.api.bean.dto.FetchingDataDto.EquipmentDto"
             parameterType="com.junmp.jyzb.api.bean.query.InventoryReq">
-        SELECT i.id,i.package_id,i.type_id,i.size_id,i.supplier_id,i.epc,
-               i.org_id_int as org_id,i.state as equ_state,i.bussiness_state,i.location_state as state,
-               i.production_date,i.warranty_period,i.maintenance_period,i.fix_count,i.location_id,i.location_type,i.lost_flag,
-               i.price,i.create_time,i.update_time,i.note,es.name as size_name,et.name as type_name,bs.name as supplier_name, bw.name as location_name
-        FROM `base_inventory` i
-                   join base_equipment_size es on i.size_id=es.id
-                   join base_equipment_type et on i.type_id=et.id
-                   join base_warehouse bw on bw.id=i.location_id
-                   join base_supplier bs on bs.id=i.supplier_id
-        where i.org_id_int=#{orgId}
-          <if test="locationId!= null and locationId != ''">
-              and i.location_id=#{locationId}
-          </if>
+
+
+        SELECT
+        t1.type_id,
+        t1.size_id,
+        t1.epc,
+        t1.location_id,
+        t2.supplier_id,
+        t2.state,
+        t2.bussiness_state,
+        t2.production_date,
+        t2.warranty_period,
+        t2.maintenance_period,
+        t2.price,
+        t2.property,
+        es.NAME AS size_name,
+        et.NAME AS type_name,
+        bs.NAME AS supplier_name,
+        bw.NAME AS location_name
+        FROM
+        (
+        SELECT
+        wi.type_id,
+        wi.size_id,
+        wi.epc,
+        wi.location_id
+        FROM
+        `base_warehouse_inventory` wi
+        WHERE
+        wi.org_id = #{orgId}
+        <if test="locationId!= null and locationId != ''">
+            and wi.location_id=#{locationId}
+        </if>
         <if test="date!= null and date != ''">
-            and i.update_time &gt; #{date}
+            and i.update_time >= #{date}
         </if>
         <if test="typeIdList != null and typeIdList.size()>0">
-            and type_id in
+            and wi.type_id in
             <foreach collection="typeIdList" item="item" open="(" separator="," close=")">
                 #{item}
             </foreach>
         </if>
         <if test="sizeIdList != null and sizeIdList.size()>0">
-            and size_id in
+            and wi.size_id in
             <foreach collection="sizeIdList" item="item" open="(" separator="," close=")">
                 #{item}
             </foreach>
         </if>
-    </select>
+        ) AS t1
+        left JOIN (
+        SELECT
+        i.supplier_id,
+        i.location_state AS state,
+        i.bussiness_state,
+        i.production_date,
+        i.warranty_period,
+        i.maintenance_period,
+        i.price,
+        i.epc,
+        i.property,
+        i.state AS equ_state
+        FROM
+        base_inventory i
+        ) AS t2 ON t2.epc = t1.epc
+        left JOIN base_equipment_size es ON t1.size_id = es.id
+        left JOIN base_equipment_type et ON t1.type_id = et.id
+        left JOIN base_warehouse bw ON bw.id = t1.location_id
+        left JOIN base_supplier bs ON bs.id = t2.supplier_id
 
-<!--    <select id="alignInventoryInfo" resultType="com.junmp.jyzb.api.bean.dto.FetchingDataDto.EquipmentDto"-->
-<!--            parameterType="com.junmp.jyzb.api.bean.query.InventoryReq">-->
-<!--        SELECT wi.type_id,wi.size_id,wi.epc,-->
-<!--        wi.org_id,wi.location_id,wi.location_type,wi.create_time,wi.update_time-->
-<!--        FROM `base_warehouse_inventory` wi-->
-<!--        join base_inventory i on i.epc=wi.epc-->
-<!--        where wi.org_id=#{orgId}-->
-<!--        <if test="locationId!= null and locationId != ''">-->
-<!--            and wi.location_id=#{locationId}-->
-<!--        </if>-->
-<!--        <if test="date!= null and date != ''">-->
-<!--            and wi.update_time &gt; #{date}-->
-<!--        </if>-->
-<!--        <if test="typeIdList != null and typeIdList.size()>0">-->
-<!--            and wi.type_id in-->
-<!--            <foreach collection="typeIdList" item="item" open="(" separator="," close=")">-->
-<!--                #{item}-->
-<!--            </foreach>-->
-<!--        </if>-->
-<!--        <if test="sizeIdList != null and sizeIdList.size()>0">-->
-<!--            and wi.size_id in-->
-<!--            <foreach collection="sizeIdList" item="item" open="(" separator="," close=")">-->
-<!--                #{item}-->
-<!--            </foreach>-->
-<!--        </if>-->
-<!--    </select>-->
+    </select>
 
 
 </mapper>
\ No newline at end of file

jyzb-biz/src/main/resources/mapper/InventorySummaryMapper.xml

@@ -670,6 +670,12 @@
             <if test="req.locationType !='all' and req.locationType != null ">
                 and is.location_type=#{req.locationType}
             </if>
+            <if test="req.locationId !=null and req.locationId !=''">
+                and is.location_id=#{req.locationId}
+            </if>
+            <if test="req.property !='all' and req.property != null">
+                and is.property=#{req.property}
+            </if>
             GROUP BY
             is.type_id,
             is.type_name
@@ -708,6 +714,12 @@
         <if test="req.locationType !='all' and req.locationType != null">
             and is.location_type=#{req.locationType}
         </if>
+        <if test="req.locationId !=null and req.locationId !=''">
+            and is.location_id=#{req.locationId}
+        </if>
+        <if test="req.property !='all' and req.property != null">
+            and is.property=#{req.property}
+        </if>
         GROUP BY
         is.type_id,
         is.type_name
@@ -748,6 +760,12 @@
         <if test="req.locationType !='all' and req.locationType != null">
             and is.location_type=#{req.locationType}
         </if>
+        <if test="req.locationId !=null and req.locationId !=''">
+            and is.location_id=#{req.locationId}
+        </if>
+        <if test="req.property !=null and req.property !='all'">
+            and is.property=#{req.property}
+        </if>
         GROUP BY
         is.type_id,
         is.type_name,

jyzb-boot/src/main/resources/application.yml

@@ -32,7 +32,7 @@ spring:
       virtual-host: /
   profiles:
     #@spring.active@
-    active: local
+    active: prod
   servlet:
     multipart:
       max-request-size: 500MB
@@ -62,7 +62,7 @@ mybatis-plus:
     lazy-loading-enabled: true
     multiple-result-sets-enabled: true
     map-underscore-to-camel-case: true #开启驼峰命名
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #控制台打印sql语句
+#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #控制台打印sql语句
   global-config:
     banner: false
     enable-sql-runner: true