工具台账功能

cuijian

2025-06-06 35d9446131124e12616c7b6b9dfd79e23d20e1c9

工具台账功能

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/OutStoreDetailController.java

@@ -16,6 +16,7 @@
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.tms.entity.OutStoreDetail;
import org.jeecg.modules.tms.entity.ToolLedger;
import org.jeecg.modules.tms.entity.vo.OutStoreDetailVo;
import org.jeecg.modules.tms.service.IOutStoreDetailService;

@@ -197,4 +198,23 @@
        return super.importExcel(request, response, OutStoreDetail.class);
    }

     /**
      * 工具台账-出库子页面列表查询
      *
      * @param outStoreDetail
      * @param pageNo
      * @param pageSize
      * @param query
      * @return
      */
     @ApiOperation(value="工具台账-出库子页面列表查询", notes="工具台账-出库子页面列表查询")
     @GetMapping(value = "/outStoreDetailList")
     public Result<?> outStoreDetailList(OutStoreDetail outStoreDetail,
                                     @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                     @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                     @RequestParam Map<String, String> query) {
         IPage<Map<String, Object>> pageList = outStoreDetailService.outStoreDetailList(pageNo,pageSize, query);
         return Result.OK(pageList);
     }

}

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ToolLedgerController.java

@@ -215,4 +215,23 @@
        return super.importExcel(request, response, ToolLedger.class);
    }

     /**
      * 工具台账-列表查询
      *
      * @param toolLedger
      * @param pageNo
      * @param pageSize
      * @param query
      * @return
      */
     @ApiOperation(value="工具台账-列表查询", notes="工具台账-列表查询")
     @GetMapping(value = "/toolLedgerList")
     public Result<?> toolLedgerList(ToolLedger toolLedger,
                                                    @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                                    @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                                     @RequestParam Map<String, String> query) {
         IPage<Map<String, Object>> pageList = toolLedgerService.toolLedgerList(pageNo,pageSize, query);
         return Result.OK(pageList);
     }

}

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ToolLedgerDetailController.java

@@ -213,4 +213,23 @@
         return Result.OK(pageList);
     }

     /**
      * 工具台账-查询把号
      *
      * @param toolLedgerDetail
      * @param pageNo
      * @param pageSize
      * @param query
      * @return
      */
     @ApiOperation(value="工具台账-查询把号", notes="工具台账-查询把号")
     @GetMapping(value = "/queryToolLedgerDetailList")
     public Result<?> queryToolLedgerDetailList(ToolLedgerDetail toolLedgerDetail,
                                                          @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                                          @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                                                      @RequestParam Map<String, String> query) {
         IPage<Map<String, Object>> pageList = toolLedgerDetailService.queryToolLedgerDetailList(pageNo, pageSize, query);
         return Result.OK(pageList);
     }

}

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ToolSharpeningController.java

@@ -6,6 +6,7 @@
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.tms.entity.OutStoreDetail;
import org.jeecg.modules.tms.entity.ToolLedger;
import org.jeecg.modules.tms.entity.ToolSharpening;
import org.jeecg.modules.tms.entity.ToolsLossBoundDetail;
@@ -115,4 +116,23 @@
        toolSharpeningService.removeById(id);
        return Result.OK("删除成功!");
    }

    /**
     * 工具台账-刃磨子页面列表查询
     *
     * @param toolSharpening
     * @param pageNo
     * @param pageSize
     * @param query
     * @return
     */
    @ApiOperation(value="工具台账-刃磨子页面列表查询", notes="工具台账-刃磨子页面列表查询")
    @GetMapping(value = "/toolSharpeningList")
    public Result<?> toolSharpeningList(ToolSharpening toolSharpening,
                                        @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                        @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                        @RequestParam Map<String, String> query) {
        IPage<Map<String, Object>> pageList = toolSharpeningService.toolSharpeningList(pageNo,pageSize, query);
        return Result.OK(pageList);
    }
}

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ToolsLossBoundController.java

@@ -13,10 +13,7 @@
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.tms.entity.OutboundDetail;
import org.jeecg.modules.tms.entity.OutboundOrder;
import org.jeecg.modules.tms.entity.ToolsLossBound;
import org.jeecg.modules.tms.entity.ToolsLossBoundDetail;
import org.jeecg.modules.tms.entity.*;
import org.jeecg.modules.tms.entity.dto.LossBoundFlowDto;
import org.jeecg.modules.tms.entity.dto.OutBoundOrderFlowDto;
import org.jeecg.modules.tms.entity.vo.OutboundDetailVo;
@@ -324,4 +321,23 @@
        IPage<ToolsLossBoundDetail> pageList = toolsLossBoundDetailService.queryPageList(page, parameterMap);
        return Result.OK(pageList);
    }

    /**
     * 工具台账-报损子页面列表查询
     *
     * @param toolsLossBoundDetail
     * @param pageNo
     * @param pageSize
     * @param query
     * @return
     */
    @ApiOperation(value="工具台账-报损子页面列表查询", notes="工具台账-报损子页面列表查询")
    @GetMapping(value = "/toolLossDetailList")
    public Result<?> toolLossDetailList(ToolsLossBoundDetail toolsLossBoundDetail,
                                        @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                        @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                        @RequestParam Map<String, String> query) {
        IPage<Map<String, Object>> pageList = toolsLossBoundDetailService.toolLossDetailList(pageNo,pageSize, query);
        return Result.OK(pageList);
    }
}

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ToolsStocktakingBoundController.java

@@ -16,6 +16,7 @@
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
import org.jeecg.modules.tms.entity.BaseTools;
import org.jeecg.modules.tms.entity.ToolSharpening;
import org.jeecg.modules.tms.entity.ToolsStocktakingBound;
import org.jeecg.modules.tms.entity.ToolsStocktakingBoundDetail;
import org.jeecg.modules.tms.entity.dto.LossBoundFlowDto;
@@ -283,4 +284,23 @@
        return Result.OK("文件导入失败！");
    }

    /**
     * 工具台账-盘点子页面列表查询
     *
     * @param toolsStocktakingBound
     * @param pageNo
     * @param pageSize
     * @param query
     * @return
     */
    @ApiOperation(value="工具台账-盘点子页面列表查询", notes="工具台账-盘点子页面列表查询")
    @GetMapping(value = "/toolsStocktakingList")
    public Result<?> toolsStocktakingList(ToolsStocktakingBound toolsStocktakingBound,
                                        @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                        @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                        @RequestParam Map<String, String> query) {
        IPage<Map<String, Object>> pageList = toolsStocktakingBoundDetailService.toolsStocktakingList(pageNo,pageSize, query);
        return Result.OK(pageList);
    }

}

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/OutStoreDetailMapper.java

@@ -1,6 +1,7 @@
package org.jeecg.modules.tms.mapper;

import java.util.List;
import java.util.Map;

import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -22,4 +23,6 @@

    IPage<OutStoreDetailVo> queryPageList(Page<OutStoreDetailVo> page,
                                          @Param(Constants.WRAPPER) Wrapper<OutStoreDetailVo> queryWrapper);

    public IPage<Map<String, Object>> outStoreDetailList(IPage<Map> pageData, @Param(Constants.WRAPPER) Wrapper<Map> wrapper);
}

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/ToolLedgerDetailMapper.java

@@ -26,4 +26,6 @@
    IPage<Map<String, Object>> queryLendTool(IPage<Map> pageData, @Param(Constants.WRAPPER) Wrapper<Map> wrapper);

    IPage<Map<String, Object>> querySharpenTool(IPage<Map> pageData, @Param(Constants.WRAPPER) Wrapper<Map> wrapper);

    IPage<Map<String, Object>> queryToolLedgerDetailList(IPage<Map> pageData, @Param(Constants.WRAPPER) Wrapper<Map> wrapper);
}

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/ToolLedgerMapper.java

@@ -1,7 +1,11 @@
package org.jeecg.modules.tms.mapper;

import java.util.List;
import java.util.Map;

import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.tms.entity.ToolLedger;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -14,4 +18,5 @@
 */
public interface ToolLedgerMapper extends BaseMapper<ToolLedger> {

    public IPage<Map<String, Object>> toolLedgerList(IPage<Map> pageData, @Param(Constants.WRAPPER) Wrapper<Map> wrapper);
}

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/ToolsLossBoundDetailMapper.java

@@ -10,6 +10,7 @@
import org.jeecg.modules.tms.entity.ToolsLossBoundDetail;

import java.util.List;
import java.util.Map;

/**
 * @Description: 损耗单明细
@@ -38,4 +39,6 @@

    IPage<ToolsLossBoundDetail> queryPageList(Page<ToolsLossBoundDetail> page,
                                        @Param(Constants.WRAPPER) Wrapper<ToolsLossBoundDetail> queryWrapper);

    public IPage<Map<String, Object>> toolLossDetailList(IPage<Map> pageData, @Param(Constants.WRAPPER) Wrapper<Map> wrapper);
}

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/ToolsSharpeningMapper.java

@@ -12,6 +12,8 @@
import org.jeecg.modules.tms.entity.vo.OutboundDetailVo;
import org.jeecg.modules.tms.entity.vo.ToolSharpeningVo;

import java.util.Map;

/**
 * @Description: tms_tool_sharpening Mapper 接口
 * @Author: 侯杰
@@ -20,4 +22,6 @@
public interface ToolsSharpeningMapper extends BaseMapper<ToolSharpening> {
    IPage<ToolSharpeningVo> queryPageList(Page<ToolSharpeningVo> page,
                                          @Param(Constants.WRAPPER) Wrapper<ToolSharpeningVo> queryWrapper);

    public IPage<Map<String, Object>> toolSharpeningList(IPage<Map> pageData, @Param(Constants.WRAPPER) Wrapper<Map> wrapper);
}

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/ToolsStocktakingBoundDetailMapper.java

@@ -10,6 +10,7 @@
import org.jeecg.modules.tms.entity.ToolsStocktakingBoundDetail;

import java.util.List;
import java.util.Map;

public interface ToolsStocktakingBoundDetailMapper extends BaseMapper<ToolsStocktakingBoundDetail> {

@@ -38,4 +39,6 @@
    IPage<ToolsStocktakingBoundDetail> selectByMainId(Page<ToolsStocktakingBoundDetail> page,
                                       @Param(Constants.WRAPPER) Wrapper<ToolsStocktakingBoundDetail> queryWrapper);

    public IPage<Map<String, Object>> toolsStocktakingList(IPage<Map> pageData, @Param(Constants.WRAPPER) Wrapper<Map> wrapper);

}

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/InStoreDetailMapper.xml

@@ -7,7 +7,7 @@
            t.id,
            t.tool_id onlyCode,
            t.in_storehouse_type inStorehouseType,
            t.goods_shelves_id goodsShelvesId,
            t10.location_code locationCode,
            t.in_number inNumber,
            t.in_storehouse_id inStorehouseId,
            t.inbound_time inboundTime,
@@ -39,6 +39,7 @@
                 LEFT JOIN (select * from v_sys_dict where dict_code='in_status') t7 on t7.item_value = t3.in_status
                 LEFT JOIN (select * from v_sys_dict where dict_code='in_bill_status') t8 on t8.item_value = t3.order_status
                 left join (select * from v_sys_dict where dict_code='in_storehouse_type') t9 on t9.item_value = t.in_storehouse_type
                left join tms_goods_shelves t10 on t10.id = t.goods_shelves_id
            ${ew.customSqlSegment}
    </select>
</mapper>

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/OutStoreDetailMapper.xml

@@ -84,4 +84,42 @@
        </choose>
        ${ew.customSqlSegment}
    </select>

    <select id="outStoreDetailList" resultType="map" parameterType="String">
        SELECT
            t1.id,
            t1.tool_id onlyCode,
            t1.out_storehouse_type outStorehouseType,
            t1.out_number outNumber,
            t1.out_storehouse_id outStorehouseId,
            t4.outbound_time outboundTime,
            t1.create_by createBy,
            t1.create_time createTime,
            t1.update_by updateBy,
            t1.update_time updateTime,
            t2.tool_code toolCode,
            t2.chinese_name chineseName,
            t2.tool_model toolModel,
            t3.classify_id classifyNum,
            t4.out_num outNum,
            t4.subject_matter subjectMatter,
            t5.realname handler,
            t6.realname reviewer,
            t7.item_text inStatus,
            t8.item_text orderStatus,
            t9.item_text outStorehouseTypeName,
            t10.item_text operateType
        FROM
            tms_out_store_detail t1
                LEFT JOIN tms_base_tools t2 ON t2.id = t1.tool_code
                LEFT JOIN tms_tools_classify t3 ON t3.id = t2.classify_id
                LEFT JOIN tms_outbound_order t4 ON t4.id = t1.out_storehouse_id
                LEFT JOIN sys_user t5 ON t5.username = t4.handler
                LEFT JOIN sys_user t6 ON t6.username = t4.reviewer
                LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'out_status' ) t7 ON t7.item_value = t4.out_status
                LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'out_bill_status' ) t8 ON t8.item_value = t4.order_status
                LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'out_storehouse_type' ) t9 ON t9.item_value = t1.out_storehouse_type
                LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'inbound_operate_type' ) t10 ON t10.item_value = t1.operate_type
            ${ew.customSqlSegment}
    </select>
</mapper>

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ToolLedgerDetailMapper.xml

@@ -172,4 +172,24 @@
                    )
            ) temp
    </select>
    <select id="queryToolLedgerDetailList"  resultType="map" parameterType="String">
        SELECT
            t1.id,
            t1.tool_code toolCodeId,
            t2.tool_code toolCode,
            t1.tool_id onlyCode,
            t2.chinese_name chineseName,
            t2.tool_model toolModel,
            t1.quantity,
            t1.warehouse_id warehouseId,
            ISNULL(t3.warehouse_id, '') + '/' + ISNULL(t3.warehouse_name, '') warehouseName,
            t1.position_code positionCode,
            t5.item_text applicationType
        FROM tms_tool_ledger_detail t1
                 LEFT JOIN tms_base_tools t2 on t1.tool_code = t2.id
                 LEFT JOIN tms_warehouse t3 on t1.warehouse_id = t3.id
                 left join tms_tools_config_property t4 on t4.tool_code = t2.id
                 left join (select * from v_sys_dict where dict_code ='application_type') t5 on t5.item_value = t4.application_type
            ${ew.customSqlSegment}
    </select>
</mapper>

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ToolLedgerMapper.xml

@@ -2,4 +2,33 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.tms.mapper.ToolLedgerMapper">

    <select id="toolLedgerList" resultType="map" parameterType="String">
        select
            t1.id,
            t1.total_count totalCount,
            t1.available_count availableCount,
            t1.lend_count lendCount,
            t1.loss_count lossCount,
            t1.repair_count repairCount,
            t1.sharpening_count sharpeningCount,
            t1.detection_count detectionCount,
            t2.id toolCodeId,
            t2.tool_code toolCode,
            t2.chinese_name chineseName,
            t2.tool_model toolModel,
            t2.sign_code signCode,
            t2.accuracy_class accuracyClass,
            t2.standard_code standardCode,
            t2.standard_level standardLevel,
            t3.position_code positionCode,
            t3.storage_location storageLocation,
            t3.highest_inventory highestInventory,
            t3.lower_inventory lowerInventory,
            t4.item_text applicationType
        from tms_tool_ledger t1
            left join tms_base_tools t2 on t1.tool_id = t2.id
            left join tms_tools_config_property t3 on t3.tool_code = t2.id
            left join (select * from v_sys_dict where dict_code = 'application_type') t4 on t4.item_value = t3.application_type
        ${ew.customSqlSegment}
    </select>
</mapper>

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ToolsLossBoundDetailMapper.xml

@@ -81,4 +81,28 @@
        </choose>
        ${ew.customSqlSegment}
    </select>


    <select id="toolLossDetailList" resultType="map" parameterType="String">
        SELECT
            t1.id,
            t1.tool_id onlyCode,
            t1.loss_number lossNumber,
            t1.loss_reason lossReason,
            t2.order_code orderCode,
            t2.loss_time lossTime,
            t3.id toolCodeId,
            t3.tool_code toolCode,
            t3.chinese_name chineseName,
            t3.tool_model toolModel,
            t4.classify_id classifyNum,
            t5.item_text handler
        FROM
            tms_loss_bound_detail t1
                LEFT JOIN tms_loss_bound t2 ON t2.id = t1.loss_bound_id
                LEFT JOIN tms_base_tools t3 ON t3.id = t1.tool_code
                LEFT JOIN tms_tools_classify t4 ON t4.id = t3.classify_id
                LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'sys_user' ) t5 ON t5.item_value = t2.handler
            ${ew.customSqlSegment}
    </select>
</mapper>

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ToolsSharpeningMapper.xml

@@ -23,4 +23,25 @@
                 LEFT JOIN tms_tool_ledger_detail t4 ON t4.tool_code = t.tool_id
        ${ew.customSqlSegment}
    </select>

    <select id="toolSharpeningList" resultType="map" parameterType="String">
        SELECT
            t1.id,
            t1.tool_id onlyCode,
            t1.sharpening_time sharpeningTime,
            t1.sharpening_result sharpeningResult,
            t1.sharpening_status sharpeningStatus,
            t1.responsible_person responsiblePerson,
            t2.tool_code toolCode,
            t2.chinese_name chineseName,
            t2.tool_model toolModel,
            t3.classify_id classifyNum,
            t4.item_text sharpeningStatusName
        FROM
            tms_tool_sharpening t1
                LEFT JOIN tms_base_tools t2 ON t2.id = t1.tool_code
                LEFT JOIN tms_tools_classify t3 ON t3.id = t2.classify_id
                LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'sharpening_status' ) t4 ON t4.item_value = t1.sharpening_status
            ${ew.customSqlSegment}
    </select>
</mapper>

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ToolsStocktakingBoundDetailMapper.xml

@@ -88,4 +88,30 @@
            ${ew.customSqlSegment}

    </select>

    <select id="toolsStocktakingList" resultType="map" parameterType="String">
        SELECT
            t1.id,
            t1.tool_id onlyCode,
            t1.book_quantity bookQuantity,
            t1.available_quantity availableQuantity,
            t1.practical_quantity practicalQuantity,
            t1.surplus_deficit surplusDeficit,
            t1.stocktaking_date stocktakingDate,
            t2.order_code orderCode,
            t2.stocktaking_type stocktakingType,
            t2.stocktaking_name stocktakingName,
            t3.tool_code toolCode,
            t3.chinese_name chineseName,
            t3.tool_model toolModel,
            t4.classify_id classifyNum,
            t5.item_text handler
        FROM
            tms_stocktaking_bound_detail t1
                LEFT JOIN tms_stocktaking_bound t2 ON t2.id = t1.stocktaking_bound_id
                LEFT JOIN tms_base_tools t3 ON t3.id = t1.tool_code
                LEFT JOIN tms_tools_classify t4 ON t4.id = t3.classify_id
                LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'sys_user' ) t5 ON t5.item_value = t2.handler
            ${ew.customSqlSegment}
    </select>
</mapper>

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IOutStoreDetailService.java

@@ -17,4 +17,6 @@
public interface IOutStoreDetailService extends IService<OutStoreDetail> {

    IPage<OutStoreDetailVo> queryPageList(Page<OutStoreDetailVo> page, Map<String, String[]> parameterMap);

    IPage<Map<String, Object>> outStoreDetailList(Integer pageNo, Integer pageSize, Map<String, String> query);
}

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IToolLedgerDetailService.java

@@ -20,4 +20,6 @@
    IPage<Map<String, Object>> queryLendTool(Integer pageNo, Integer pageSize, Map<String, String> query);

    IPage<Map<String, Object>> querySharpenTool(Integer pageNo, Integer pageSize, Map<String, String> query);

    IPage<Map<String, Object>> queryToolLedgerDetailList(Integer pageNo, Integer pageSize, Map<String, String> query);
}

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IToolLedgerService.java

@@ -1,7 +1,10 @@
package org.jeecg.modules.tms.service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import org.jeecg.modules.tms.entity.ToolLedger;
import com.baomidou.mybatisplus.extension.service.IService;

import java.util.Map;

/**
 * @Description: tms_tool_ledger
@@ -11,4 +14,5 @@
 */
public interface IToolLedgerService extends IService<ToolLedger> {

    IPage<Map<String, Object>> toolLedgerList(Integer pageNo, Integer pageSize, Map<String, String> query);
}

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IToolsLossBoundDetailService.java

@@ -19,4 +19,6 @@
 */
public interface IToolsLossBoundDetailService extends IService<ToolsLossBoundDetail> {
    IPage<ToolsLossBoundDetail> queryPageList(Page<ToolsLossBoundDetail> page, Map<String, String[]> parameterMap);

    IPage<Map<String, Object>> toolLossDetailList(Integer pageNo, Integer pageSize, Map<String, String> query);
}

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IToolsSharpeningService.java

@@ -16,4 +16,6 @@
 */
public interface IToolsSharpeningService extends IService<ToolSharpening> {
    IPage<ToolSharpeningVo> queryPageList(Page<ToolSharpeningVo> page, Map<String, String[]> parameterMap);

    IPage<Map<String, Object>> toolSharpeningList(Integer pageNo, Integer pageSize, Map<String, String> query);
}

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IToolsStocktakingBoundDetailService.java

@@ -27,5 +27,5 @@
     */
    public   IPage<ToolsStocktakingBoundDetail> selectByMainId(Page<ToolsStocktakingBoundDetail> page, Map<String, String[]> parameterMap);


    IPage<Map<String, Object>> toolsStocktakingList(Integer pageNo, Integer pageSize, Map<String, String> query);
}

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/InboundOrderServiceImpl.java

@@ -68,6 +68,9 @@

    @Autowired
    private IInboundDetailService inboundDetailService;

    @Autowired
    private IGoodsShelvesService goodsShelvesService;
    @Override
    public boolean submit(String id) {
        InboundOrder inboundOrder = this.getById(id);
@@ -215,6 +218,7 @@
    @Override
    public void addInStorage(JSONObject jSONObject) {
        String inStorehouseType = jSONObject.getString("inStorehouseType");
        String locationCodeId = jSONObject.getString("locationCodeId");
        String classifyId = jSONObject.getString("classifyId");
        Date inboundTime = jSONObject.getDate("inboundTime");
        //获取入库明细
@@ -266,6 +270,7 @@
                        inStoreDetail.setInStorehouseType("1");
                        inStoreDetail.setToolCode(inboundDetailVo.getToolCodeId());
                        inStoreDetail.setToolId(inboundDetailVo.getToolCode()+"-"+result);
                        inStoreDetail.setGoodsShelvesId(locationCodeId);
                        inStoreDetailService.save(inStoreDetail);
                        //增加库存明细
                        ToolLedgerDetail toolLedgerDetail = new ToolLedgerDetail();
@@ -287,6 +292,7 @@
                    inStoreDetail.setInNumber(inboundDetailVo.getInStorageQuantity());
                    inStoreDetail.setInStorehouseType("1");
                    inStoreDetail.setToolCode(inboundDetailVo.getToolCodeId());
                    inStoreDetail.setGoodsShelvesId(locationCodeId);
                    inStoreDetailService.save(inStoreDetail);
                    //查询库存明细中是否存在该工具
                    ToolLedgerDetail toolLedgerDetail = toolLedgerDetailService.lambdaQuery().eq(ToolLedgerDetail::getToolCode,inboundDetailVo.getToolCodeId()).one();
@@ -331,6 +337,7 @@
                    inStoreDetail.setInStorehouseType("2");
                    inStoreDetail.setToolCode(inboundDetailVo.getToolCodeId());
                    inStoreDetail.setToolId(inboundDetailVo.getOnlyCode());
                    inStoreDetail.setGoodsShelvesId(locationCodeId);
                    inStoreDetailService.save(inStoreDetail);
                    //不管到把
                }else {
@@ -346,6 +353,7 @@
                    inStoreDetail.setInNumber(inboundDetailVo.getInStorageQuantity());
                    inStoreDetail.setInStorehouseType("2");
                    inStoreDetail.setToolCode(inboundDetailVo.getToolCodeId());
                    inStoreDetail.setGoodsShelvesId(locationCodeId);
                    inStoreDetailService.save(inStoreDetail);
                }

@@ -378,6 +386,7 @@
                    inStoreDetail.setInStorehouseType("5");
                    inStoreDetail.setToolCode(inboundDetailVo.getToolCodeId());
                    inStoreDetail.setToolId(inboundDetailVo.getOnlyCode());
                    inStoreDetail.setGoodsShelvesId(locationCodeId);
                    inStoreDetailService.save(inStoreDetail);
                    //不管到把
                }else {
@@ -393,6 +402,7 @@
                    inStoreDetail.setInNumber(inboundDetailVo.getInStorageQuantity());
                    inStoreDetail.setInStorehouseType("5");
                    inStoreDetail.setToolCode(inboundDetailVo.getToolCodeId());
                    inStoreDetail.setGoodsShelvesId(locationCodeId);
                    inStoreDetailService.save(inStoreDetail);
                }

@@ -403,6 +413,7 @@
    @Override
    public void addApplyInStorage(JSONObject jSONObject) {
        String inStorehouseType = jSONObject.getString("inStorehouseType");
        String locationCodeId = jSONObject.getString("locationCodeId");
        //入库申请单id
        String orderId = jSONObject.getString("orderId");
        //获取入库明细
@@ -455,6 +466,7 @@
                        inStoreDetail.setInStorehouseType("1");
                        inStoreDetail.setToolCode(inboundDetailVo.getToolCodeId());
                        inStoreDetail.setToolId(inboundDetailVo.getToolCode()+"-"+result);
                        inStoreDetail.setGoodsShelvesId(locationCodeId);
                        inStoreDetailService.save(inStoreDetail);
                        //增加库存明细
                        ToolLedgerDetail toolLedgerDetail = new ToolLedgerDetail();
@@ -477,6 +489,7 @@
                    inStoreDetail.setInStorehouseType("1");
                    inStoreDetail.setInStorehouseId(orderId);
                    inStoreDetail.setToolCode(inboundDetailVo.getToolCodeId());
                    inStoreDetail.setGoodsShelvesId(locationCodeId);
                    inStoreDetailService.save(inStoreDetail);
                    //查询库存明细中是否存在该工具
                    ToolLedgerDetail toolLedgerDetail = toolLedgerDetailService.lambdaQuery().eq(ToolLedgerDetail::getToolCode,inboundDetailVo.getToolCodeId()).one();
@@ -527,6 +540,7 @@
                    inStoreDetail.setInStorehouseId(orderId);
                    inStoreDetail.setToolCode(inboundDetailVo.getToolCodeId());
                    inStoreDetail.setToolId(inboundDetailVo.getOnlyCode());
                    inStoreDetail.setGoodsShelvesId(locationCodeId);
                    inStoreDetailService.save(inStoreDetail);
                    //不管到把
                }else {
@@ -543,6 +557,7 @@
                    inStoreDetail.setInStorehouseType("2");
                    inStoreDetail.setInStorehouseId(orderId);
                    inStoreDetail.setToolCode(inboundDetailVo.getToolCodeId());
                    inStoreDetail.setGoodsShelvesId(locationCodeId);
                    inStoreDetailService.save(inStoreDetail);
                }
                //更改明细入库状态及实际入库数量
@@ -580,6 +595,7 @@
                    inStoreDetail.setInStorehouseId(orderId);
                    inStoreDetail.setToolCode(inboundDetailVo.getToolCodeId());
                    inStoreDetail.setToolId(inboundDetailVo.getOnlyCode());
                    inStoreDetail.setGoodsShelvesId(locationCodeId);
                    inStoreDetailService.save(inStoreDetail);
                    //不管到把
                }else {
@@ -596,6 +612,7 @@
                    inStoreDetail.setInStorehouseType("5");
                    inStoreDetail.setInStorehouseId(orderId);
                    inStoreDetail.setToolCode(inboundDetailVo.getToolCodeId());
                    inStoreDetail.setGoodsShelvesId(locationCodeId);
                    inStoreDetailService.save(inStoreDetail);
                }
                //更改明细入库状态及实际入库数量

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/OutStoreDetailServiceImpl.java

@@ -2,8 +2,11 @@

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.commons.lang.StringUtils;
import org.jeecg.common.exception.ExceptionCast;
import org.jeecg.modules.tms.entity.OutStoreDetail;
import org.jeecg.modules.tms.entity.vo.OutStoreDetailVo;
import org.jeecg.modules.tms.mapper.OutStoreDetailMapper;
@@ -12,6 +15,8 @@

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

import java.util.ArrayList;
import java.util.List;
import java.util.Map;

/**
@@ -41,4 +46,32 @@
        queryWrapper.orderByDesc("t1.create_time");
        return this.baseMapper.queryPageList(page, queryWrapper);
    }

    @Override
    public IPage<Map<String, Object>> outStoreDetailList(Integer pageNo, Integer pageSize, Map<String, String> query) {
        if (pageNo == null || pageNo < 1 || pageSize == null || pageSize < 1) {
            ExceptionCast.cast("参数错误");
        }
        IPage<Map> pageData = new Page<Map>(pageNo, pageSize);
        QueryWrapper<Map> queryWrapper = Wrappers.query();
        if (null != query) {
            String classifyId = query.get("classifyId");
            if (StringUtils.isNotBlank(classifyId)) {
                queryWrapper.eq("t2.classify_id", classifyId);
            }
            String toolCode = query.get("toolCode");
            if (StringUtils.isNotBlank(toolCode)) {
                queryWrapper.like("t2.tool_code", toolCode);
            }
            String toolModel = query.get("toolModel");
            if (StringUtils.isNotBlank(toolModel)) {
                queryWrapper.like("t2.tool_mode", toolModel);
            }
            // 排序写法
            List<OrderItem> orderItems = new ArrayList<>();
            orderItems.add(OrderItem.desc("t1.create_time"));
            ((Page<Map>) pageData).setOrders(orderItems);
        }
        return super.getBaseMapper().outStoreDetailList(pageData,queryWrapper);
    }
}

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ToolLedgerDetailServiceImpl.java

@@ -98,4 +98,29 @@
        }
        return this.baseMapper.querySharpenTool(pageData,queryWrapper);
    }

    @Override
    public IPage<Map<String, Object>> queryToolLedgerDetailList(Integer pageNo, Integer pageSize, Map<String, String> query) {

        if (pageNo == null || pageNo < 1 || pageSize == null || pageSize < 1) {
            ExceptionCast.cast("参数错误");
        }
        IPage<Map> pageData = new Page<Map>(pageNo, pageSize);
        QueryWrapper<Map> queryWrapper = Wrappers.query();
        if (null != query) {
            String toolCode = query.get("toolCode");
            if (StringUtils.isNotBlank(toolCode)) {
                queryWrapper.like("t2.tool_code", toolCode);
            }
            String status = query.get("status");
            if (StringUtils.isNotBlank(status)) {
                queryWrapper.eq("t1.status", status);
            }
            String classifyId = query.get("classifyId");
            if (StringUtils.isNotBlank(classifyId)) {
                queryWrapper.like("t2.classify_id", classifyId);
            }
        }
        return this.baseMapper.queryToolLedgerDetailList(pageData,queryWrapper);
    }
}

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ToolLedgerServiceImpl.java

@@ -1,11 +1,22 @@
package org.jeecg.modules.tms.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.commons.lang.StringUtils;
import org.jeecg.common.exception.ExceptionCast;
import org.jeecg.modules.tms.entity.ToolLedger;
import org.jeecg.modules.tms.mapper.ToolLedgerMapper;
import org.jeecg.modules.tms.service.IToolLedgerService;
import org.springframework.stereotype.Service;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

import java.util.ArrayList;
import java.util.List;
import java.util.Map;

/**
 * @Description: tms_tool_ledger
@@ -16,4 +27,31 @@
@Service
public class ToolLedgerServiceImpl extends ServiceImpl<ToolLedgerMapper, ToolLedger> implements IToolLedgerService {

    @Override
    public IPage<Map<String, Object>> toolLedgerList(Integer pageNo, Integer pageSize, Map<String, String> query) {
        if (pageNo == null || pageNo < 1 || pageSize == null || pageSize < 1) {
            ExceptionCast.cast("参数错误");
        }
        IPage<Map> pageData = new Page<Map>(pageNo, pageSize);
        QueryWrapper<Map> queryWrapper = Wrappers.query();
        if (null != query) {
            String classifyId = query.get("classifyId");
            if (StringUtils.isNotBlank(classifyId)) {
                queryWrapper.eq("t1.classify_id", classifyId);
            }
            String toolCode = query.get("toolCode");
            if (StringUtils.isNotBlank(toolCode)) {
                queryWrapper.like("t2.tool_code", toolCode);
            }
            String toolModel = query.get("toolModel");
            if (StringUtils.isNotBlank(toolModel)) {
                queryWrapper.like("t2.tool_mode", toolModel);
            }
            // 排序写法
            List<OrderItem> orderItems = new ArrayList<>();
            orderItems.add(OrderItem.desc("t1.create_time"));
            ((Page<Map>) pageData).setOrders(orderItems);
        }
        return super.getBaseMapper().toolLedgerList(pageData,queryWrapper);
    }
}

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ToolsLossBoundDetailServiceImpl.java

@@ -3,8 +3,11 @@

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.commons.lang.StringUtils;
import org.jeecg.common.exception.ExceptionCast;
import org.jeecg.modules.tms.entity.OutboundDetail;
import org.jeecg.modules.tms.entity.ToolsLossBound;
import org.jeecg.modules.tms.entity.ToolsLossBoundDetail;
@@ -15,6 +18,8 @@

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

import java.util.ArrayList;
import java.util.List;
import java.util.Map;

/**
@@ -35,4 +40,32 @@
        }
        return this.baseMapper.queryPageList(page, queryWrapper);
    }

    @Override
    public IPage<Map<String, Object>> toolLossDetailList(Integer pageNo, Integer pageSize, Map<String, String> query) {
        if (pageNo == null || pageNo < 1 || pageSize == null || pageSize < 1) {
            ExceptionCast.cast("参数错误");
        }
        IPage<Map> pageData = new Page<Map>(pageNo, pageSize);
        QueryWrapper<Map> queryWrapper = Wrappers.query();
        if (null != query) {
            String classifyId = query.get("classifyId");
            if (StringUtils.isNotBlank(classifyId)) {
                queryWrapper.eq("t3.classify_id", classifyId);
            }
            String toolCode = query.get("toolCode");
            if (StringUtils.isNotBlank(toolCode)) {
                queryWrapper.like("t3.tool_code", toolCode);
            }
            String toolModel = query.get("toolModel");
            if (StringUtils.isNotBlank(toolModel)) {
                queryWrapper.like("t3.tool_mode", toolModel);
            }
            // 排序写法
            List<OrderItem> orderItems = new ArrayList<>();
            orderItems.add(OrderItem.desc("t1.create_time"));
            ((Page<Map>) pageData).setOrders(orderItems);
        }
        return super.getBaseMapper().toolLossDetailList(pageData,queryWrapper);
    }
}

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ToolsSharpeningServiceImpl.java

@@ -2,8 +2,11 @@

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.commons.lang.StringUtils;
import org.jeecg.common.exception.ExceptionCast;
import org.jeecg.modules.tms.entity.ToolSharpening;
import org.jeecg.modules.tms.entity.ToolsLossBoundDetail;
import org.jeecg.modules.tms.entity.vo.ToolSharpeningVo;
@@ -12,6 +15,8 @@
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

import java.util.ArrayList;
import java.util.List;
import java.util.Map;

/**
@@ -48,5 +53,32 @@
        return this.baseMapper.queryPageList(page, queryWrapper);
    }

    @Override
    public IPage<Map<String, Object>> toolSharpeningList(Integer pageNo, Integer pageSize, Map<String, String> query) {
        if (pageNo == null || pageNo < 1 || pageSize == null || pageSize < 1) {
            ExceptionCast.cast("参数错误");
        }
        IPage<Map> pageData = new Page<Map>(pageNo, pageSize);
        QueryWrapper<Map> queryWrapper = Wrappers.query();
        if (null != query) {
            String classifyId = query.get("classifyId");
            if (StringUtils.isNotBlank(classifyId)) {
                queryWrapper.eq("t2.classify_id", classifyId);
            }
            String toolCode = query.get("toolCode");
            if (StringUtils.isNotBlank(toolCode)) {
                queryWrapper.like("t2.tool_code", toolCode);
            }
            String toolModel = query.get("toolModel");
            if (StringUtils.isNotBlank(toolModel)) {
                queryWrapper.like("t2.tool_mode", toolModel);
            }
            // 排序写法
            List<OrderItem> orderItems = new ArrayList<>();
            orderItems.add(OrderItem.desc("t1.create_time"));
            ((Page<Map>) pageData).setOrders(orderItems);
        }
        return super.getBaseMapper().toolSharpeningList(pageData,queryWrapper);
    }

}

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ToolsStocktakingBoundDetailServiceImpl.java

@@ -2,15 +2,19 @@

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang.StringUtils;
import org.jeecg.common.exception.ExceptionCast;
import org.jeecg.modules.tms.entity.ToolsStocktakingBoundDetail;
import org.jeecg.modules.tms.mapper.ToolsStocktakingBoundDetailMapper;
import org.jeecg.modules.tms.service.IToolsStocktakingBoundDetailService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.List;
import java.util.Map;

@@ -36,4 +40,32 @@
        return toolsStocktakingBoundDetailMapper.selectByMainId(page, queryWrapper);
    }

    @Override
    public IPage<Map<String, Object>> toolsStocktakingList(Integer pageNo, Integer pageSize, Map<String, String> query) {
        if (pageNo == null || pageNo < 1 || pageSize == null || pageSize < 1) {
            ExceptionCast.cast("参数错误");
        }
        IPage<Map> pageData = new Page<Map>(pageNo, pageSize);
        QueryWrapper<Map> queryWrapper = Wrappers.query();
        if (null != query) {
            String classifyId = query.get("classifyId");
            if (StringUtils.isNotBlank(classifyId)) {
                queryWrapper.eq("t3.classify_id", classifyId);
            }
            String toolCode = query.get("toolCode");
            if (StringUtils.isNotBlank(toolCode)) {
                queryWrapper.like("t3.tool_code", toolCode);
            }
            String toolModel = query.get("toolModel");
            if (StringUtils.isNotBlank(toolModel)) {
                queryWrapper.like("t3.tool_mode", toolModel);
            }
            // 排序写法
            List<OrderItem> orderItems = new ArrayList<>();
            orderItems.add(OrderItem.desc("t1.create_time"));
            ((Page<Map>) pageData).setOrders(orderItems);
        }
        return super.getBaseMapper().toolsStocktakingList(pageData,queryWrapper);
    }

}