新火炬后端单体项目初始化代码
ffa5afb4e38d577c85813f48e41696f0c569c7a7..8c945d42c6610abd9ef17bc153114024175bec2a
2025-07-03 houshuai
线边库和订单 基本搭建
8c945d 对比 | 目录
2025-07-03 cuijian
质量管理-抽样规则、缺陷维护功能
bc9060 对比 | 目录
已添加42个文件
已修改24个文件
3127 ■■■■■ 文件已修改
src/main/java/org/jeecg/codegenerate/JeecgOneUtil.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/lsw/controller/LswMaterialController.java 423 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/lsw/controller/LswMaterialInboundController.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/lsw/controller/LswMaterialOutboundController.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/lsw/entity/LswMaterialInbound.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/lsw/entity/LswMaterialInventory.java 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/lsw/entity/LswMaterialOutbound.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/lsw/mapper/LswMaterialInboundMapper.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/lsw/mapper/LswMaterialMapper.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/lsw/mapper/LswMaterialOutboundMapper.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/lsw/mapper/xml/LswMaterialInboundMapper.xml 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/lsw/mapper/xml/LswMaterialMapper.xml 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/lsw/mapper/xml/LswMaterialOutboundMapper.xml 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/lsw/service/ILswMaterialInboundService.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/lsw/service/ILswMaterialOutboundService.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/lsw/service/ILswMaterialService.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/lsw/service/impl/LswMaterialInboundServiceImpl.java 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/lsw/service/impl/LswMaterialOutboundServiceImpl.java 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/lsw/service/impl/LswMaterialServiceImpl.java 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/pms/controller/PmsMaterialProcessController.java 172 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/pms/controller/PmsProcessBillMaterialsController.java 172 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/pms/controller/PmsProcessBillMaterialsDetailController.java 182 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/pms/entity/PmsMaterialProcess.java 84 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/pms/entity/PmsProcessBillMaterials.java 82 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/pms/entity/PmsProcessBillMaterialsDetail.java 70 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/pms/mapper/PmsMaterialProcessMapper.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/pms/mapper/PmsProcessBillMaterialsDetailMapper.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/pms/mapper/PmsProcessBillMaterialsMapper.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/pms/mapper/xml/PmsMaterialProcessMapper.xml 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/pms/mapper/xml/PmsProcessBillMaterialsDetailMapper.xml 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/pms/mapper/xml/PmsProcessBillMaterialsMapper.xml 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/pms/service/IPmsMaterialProcessService.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/pms/service/IPmsProcessBillMaterialsDetailService.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/pms/service/IPmsProcessBillMaterialsService.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/pms/service/impl/PmsMaterialProcessServiceImpl.java 43 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/pms/service/impl/PmsProcessBillMaterialsDetailServiceImpl.java 48 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/pms/service/impl/PmsProcessBillMaterialsServiceImpl.java 43 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/qms/controller/DefectController.java 194 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/qms/controller/InspectionItemController.java 61 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/qms/controller/InspectionPlanController.java 194 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/qms/controller/InspectionPlanItemController.java 177 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/qms/controller/SamplingRulesController.java 194 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/qms/entity/Defect.java 82 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/qms/entity/InspectionPlan.java 94 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/qms/entity/InspectionPlanItem.java 71 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/qms/entity/SamplingRules.java 98 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/qms/mapper/DefectMapper.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/qms/mapper/InspectionItemMapper.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/qms/mapper/InspectionPlanItemMapper.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/qms/mapper/InspectionPlanMapper.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/qms/mapper/SamplingRulesMapper.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/qms/mapper/xml/DefectMapper.xml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/qms/mapper/xml/InspectionItemMapper.xml 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/qms/mapper/xml/InspectionPlanItemMapper.xml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/qms/mapper/xml/InspectionPlanMapper.xml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/qms/mapper/xml/SamplingRulesMapper.xml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/qms/service/IDefectService.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/qms/service/IInspectionItemService.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/qms/service/IInspectionPlanItemService.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/qms/service/IInspectionPlanService.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/qms/service/ISamplingRulesService.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/qms/service/impl/DefectServiceImpl.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/qms/service/impl/InspectionItemServiceImpl.java 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/qms/service/impl/InspectionPlanItemServiceImpl.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/qms/service/impl/InspectionPlanServiceImpl.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/qms/service/impl/SamplingRulesServiceImpl.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/codegenerate/JeecgOneUtil.java
@@ -6,10 +6,10 @@
public class JeecgOneUtil {
    public static void main(String[] args) throws Exception {
        TableVo tableVo = new TableVo();
        tableVo.setTableName("eam_equipment_scrap");
        tableVo.setEntityName("EamEquipmentScrap");
        tableVo.setEntityPackage("eam");
        tableVo.setFtlDescription("设备报废(转让)");
        tableVo.setTableName("lsw_material");
        tableVo.setEntityName("LswMaterial");
        tableVo.setEntityPackage("lsw");
        tableVo.setFtlDescription("线边库物料信息");
        new CodeGenerateOne(tableVo).generateCodeFile(null);
    }
}
src/main/java/org/jeecg/modules/lsw/controller/LswMaterialController.java
@@ -6,12 +6,15 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.base.entity.LineSideWarehouse;
import org.jeecg.modules.base.service.ILineSideWarehouseService;
import org.jeecg.modules.lsw.entity.LswMaterial;
import org.jeecg.modules.lsw.entity.LswMaterialInventory;
import org.jeecg.modules.lsw.service.ILswMaterialInventoryService;
@@ -38,223 +41,241 @@
import java.util.Map;
/**
* @Description: çº¿è¾¹åº“物料信息
* @Author: jeecg-boot
* @Date:   2025-06-30
* @Version: V1.0
*/
@Api(tags="线边库物料信息")
 * @Description: çº¿è¾¹åº“物料信息
 * @Author: jeecg-boot
 * @Date: 2025-06-30
 * @Version: V1.0
 */
@Api(tags = "线边库物料信息")
@RestController
@RequestMapping("/lswmaterial/lswMaterial")
@Slf4j
public class LswMaterialController {
   @Autowired
   private ILswMaterialService lswMaterialService;
   @Autowired
   private ILswMaterialInventoryService lswMaterialInventoryService;
    @Autowired
    private ILswMaterialService lswMaterialService;
    @Autowired
    private ILswMaterialInventoryService lswMaterialInventoryService;
    @Autowired
    private ILineSideWarehouseService lineSideWarehouseService;
   /**
    * åˆ†é¡µåˆ—表查询
    *
    * @param lswMaterial
    * @param pageNo
    * @param pageSize
    * @param req
    * @return
    */
   //@AutoLog(value = "线边库物料信息-分页列表查询")
   @ApiOperation(value="线边库物料信息-分页列表查询", notes="线边库物料信息-分页列表查询")
   @GetMapping(value = "/list")
   public Result<IPage<LswMaterial>> queryPageList(LswMaterial lswMaterial,
                                  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                  HttpServletRequest req) {
       QueryWrapper<LswMaterial> queryWrapper = QueryGenerator.initQueryWrapper(lswMaterial, req.getParameterMap());
       Page<LswMaterial> page = new Page<LswMaterial>(pageNo, pageSize);
       IPage<LswMaterial> pageList = lswMaterialService.page(page, queryWrapper);
       return Result.OK(pageList);
   }
    /**
     * åˆ†é¡µåˆ—表查询
     *
     * @param lswMaterial
     * @param pageNo
     * @param pageSize
     * @param req
     * @return
     */
    //@AutoLog(value = "线边库物料信息-分页列表查询")
    @ApiOperation(value = "线边库物料信息-分页列表查询", notes = "线边库物料信息-分页列表查询")
    @GetMapping(value = "/list")
    public Result<IPage<LswMaterial>> queryPageList(LswMaterial lswMaterial,
                                                    @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                    HttpServletRequest req) {
        QueryWrapper<LswMaterial> queryWrapper = QueryGenerator.initQueryWrapper(lswMaterial, req.getParameterMap());
        Page<LswMaterial> page = new Page<LswMaterial>(pageNo, pageSize);
        IPage<LswMaterial> pageList = lswMaterialService.page(page, queryWrapper);
        return Result.OK(pageList);
    }
   /**
    *   æ·»åŠ 
    *
    * @param lswMaterialPage
    * @return
    */
   @AutoLog(value = "线边库物料信息-添加")
   @ApiOperation(value="线边库物料信息-添加", notes="线边库物料信息-添加")
   //@RequiresPermissions("org.jeecg.modules:lsw_material:add")
   @PostMapping(value = "/add")
   public Result<String> add(@RequestBody LswMaterialPage lswMaterialPage) {
       LswMaterial lswMaterial = new LswMaterial();
       BeanUtils.copyProperties(lswMaterialPage, lswMaterial);
       lswMaterialService.saveMain(lswMaterial, lswMaterialPage.getLswMaterialInventoryList());
       return Result.OK("添加成功!");
   }
    /**
     * æ·»åŠ 
     *
     * @param lswMaterialPage
     * @return
     */
    @AutoLog(value = "线边库物料信息-添加")
    @ApiOperation(value = "线边库物料信息-添加", notes = "线边库物料信息-添加")
    //@RequiresPermissions("org.jeecg.modules:lsw_material:add")
    @PostMapping(value = "/add")
    public Result<String> add(@RequestBody LswMaterialPage lswMaterialPage) {
        LswMaterial lswMaterial = new LswMaterial();
        BeanUtils.copyProperties(lswMaterialPage, lswMaterial);
        lswMaterialService.saveMain(lswMaterial, lswMaterialPage.getLswMaterialInventoryList());
        return Result.OK("添加成功!");
    }
   /**
    *  ç¼–辑
    *
    * @param lswMaterialPage
    * @return
    */
   @AutoLog(value = "线边库物料信息-编辑")
   @ApiOperation(value="线边库物料信息-编辑", notes="线边库物料信息-编辑")
   //@RequiresPermissions("org.jeecg.modules:lsw_material:edit")
   @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
   public Result<String> edit(@RequestBody LswMaterialPage lswMaterialPage) {
       LswMaterial lswMaterial = new LswMaterial();
       BeanUtils.copyProperties(lswMaterialPage, lswMaterial);
       LswMaterial lswMaterialEntity = lswMaterialService.getById(lswMaterial.getId());
       if(lswMaterialEntity==null) {
           return Result.error("未找到对应数据");
       }
       lswMaterialService.updateMain(lswMaterial, lswMaterialPage.getLswMaterialInventoryList());
       return Result.OK("编辑成功!");
   }
    /**
     * ç¼–辑
     *
     * @param lswMaterialPage
     * @return
     */
    @AutoLog(value = "线边库物料信息-编辑")
    @ApiOperation(value = "线边库物料信息-编辑", notes = "线边库物料信息-编辑")
    //@RequiresPermissions("org.jeecg.modules:lsw_material:edit")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
    public Result<String> edit(@RequestBody LswMaterialPage lswMaterialPage) {
        LswMaterial lswMaterial = new LswMaterial();
        BeanUtils.copyProperties(lswMaterialPage, lswMaterial);
        LswMaterial lswMaterialEntity = lswMaterialService.getById(lswMaterial.getId());
        if (lswMaterialEntity == null) {
            return Result.error("未找到对应数据");
        }
        lswMaterialService.updateMain(lswMaterial, lswMaterialPage.getLswMaterialInventoryList());
        return Result.OK("编辑成功!");
    }
   /**
    *   é€šè¿‡id删除
    *
    * @param id
    * @return
    */
   @AutoLog(value = "线边库物料信息-通过id删除")
   @ApiOperation(value="线边库物料信息-通过id删除", notes="线边库物料信息-通过id删除")
   //@RequiresPermissions("org.jeecg.modules:lsw_material:delete")
   @DeleteMapping(value = "/delete")
   public Result<String> delete(@RequestParam(name="id",required=true) String id) {
       lswMaterialService.delMain(id);
       return Result.OK("删除成功!");
   }
    /**
     * é€šè¿‡id删除
     *
     * @param id
     * @return
     */
    @AutoLog(value = "线边库物料信息-通过id删除")
    @ApiOperation(value = "线边库物料信息-通过id删除", notes = "线边库物料信息-通过id删除")
    //@RequiresPermissions("org.jeecg.modules:lsw_material:delete")
    @DeleteMapping(value = "/delete")
    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
        lswMaterialService.delMain(id);
        return Result.OK("删除成功!");
    }
   /**
    *  æ‰¹é‡åˆ é™¤
    *
    * @param ids
    * @return
    */
   @AutoLog(value = "线边库物料信息-批量删除")
   @ApiOperation(value="线边库物料信息-批量删除", notes="线边库物料信息-批量删除")
   //@RequiresPermissions("org.jeecg.modules:lsw_material:deleteBatch")
   @DeleteMapping(value = "/deleteBatch")
   public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
       this.lswMaterialService.delBatchMain(Arrays.asList(ids.split(",")));
       return Result.OK("批量删除成功!");
   }
    /**
     * æ‰¹é‡åˆ é™¤
     *
     * @param ids
     * @return
     */
    @AutoLog(value = "线边库物料信息-批量删除")
    @ApiOperation(value = "线边库物料信息-批量删除", notes = "线边库物料信息-批量删除")
    //@RequiresPermissions("org.jeecg.modules:lsw_material:deleteBatch")
    @DeleteMapping(value = "/deleteBatch")
    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
        this.lswMaterialService.delBatchMain(Arrays.asList(ids.split(",")));
        return Result.OK("批量删除成功!");
    }
   /**
    * é€šè¿‡id查询
    *
    * @param id
    * @return
    */
   //@AutoLog(value = "线边库物料信息-通过id查询")
   @ApiOperation(value="线边库物料信息-通过id查询", notes="线边库物料信息-通过id查询")
   @GetMapping(value = "/queryById")
   public Result<LswMaterial> queryById(@RequestParam(name="id",required=true) String id) {
       LswMaterial lswMaterial = lswMaterialService.getById(id);
       if(lswMaterial==null) {
           return Result.error("未找到对应数据");
       }
       return Result.OK(lswMaterial);
    /**
     * é€šè¿‡id查询
     *
     * @param id
     * @return
     */
    //@AutoLog(value = "线边库物料信息-通过id查询")
    @ApiOperation(value = "线边库物料信息-通过id查询", notes = "线边库物料信息-通过id查询")
    @GetMapping(value = "/queryById")
    public Result<LswMaterial> queryById(@RequestParam(name = "id", required = true) String id) {
        LswMaterial lswMaterial = lswMaterialService.getById(id);
        if (lswMaterial == null) {
            return Result.error("未找到对应数据");
        }
        return Result.OK(lswMaterial);
   }
    }
   /**
    * é€šè¿‡id查询
    *
    * @param id
    * @return
    */
   //@AutoLog(value = "物料库存信息通过主表ID查询")
   @ApiOperation(value="物料库存信息主表ID查询", notes="物料库存信息-通主表ID查询")
   @GetMapping(value = "/queryLswMaterialInventoryByMainId")
   public Result<List<LswMaterialInventory>> queryLswMaterialInventoryListByMainId(@RequestParam(name="id",required=true) String id) {
       List<LswMaterialInventory> lswMaterialInventoryList = lswMaterialInventoryService.selectByMainId(id);
       return Result.OK(lswMaterialInventoryList);
   }
    /**
     * é€šè¿‡id查询
     *
     * @param id
     * @return
     */
    //@AutoLog(value = "物料库存信息通过主表ID查询")
    @ApiOperation(value = "物料库存信息主表ID查询", notes = "物料库存信息-通主表ID查询")
    @GetMapping(value = "/queryLswMaterialInventoryByMainId")
    public Result<List<LswMaterialInventory>> queryLswMaterialInventoryListByMainId(@RequestParam(name = "id", required = true) String id) {
        List<LswMaterialInventory> lswMaterialInventoryList = lswMaterialInventoryService.selectByMainId(id);
        for (LswMaterialInventory lswMaterialInventory : lswMaterialInventoryList) {
            if(StringUtils.isNotEmpty(lswMaterialInventory.getWarehouseId())){
                String warehouseId = lswMaterialInventory.getWarehouseId();
                LineSideWarehouse warehouse = lineSideWarehouseService.getById(warehouseId);
                lswMaterialInventory.setWarehouseName(warehouse.getWarehouseName());
            }
        }
        return Result.OK(lswMaterialInventoryList);
    }
   /**
   * å¯¼å‡ºexcel
   *
   * @param request
   * @param lswMaterial
   */
   //@RequiresPermissions("org.jeecg.modules:lsw_material:exportXls")
   @RequestMapping(value = "/exportXls")
   public ModelAndView exportXls(HttpServletRequest request, LswMaterial lswMaterial) {
     // Step.1 ç»„装查询条件查询数据
     QueryWrapper<LswMaterial> queryWrapper = QueryGenerator.initQueryWrapper(lswMaterial, request.getParameterMap());
     LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
    /**
     * å¯¼å‡ºexcel
     *
     * @param request
     * @param lswMaterial
     */
    //@RequiresPermissions("org.jeecg.modules:lsw_material:exportXls")
    @RequestMapping(value = "/exportXls")
    public ModelAndView exportXls(HttpServletRequest request, LswMaterial lswMaterial) {
        // Step.1 ç»„装查询条件查询数据
        QueryWrapper<LswMaterial> queryWrapper = QueryGenerator.initQueryWrapper(lswMaterial, request.getParameterMap());
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
     //配置选中数据查询条件
     String selections = request.getParameter("selections");
     if(oConvertUtils.isNotEmpty(selections)) {
        List<String> selectionList = Arrays.asList(selections.split(","));
        queryWrapper.in("id",selectionList);
     }
     //Step.2 èŽ·å–å¯¼å‡ºæ•°æ®
     List<LswMaterial> lswMaterialList = lswMaterialService.list(queryWrapper);
        //配置选中数据查询条件
        String selections = request.getParameter("selections");
        if (oConvertUtils.isNotEmpty(selections)) {
            List<String> selectionList = Arrays.asList(selections.split(","));
            queryWrapper.in("id", selectionList);
        }
        //Step.2 èŽ·å–å¯¼å‡ºæ•°æ®
        List<LswMaterial> lswMaterialList = lswMaterialService.list(queryWrapper);
     // Step.3 ç»„装pageList
     List<LswMaterialPage> pageList = new ArrayList<LswMaterialPage>();
     for (LswMaterial main : lswMaterialList) {
         LswMaterialPage vo = new LswMaterialPage();
         BeanUtils.copyProperties(main, vo);
         List<LswMaterialInventory> lswMaterialInventoryList = lswMaterialInventoryService.selectByMainId(main.getId());
         vo.setLswMaterialInventoryList(lswMaterialInventoryList);
         pageList.add(vo);
     }
        // Step.3 ç»„装pageList
        List<LswMaterialPage> pageList = new ArrayList<LswMaterialPage>();
        for (LswMaterial main : lswMaterialList) {
            LswMaterialPage vo = new LswMaterialPage();
            BeanUtils.copyProperties(main, vo);
            List<LswMaterialInventory> lswMaterialInventoryList = lswMaterialInventoryService.selectByMainId(main.getId());
            vo.setLswMaterialInventoryList(lswMaterialInventoryList);
            pageList.add(vo);
        }
     // Step.4 AutoPoi å¯¼å‡ºExcel
     ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
     mv.addObject(NormalExcelConstants.FILE_NAME, "线边库物料信息列表");
     mv.addObject(NormalExcelConstants.CLASS, LswMaterialPage.class);
     mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("线边库物料信息数据", "导出人:"+sysUser.getRealname(), "线边库物料信息"));
     mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
     return mv;
   }
        // Step.4 AutoPoi å¯¼å‡ºExcel
        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
        mv.addObject(NormalExcelConstants.FILE_NAME, "线边库物料信息列表");
        mv.addObject(NormalExcelConstants.CLASS, LswMaterialPage.class);
        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("线边库物料信息数据", "导出人:" + sysUser.getRealname(), "线边库物料信息"));
        mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
        return mv;
    }
   /**
   * é€šè¿‡excel导入数据
   *
   * @param request
   * @param response
   * @return
   */
   //@RequiresPermissions("org.jeecg.modules:lsw_material:importExcel")
   @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
   public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
     MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
     Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
     for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
         // èŽ·å–ä¸Šä¼ æ–‡ä»¶å¯¹è±¡
         MultipartFile file = entity.getValue();
         ImportParams params = new ImportParams();
         params.setTitleRows(2);
         params.setHeadRows(1);
         params.setNeedSave(true);
         try {
             List<LswMaterialPage> list = ExcelImportUtil.importExcel(file.getInputStream(), LswMaterialPage.class, params);
             for (LswMaterialPage page : list) {
                 LswMaterial po = new LswMaterial();
                 BeanUtils.copyProperties(page, po);
                 lswMaterialService.saveMain(po, page.getLswMaterialInventoryList());
             }
             return Result.OK("文件导入成功!数据行数:" + list.size());
         } catch (Exception e) {
             log.error(e.getMessage(),e);
             return Result.error("文件导入失败:"+e.getMessage());
         } finally {
             try {
                 file.getInputStream().close();
             } catch (IOException e) {
                 e.printStackTrace();
             }
         }
     }
     return Result.OK("文件导入失败!");
   }
    /**
     * é€šè¿‡excel导入数据
     *
     * @param request
     * @param response
     * @return
     */
    //@RequiresPermissions("org.jeecg.modules:lsw_material:importExcel")
    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
            // èŽ·å–ä¸Šä¼ æ–‡ä»¶å¯¹è±¡
            MultipartFile file = entity.getValue();
            ImportParams params = new ImportParams();
            params.setTitleRows(2);
            params.setHeadRows(1);
            params.setNeedSave(true);
            try {
                List<LswMaterialPage> list = ExcelImportUtil.importExcel(file.getInputStream(), LswMaterialPage.class, params);
                for (LswMaterialPage page : list) {
                    LswMaterial po = new LswMaterial();
                    BeanUtils.copyProperties(page, po);
                    lswMaterialService.saveMain(po, page.getLswMaterialInventoryList());
                }
                return Result.OK("文件导入成功!数据行数:" + list.size());
            } catch (Exception e) {
                log.error(e.getMessage(), e);
                return Result.error("文件导入失败:" + e.getMessage());
            } finally {
                try {
                    file.getInputStream().close();
                } catch (IOException e) {
                    e.printStackTrace();
                }
            }
        }
        return Result.OK("文件导入失败!");
    }
    @GetMapping(value = "/searchlikeQuery")
    public Result<?> searchlikeQuery(LswMaterial lswMaterial,
                                     @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                     @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                     HttpServletRequest req) {
        IPage<Map<String, Object>> pageList = lswMaterialService.getLswMaterialListData(pageNo, pageSize, req);
        return Result.OK(pageList);
    }
}
src/main/java/org/jeecg/modules/lsw/controller/LswMaterialInboundController.java
@@ -10,6 +10,7 @@
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.lsw.entity.LswMaterial;
import org.jeecg.modules.lsw.entity.LswMaterialInbound;
import org.jeecg.modules.lsw.service.ILswMaterialInboundService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -19,6 +20,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.Map;
/**
* @Description: ç‰©æ–™å…¥åº“单
@@ -157,5 +159,14 @@
   public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
       return super.importExcel(request, response, LswMaterialInbound.class);
   }
    @GetMapping(value = "/searchlikeQuery")
    public Result<?> searchlikeQuery(LswMaterialInbound lswMaterialInbound,
                                     @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                     @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                     HttpServletRequest req){
        IPage<Map<String, Object>> pageList = lswMaterialInboundService.getlswMaterialInboundListData(pageNo,pageSize,req);
        return Result.OK(pageList);
    }
}
src/main/java/org/jeecg/modules/lsw/controller/LswMaterialOutboundController.java
@@ -10,6 +10,7 @@
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.lsw.entity.LswMaterialInbound;
import org.jeecg.modules.lsw.entity.LswMaterialOutbound;
import org.jeecg.modules.lsw.service.ILswMaterialOutboundService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -19,6 +20,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.Map;
/**
* @Description: ç‰©æ–™å‡ºåº“单
@@ -157,5 +159,13 @@
   public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
       return super.importExcel(request, response, LswMaterialOutbound.class);
   }
    @GetMapping(value = "/searchlikeQuery")
    public Result<?> searchlikeQuery(LswMaterialOutbound lswMaterialOutbound,
                                     @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                     @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                     HttpServletRequest req){
        IPage<Map<String, Object>> pageList = lswMaterialOutboundService.getlswMaterialOutboundListData(pageNo,pageSize,req);
        return Result.OK(pageList);
    }
}
src/main/java/org/jeecg/modules/lsw/entity/LswMaterialInbound.java
@@ -10,6 +10,7 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.common.aspect.annotation.Dict;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
@@ -58,10 +59,12 @@
    /**产线ID*/
    @Excel(name = "产线ID", width = 15)
    @ApiModelProperty(value = "产线ID")
    @Dict(dictTable = "base_factory", dicCode = "id", dicText = "factory_name")
    private String factoryId;
    /**库存地ID*/
    @Excel(name = "库存地ID", width = 15)
    @ApiModelProperty(value = "库存地ID")
    @Dict(dictTable = "base_line_side_warehouse", dicCode = "id", dicText = "warehouse_name")
    private String warehouseId;
    /**物料编码*/
    @Excel(name = "物料编码", width = 15)
@@ -78,7 +81,7 @@
    /**入库数量*/
    @Excel(name = "入库数量", width = 15)
    @ApiModelProperty(value = "入库数量")
    private Integer quantity;
    private Double quantity;
    /**接收人*/
    @Excel(name = "接收人", width = 15)
    @ApiModelProperty(value = "接收人")
src/main/java/org/jeecg/modules/lsw/entity/LswMaterialInventory.java
@@ -1,15 +1,18 @@
package org.jeecg.modules.lsw.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.jeecg.common.aspect.annotation.Dict;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import javax.persistence.Table;
import java.io.Serializable;
import java.util.Date;
@@ -59,11 +62,15 @@
    /**数量*/
    @Excel(name = "数量", width = 15)
    @ApiModelProperty(value = "数量")
    private String quantity;
    private Double quantity;
    /**库存地ID*/
    @Excel(name = "库存地ID", width = 15)
    @Dict(dictTable = "base_line_side_warehouse", dicCode = "id", dicText = "warehouse_name")
    @ApiModelProperty(value = "库存地ID")
    private String warehouseId;
    @TableField(exist = false)
    @ApiModelProperty(value = "库存地")
    private String warehouseName;
    /**库存状态*/
    @Excel(name = "库存状态", width = 15)
    @ApiModelProperty(value = "库存状态")
src/main/java/org/jeecg/modules/lsw/entity/LswMaterialOutbound.java
@@ -10,6 +10,7 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.common.aspect.annotation.Dict;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
@@ -66,6 +67,7 @@
    /**产线ID*/
    @Excel(name = "产线ID", width = 15)
    @ApiModelProperty(value = "产线ID")
    @Dict(dictTable = "base_factory", dicCode = "id", dicText = "factory_name")
    private String factoryId;
    /**批次号*/
    @Excel(name = "批次号", width = 15)
@@ -84,7 +86,7 @@
    /**出库数量*/
    @Excel(name = "出库数量", width = 15)
    @ApiModelProperty(value = "出库数量")
    private String quantity;
    private Double quantity;
    /**工单ID*/
    @Excel(name = "工单ID", width = 15)
    @ApiModelProperty(value = "工单ID")
src/main/java/org/jeecg/modules/lsw/mapper/LswMaterialInboundMapper.java
@@ -1,7 +1,11 @@
package org.jeecg.modules.lsw.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.lsw.entity.LswMaterialInbound;
import java.util.Map;
/**
 * @Description: ç‰©æ–™å…¥åº“单
@@ -10,5 +14,5 @@
 * @Version: V1.0
 */
public interface LswMaterialInboundMapper extends BaseMapper<LswMaterialInbound> {
    IPage<Map<String, Object>> getlswMaterialInboundListData(IPage<Map> pageData, @Param("params")Map<String, String> paramMap);
}
src/main/java/org/jeecg/modules/lsw/mapper/LswMaterialMapper.java
@@ -1,7 +1,11 @@
package org.jeecg.modules.lsw.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.lsw.entity.LswMaterial;
import java.util.Map;
/**
 * @Description: çº¿è¾¹åº“物料信息
@@ -10,5 +14,5 @@
 * @Version: V1.0
 */
public interface LswMaterialMapper extends BaseMapper<LswMaterial> {
    IPage<Map<String, Object>> getLswMaterialListData(IPage<Map> pageData, @Param("params")Map<String, String> paramMap);
}
src/main/java/org/jeecg/modules/lsw/mapper/LswMaterialOutboundMapper.java
@@ -1,7 +1,11 @@
package org.jeecg.modules.lsw.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.lsw.entity.LswMaterialOutbound;
import java.util.Map;
/**
 * @Description: ç‰©æ–™å‡ºåº“单
@@ -10,5 +14,5 @@
 * @Version: V1.0
 */
public interface LswMaterialOutboundMapper extends BaseMapper<LswMaterialOutbound> {
    IPage<Map<String, Object>> getlswMaterialOutboundListData(IPage<Map> pageData, @Param("params")Map<String, String> paramMap);
}
src/main/java/org/jeecg/modules/lsw/mapper/xml/LswMaterialInboundMapper.xml
@@ -1,5 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.lsw.mapper.LswMaterialInboundMapper">
    <select id="getlswMaterialInboundListData" parameterType="Map" resultType="Map">
        select * from lsw_material_inbound WHERE 1=1
        <if test="params.materialNumber != null and params.materialNumber != ''">
            AND material_number LIKE CONCAT('%', #{params.materialNumber}, '%')
        </if>
        <if test="params.materialName != null and params.materialName != ''">
            AND material_name LIKE CONCAT('%', #{params.materialName}, '%')
        </if>
        <if test="params.batchNumber != null and params.batchNumber != ''">
            AND batch_number LIKE CONCAT('%', #{params.batchNumber}, '%')
        </if>
    </select>
</mapper>
src/main/java/org/jeecg/modules/lsw/mapper/xml/LswMaterialMapper.xml
@@ -1,5 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.lsw.mapper.LswMaterialMapper">
    <select id="getLswMaterialListData" parameterType="Map" resultType="Map">
        select * from lsw_material WHERE 1=1
        <if test="params.materialNumber != null and params.materialNumber != ''">
            AND material_number LIKE CONCAT('%', #{params.materialNumber}, '%')
        </if>
        <if test="params.materialName != null and params.materialName != ''">
            AND material_name LIKE CONCAT('%', #{params.materialName}, '%')
        </if>
        <if test="params.materialModel != null and params.materialModel != ''">
            AND material_model LIKE CONCAT('%', #{params.materialModel}, '%')
        </if>
        <if test="params.materialCategory != null and params.materialCategory != ''">
            AND material_category = #{params.materialCategory}
        </if>
    </select>
</mapper>
src/main/java/org/jeecg/modules/lsw/mapper/xml/LswMaterialOutboundMapper.xml
@@ -1,5 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.lsw.mapper.LswMaterialOutboundMapper">
    <select id="getlswMaterialOutboundListData" parameterType="Map" resultType="Map">
        select * from lsw_material_outbound WHERE 1=1
        <if test="params.materialNumber != null and params.materialNumber != ''">
            AND material_number LIKE CONCAT('%', #{params.materialNumber}, '%')
        </if>
        <if test="params.materialName != null and params.materialName != ''">
            AND material_name LIKE CONCAT('%', #{params.materialName}, '%')
        </if>
        <if test="params.batchNumber != null and params.batchNumber != ''">
            AND batch_number LIKE CONCAT('%', #{params.batchNumber}, '%')
        </if>
    </select>
</mapper>
src/main/java/org/jeecg/modules/lsw/service/ILswMaterialInboundService.java
@@ -1,7 +1,11 @@
package org.jeecg.modules.lsw.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.lsw.entity.LswMaterialInbound;
import javax.servlet.http.HttpServletRequest;
import java.util.Map;
/**
 * @Description: ç‰©æ–™å…¥åº“单
@@ -10,5 +14,5 @@
 * @Version: V1.0
 */
public interface ILswMaterialInboundService extends IService<LswMaterialInbound> {
    IPage<Map<String, Object>> getlswMaterialInboundListData(Integer pageNo, Integer pageSize, HttpServletRequest req);
}
src/main/java/org/jeecg/modules/lsw/service/ILswMaterialOutboundService.java
@@ -1,7 +1,11 @@
package org.jeecg.modules.lsw.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.lsw.entity.LswMaterialOutbound;
import javax.servlet.http.HttpServletRequest;
import java.util.Map;
/**
 * @Description: ç‰©æ–™å‡ºåº“单
@@ -10,5 +14,5 @@
 * @Version: V1.0
 */
public interface ILswMaterialOutboundService extends IService<LswMaterialOutbound> {
    IPage<Map<String, Object>> getlswMaterialOutboundListData(Integer pageNo, Integer pageSize, HttpServletRequest req);
}
src/main/java/org/jeecg/modules/lsw/service/ILswMaterialService.java
@@ -1,12 +1,15 @@
package org.jeecg.modules.lsw.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.lsw.entity.LswMaterial;
import org.jeecg.modules.lsw.entity.LswMaterialInventory;
import javax.servlet.http.HttpServletRequest;
import java.io.Serializable;
import java.util.Collection;
import java.util.List;
import java.util.Map;
/**
 * @Description: çº¿è¾¹åº“物料信息
@@ -45,5 +48,7 @@
     * @param idList
     */
    public void delBatchMain (Collection<? extends Serializable> idList);
    IPage<Map<String, Object>> getLswMaterialListData(Integer pageNo, Integer pageSize, HttpServletRequest req);
    
}
src/main/java/org/jeecg/modules/lsw/service/impl/LswMaterialInboundServiceImpl.java
@@ -1,18 +1,43 @@
package org.jeecg.modules.lsw.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
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.modules.lsw.entity.LswMaterialInbound;
import org.jeecg.modules.lsw.mapper.LswMaterialInboundMapper;
import org.jeecg.modules.lsw.service.ILswMaterialInboundService;
import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletRequest;
import java.util.HashMap;
import java.util.Map;
/**
 * @Description: ç‰©æ–™å…¥åº“单
 * @Author: jeecg-boot
 * @Date:   2025-06-30
 * @Date: 2025-06-30
 * @Version: V1.0
 */
@Service
public class LswMaterialInboundServiceImpl extends ServiceImpl<LswMaterialInboundMapper, LswMaterialInbound> implements ILswMaterialInboundService {
    @Override
    public IPage<Map<String, Object>> getlswMaterialInboundListData(Integer pageNo, Integer pageSize, HttpServletRequest req) {
        IPage<Map> pageData = new Page<Map>(pageNo, pageSize);
        Map<String, String> paramMap = new HashMap<String, String>();
        Map<String, String[]> parameterMap = req.getParameterMap();
        if (null != parameterMap) {
            if (parameterMap.containsKey("materialNumber") && StringUtils.isNotBlank(parameterMap.get("materialNumber")[0])) {
                paramMap.put("materialNumber", parameterMap.get("materialNumber")[0]);
            }
            if (parameterMap.containsKey("materialName") && StringUtils.isNotBlank(parameterMap.get("materialName")[0])) {
                paramMap.put("materialName", parameterMap.get("materialName")[0].trim());
            }
            if (parameterMap.containsKey("batchNumber") && StringUtils.isNotBlank(parameterMap.get("batchNumber")[0])) {
                paramMap.put("batchNumber", parameterMap.get("batchNumber")[0].trim());
            }
        }
        return super.getBaseMapper().getlswMaterialInboundListData(pageData, paramMap);
    }
}
src/main/java/org/jeecg/modules/lsw/service/impl/LswMaterialOutboundServiceImpl.java
@@ -1,10 +1,17 @@
package org.jeecg.modules.lsw.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
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.modules.lsw.entity.LswMaterialOutbound;
import org.jeecg.modules.lsw.mapper.LswMaterialOutboundMapper;
import org.jeecg.modules.lsw.service.ILswMaterialOutboundService;
import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletRequest;
import java.util.HashMap;
import java.util.Map;
/**
 * @Description: ç‰©æ–™å‡ºåº“单
@@ -15,4 +22,22 @@
@Service
public class LswMaterialOutboundServiceImpl extends ServiceImpl<LswMaterialOutboundMapper, LswMaterialOutbound> implements ILswMaterialOutboundService {
    @Override
    public IPage<Map<String, Object>> getlswMaterialOutboundListData(Integer pageNo, Integer pageSize, HttpServletRequest req) {
        IPage<Map> pageData = new Page<Map>(pageNo, pageSize);
        Map<String, String> paramMap = new HashMap<String, String>();
        Map<String, String[]> parameterMap = req.getParameterMap();
        if (null != parameterMap) {
            if (parameterMap.containsKey("materialNumber") && StringUtils.isNotBlank(parameterMap.get("materialNumber")[0])) {
                paramMap.put("materialNumber", parameterMap.get("materialNumber")[0]);
            }
            if (parameterMap.containsKey("materialName") && StringUtils.isNotBlank(parameterMap.get("materialName")[0])) {
                paramMap.put("materialName", parameterMap.get("materialName")[0].trim());
            }
            if (parameterMap.containsKey("batchNumber") && StringUtils.isNotBlank(parameterMap.get("batchNumber")[0])) {
                paramMap.put("batchNumber", parameterMap.get("batchNumber")[0].trim());
            }
        }
        return super.getBaseMapper().getlswMaterialOutboundListData(pageData, paramMap);
    }
}
src/main/java/org/jeecg/modules/lsw/service/impl/LswMaterialServiceImpl.java
@@ -1,6 +1,9 @@
package org.jeecg.modules.lsw.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
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.modules.lsw.entity.LswMaterial;
import org.jeecg.modules.lsw.entity.LswMaterialInventory;
import org.jeecg.modules.lsw.mapper.LswMaterialInventoryMapper;
@@ -10,9 +13,12 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.servlet.http.HttpServletRequest;
import java.io.Serializable;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
 * @Description: çº¿è¾¹åº“物料信息
@@ -74,5 +80,27 @@
            lswMaterialMapper.deleteById(id);
        }
    }
    @Override
    public IPage<Map<String, Object>> getLswMaterialListData(Integer pageNo, Integer pageSize, HttpServletRequest req) {
        IPage<Map> pageData = new Page<Map>(pageNo, pageSize);
        Map<String, String> paramMap = new HashMap<String, String>();
        Map<String, String[]> parameterMap = req.getParameterMap();
        if (null != parameterMap) {
            if (parameterMap.containsKey("materialNumber") && StringUtils.isNotBlank(parameterMap.get("materialNumber")[0])) {
                paramMap.put("materialNumber", parameterMap.get("materialNumber")[0]);
            }
            if (parameterMap.containsKey("materialName") && StringUtils.isNotBlank(parameterMap.get("materialName")[0])) {
                paramMap.put("materialName", parameterMap.get("materialName")[0].trim());
            }
            if (parameterMap.containsKey("materialModel") && StringUtils.isNotBlank(parameterMap.get("materialModel")[0])) {
                paramMap.put("materialModel", parameterMap.get("materialModel")[0].trim());
            }
            if (parameterMap.containsKey("materialCategory") && StringUtils.isNotBlank(parameterMap.get("materialCategory")[0])) {
                paramMap.put("materialCategory", parameterMap.get("materialCategory")[0].trim());
            }
        }
        return super.getBaseMapper().getLswMaterialListData(pageData, paramMap);
    }
}
src/main/java/org/jeecg/modules/pms/controller/PmsMaterialProcessController.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,172 @@
package org.jeecg.modules.pms.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.pms.entity.PmsMaterialProcess;
import org.jeecg.modules.pms.entity.PmsProcessBillMaterialsDetail;
import org.jeecg.modules.pms.service.IPmsMaterialProcessService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.Map;
/**
* @Description: ç‰©æ–™å·¥åº
* @Author: jeecg-boot
* @Date:   2025-07-01
* @Version: V1.0
*/
@Api(tags="物料工序")
@RestController
@RequestMapping("/pms/pmsMaterialProcess")
@Slf4j
public class PmsMaterialProcessController extends JeecgController<PmsMaterialProcess, IPmsMaterialProcessService> {
   @Autowired
   private IPmsMaterialProcessService pmsMaterialProcessService;
   /**
    * åˆ†é¡µåˆ—表查询
    *
    * @param pmsMaterialProcess
    * @param pageNo
    * @param pageSize
    * @param req
    * @return
    */
   //@AutoLog(value = "物料工序-分页列表查询")
   @ApiOperation(value="物料工序-分页列表查询", notes="物料工序-分页列表查询")
   @GetMapping(value = "/list")
   public Result<IPage<PmsMaterialProcess>> queryPageList(PmsMaterialProcess pmsMaterialProcess,
                                  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                  HttpServletRequest req) {
       QueryWrapper<PmsMaterialProcess> queryWrapper = QueryGenerator.initQueryWrapper(pmsMaterialProcess, req.getParameterMap());
       Page<PmsMaterialProcess> page = new Page<PmsMaterialProcess>(pageNo, pageSize);
       IPage<PmsMaterialProcess> pageList = pmsMaterialProcessService.page(page, queryWrapper);
       return Result.OK(pageList);
   }
   /**
    *   æ·»åŠ 
    *
    * @param pmsMaterialProcess
    * @return
    */
   @AutoLog(value = "物料工序-添加")
   @ApiOperation(value="物料工序-添加", notes="物料工序-添加")
   //@RequiresPermissions("org.jeecg.modules:pms_material_process:add")
   @PostMapping(value = "/add")
   public Result<String> add(@RequestBody PmsMaterialProcess pmsMaterialProcess) {
       pmsMaterialProcessService.save(pmsMaterialProcess);
       return Result.OK("添加成功!");
   }
   /**
    *  ç¼–辑
    *
    * @param pmsMaterialProcess
    * @return
    */
   @AutoLog(value = "物料工序-编辑")
   @ApiOperation(value="物料工序-编辑", notes="物料工序-编辑")
   //@RequiresPermissions("org.jeecg.modules:pms_material_process:edit")
   @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
   public Result<String> edit(@RequestBody PmsMaterialProcess pmsMaterialProcess) {
       pmsMaterialProcessService.updateById(pmsMaterialProcess);
       return Result.OK("编辑成功!");
   }
   /**
    *   é€šè¿‡id删除
    *
    * @param id
    * @return
    */
   @AutoLog(value = "物料工序-通过id删除")
   @ApiOperation(value="物料工序-通过id删除", notes="物料工序-通过id删除")
   //@RequiresPermissions("org.jeecg.modules:pms_material_process:delete")
   @DeleteMapping(value = "/delete")
   public Result<String> delete(@RequestParam(name="id",required=true) String id) {
       pmsMaterialProcessService.removeById(id);
       return Result.OK("删除成功!");
   }
   /**
    *  æ‰¹é‡åˆ é™¤
    *
    * @param ids
    * @return
    */
   @AutoLog(value = "物料工序-批量删除")
   @ApiOperation(value="物料工序-批量删除", notes="物料工序-批量删除")
   //@RequiresPermissions("org.jeecg.modules:pms_material_process:deleteBatch")
   @DeleteMapping(value = "/deleteBatch")
   public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
       this.pmsMaterialProcessService.removeByIds(Arrays.asList(ids.split(",")));
       return Result.OK("批量删除成功!");
   }
   /**
    * é€šè¿‡id查询
    *
    * @param id
    * @return
    */
   //@AutoLog(value = "物料工序-通过id查询")
   @ApiOperation(value="物料工序-通过id查询", notes="物料工序-通过id查询")
   @GetMapping(value = "/queryById")
   public Result<PmsMaterialProcess> queryById(@RequestParam(name="id",required=true) String id) {
       PmsMaterialProcess pmsMaterialProcess = pmsMaterialProcessService.getById(id);
       if(pmsMaterialProcess==null) {
           return Result.error("未找到对应数据");
       }
       return Result.OK(pmsMaterialProcess);
   }
   /**
   * å¯¼å‡ºexcel
   *
   * @param request
   * @param pmsMaterialProcess
   */
   //@RequiresPermissions("org.jeecg.modules:pms_material_process:exportXls")
   @RequestMapping(value = "/exportXls")
   public ModelAndView exportXls(HttpServletRequest request, PmsMaterialProcess pmsMaterialProcess) {
       return super.exportXls(request, pmsMaterialProcess, PmsMaterialProcess.class, "物料工序");
   }
   /**1·3
     * é€šè¿‡excel导入数据
   *
   * @param request
   * @param response
   * @return
   */
   //@RequiresPermissions("pms_material_process:importExcel")
   @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
   public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
       return super.importExcel(request, response, PmsMaterialProcess.class);
   }
    @GetMapping(value = "/searchlikeQuery")
    public Result<?> searchlikeQuery(PmsMaterialProcess pmsMaterialProcess,
                                     @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                     @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                     HttpServletRequest req){
        IPage<Map<String, Object>> pageList = pmsMaterialProcessService.getpmsMaterialProcessListData(pageNo,pageSize,req);
        return Result.OK(pageList);
    }
}
src/main/java/org/jeecg/modules/pms/controller/PmsProcessBillMaterialsController.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,172 @@
package org.jeecg.modules.pms.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.lsw.entity.LswMaterialInbound;
import org.jeecg.modules.pms.entity.PmsProcessBillMaterials;
import org.jeecg.modules.pms.service.IPmsProcessBillMaterialsService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.Map;
/**
* @Description: è®¢å•BOM
* @Author: jeecg-boot
* @Date:   2025-07-01
* @Version: V1.0
*/
@Api(tags="订单BOM")
@RestController
@RequestMapping("/pmsprocessbillmaterials/pmsProcessBillMaterials")
@Slf4j
public class PmsProcessBillMaterialsController extends JeecgController<PmsProcessBillMaterials, IPmsProcessBillMaterialsService> {
   @Autowired
   private IPmsProcessBillMaterialsService pmsProcessBillMaterialsService;
   /**
    * åˆ†é¡µåˆ—表查询
    *
    * @param pmsProcessBillMaterials
    * @param pageNo
    * @param pageSize
    * @param req
    * @return
    */
   //@AutoLog(value = "订单BOM-分页列表查询")
   @ApiOperation(value="订单BOM-分页列表查询", notes="订单BOM-分页列表查询")
   @GetMapping(value = "/list")
   public Result<IPage<PmsProcessBillMaterials>> queryPageList(PmsProcessBillMaterials pmsProcessBillMaterials,
                                  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                  HttpServletRequest req) {
       QueryWrapper<PmsProcessBillMaterials> queryWrapper = QueryGenerator.initQueryWrapper(pmsProcessBillMaterials, req.getParameterMap());
       Page<PmsProcessBillMaterials> page = new Page<PmsProcessBillMaterials>(pageNo, pageSize);
       IPage<PmsProcessBillMaterials> pageList = pmsProcessBillMaterialsService.page(page, queryWrapper);
       return Result.OK(pageList);
   }
   /**
    *   æ·»åŠ 
    *
    * @param pmsProcessBillMaterials
    * @return
    */
   @AutoLog(value = "订单BOM-添加")
   @ApiOperation(value="订单BOM-添加", notes="订单BOM-添加")
   //@RequiresPermissions("org.jeecg.modules:pms_process_bill_materials:add")
   @PostMapping(value = "/add")
   public Result<String> add(@RequestBody PmsProcessBillMaterials pmsProcessBillMaterials) {
       pmsProcessBillMaterialsService.save(pmsProcessBillMaterials);
       return Result.OK("添加成功!");
   }
   /**
    *  ç¼–辑
    *
    * @param pmsProcessBillMaterials
    * @return
    */
   @AutoLog(value = "订单BOM-编辑")
   @ApiOperation(value="订单BOM-编辑", notes="订单BOM-编辑")
   //@RequiresPermissions("org.jeecg.modules:pms_process_bill_materials:edit")
   @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
   public Result<String> edit(@RequestBody PmsProcessBillMaterials pmsProcessBillMaterials) {
       pmsProcessBillMaterialsService.updateById(pmsProcessBillMaterials);
       return Result.OK("编辑成功!");
   }
   /**
    *   é€šè¿‡id删除
    *
    * @param id
    * @return
    */
   @AutoLog(value = "订单BOM-通过id删除")
   @ApiOperation(value="订单BOM-通过id删除", notes="订单BOM-通过id删除")
   //@RequiresPermissions("org.jeecg.modules:pms_process_bill_materials:delete")
   @DeleteMapping(value = "/delete")
   public Result<String> delete(@RequestParam(name="id",required=true) String id) {
       pmsProcessBillMaterialsService.removeById(id);
       return Result.OK("删除成功!");
   }
   /**
    *  æ‰¹é‡åˆ é™¤
    *
    * @param ids
    * @return
    */
   @AutoLog(value = "订单BOM-批量删除")
   @ApiOperation(value="订单BOM-批量删除", notes="订单BOM-批量删除")
   //@RequiresPermissions("org.jeecg.modules:pms_process_bill_materials:deleteBatch")
   @DeleteMapping(value = "/deleteBatch")
   public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
       this.pmsProcessBillMaterialsService.removeByIds(Arrays.asList(ids.split(",")));
       return Result.OK("批量删除成功!");
   }
   /**
    * é€šè¿‡id查询
    *
    * @param id
    * @return
    */
   //@AutoLog(value = "订单BOM-通过id查询")
   @ApiOperation(value="订单BOM-通过id查询", notes="订单BOM-通过id查询")
   @GetMapping(value = "/queryById")
   public Result<PmsProcessBillMaterials> queryById(@RequestParam(name="id",required=true) String id) {
       PmsProcessBillMaterials pmsProcessBillMaterials = pmsProcessBillMaterialsService.getById(id);
       if(pmsProcessBillMaterials==null) {
           return Result.error("未找到对应数据");
       }
       return Result.OK(pmsProcessBillMaterials);
   }
   /**
   * å¯¼å‡ºexcel
   *
   * @param request
   * @param pmsProcessBillMaterials
   */
   //@RequiresPermissions("org.jeecg.modules:pms_process_bill_materials:exportXls")
   @RequestMapping(value = "/exportXls")
   public ModelAndView exportXls(HttpServletRequest request, PmsProcessBillMaterials pmsProcessBillMaterials) {
       return super.exportXls(request, pmsProcessBillMaterials, PmsProcessBillMaterials.class, "订单BOM");
   }
   /**
     * é€šè¿‡excel导入数据
   *
   * @param request
   * @param response
   * @return
   */
   //@RequiresPermissions("pms_process_bill_materials:importExcel")
   @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
   public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
       return super.importExcel(request, response, PmsProcessBillMaterials.class);
   }
    @GetMapping(value = "/searchlikeQuery")
    public Result<?> searchlikeQuery(PmsProcessBillMaterials pmsProcessBillMaterials,
                                     @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                     @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                     HttpServletRequest req){
        IPage<Map<String, Object>> pageList = pmsProcessBillMaterialsService.getpmsProcessBillMaterialsListData(pageNo,pageSize,req);
        return Result.OK(pageList);
    }
}
src/main/java/org/jeecg/modules/pms/controller/PmsProcessBillMaterialsDetailController.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,182 @@
package org.jeecg.modules.pms.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.pms.entity.PmsProcessBillMaterials;
import org.jeecg.modules.pms.entity.PmsProcessBillMaterialsDetail;
import org.jeecg.modules.pms.service.IPmsProcessBillMaterialsDetailService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.Map;
/**
* @Description: ç‰©æ–™æ¸…单
* @Author: jeecg-boot
* @Date:   2025-07-01
* @Version: V1.0
*/
@Api(tags="物料清单")
@RestController
@RequestMapping("/pms/pmsProcessBillMaterialsDetail")
@Slf4j
public class PmsProcessBillMaterialsDetailController extends JeecgController<PmsProcessBillMaterialsDetail, IPmsProcessBillMaterialsDetailService> {
   @Autowired
   private IPmsProcessBillMaterialsDetailService pmsProcessBillMaterialsDetailService;
   /**
    * åˆ†é¡µåˆ—表查询
    *
    * @param pmsProcessBillMaterialsDetail
    * @param pageNo
    * @param pageSize
    * @param req
    * @return
    */
   //@AutoLog(value = "物料清单-分页列表查询")
   @ApiOperation(value="物料清单-分页列表查询", notes="物料清单-分页列表查询")
   @GetMapping(value = "/list")
   public Result<IPage<PmsProcessBillMaterialsDetail>> queryPageList(PmsProcessBillMaterialsDetail pmsProcessBillMaterialsDetail,
                                  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                  HttpServletRequest req) {
       QueryWrapper<PmsProcessBillMaterialsDetail> queryWrapper = QueryGenerator.initQueryWrapper(pmsProcessBillMaterialsDetail, req.getParameterMap());
       Page<PmsProcessBillMaterialsDetail> page = new Page<PmsProcessBillMaterialsDetail>(pageNo, pageSize);
       IPage<PmsProcessBillMaterialsDetail> pageList = pmsProcessBillMaterialsDetailService.page(page, queryWrapper);
       return Result.OK(pageList);
   }
   /**
    *   æ·»åŠ 
    *
    * @param pmsProcessBillMaterialsDetail
    * @return
    */
   @AutoLog(value = "物料清单-添加")
   @ApiOperation(value="物料清单-添加", notes="物料清单-添加")
   //@RequiresPermissions("org.jeecg.modules:pms_process_bill_materials_detail:add")
   @PostMapping(value = "/add")
   public Result<String> add(@RequestBody PmsProcessBillMaterialsDetail pmsProcessBillMaterialsDetail) {
       pmsProcessBillMaterialsDetailService.save(pmsProcessBillMaterialsDetail);
       return Result.OK("添加成功!");
   }
   /**
    *  ç¼–辑
    *
    * @param pmsProcessBillMaterialsDetail
    * @return
    */
   @AutoLog(value = "物料清单-编辑")
   @ApiOperation(value="物料清单-编辑", notes="物料清单-编辑")
   //@RequiresPermissions("org.jeecg.modules:pms_process_bill_materials_detail:edit")
   @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
   public Result<String> edit(@RequestBody PmsProcessBillMaterialsDetail pmsProcessBillMaterialsDetail) {
       pmsProcessBillMaterialsDetailService.updateById(pmsProcessBillMaterialsDetail);
       return Result.OK("编辑成功!");
   }
   /**
    *   é€šè¿‡id删除
    *
    * @param id
    * @return
    */
   @AutoLog(value = "物料清单-通过id删除")
   @ApiOperation(value="物料清单-通过id删除", notes="物料清单-通过id删除")
   //@RequiresPermissions("org.jeecg.modules:pms_process_bill_materials_detail:delete")
   @DeleteMapping(value = "/delete")
   public Result<String> delete(@RequestParam(name="id",required=true) String id) {
       pmsProcessBillMaterialsDetailService.removeById(id);
       return Result.OK("删除成功!");
   }
   /**
    *  æ‰¹é‡åˆ é™¤
    *
    * @param ids
    * @return
    */
   @AutoLog(value = "物料清单-批量删除")
   @ApiOperation(value="物料清单-批量删除", notes="物料清单-批量删除")
   //@RequiresPermissions("org.jeecg.modules:pms_process_bill_materials_detail:deleteBatch")
   @DeleteMapping(value = "/deleteBatch")
   public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
       this.pmsProcessBillMaterialsDetailService.removeByIds(Arrays.asList(ids.split(",")));
       return Result.OK("批量删除成功!");
   }
   /**
    * é€šè¿‡id查询
    *
    * @param id
    * @return
    */
   //@AutoLog(value = "物料清单-通过id查询")
   @ApiOperation(value="物料清单-通过id查询", notes="物料清单-通过id查询")
   @GetMapping(value = "/queryById")
   public Result<PmsProcessBillMaterialsDetail> queryById(@RequestParam(name="id",required=true) String id) {
       PmsProcessBillMaterialsDetail pmsProcessBillMaterialsDetail = pmsProcessBillMaterialsDetailService.getById(id);
       if(pmsProcessBillMaterialsDetail==null) {
           return Result.error("未找到对应数据");
       }
       return Result.OK(pmsProcessBillMaterialsDetail);
   }
   /**
   * å¯¼å‡ºexcel
   *
   * @param request
   * @param pmsProcessBillMaterialsDetail
   */
   //@RequiresPermissions("org.jeecg.modules:pms_process_bill_materials_detail:exportXls")
   @RequestMapping(value = "/exportXls")
   public ModelAndView exportXls(HttpServletRequest request, PmsProcessBillMaterialsDetail pmsProcessBillMaterialsDetail) {
       return super.exportXls(request, pmsProcessBillMaterialsDetail, PmsProcessBillMaterialsDetail.class, "物料清单");
   }
   /**
     * é€šè¿‡excel导入数据
   *
   * @param request
   * @param response
   * @return
   */
   //@RequiresPermissions("pms_process_bill_materials_detail:importExcel")
   @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
   public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
       return super.importExcel(request, response, PmsProcessBillMaterialsDetail.class);
   }
    @ApiOperation(value="物料清单-通过生产物料ID查询", notes="物料清单-通过id查询")
    @GetMapping(value = "/queryByMaterialId")
    public Result<PmsProcessBillMaterialsDetail> queryByMaterialId(@RequestParam(name="materialId",required=true) String materialId) {
        PmsProcessBillMaterialsDetail pmsProcessBillMaterialsDetail = pmsProcessBillMaterialsDetailService.queryByMaterialId(materialId);
        if(pmsProcessBillMaterialsDetail==null) {
            return Result.error("未找到对应数据");
        }
        return Result.OK(pmsProcessBillMaterialsDetail);
    }
    @GetMapping(value = "/searchlikeQuery")
    public Result<?> searchlikeQuery(PmsProcessBillMaterialsDetail pmsProcessBillMaterialsDetail,
                                     @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                     @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                     HttpServletRequest req){
        IPage<Map<String, Object>> pageList = pmsProcessBillMaterialsDetailService.getpmsProcessBillMaterialsDetailListData(pageNo,pageSize,req);
        return Result.OK(pageList);
    }
}
src/main/java/org/jeecg/modules/pms/entity/PmsMaterialProcess.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,84 @@
package org.jeecg.modules.pms.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.common.aspect.annotation.Dict;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
/**
 * @Description: ç‰©æ–™å·¥åº
 * @Author: jeecg-boot
 * @Date:   2025-07-01
 * @Version: V1.0
 */
@Data
@TableName("pms_material_process")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="pms_material_process对象", description="物料工序")
public class PmsMaterialProcess implements Serializable {
    private static final long serialVersionUID = 1L;
    /**主键*/
    @TableId(type = IdType.ASSIGN_ID)
    @ApiModelProperty(value = "主键")
    private String id;
    /**创建人*/
    @ApiModelProperty(value = "创建人")
    private String createBy;
    /**创建日期*/
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "创建日期")
    private Date createTime;
    /**更新人*/
    @ApiModelProperty(value = "更新人")
    private String updateBy;
    /**更新日期*/
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "更新日期")
    private Date updateTime;
    /**删除标记*/
    @Excel(name = "删除标记", width = 15)
    @ApiModelProperty(value = "删除标记")
    @TableLogic
    private Integer delFlag;
    /**物料编码*/
    @Excel(name = "物料编码", width = 15)
    @ApiModelProperty(value = "物料编码")
    private String materialNumber;
    /**物料名称*/
    @Excel(name = "物料名称", width = 15)
    @ApiModelProperty(value = "物料名称")
    private String materialName;
    /**产线ID(SAP工作中心)*/
    @Excel(name = "产线ID(SAP工作中心)", width = 15)
    @ApiModelProperty(value = "产线ID(SAP工作中心)")
    @Dict(dictTable = "base_factory", dicCode = "id", dicText = "factory_name")
    private String factoryId;
    /**工序号*/
    @Excel(name = "工序号", width = 15)
    @ApiModelProperty(value = "工序号")
    private String processCode;
    /**工序名称*/
    @Excel(name = "工序名称", width = 15)
    @ApiModelProperty(value = "工序名称")
    private String processName;
    /**控制码*/
    @Excel(name = "控制码", width = 15)
    @ApiModelProperty(value = "控制码")
    private String controlCode;
}
src/main/java/org/jeecg/modules/pms/entity/PmsProcessBillMaterials.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,82 @@
package org.jeecg.modules.pms.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
/**
 * @Description: è®¢å•BOM
 * @Author: jeecg-boot
 * @Date:   2025-07-01
 * @Version: V1.0
 */
@Data
@TableName("pms_process_bill_materials")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="pms_process_bill_materials对象", description="订单BOM")
public class PmsProcessBillMaterials implements Serializable {
    private static final long serialVersionUID = 1L;
    /**主键*/
    @TableId(type = IdType.ASSIGN_ID)
    @ApiModelProperty(value = "主键")
    private String id;
    /**创建人*/
    @ApiModelProperty(value = "创建人")
    private String createBy;
    /**创建日期*/
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "创建日期")
    private Date createTime;
    /**更新人*/
    @ApiModelProperty(value = "更新人")
    private String updateBy;
    /**更新日期*/
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "更新日期")
    private Date updateTime;
    /**删除标记*/
    @Excel(name = "删除标记", width = 15)
    @ApiModelProperty(value = "删除标记")
    @TableLogic
    private Integer delFlag;
    /**生成订单ID*/
    @Excel(name = "生成订单ID", width = 15)
    @ApiModelProperty(value = "生成订单ID")
    private String orderId;
    /**物料编码*/
    @Excel(name = "物料编码", width = 15)
    @ApiModelProperty(value = "物料编码")
    private String materialNumber;
    /**物料名称*/
    @Excel(name = "物料名称", width = 15)
    @ApiModelProperty(value = "物料名称")
    private String materialName;
    /**BOM代码*/
    @Excel(name = "BOM代码", width = 15)
    @ApiModelProperty(value = "BOM代码")
    private String billMaterialsCode;
    /**基本单位*/
    @Excel(name = "基本单位", width = 15)
    @ApiModelProperty(value = "基本单位")
    private String productionUnit;
    /**订单数量*/
    @Excel(name = "订单数量", width = 15)
    @ApiModelProperty(value = "订单数量")
    private Double productionQuantity;
}
src/main/java/org/jeecg/modules/pms/entity/PmsProcessBillMaterialsDetail.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,70 @@
package org.jeecg.modules.pms.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.common.aspect.annotation.Dict;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
/**
 * @Description: ç‰©æ–™æ¸…单
 * @Author: jeecg-boot
 * @Date:   2025-07-01
 * @Version: V1.0
 */
@Data
@TableName("pms_process_bill_materials_detail")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="pms_process_bill_materials_detail对象", description="物料清单")
public class PmsProcessBillMaterialsDetail implements Serializable {
    private static final long serialVersionUID = 1L;
    /**主键*/
    @TableId(type = IdType.ASSIGN_ID)
    @ApiModelProperty(value = "主键")
    private String id;
    /**创建人*/
    @ApiModelProperty(value = "创建人")
    private String createBy;
    /**创建日期*/
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "创建日期")
    private Date createTime;
    /**更新人*/
    @ApiModelProperty(value = "更新人")
    private String updateBy;
    /**更新日期*/
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "更新日期")
    private Date updateTime;
    /**生产物料ID*/
    @Excel(name = "生产物料ID", width = 15)
    @ApiModelProperty(value = "生产物料ID")
    @Dict(dictTable = "pms_process_bill_materials", dicCode = "id", dicText = "material_number")
    private String materialId;
    /**物料编码*/
    @Excel(name = "物料编码", width = 15)
    @ApiModelProperty(value = "物料编码")
    private String materialNumber;
    /**物料名称*/
    @Excel(name = "物料名称", width = 15)
    @ApiModelProperty(value = "物料名称")
    private String materialName;
    /**需求用量*/
    @Excel(name = "需求用量", width = 15)
    @ApiModelProperty(value = "需求用量")
    private Double usageUnit;
}
src/main/java/org/jeecg/modules/pms/mapper/PmsMaterialProcessMapper.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
package org.jeecg.modules.pms.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.pms.entity.PmsMaterialProcess;
import java.util.Map;
/**
 * @Description: ç‰©æ–™å·¥åº
 * @Author: jeecg-boot
 * @Date:   2025-07-01
 * @Version: V1.0
 */
public interface PmsMaterialProcessMapper extends BaseMapper<PmsMaterialProcess> {
    IPage<Map<String, Object>> getpmsMaterialProcessListData(IPage<Map> pageData, @Param("params")Map<String, String> paramMap);
}
src/main/java/org/jeecg/modules/pms/mapper/PmsProcessBillMaterialsDetailMapper.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,19 @@
package org.jeecg.modules.pms.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.pms.entity.PmsProcessBillMaterialsDetail;
import java.util.Map;
/**
 * @Description: ç‰©æ–™æ¸…单
 * @Author: jeecg-boot
 * @Date:   2025-07-01
 * @Version: V1.0
 */
public interface PmsProcessBillMaterialsDetailMapper extends BaseMapper<PmsProcessBillMaterialsDetail> {
    PmsProcessBillMaterialsDetail queryByMaterialId(@Param("materialId") String materialId);
    IPage<Map<String, Object>> getpmsProcessBillMaterialsDetailListData(IPage<Map> pageData, @Param("params")Map<String, String> paramMap);
}
src/main/java/org/jeecg/modules/pms/mapper/PmsProcessBillMaterialsMapper.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
package org.jeecg.modules.pms.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.pms.entity.PmsProcessBillMaterials;
import java.util.Map;
/**
 * @Description: è®¢å•BOM
 * @Author: jeecg-boot
 * @Date:   2025-07-01
 * @Version: V1.0
 */
public interface PmsProcessBillMaterialsMapper extends BaseMapper<PmsProcessBillMaterials> {
    IPage<Map<String, Object>> getpmsProcessBillMaterialsListData(IPage<Map> pageData, @Param("params")Map<String, String> paramMap);
}
src/main/java/org/jeecg/modules/pms/mapper/xml/PmsMaterialProcessMapper.xml
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.pms.mapper.PmsMaterialProcessMapper">
    <select id="getpmsMaterialProcessListData" parameterType="Map" resultType="Map">
        select * from pms_material_process WHERE 1=1
        <if test="params.materialNumber != null and params.materialNumber != ''">
            AND material_number LIKE CONCAT('%', #{params.materialNumber}, '%')
        </if>
        <if test="params.materialName != null and params.materialName != ''">
            AND material_name LIKE CONCAT('%', #{params.materialName}, '%')
        </if>
    </select>
</mapper>
src/main/java/org/jeecg/modules/pms/mapper/xml/PmsProcessBillMaterialsDetailMapper.xml
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.pms.mapper.PmsProcessBillMaterialsDetailMapper">
    <select id="queryByMaterialId" resultType="org.jeecg.modules.pms.entity.PmsProcessBillMaterialsDetail">
        SELECT TOP 1 * FROM pms_process_bill_materials_detail
        WHERE material_id = #{materialId}
    </select>
    <select id="getpmsProcessBillMaterialsDetailListData" parameterType="Map" resultType="Map">
        select * from pms_process_bill_materials_detail WHERE 1=1
        <if test="params.materialNumber != null and params.materialNumber != ''">
            AND material_number LIKE CONCAT('%', #{params.materialNumber}, '%')
        </if>
        <if test="params.materialName != null and params.materialName != ''">
            AND material_name LIKE CONCAT('%', #{params.materialName}, '%')
        </if>
    </select>
</mapper>
src/main/java/org/jeecg/modules/pms/mapper/xml/PmsProcessBillMaterialsMapper.xml
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.pms.mapper.PmsProcessBillMaterialsMapper">
    <select id="getpmsProcessBillMaterialsListData" parameterType="Map" resultType="Map">
        select * from pms_process_bill_materials WHERE 1=1
        <if test="params.materialNumber != null and params.materialNumber != ''">
            AND material_number LIKE CONCAT('%', #{params.materialNumber}, '%')
        </if>
        <if test="params.materialName != null and params.materialName != ''">
            AND material_name LIKE CONCAT('%', #{params.materialName}, '%')
        </if>
    </select>
</mapper>
src/main/java/org/jeecg/modules/pms/service/IPmsMaterialProcessService.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
package org.jeecg.modules.pms.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.pms.entity.PmsMaterialProcess;
import javax.servlet.http.HttpServletRequest;
import java.util.Map;
/**
 * @Description: ç‰©æ–™å·¥åº
 * @Author: jeecg-boot
 * @Date:   2025-07-01
 * @Version: V1.0
 */
public interface IPmsMaterialProcessService extends IService<PmsMaterialProcess> {
    IPage<Map<String, Object>> getpmsMaterialProcessListData(Integer pageNo, Integer pageSize, HttpServletRequest req);
}
src/main/java/org/jeecg/modules/pms/service/IPmsProcessBillMaterialsDetailService.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,19 @@
package org.jeecg.modules.pms.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.pms.entity.PmsProcessBillMaterialsDetail;
import javax.servlet.http.HttpServletRequest;
import java.util.Map;
/**
 * @Description: ç‰©æ–™æ¸…单
 * @Author: jeecg-boot
 * @Date:   2025-07-01
 * @Version: V1.0
 */
public interface IPmsProcessBillMaterialsDetailService extends IService<PmsProcessBillMaterialsDetail> {
    PmsProcessBillMaterialsDetail queryByMaterialId(String materialId);
    IPage<Map<String, Object>> getpmsProcessBillMaterialsDetailListData(Integer pageNo, Integer pageSize, HttpServletRequest req);
}
src/main/java/org/jeecg/modules/pms/service/IPmsProcessBillMaterialsService.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
package org.jeecg.modules.pms.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.pms.entity.PmsProcessBillMaterials;
import javax.servlet.http.HttpServletRequest;
import java.util.Map;
/**
 * @Description: è®¢å•BOM
 * @Author: jeecg-boot
 * @Date:   2025-07-01
 * @Version: V1.0
 */
public interface IPmsProcessBillMaterialsService extends IService<PmsProcessBillMaterials> {
    IPage<Map<String, Object>> getpmsProcessBillMaterialsListData(Integer pageNo, Integer pageSize, HttpServletRequest req);
}
src/main/java/org/jeecg/modules/pms/service/impl/PmsMaterialProcessServiceImpl.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,43 @@
package org.jeecg.modules.pms.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
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.modules.pms.entity.PmsMaterialProcess;
import org.jeecg.modules.pms.mapper.PmsMaterialProcessMapper;
import org.jeecg.modules.pms.service.IPmsMaterialProcessService;
import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletRequest;
import java.util.HashMap;
import java.util.Map;
/**
 * @Description: ç‰©æ–™å·¥åº
 * @Author: jeecg-boot
 * @Date:   2025-07-01
 * @Version: V1.0
 */
@Service
public class PmsMaterialProcessServiceImpl extends ServiceImpl<PmsMaterialProcessMapper, PmsMaterialProcess> implements IPmsMaterialProcessService {
    @Override
    public IPage<Map<String, Object>> getpmsMaterialProcessListData(Integer pageNo, Integer pageSize, HttpServletRequest req) {
        IPage<Map> pageData = new Page<Map>(pageNo, pageSize);
        Map<String, String> paramMap = new HashMap<String, String>();
        Map<String, String[]> parameterMap = req.getParameterMap();
        if (null != parameterMap) {
            if (parameterMap.containsKey("materialNumber") && StringUtils.isNotBlank(parameterMap.get("materialNumber")[0])) {
                paramMap.put("materialNumber", parameterMap.get("materialNumber")[0]);
            }
            if (parameterMap.containsKey("materialName") && StringUtils.isNotBlank(parameterMap.get("materialName")[0])) {
                paramMap.put("materialName", parameterMap.get("materialName")[0].trim());
            }
            if (parameterMap.containsKey("batchNumber") && StringUtils.isNotBlank(parameterMap.get("batchNumber")[0])) {
                paramMap.put("batchNumber", parameterMap.get("batchNumber")[0].trim());
            }
        }
        return super.getBaseMapper().getpmsMaterialProcessListData(pageData, paramMap);
    }
}
src/main/java/org/jeecg/modules/pms/service/impl/PmsProcessBillMaterialsDetailServiceImpl.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,48 @@
package org.jeecg.modules.pms.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
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.modules.pms.entity.PmsProcessBillMaterialsDetail;
import org.jeecg.modules.pms.mapper.PmsProcessBillMaterialsDetailMapper;
import org.jeecg.modules.pms.service.IPmsProcessBillMaterialsDetailService;
import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletRequest;
import java.util.HashMap;
import java.util.Map;
/**
 * @Description: ç‰©æ–™æ¸…单
 * @Author: jeecg-boot
 * @Date:   2025-07-01
 * @Version: V1.0
 */
@Service
public class PmsProcessBillMaterialsDetailServiceImpl extends ServiceImpl<PmsProcessBillMaterialsDetailMapper, PmsProcessBillMaterialsDetail> implements IPmsProcessBillMaterialsDetailService {
    @Override
    public PmsProcessBillMaterialsDetail queryByMaterialId(String materialId) {
        return baseMapper.queryByMaterialId(materialId);
    }
    @Override
    public IPage<Map<String, Object>> getpmsProcessBillMaterialsDetailListData(Integer pageNo, Integer pageSize, HttpServletRequest req) {
        IPage<Map> pageData = new Page<Map>(pageNo, pageSize);
        Map<String, String> paramMap = new HashMap<String, String>();
        Map<String, String[]> parameterMap = req.getParameterMap();
        if (null != parameterMap) {
            if (parameterMap.containsKey("materialNumber") && StringUtils.isNotBlank(parameterMap.get("materialNumber")[0])) {
                paramMap.put("materialNumber", parameterMap.get("materialNumber")[0]);
            }
            if (parameterMap.containsKey("materialName") && StringUtils.isNotBlank(parameterMap.get("materialName")[0])) {
                paramMap.put("materialName", parameterMap.get("materialName")[0].trim());
            }
            if (parameterMap.containsKey("batchNumber") && StringUtils.isNotBlank(parameterMap.get("batchNumber")[0])) {
                paramMap.put("batchNumber", parameterMap.get("batchNumber")[0].trim());
            }
        }
        return super.getBaseMapper().getpmsProcessBillMaterialsDetailListData(pageData, paramMap);
    }
}
src/main/java/org/jeecg/modules/pms/service/impl/PmsProcessBillMaterialsServiceImpl.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,43 @@
package org.jeecg.modules.pms.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
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.modules.pms.entity.PmsProcessBillMaterials;
import org.jeecg.modules.pms.mapper.PmsProcessBillMaterialsMapper;
import org.jeecg.modules.pms.service.IPmsProcessBillMaterialsService;
import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletRequest;
import java.util.HashMap;
import java.util.Map;
/**
 * @Description: è®¢å•BOM
 * @Author: jeecg-boot
 * @Date:   2025-07-01
 * @Version: V1.0
 */
@Service
public class PmsProcessBillMaterialsServiceImpl extends ServiceImpl<PmsProcessBillMaterialsMapper, PmsProcessBillMaterials> implements IPmsProcessBillMaterialsService {
    @Override
    public IPage<Map<String, Object>> getpmsProcessBillMaterialsListData(Integer pageNo, Integer pageSize, HttpServletRequest req) {
        IPage<Map> pageData = new Page<Map>(pageNo, pageSize);
        Map<String, String> paramMap = new HashMap<String, String>();
        Map<String, String[]> parameterMap = req.getParameterMap();
        if (null != parameterMap) {
            if (parameterMap.containsKey("materialNumber") && StringUtils.isNotBlank(parameterMap.get("materialNumber")[0])) {
                paramMap.put("materialNumber", parameterMap.get("materialNumber")[0]);
            }
            if (parameterMap.containsKey("materialName") && StringUtils.isNotBlank(parameterMap.get("materialName")[0])) {
                paramMap.put("materialName", parameterMap.get("materialName")[0].trim());
            }
            if (parameterMap.containsKey("batchNumber") && StringUtils.isNotBlank(parameterMap.get("batchNumber")[0])) {
                paramMap.put("batchNumber", parameterMap.get("batchNumber")[0].trim());
            }
        }
        return super.getBaseMapper().getpmsProcessBillMaterialsListData(pageData, paramMap);
    }
}
src/main/java/org/jeecg/modules/qms/controller/DefectController.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,194 @@
package org.jeecg.modules.qms.controller;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.qms.entity.Defect;
import org.jeecg.modules.qms.entity.InspectionItem;
import org.jeecg.modules.qms.service.IDefectService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog;
 /**
 * @Description: ç¼ºé™·ç»´æŠ¤
 * @Author: jeecg-boot
 * @Date:   2025-07-02
 * @Version: V1.0
 */
@Api(tags="缺陷维护")
@RestController
@RequestMapping("/qms/defect")
@Slf4j
public class DefectController extends JeecgController<Defect, IDefectService> {
    @Autowired
    private IDefectService defectService;
    /**
     * åˆ†é¡µåˆ—表查询
     *
     * @param defect
     * @param pageNo
     * @param pageSize
     * @param req
     * @return
     */
    //@AutoLog(value = "缺陷维护-分页列表查询")
    @ApiOperation(value="缺陷维护-分页列表查询", notes="缺陷维护-分页列表查询")
    @GetMapping(value = "/list")
    public Result<IPage<Defect>> queryPageList(Defect defect,
                                   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                   HttpServletRequest req) {
        QueryWrapper<Defect> queryWrapper = QueryGenerator.initQueryWrapper(defect, req.getParameterMap());
        Page<Defect> page = new Page<Defect>(pageNo, pageSize);
        IPage<Defect> pageList = defectService.page(page, queryWrapper);
        return Result.OK(pageList);
    }
    /**
     *   æ·»åŠ 
     *
     * @param defect
     * @return
     */
    @AutoLog(value = "缺陷维护-添加")
    @ApiOperation(value="缺陷维护-添加", notes="缺陷维护-添加")
    //@RequiresPermissions("org.jeecg.modules:qms_defect:add")
    @PostMapping(value = "/add")
    public Result<String> add(@RequestBody Defect defect) {
        defect.setDefectStatus(CommonConstant.STATUS_1);
        defectService.save(defect);
        return Result.OK("添加成功!");
    }
    /**
     *  ç¼–辑
     *
     * @param defect
     * @return
     */
    @AutoLog(value = "缺陷维护-编辑")
    @ApiOperation(value="缺陷维护-编辑", notes="缺陷维护-编辑")
    //@RequiresPermissions("org.jeecg.modules:qms_defect:edit")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
    public Result<String> edit(@RequestBody Defect defect) {
        defectService.updateById(defect);
        return Result.OK("编辑成功!");
    }
    /**
     *   é€šè¿‡id删除
     *
     * @param id
     * @return
     */
    @AutoLog(value = "缺陷维护-通过id删除")
    @ApiOperation(value="缺陷维护-通过id删除", notes="缺陷维护-通过id删除")
    //@RequiresPermissions("org.jeecg.modules:qms_defect:delete")
    @DeleteMapping(value = "/delete")
    public Result<String> delete(@RequestParam(name="id",required=true) String id) {
        defectService.removeById(id);
        return Result.OK("删除成功!");
    }
    /**
     *  æ‰¹é‡åˆ é™¤
     *
     * @param ids
     * @return
     */
    @AutoLog(value = "缺陷维护-批量删除")
    @ApiOperation(value="缺陷维护-批量删除", notes="缺陷维护-批量删除")
    //@RequiresPermissions("org.jeecg.modules:qms_defect:deleteBatch")
    @DeleteMapping(value = "/deleteBatch")
    public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
        this.defectService.removeByIds(Arrays.asList(ids.split(",")));
        return Result.OK("批量删除成功!");
    }
    /**
     * é€šè¿‡id查询
     *
     * @param id
     * @return
     */
    //@AutoLog(value = "缺陷维护-通过id查询")
    @ApiOperation(value="缺陷维护-通过id查询", notes="缺陷维护-通过id查询")
    @GetMapping(value = "/queryById")
    public Result<Defect> queryById(@RequestParam(name="id",required=true) String id) {
        Defect defect = defectService.getById(id);
        if(defect==null) {
            return Result.error("未找到对应数据");
        }
        return Result.OK(defect);
    }
    /**
    * å¯¼å‡ºexcel
    *
    * @param request
    * @param defect
    */
    //@RequiresPermissions("org.jeecg.modules:qms_defect:exportXls")
    @RequestMapping(value = "/exportXls")
    public ModelAndView exportXls(HttpServletRequest request, Defect defect) {
        return super.exportXls(request, defect, Defect.class, "缺陷维护");
    }
    /**
      * é€šè¿‡excel导入数据
    *
    * @param request
    * @param response
    * @return
    */
    //@RequiresPermissions("qms_defect:importExcel")
    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
        return super.importExcel(request, response, Defect.class);
    }
     @AutoLog(value = "缺陷维护-启用&禁用")
     @ApiOperation(value = "缺陷维护-启用&禁用", notes = "缺陷维护-启用&禁用")
     @PutMapping(value = "/active")
     public Result<?> active(@RequestParam(name = "id", required = true) String id) {
         Defect defect = defectService.getById(id);
         if (CommonConstant.STATUS_1.equals(defect.getDefectStatus())) {
             defect.setDefectStatus(CommonConstant.STATUS_0);
         } else {
             defect.setDefectStatus(CommonConstant.STATUS_1);
         }
         defectService.updateById(defect);
         return Result.ok("操作成功!");
     }
}
src/main/java/org/jeecg/modules/qms/controller/InspectionItemController.java
@@ -1,5 +1,6 @@
package org.jeecg.modules.qms.controller;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -9,11 +10,14 @@
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.StringUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.qms.entity.InspectionItem;
import org.jeecg.modules.qms.entity.InspectionTools;
import org.jeecg.modules.qms.service.IInspectionItemService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -21,6 +25,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.modules.qms.service.IInspectionToolsService;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -50,6 +55,9 @@
public class InspectionItemController extends JeecgController<InspectionItem, IInspectionItemService> {
    @Autowired
    private IInspectionItemService inspectionItemService;
     @Autowired
     private IInspectionToolsService inspectionToolsService;
    
    /**
     * åˆ†é¡µåˆ—表查询
@@ -176,4 +184,57 @@
        return super.importExcel(request, response, InspectionItem.class);
    }
     @AutoLog(value = "检验项目-启用&禁用")
     @ApiOperation(value = "检验项目-启用&禁用", notes = "检验项目-启用&禁用")
     @PutMapping(value = "/active")
     public Result<?> active(@RequestParam(name = "id", required = true) String id) {
         InspectionItem inspectionItem = inspectionItemService.getById(id);
         if (CommonConstant.STATUS_1.equals(inspectionItem.getItemStatus())) {
             inspectionItem.setItemStatus(CommonConstant.STATUS_0);
         } else {
             inspectionItem.setItemStatus(CommonConstant.STATUS_1);
         }
         inspectionItemService.updateById(inspectionItem);
         return Result.ok("操作成功!");
     }
     /**
      * åˆ†é¡µåˆ—表查询
      *
      * @param inspectionItem
      * @param pageNo
      * @param pageSize
      * @param query
      * @return
      */
     @ApiOperation(value="检验项目-分页列表查询", notes="检验项目-分页列表查询")
     @GetMapping(value = "/queryList")
     public Result<?> queryList(InspectionItem inspectionItem,
                                                        @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                                        @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                                        @RequestParam Map<String, String> query) {
         IPage<Map<String, Object>> pageList = inspectionItemService.queryList(pageNo,pageSize, query);
         for(Map<String, Object> r : pageList.getRecords()){
             String inspectionTools = (String) r.get("inspectionTools");
             if(StringUtils.isNotBlank(inspectionTools)){
                 List<String> inspectionToolsList = Arrays.asList(inspectionTools.split(","));
                 List<String> inspectionToolsNameList = new ArrayList<>();
                 String inspectionToolsNames = "";
                 for(String inspectionTool : inspectionToolsList){
                     InspectionTools inspectionTools1 = inspectionToolsService.getById(inspectionTool);
                     if(inspectionTools1 != null){
                         inspectionToolsNameList.add(inspectionTools1.getToolName());
                     }
                 }
                 inspectionToolsNames = inspectionToolsNameList.stream()
                             .collect(Collectors.joining(","));
                 r.put("inspectionToolsNames",inspectionToolsNames);
             }
         }
         return Result.OK(pageList);
     }
}
src/main/java/org/jeecg/modules/qms/controller/InspectionPlanController.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,194 @@
package org.jeecg.modules.qms.controller;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.qms.entity.Defect;
import org.jeecg.modules.qms.entity.InspectionPlan;
import org.jeecg.modules.qms.service.IInspectionPlanService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog;
 /**
 * @Description: æ£€éªŒæ–¹æ¡ˆ
 * @Author: jeecg-boot
 * @Date:   2025-07-02
 * @Version: V1.0
 */
@Api(tags="检验方案")
@RestController
@RequestMapping("/qms/inspectionPlan")
@Slf4j
public class InspectionPlanController extends JeecgController<InspectionPlan, IInspectionPlanService> {
    @Autowired
    private IInspectionPlanService inspectionPlanService;
    /**
     * åˆ†é¡µåˆ—表查询
     *
     * @param inspectionPlan
     * @param pageNo
     * @param pageSize
     * @param req
     * @return
     */
    //@AutoLog(value = "检验方案-分页列表查询")
    @ApiOperation(value="检验方案-分页列表查询", notes="检验方案-分页列表查询")
    @GetMapping(value = "/list")
    public Result<IPage<InspectionPlan>> queryPageList(InspectionPlan inspectionPlan,
                                   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                   HttpServletRequest req) {
        QueryWrapper<InspectionPlan> queryWrapper = QueryGenerator.initQueryWrapper(inspectionPlan, req.getParameterMap());
        Page<InspectionPlan> page = new Page<InspectionPlan>(pageNo, pageSize);
        IPage<InspectionPlan> pageList = inspectionPlanService.page(page, queryWrapper);
        return Result.OK(pageList);
    }
    /**
     *   æ·»åŠ 
     *
     * @param inspectionPlan
     * @return
     */
    @AutoLog(value = "检验方案-添加")
    @ApiOperation(value="检验方案-添加", notes="检验方案-添加")
    //@RequiresPermissions("org.jeecg.modules:qms_inspection_plan:add")
    @PostMapping(value = "/add")
    public Result<String> add(@RequestBody InspectionPlan inspectionPlan) {
        inspectionPlan.setPlanStatus(CommonConstant.STATUS_1);
        inspectionPlanService.save(inspectionPlan);
        return Result.OK("添加成功!");
    }
    /**
     *  ç¼–辑
     *
     * @param inspectionPlan
     * @return
     */
    @AutoLog(value = "检验方案-编辑")
    @ApiOperation(value="检验方案-编辑", notes="检验方案-编辑")
    //@RequiresPermissions("org.jeecg.modules:qms_inspection_plan:edit")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
    public Result<String> edit(@RequestBody InspectionPlan inspectionPlan) {
        inspectionPlanService.updateById(inspectionPlan);
        return Result.OK("编辑成功!");
    }
    /**
     *   é€šè¿‡id删除
     *
     * @param id
     * @return
     */
    @AutoLog(value = "检验方案-通过id删除")
    @ApiOperation(value="检验方案-通过id删除", notes="检验方案-通过id删除")
    //@RequiresPermissions("org.jeecg.modules:qms_inspection_plan:delete")
    @DeleteMapping(value = "/delete")
    public Result<String> delete(@RequestParam(name="id",required=true) String id) {
        inspectionPlanService.removeById(id);
        return Result.OK("删除成功!");
    }
    /**
     *  æ‰¹é‡åˆ é™¤
     *
     * @param ids
     * @return
     */
    @AutoLog(value = "检验方案-批量删除")
    @ApiOperation(value="检验方案-批量删除", notes="检验方案-批量删除")
    //@RequiresPermissions("org.jeecg.modules:qms_inspection_plan:deleteBatch")
    @DeleteMapping(value = "/deleteBatch")
    public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
        this.inspectionPlanService.removeByIds(Arrays.asList(ids.split(",")));
        return Result.OK("批量删除成功!");
    }
    /**
     * é€šè¿‡id查询
     *
     * @param id
     * @return
     */
    //@AutoLog(value = "检验方案-通过id查询")
    @ApiOperation(value="检验方案-通过id查询", notes="检验方案-通过id查询")
    @GetMapping(value = "/queryById")
    public Result<InspectionPlan> queryById(@RequestParam(name="id",required=true) String id) {
        InspectionPlan inspectionPlan = inspectionPlanService.getById(id);
        if(inspectionPlan==null) {
            return Result.error("未找到对应数据");
        }
        return Result.OK(inspectionPlan);
    }
    /**
    * å¯¼å‡ºexcel
    *
    * @param request
    * @param inspectionPlan
    */
    //@RequiresPermissions("org.jeecg.modules:qms_inspection_plan:exportXls")
    @RequestMapping(value = "/exportXls")
    public ModelAndView exportXls(HttpServletRequest request, InspectionPlan inspectionPlan) {
        return super.exportXls(request, inspectionPlan, InspectionPlan.class, "检验方案");
    }
    /**
      * é€šè¿‡excel导入数据
    *
    * @param request
    * @param response
    * @return
    */
    //@RequiresPermissions("qms_inspection_plan:importExcel")
    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
        return super.importExcel(request, response, InspectionPlan.class);
    }
     @AutoLog(value = "检验方案-启用&禁用")
     @ApiOperation(value = "检验方案-启用&禁用", notes = "检验方案-启用&禁用")
     @PutMapping(value = "/active")
     public Result<?> active(@RequestParam(name = "id", required = true) String id) {
         InspectionPlan inspectionPlan = inspectionPlanService.getById(id);
         if (CommonConstant.STATUS_1.equals(inspectionPlan.getPlanStatus())) {
             inspectionPlan.setPlanStatus(CommonConstant.STATUS_0);
         } else {
             inspectionPlan.setPlanStatus(CommonConstant.STATUS_1);
         }
         inspectionPlanService.updateById(inspectionPlan);
         return Result.ok("操作成功!");
     }
}
src/main/java/org/jeecg/modules/qms/controller/InspectionPlanItemController.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,177 @@
package org.jeecg.modules.qms.controller;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.qms.entity.InspectionPlanItem;
import org.jeecg.modules.qms.service.IInspectionPlanItemService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog;
 /**
 * @Description: æ£€éªŒæ–¹æ¡ˆæ£€éªŒé¡¹
 * @Author: jeecg-boot
 * @Date:   2025-07-02
 * @Version: V1.0
 */
@Api(tags="检验方案检验项")
@RestController
@RequestMapping("/qms/inspectionPlanItem")
@Slf4j
public class InspectionPlanItemController extends JeecgController<InspectionPlanItem, IInspectionPlanItemService> {
    @Autowired
    private IInspectionPlanItemService inspectionPlanItemService;
    /**
     * åˆ†é¡µåˆ—表查询
     *
     * @param inspectionPlanItem
     * @param pageNo
     * @param pageSize
     * @param req
     * @return
     */
    //@AutoLog(value = "检验方案检验项-分页列表查询")
    @ApiOperation(value="检验方案检验项-分页列表查询", notes="检验方案检验项-分页列表查询")
    @GetMapping(value = "/list")
    public Result<IPage<InspectionPlanItem>> queryPageList(InspectionPlanItem inspectionPlanItem,
                                   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                   HttpServletRequest req) {
        QueryWrapper<InspectionPlanItem> queryWrapper = QueryGenerator.initQueryWrapper(inspectionPlanItem, req.getParameterMap());
        Page<InspectionPlanItem> page = new Page<InspectionPlanItem>(pageNo, pageSize);
        IPage<InspectionPlanItem> pageList = inspectionPlanItemService.page(page, queryWrapper);
        return Result.OK(pageList);
    }
    /**
     *   æ·»åŠ 
     *
     * @param inspectionPlanItem
     * @return
     */
    @AutoLog(value = "检验方案检验项-添加")
    @ApiOperation(value="检验方案检验项-添加", notes="检验方案检验项-添加")
    //@RequiresPermissions("org.jeecg.modules:qms_inspection_plan_item:add")
    @PostMapping(value = "/add")
    public Result<String> add(@RequestBody InspectionPlanItem inspectionPlanItem) {
        inspectionPlanItemService.save(inspectionPlanItem);
        return Result.OK("添加成功!");
    }
    /**
     *  ç¼–辑
     *
     * @param inspectionPlanItem
     * @return
     */
    @AutoLog(value = "检验方案检验项-编辑")
    @ApiOperation(value="检验方案检验项-编辑", notes="检验方案检验项-编辑")
    //@RequiresPermissions("org.jeecg.modules:qms_inspection_plan_item:edit")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
    public Result<String> edit(@RequestBody InspectionPlanItem inspectionPlanItem) {
        inspectionPlanItemService.updateById(inspectionPlanItem);
        return Result.OK("编辑成功!");
    }
    /**
     *   é€šè¿‡id删除
     *
     * @param id
     * @return
     */
    @AutoLog(value = "检验方案检验项-通过id删除")
    @ApiOperation(value="检验方案检验项-通过id删除", notes="检验方案检验项-通过id删除")
    //@RequiresPermissions("org.jeecg.modules:qms_inspection_plan_item:delete")
    @DeleteMapping(value = "/delete")
    public Result<String> delete(@RequestParam(name="id",required=true) String id) {
        inspectionPlanItemService.removeById(id);
        return Result.OK("删除成功!");
    }
    /**
     *  æ‰¹é‡åˆ é™¤
     *
     * @param ids
     * @return
     */
    @AutoLog(value = "检验方案检验项-批量删除")
    @ApiOperation(value="检验方案检验项-批量删除", notes="检验方案检验项-批量删除")
    //@RequiresPermissions("org.jeecg.modules:qms_inspection_plan_item:deleteBatch")
    @DeleteMapping(value = "/deleteBatch")
    public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
        this.inspectionPlanItemService.removeByIds(Arrays.asList(ids.split(",")));
        return Result.OK("批量删除成功!");
    }
    /**
     * é€šè¿‡id查询
     *
     * @param id
     * @return
     */
    //@AutoLog(value = "检验方案检验项-通过id查询")
    @ApiOperation(value="检验方案检验项-通过id查询", notes="检验方案检验项-通过id查询")
    @GetMapping(value = "/queryById")
    public Result<InspectionPlanItem> queryById(@RequestParam(name="id",required=true) String id) {
        InspectionPlanItem inspectionPlanItem = inspectionPlanItemService.getById(id);
        if(inspectionPlanItem==null) {
            return Result.error("未找到对应数据");
        }
        return Result.OK(inspectionPlanItem);
    }
    /**
    * å¯¼å‡ºexcel
    *
    * @param request
    * @param inspectionPlanItem
    */
    //@RequiresPermissions("org.jeecg.modules:qms_inspection_plan_item:exportXls")
    @RequestMapping(value = "/exportXls")
    public ModelAndView exportXls(HttpServletRequest request, InspectionPlanItem inspectionPlanItem) {
        return super.exportXls(request, inspectionPlanItem, InspectionPlanItem.class, "检验方案检验项");
    }
    /**
      * é€šè¿‡excel导入数据
    *
    * @param request
    * @param response
    * @return
    */
    //@RequiresPermissions("qms_inspection_plan_item:importExcel")
    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
        return super.importExcel(request, response, InspectionPlanItem.class);
    }
}
src/main/java/org/jeecg/modules/qms/controller/SamplingRulesController.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,194 @@
package org.jeecg.modules.qms.controller;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.qms.entity.InspectionItem;
import org.jeecg.modules.qms.entity.SamplingRules;
import org.jeecg.modules.qms.service.ISamplingRulesService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog;
 /**
 * @Description: æŠ½æ ·è§„则
 * @Author: jeecg-boot
 * @Date:   2025-07-02
 * @Version: V1.0
 */
@Api(tags="抽样规则")
@RestController
@RequestMapping("/qms/samplingRules")
@Slf4j
public class SamplingRulesController extends JeecgController<SamplingRules, ISamplingRulesService> {
    @Autowired
    private ISamplingRulesService samplingRulesService;
    /**
     * åˆ†é¡µåˆ—表查询
     *
     * @param samplingRules
     * @param pageNo
     * @param pageSize
     * @param req
     * @return
     */
    //@AutoLog(value = "抽样规则-分页列表查询")
    @ApiOperation(value="抽样规则-分页列表查询", notes="抽样规则-分页列表查询")
    @GetMapping(value = "/list")
    public Result<IPage<SamplingRules>> queryPageList(SamplingRules samplingRules,
                                   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                   HttpServletRequest req) {
        QueryWrapper<SamplingRules> queryWrapper = QueryGenerator.initQueryWrapper(samplingRules, req.getParameterMap());
        Page<SamplingRules> page = new Page<SamplingRules>(pageNo, pageSize);
        IPage<SamplingRules> pageList = samplingRulesService.page(page, queryWrapper);
        return Result.OK(pageList);
    }
    /**
     *   æ·»åŠ 
     *
     * @param samplingRules
     * @return
     */
    @AutoLog(value = "抽样规则-添加")
    @ApiOperation(value="抽样规则-添加", notes="抽样规则-添加")
    //@RequiresPermissions("org.jeecg.modules:qms_sampling_rules:add")
    @PostMapping(value = "/add")
    public Result<String> add(@RequestBody SamplingRules samplingRules) {
        samplingRules.setRuleStatus(CommonConstant.STATUS_1);
        samplingRulesService.save(samplingRules);
        return Result.OK("添加成功!");
    }
    /**
     *  ç¼–辑
     *
     * @param samplingRules
     * @return
     */
    @AutoLog(value = "抽样规则-编辑")
    @ApiOperation(value="抽样规则-编辑", notes="抽样规则-编辑")
    //@RequiresPermissions("org.jeecg.modules:qms_sampling_rules:edit")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
    public Result<String> edit(@RequestBody SamplingRules samplingRules) {
        samplingRulesService.updateById(samplingRules);
        return Result.OK("编辑成功!");
    }
    /**
     *   é€šè¿‡id删除
     *
     * @param id
     * @return
     */
    @AutoLog(value = "抽样规则-通过id删除")
    @ApiOperation(value="抽样规则-通过id删除", notes="抽样规则-通过id删除")
    //@RequiresPermissions("org.jeecg.modules:qms_sampling_rules:delete")
    @DeleteMapping(value = "/delete")
    public Result<String> delete(@RequestParam(name="id",required=true) String id) {
        samplingRulesService.removeById(id);
        return Result.OK("删除成功!");
    }
    /**
     *  æ‰¹é‡åˆ é™¤
     *
     * @param ids
     * @return
     */
    @AutoLog(value = "抽样规则-批量删除")
    @ApiOperation(value="抽样规则-批量删除", notes="抽样规则-批量删除")
    //@RequiresPermissions("org.jeecg.modules:qms_sampling_rules:deleteBatch")
    @DeleteMapping(value = "/deleteBatch")
    public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
        this.samplingRulesService.removeByIds(Arrays.asList(ids.split(",")));
        return Result.OK("批量删除成功!");
    }
    /**
     * é€šè¿‡id查询
     *
     * @param id
     * @return
     */
    //@AutoLog(value = "抽样规则-通过id查询")
    @ApiOperation(value="抽样规则-通过id查询", notes="抽样规则-通过id查询")
    @GetMapping(value = "/queryById")
    public Result<SamplingRules> queryById(@RequestParam(name="id",required=true) String id) {
        SamplingRules samplingRules = samplingRulesService.getById(id);
        if(samplingRules==null) {
            return Result.error("未找到对应数据");
        }
        return Result.OK(samplingRules);
    }
    /**
    * å¯¼å‡ºexcel
    *
    * @param request
    * @param samplingRules
    */
    //@RequiresPermissions("org.jeecg.modules:qms_sampling_rules:exportXls")
    @RequestMapping(value = "/exportXls")
    public ModelAndView exportXls(HttpServletRequest request, SamplingRules samplingRules) {
        return super.exportXls(request, samplingRules, SamplingRules.class, "抽样规则");
    }
    /**
      * é€šè¿‡excel导入数据
    *
    * @param request
    * @param response
    * @return
    */
    //@RequiresPermissions("qms_sampling_rules:importExcel")
    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
        return super.importExcel(request, response, SamplingRules.class);
    }
     @AutoLog(value = "抽样规则-启用&禁用")
     @ApiOperation(value = "抽样规则-启用&禁用", notes = "抽样规则-启用&禁用")
     @PutMapping(value = "/active")
     public Result<?> active(@RequestParam(name = "id", required = true) String id) {
         SamplingRules samplingRules = samplingRulesService.getById(id);
         if (CommonConstant.STATUS_1.equals(samplingRules.getRuleStatus())) {
             samplingRules.setRuleStatus(CommonConstant.STATUS_0);
         } else {
             samplingRules.setRuleStatus(CommonConstant.STATUS_1);
         }
         samplingRulesService.updateById(samplingRules);
         return Result.ok("操作成功!");
     }
}
src/main/java/org/jeecg/modules/qms/entity/Defect.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,82 @@
package org.jeecg.modules.qms.entity;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableLogic;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.jeecg.common.constant.CommonConstant;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
 * @Description: ç¼ºé™·ç»´æŠ¤
 * @Author: jeecg-boot
 * @Date:   2025-07-02
 * @Version: V1.0
 */
@Data
@TableName("qms_defect")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="qms_defect对象", description="缺陷维护")
public class Defect implements Serializable {
    private static final long serialVersionUID = 1L;
    /**主键*/
    @TableId(type = IdType.ASSIGN_ID)
    @ApiModelProperty(value = "主键")
    private String id;
    /**创建人*/
    @ApiModelProperty(value = "创建人")
    private String createBy;
    /**创建时间*/
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern="yyyy-MM-dd")
    @ApiModelProperty(value = "创建时间")
    private Date createTime;
    /**更新人*/
    @ApiModelProperty(value = "更新人")
    private String updateBy;
    /**更新时间*/
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern="yyyy-MM-dd")
    @ApiModelProperty(value = "更新时间")
    private Date updateTime;
    /**删除标记*/
    @Excel(name = "删除标记", width = 15)
    @ApiModelProperty(value = "删除标记")
    @TableLogic
    private Integer delFlag = CommonConstant.DEL_FLAG_0;
    /**缺陷编码*/
    @Excel(name = "缺陷编码", width = 15)
    @ApiModelProperty(value = "缺陷编码")
    private String defectCode;
    /**缺陷名称*/
    @Excel(name = "缺陷名称", width = 15)
    @ApiModelProperty(value = "缺陷名称")
    private String defectName;
    /**缺陷分类*/
    @Excel(name = "缺陷分类", width = 15)
    @ApiModelProperty(value = "缺陷分类")
    @Dict(dicCode = "defect_category")
    private String defectCategory;
    /**缺陷状态*/
    @Excel(name = "缺陷状态", width = 15)
    @ApiModelProperty(value = "缺陷状态")
    private String defectStatus;
    /**缺陷描述*/
    @Excel(name = "缺陷描述", width = 15)
    @ApiModelProperty(value = "缺陷描述")
    private String descreption;
}
src/main/java/org/jeecg/modules/qms/entity/InspectionPlan.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,94 @@
package org.jeecg.modules.qms.entity;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableLogic;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.jeecg.common.constant.CommonConstant;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
 * @Description: æ£€éªŒæ–¹æ¡ˆ
 * @Author: jeecg-boot
 * @Date:   2025-07-02
 * @Version: V1.0
 */
@Data
@TableName("qms_inspection_plan")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="qms_inspection_plan对象", description="检验方案")
public class InspectionPlan implements Serializable {
    private static final long serialVersionUID = 1L;
    /**主键*/
    @TableId(type = IdType.ASSIGN_ID)
    @ApiModelProperty(value = "主键")
    private String id;
    /**创建人*/
    @ApiModelProperty(value = "创建人")
    private String createBy;
    /**创建时间*/
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern="yyyy-MM-dd")
    @ApiModelProperty(value = "创建时间")
    private Date createTime;
    /**更新人*/
    @ApiModelProperty(value = "更新人")
    private String updateBy;
    /**更新时间*/
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern="yyyy-MM-dd")
    @ApiModelProperty(value = "更新时间")
    private Date updateTime;
    /**删除标记*/
    @Excel(name = "删除标记", width = 15)
    @ApiModelProperty(value = "删除标记")
    @TableLogic
    private Integer delFlag = CommonConstant.DEL_FLAG_0;
    /**方案编码*/
    @Excel(name = "方案编码", width = 15)
    @ApiModelProperty(value = "方案编码")
    private String planCode;
    /**方案名称*/
    @Excel(name = "方案名称", width = 15)
    @ApiModelProperty(value = "方案名称")
    private String planName;
    /**物料编码*/
    @Excel(name = "物料编码", width = 15)
    @ApiModelProperty(value = "物料编码")
    private String materialNumber;
    /**物料名称*/
    @Excel(name = "物料名称", width = 15)
    @ApiModelProperty(value = "物料名称")
    private String materialName;
    /**方案状态*/
    @Excel(name = "方案状态", width = 15)
    @ApiModelProperty(value = "方案状态")
    private String planStatus;
    /**方案分类;首检、巡检、完工检*/
    @Excel(name = "方案分类;首检、巡检、完工检", width = 15)
    @ApiModelProperty(value = "方案分类;首检、巡检、完工检")
    @Dict(dicCode = "plan_category")
    private String planCategory;
    /**抽样规则ID*/
    @Excel(name = "抽样规则ID", width = 15)
    @ApiModelProperty(value = "抽样规则ID")
    private String ruleId;
    /**方案描述*/
    @Excel(name = "方案描述", width = 15)
    @ApiModelProperty(value = "方案描述")
    private String descreption;
}
src/main/java/org/jeecg/modules/qms/entity/InspectionPlanItem.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,71 @@
package org.jeecg.modules.qms.entity;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableLogic;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
 * @Description: æ£€éªŒæ–¹æ¡ˆæ£€éªŒé¡¹
 * @Author: jeecg-boot
 * @Date:   2025-07-02
 * @Version: V1.0
 */
@Data
@TableName("qms_inspection_plan_item")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="qms_inspection_plan_item对象", description="检验方案检验项")
public class InspectionPlanItem implements Serializable {
    private static final long serialVersionUID = 1L;
    /**主键*/
    @TableId(type = IdType.ASSIGN_ID)
    @ApiModelProperty(value = "主键")
    private String id;
    /**创建人*/
    @ApiModelProperty(value = "创建人")
    private String createBy;
    /**创建时间*/
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern="yyyy-MM-dd")
    @ApiModelProperty(value = "创建时间")
    private Date createTime;
    /**方案ID*/
    @Excel(name = "方案ID", width = 15)
    @ApiModelProperty(value = "方案ID")
    private String planId;
    /**检验项ID*/
    @Excel(name = "检验项ID", width = 15)
    @ApiModelProperty(value = "检验项ID")
    private String itemId;
    /**排序*/
    @Excel(name = "排序", width = 15)
    @ApiModelProperty(value = "排序")
    private Integer sorter;
    /**标准值*/
    @Excel(name = "标准值", width = 15)
    @ApiModelProperty(value = "标准值")
    private BigDecimal standardValue;
    /**上公差(最大值)*/
    @Excel(name = "上公差(最大值)", width = 15)
    @ApiModelProperty(value = "上公差(最大值)")
    private BigDecimal maxValue;
    /**下公差(最小值)*/
    @Excel(name = "下公差(最小值)", width = 15)
    @ApiModelProperty(value = "下公差(最小值)")
    private BigDecimal minValue;
}
src/main/java/org/jeecg/modules/qms/entity/SamplingRules.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,98 @@
package org.jeecg.modules.qms.entity;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableLogic;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.jeecg.common.constant.CommonConstant;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
 * @Description: æŠ½æ ·è§„则
 * @Author: jeecg-boot
 * @Date:   2025-07-02
 * @Version: V1.0
 */
@Data
@TableName("qms_sampling_rules")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="qms_sampling_rules对象", description="抽样规则")
public class SamplingRules implements Serializable {
    private static final long serialVersionUID = 1L;
    /**主键*/
    @TableId(type = IdType.ASSIGN_ID)
    @ApiModelProperty(value = "主键")
    private String id;
    /**创建人*/
    @ApiModelProperty(value = "创建人")
    private String createBy;
    /**创建时间*/
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern="yyyy-MM-dd")
    @ApiModelProperty(value = "创建时间")
    private Date createTime;
    /**更新人*/
    @ApiModelProperty(value = "更新人")
    private String updateBy;
    /**更新时间*/
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern="yyyy-MM-dd")
    @ApiModelProperty(value = "更新时间")
    private Date updateTime;
    /**删除标记*/
    @Excel(name = "删除标记", width = 15)
    @ApiModelProperty(value = "删除标记")
    @TableLogic
    private Integer delFlag = CommonConstant.DEL_FLAG_0;
    /**规则编码*/
    @Excel(name = "规则编码", width = 15)
    @ApiModelProperty(value = "规则编码")
    private String ruleCode;
    /**规则名称*/
    @Excel(name = "规则名称", width = 15)
    @ApiModelProperty(value = "规则名称")
    private String ruleName;
    /**抽样分类*/
    @Excel(name = "抽样分类", width = 15)
    @ApiModelProperty(value = "抽样分类")
    @Dict(dicCode = "rule_category")
    private String ruleCategory;
    /**规则状态*/
    @Excel(name = "规则状态", width = 15)
    @ApiModelProperty(value = "规则状态")
    private String ruleStatus;
    /**最大不合格数*/
    @Excel(name = "最大不合格数", width = 15)
    @ApiModelProperty(value = "最大不合格数")
    private BigDecimal maxUnqualifiedQuantity;
    /**抽样数量*/
    @Excel(name = "抽样数量", width = 15)
    @ApiModelProperty(value = "抽样数量")
    private BigDecimal samplingQuantity;
    /**批量下限值*/
    @Excel(name = "批量下限值", width = 15)
    @ApiModelProperty(value = "批量下限值")
    private BigDecimal batchLowerLimit;
    /**批量上限值*/
    @Excel(name = "批量上限值", width = 15)
    @ApiModelProperty(value = "批量上限值")
    private BigDecimal batchUpperLimit;
    /**备注*/
    @Excel(name = "备注", width = 15)
    @ApiModelProperty(value = "备注")
    private String remark;
}
src/main/java/org/jeecg/modules/qms/mapper/DefectMapper.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,17 @@
package org.jeecg.modules.qms.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.qms.entity.Defect;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
 * @Description: ç¼ºé™·ç»´æŠ¤
 * @Author: jeecg-boot
 * @Date:   2025-07-02
 * @Version: V1.0
 */
public interface DefectMapper extends BaseMapper<Defect> {
}
src/main/java/org/jeecg/modules/qms/mapper/InspectionItemMapper.java
@@ -1,7 +1,11 @@
package org.jeecg.modules.qms.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.qms.entity.InspectionItem;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -14,4 +18,5 @@
 */
public interface InspectionItemMapper extends BaseMapper<InspectionItem> {
    public IPage<Map<String, Object>> queryList(IPage<Map> pageData, @Param(Constants.WRAPPER) Wrapper<Map> wrapper);
}
src/main/java/org/jeecg/modules/qms/mapper/InspectionPlanItemMapper.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,17 @@
package org.jeecg.modules.qms.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.qms.entity.InspectionPlanItem;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
 * @Description: æ£€éªŒæ–¹æ¡ˆæ£€éªŒé¡¹
 * @Author: jeecg-boot
 * @Date:   2025-07-02
 * @Version: V1.0
 */
public interface InspectionPlanItemMapper extends BaseMapper<InspectionPlanItem> {
}
src/main/java/org/jeecg/modules/qms/mapper/InspectionPlanMapper.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,17 @@
package org.jeecg.modules.qms.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.qms.entity.InspectionPlan;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
 * @Description: æ£€éªŒæ–¹æ¡ˆ
 * @Author: jeecg-boot
 * @Date:   2025-07-02
 * @Version: V1.0
 */
public interface InspectionPlanMapper extends BaseMapper<InspectionPlan> {
}
src/main/java/org/jeecg/modules/qms/mapper/SamplingRulesMapper.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,17 @@
package org.jeecg.modules.qms.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.qms.entity.SamplingRules;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
 * @Description: æŠ½æ ·è§„则
 * @Author: jeecg-boot
 * @Date:   2025-07-02
 * @Version: V1.0
 */
public interface SamplingRulesMapper extends BaseMapper<SamplingRules> {
}
src/main/java/org/jeecg/modules/qms/mapper/xml/DefectMapper.xml
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.qms.mapper.DefectMapper">
</mapper>
src/main/java/org/jeecg/modules/qms/mapper/xml/InspectionItemMapper.xml
@@ -2,4 +2,24 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.qms.mapper.InspectionItemMapper">
    <select id="queryList" resultType="map" parameterType="String">
        SELECT
            t1.id,
            t1.item_code itemCode,
            t1.item_name itemName,
            t1.item_category itemCategory,
            t1.qualitative_or_quantitative qualitativeOrQuantitative,
            t1.inspection_tools inspectionTools,
            t1.item_status itemStatus,
            t1.create_time createTime,
            t2.item_text itemCategoryName,
            t3.item_text qualitativeOrQuantitativeName,
            t1.remark
        FROM
            qms_inspection_item t1
                LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'item_category' ) t2 ON t2.item_value = t1.item_category
                left join ( SELECT * FROM v_sys_dict WHERE dict_code = 'qualitative_or_quantitative' ) t3 on t3.item_value = t1.qualitative_or_quantitative
            ${ew.customSqlSegment}
    </select>
</mapper>
src/main/java/org/jeecg/modules/qms/mapper/xml/InspectionPlanItemMapper.xml
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.qms.mapper.InspectionPlanItemMapper">
</mapper>
src/main/java/org/jeecg/modules/qms/mapper/xml/InspectionPlanMapper.xml
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.qms.mapper.InspectionPlanMapper">
</mapper>
src/main/java/org/jeecg/modules/qms/mapper/xml/SamplingRulesMapper.xml
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.qms.mapper.SamplingRulesMapper">
</mapper>
src/main/java/org/jeecg/modules/qms/service/IDefectService.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,14 @@
package org.jeecg.modules.qms.service;
import org.jeecg.modules.qms.entity.Defect;
import com.baomidou.mybatisplus.extension.service.IService;
/**
 * @Description: ç¼ºé™·ç»´æŠ¤
 * @Author: jeecg-boot
 * @Date:   2025-07-02
 * @Version: V1.0
 */
public interface IDefectService extends IService<Defect> {
}
src/main/java/org/jeecg/modules/qms/service/IInspectionItemService.java
@@ -1,7 +1,10 @@
package org.jeecg.modules.qms.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.jeecg.modules.qms.entity.InspectionItem;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.Map;
/**
 * @Description: æ£€éªŒé¡¹ç›®
@@ -11,4 +14,5 @@
 */
public interface IInspectionItemService extends IService<InspectionItem> {
    IPage<Map<String, Object>> queryList(Integer pageNo, Integer pageSize, Map<String, String> query);
}
src/main/java/org/jeecg/modules/qms/service/IInspectionPlanItemService.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,14 @@
package org.jeecg.modules.qms.service;
import org.jeecg.modules.qms.entity.InspectionPlanItem;
import com.baomidou.mybatisplus.extension.service.IService;
/**
 * @Description: æ£€éªŒæ–¹æ¡ˆæ£€éªŒé¡¹
 * @Author: jeecg-boot
 * @Date:   2025-07-02
 * @Version: V1.0
 */
public interface IInspectionPlanItemService extends IService<InspectionPlanItem> {
}
src/main/java/org/jeecg/modules/qms/service/IInspectionPlanService.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,14 @@
package org.jeecg.modules.qms.service;
import org.jeecg.modules.qms.entity.InspectionPlan;
import com.baomidou.mybatisplus.extension.service.IService;
/**
 * @Description: æ£€éªŒæ–¹æ¡ˆ
 * @Author: jeecg-boot
 * @Date:   2025-07-02
 * @Version: V1.0
 */
public interface IInspectionPlanService extends IService<InspectionPlan> {
}
src/main/java/org/jeecg/modules/qms/service/ISamplingRulesService.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,14 @@
package org.jeecg.modules.qms.service;
import org.jeecg.modules.qms.entity.SamplingRules;
import com.baomidou.mybatisplus.extension.service.IService;
/**
 * @Description: æŠ½æ ·è§„则
 * @Author: jeecg-boot
 * @Date:   2025-07-02
 * @Version: V1.0
 */
public interface ISamplingRulesService extends IService<SamplingRules> {
}
src/main/java/org/jeecg/modules/qms/service/impl/DefectServiceImpl.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,19 @@
package org.jeecg.modules.qms.service.impl;
import org.jeecg.modules.qms.entity.Defect;
import org.jeecg.modules.qms.mapper.DefectMapper;
import org.jeecg.modules.qms.service.IDefectService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
 * @Description: ç¼ºé™·ç»´æŠ¤
 * @Author: jeecg-boot
 * @Date:   2025-07-02
 * @Version: V1.0
 */
@Service
public class DefectServiceImpl extends ServiceImpl<DefectMapper, Defect> implements IDefectService {
}
src/main/java/org/jeecg/modules/qms/service/impl/InspectionItemServiceImpl.java
@@ -1,11 +1,22 @@
package org.jeecg.modules.qms.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.qms.entity.InspectionItem;
import org.jeecg.modules.qms.mapper.InspectionItemMapper;
import org.jeecg.modules.qms.service.IInspectionItemService;
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: æ£€éªŒé¡¹ç›®
@@ -16,4 +27,28 @@
@Service
public class InspectionItemServiceImpl extends ServiceImpl<InspectionItemMapper, InspectionItem> implements IInspectionItemService {
    @Override
    public IPage<Map<String, Object>> queryList(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 itemCode = query.get("itemCode");
            if (StringUtils.isNotBlank(itemCode)) {
                queryWrapper.like("t1.item_code", itemCode);
            }
            String itemName = query.get("itemName");
            if (StringUtils.isNotBlank(itemName)) {
                queryWrapper.like("t2.item_name", itemName);
            }
            // æŽ’序写法
            List<OrderItem> orderItems = new ArrayList<>();
            orderItems.add(OrderItem.desc("t1.create_time"));
            ((Page<Map>) pageData).setOrders(orderItems);
        }
        return super.getBaseMapper().queryList(pageData,queryWrapper);
    }
}
src/main/java/org/jeecg/modules/qms/service/impl/InspectionPlanItemServiceImpl.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,19 @@
package org.jeecg.modules.qms.service.impl;
import org.jeecg.modules.qms.entity.InspectionPlanItem;
import org.jeecg.modules.qms.mapper.InspectionPlanItemMapper;
import org.jeecg.modules.qms.service.IInspectionPlanItemService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
 * @Description: æ£€éªŒæ–¹æ¡ˆæ£€éªŒé¡¹
 * @Author: jeecg-boot
 * @Date:   2025-07-02
 * @Version: V1.0
 */
@Service
public class InspectionPlanItemServiceImpl extends ServiceImpl<InspectionPlanItemMapper, InspectionPlanItem> implements IInspectionPlanItemService {
}
src/main/java/org/jeecg/modules/qms/service/impl/InspectionPlanServiceImpl.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,19 @@
package org.jeecg.modules.qms.service.impl;
import org.jeecg.modules.qms.entity.InspectionPlan;
import org.jeecg.modules.qms.mapper.InspectionPlanMapper;
import org.jeecg.modules.qms.service.IInspectionPlanService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
 * @Description: æ£€éªŒæ–¹æ¡ˆ
 * @Author: jeecg-boot
 * @Date:   2025-07-02
 * @Version: V1.0
 */
@Service
public class InspectionPlanServiceImpl extends ServiceImpl<InspectionPlanMapper, InspectionPlan> implements IInspectionPlanService {
}
src/main/java/org/jeecg/modules/qms/service/impl/SamplingRulesServiceImpl.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,19 @@
package org.jeecg.modules.qms.service.impl;
import org.jeecg.modules.qms.entity.SamplingRules;
import org.jeecg.modules.qms.mapper.SamplingRulesMapper;
import org.jeecg.modules.qms.service.ISamplingRulesService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
 * @Description: æŠ½æ ·è§„则
 * @Author: jeecg-boot
 * @Date:   2025-07-02
 * @Version: V1.0
 */
@Service
public class SamplingRulesServiceImpl extends ServiceImpl<SamplingRulesMapper, SamplingRules> implements ISamplingRulesService {
}