Merge remote-tracking branch 'origin/master'

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/inventory/controller/ItdmSampleClassificationController.java

@@ -0,0 +1,177 @@
+package org.jeecg.modules.inventory.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.inventory.entity.ItdmSampleClassification;
+import org.jeecg.modules.inventory.service.IItdmSampleClassificationService;
+
+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:   2023-06-26
+ * @Version: V1.0
+ */
+@Api(tags="样品分类表")
+@RestController
+@RequestMapping("/inventory/itdmSampleClassification")
+@Slf4j
+public class ItdmSampleClassificationController extends JeecgController<ItdmSampleClassification, IItdmSampleClassificationService> {
+	@Autowired
+	private IItdmSampleClassificationService itdmSampleClassificationService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param itdmSampleClassification
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "样品分类表-分页列表查询")
+	@ApiOperation(value="样品分类表-分页列表查询", notes="样品分类表-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<ItdmSampleClassification>> queryPageList(ItdmSampleClassification itdmSampleClassification,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<ItdmSampleClassification> queryWrapper = QueryGenerator.initQueryWrapper(itdmSampleClassification, req.getParameterMap());
+		Page<ItdmSampleClassification> page = new Page<ItdmSampleClassification>(pageNo, pageSize);
+		IPage<ItdmSampleClassification> pageList = itdmSampleClassificationService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param itdmSampleClassification
+	 * @return
+	 */
+	@AutoLog(value = "样品分类表-添加")
+	@ApiOperation(value="样品分类表-添加", notes="样品分类表-添加")
+	//@RequiresPermissions("org.jeecg.modules:itdm_sample_classification:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody ItdmSampleClassification itdmSampleClassification) {
+		itdmSampleClassificationService.save(itdmSampleClassification);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param itdmSampleClassification
+	 * @return
+	 */
+	@AutoLog(value = "样品分类表-编辑")
+	@ApiOperation(value="样品分类表-编辑", notes="样品分类表-编辑")
+	//@RequiresPermissions("org.jeecg.modules:itdm_sample_classification:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody ItdmSampleClassification itdmSampleClassification) {
+		itdmSampleClassificationService.updateById(itdmSampleClassification);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "样品分类表-通过id删除")
+	@ApiOperation(value="样品分类表-通过id删除", notes="样品分类表-通过id删除")
+	//@RequiresPermissions("org.jeecg.modules:itdm_sample_classification:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		itdmSampleClassificationService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "样品分类表-批量删除")
+	@ApiOperation(value="样品分类表-批量删除", notes="样品分类表-批量删除")
+	//@RequiresPermissions("org.jeecg.modules:itdm_sample_classification:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.itdmSampleClassificationService.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<ItdmSampleClassification> queryById(@RequestParam(name="id",required=true) String id) {
+		ItdmSampleClassification itdmSampleClassification = itdmSampleClassificationService.getById(id);
+		if(itdmSampleClassification==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(itdmSampleClassification);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param itdmSampleClassification
+    */
+    //@RequiresPermissions("org.jeecg.modules:itdm_sample_classification:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, ItdmSampleClassification itdmSampleClassification) {
+        return super.exportXls(request, itdmSampleClassification, ItdmSampleClassification.class, "样品分类表");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("itdm_sample_classification:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, ItdmSampleClassification.class);
+    }
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/inventory/controller/ItdmSampleExpireController.java

@@ -0,0 +1,230 @@
+package org.jeecg.modules.inventory.controller;
+
+import java.util.ArrayList;
+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.apache.commons.lang3.StringUtils;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.inventory.entity.ItdmSampleExpire;
+import org.jeecg.modules.inventory.entity.ItdmSampleExpireReal;
+import org.jeecg.modules.inventory.service.IItdmSampleExpireRealService;
+import org.jeecg.modules.inventory.service.IItdmSampleExpireService;
+
+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:   2023-06-26
+ * @Version: V1.0
+ */
+@Api(tags="样品过期表")
+@RestController
+@RequestMapping("/inventory/itdmSampleExpire")
+@Slf4j
+public class ItdmSampleExpireController extends JeecgController<ItdmSampleExpire, IItdmSampleExpireService> {
+	@Autowired
+	private IItdmSampleExpireService itdmSampleExpireService;
+	@Autowired
+	private IItdmSampleExpireRealService realService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param itdmSampleExpire
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "样品过期表-分页列表查询")
+	@ApiOperation(value="样品过期表-分页列表查询", notes="样品过期表-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<ItdmSampleExpire>> queryPageList(ItdmSampleExpire itdmSampleExpire,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<ItdmSampleExpire> queryWrapper = QueryGenerator.initQueryWrapper(itdmSampleExpire, req.getParameterMap());
+		queryWrapper.like(StringUtils.isNotBlank(itdmSampleExpire.getBarCodes()), "bar_codes", itdmSampleExpire.getBarCodes());
+		Page<ItdmSampleExpire> page = new Page<ItdmSampleExpire>(pageNo, pageSize);
+		IPage<ItdmSampleExpire> pageList = itdmSampleExpireService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+	 @ApiOperation(value="分页列表查询待审核", notes="分页列表查询待审核")
+	 @GetMapping(value = "/shenheList")
+	 public Result<IPage<ItdmSampleExpire>> queryPageShenheList(ItdmSampleExpire itdmSampleExpire,
+														  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+														  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+														  HttpServletRequest req) {
+		itdmSampleExpire.setAuditStatus("0");
+		QueryWrapper<ItdmSampleExpire> queryWrapper = QueryGenerator.initQueryWrapper(itdmSampleExpire, req.getParameterMap());
+		if(itdmSampleExpire.getBarCodes()!=null){
+			queryWrapper.like("bar_codes",itdmSampleExpire.getBarCodes());
+		}
+		Page<ItdmSampleExpire> page = new Page<ItdmSampleExpire>(pageNo, pageSize);
+		IPage<ItdmSampleExpire> pageList = itdmSampleExpireService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	 }
+
+	/**
+	 *   添加
+	 *
+	 * @param itdmSampleExpire
+	 * @return
+	 */
+	@AutoLog(value = "样品过期表-添加")
+	@ApiOperation(value="样品过期表-添加", notes="样品过期表-添加")
+	//@RequiresPermissions("org.jeecg.modules:itdm_sample_expire:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody ItdmSampleExpire itdmSampleExpire) {
+		itdmSampleExpireService.save(itdmSampleExpire);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param itdmSampleExpire
+	 * @return
+	 */
+	@AutoLog(value = "样品过期表-编辑")
+	@ApiOperation(value="样品过期表-编辑", notes="样品过期表-编辑")
+	//@RequiresPermissions("org.jeecg.modules:itdm_sample_expire:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody ItdmSampleExpire itdmSampleExpire) {
+		if(itdmSampleExpire.getAuditStatus().equals("0")){ //0未审批1审批通过2审批拒绝
+			itdmSampleExpireService.updateById(itdmSampleExpire);
+			return Result.OK("编辑成功!");
+		}else return Result.error("已审批,不可修改!");
+	}
+
+	 /**
+	  *  审核
+	  *
+	  * @param itdmSampleExpire
+	  * @return
+	  */
+	 @AutoLog(value = "样品过期表-审核")
+	 @ApiOperation(value="样品过期表-审核", notes="样品过期表-审核")
+	 //@RequiresPermissions("org.jeecg.modules:itdm_sample_expire:edit")
+	 @RequestMapping(value = "/shenhe", method = {RequestMethod.PUT,RequestMethod.POST})
+	 public Result<String> shenhe(@RequestBody ItdmSampleExpire itdmSampleExpire) {
+		 if(itdmSampleExpire.getAuditStatus().equals("1")){ //审批通过
+			 List<ItdmSampleExpireReal> reals = new ArrayList<>();
+			 List<String> barcodeIdList = Arrays.asList(itdmSampleExpire.getBarCodes().split(","));
+			 for(String barcode:barcodeIdList){
+				 ItdmSampleExpireReal real = new ItdmSampleExpireReal();
+				 real.setExpireId(itdmSampleExpire.getId());
+				 real.setBarCode(barcode);
+				 real.setHandlingMethod(itdmSampleExpire.getHandlingMethod());
+				 reals.add(real);
+			 }
+			 realService.saveBatch(reals);
+		 }
+		 itdmSampleExpireService.updateById(itdmSampleExpire);
+		 return Result.OK("审批成功!");
+	 }
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "样品过期表-通过id删除")
+	@ApiOperation(value="样品过期表-通过id删除", notes="样品过期表-通过id删除")
+	//@RequiresPermissions("org.jeecg.modules:itdm_sample_expire:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		itdmSampleExpireService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "样品过期表-批量删除")
+	@ApiOperation(value="样品过期表-批量删除", notes="样品过期表-批量删除")
+	//@RequiresPermissions("org.jeecg.modules:itdm_sample_expire:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.itdmSampleExpireService.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<ItdmSampleExpire> queryById(@RequestParam(name="id",required=true) String id) {
+		ItdmSampleExpire itdmSampleExpire = itdmSampleExpireService.getById(id);
+		if(itdmSampleExpire==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(itdmSampleExpire);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param itdmSampleExpire
+    */
+    //@RequiresPermissions("org.jeecg.modules:itdm_sample_expire:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, ItdmSampleExpire itdmSampleExpire) {
+        return super.exportXls(request, itdmSampleExpire, ItdmSampleExpire.class, "样品过期表");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("itdm_sample_expire:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, ItdmSampleExpire.class);
+    }
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/inventory/controller/ItdmSampleExpireRealController.java

@@ -0,0 +1,179 @@
+package org.jeecg.modules.inventory.controller;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.inventory.convert.ItdmSampleExpireRealConvert;
+import org.jeecg.modules.inventory.entity.ItdmSampleExpireReal;
+import org.jeecg.modules.inventory.entity.ItdmSampleInventory;
+import org.jeecg.modules.inventory.service.IItdmSampleExpireRealService;
+import org.jeecg.modules.inventory.service.IItdmSampleInventoryService;
+import org.jeecg.modules.inventory.vo.ItdmSampleExpireRealListVO;
+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.List;
+import java.util.stream.Collectors;
+
+/**
+ * @Description: 样品过期审核通过表
+ * @Author: jeecg-boot
+ * @Date:   2023-06-26
+ * @Version: V1.0
+ */
+@Api(tags="样品过期审核通过表")
+@RestController
+@RequestMapping("/inventory/itdmSampleExpireReal")
+@Slf4j
+public class ItdmSampleExpireRealController extends JeecgController<ItdmSampleExpireReal, IItdmSampleExpireRealService> {
+	@Autowired
+	private IItdmSampleExpireRealService itdmSampleExpireRealService;
+	@Autowired
+	private IItdmSampleInventoryService sampleInventoryService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param itdmSampleExpireReal
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "样品过期审核通过表-分页列表查询")
+	@ApiOperation(value="样品过期审核通过表-分页列表查询", notes="样品过期审核通过表-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<Page<ItdmSampleExpireRealListVO>> queryPageList(ItdmSampleExpireReal itdmSampleExpireReal,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<ItdmSampleExpireReal> queryWrapper = QueryGenerator.initQueryWrapper(itdmSampleExpireReal, req.getParameterMap());
+		Page<ItdmSampleExpireReal> page = new Page<ItdmSampleExpireReal>(pageNo, pageSize);
+		Page<ItdmSampleExpireReal> pageList = itdmSampleExpireRealService.page(page, queryWrapper);
+		if(pageList != null ){
+			List<ItdmSampleExpireRealListVO> list = pageList.getRecords().stream().map(i->{
+				ItdmSampleInventory inventory = new ItdmSampleInventory();
+				if(i.getBarCode()!=null){
+					inventory = sampleInventoryService.getByBarCode(i.getBarCode());
+				}
+				return ItdmSampleExpireRealConvert.INSTANCE.convert(i,inventory);
+			}).collect(Collectors.toList());
+			return Result.OK(ItdmSampleExpireRealConvert.INSTANCE.converter(pageList,list));
+		}else return Result.OK(new Page<ItdmSampleExpireRealListVO>());
+
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param itdmSampleExpireReal
+	 * @return
+	 */
+	@AutoLog(value = "样品过期审核通过表-添加")
+	@ApiOperation(value="样品过期审核通过表-添加", notes="样品过期审核通过表-添加")
+	//@RequiresPermissions("org.jeecg.modules:itdm_sample_expire_real:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody ItdmSampleExpireReal itdmSampleExpireReal) {
+		itdmSampleExpireRealService.save(itdmSampleExpireReal);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param itdmSampleExpireReal
+	 * @return
+	 */
+	@AutoLog(value = "样品过期审核通过表-编辑")
+	@ApiOperation(value="样品过期审核通过表-编辑", notes="样品过期审核通过表-编辑")
+	//@RequiresPermissions("org.jeecg.modules:itdm_sample_expire_real:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody ItdmSampleExpireReal itdmSampleExpireReal) {
+		itdmSampleExpireRealService.updateById(itdmSampleExpireReal);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "样品过期审核通过表-通过id删除")
+	@ApiOperation(value="样品过期审核通过表-通过id删除", notes="样品过期审核通过表-通过id删除")
+	//@RequiresPermissions("org.jeecg.modules:itdm_sample_expire_real:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		itdmSampleExpireRealService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "样品过期审核通过表-批量删除")
+	@ApiOperation(value="样品过期审核通过表-批量删除", notes="样品过期审核通过表-批量删除")
+	//@RequiresPermissions("org.jeecg.modules:itdm_sample_expire_real:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.itdmSampleExpireRealService.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<ItdmSampleExpireReal> queryById(@RequestParam(name="id",required=true) String id) {
+		ItdmSampleExpireReal itdmSampleExpireReal = itdmSampleExpireRealService.getById(id);
+		if(itdmSampleExpireReal==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(itdmSampleExpireReal);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param itdmSampleExpireReal
+    */
+    //@RequiresPermissions("org.jeecg.modules:itdm_sample_expire_real:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, ItdmSampleExpireReal itdmSampleExpireReal) {
+        return super.exportXls(request, itdmSampleExpireReal, ItdmSampleExpireReal.class, "样品过期审核通过表");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("itdm_sample_expire_real:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, ItdmSampleExpireReal.class);
+    }
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/inventory/convert/ItdmSampleExpireRealConvert.java

@@ -0,0 +1,31 @@
+package org.jeecg.modules.inventory.convert;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.modules.inventory.entity.ItdmSampleExpireReal;
+import org.jeecg.modules.inventory.entity.ItdmSampleInventory;
+import org.jeecg.modules.inventory.vo.ItdmSampleExpireRealListVO;
+import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanDetail;
+import org.jeecg.modules.itdmGongDan.vo.ItdmGongdanDetailListVO;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.ReportingPolicy;
+import org.mapstruct.factory.Mappers;
+import org.springframework.util.CollectionUtils;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Mapper(unmappedTargetPolicy = ReportingPolicy.IGNORE,imports ={ CollectionUtils.class, Collectors.class})
+public interface ItdmSampleExpireRealConvert {
+
+    ItdmSampleExpireRealConvert INSTANCE = Mappers.getMapper(ItdmSampleExpireRealConvert.class);
+
+//    @Mapping(target ="",source ="results")
+    ItdmSampleExpireRealListVO convert(ItdmSampleExpireReal real, ItdmSampleInventory inventory);
+
+    @Mapping(target ="records",source ="results" )
+    Page<ItdmSampleExpireRealListVO> converter(Page<ItdmSampleExpireReal> page, List<ItdmSampleExpireRealListVO> results);
+
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/inventory/entity/ItdmSampleClassification.java

@@ -0,0 +1,75 @@
+package org.jeecg.modules.inventory.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:   2023-06-26
+ * @Version: V1.0
+ */
+@Data
+@TableName("itdm_sample_classification")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="itdm_sample_classification对象", description="样品分类表")
+public class ItdmSampleClassification implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+	/**名称*/
+	@Excel(name = "名称", width = 15)
+    @ApiModelProperty(value = "名称")
+    private java.lang.String name;
+	/**上级id*/
+	@Excel(name = "上级id", width = 15)
+    @ApiModelProperty(value = "上级id")
+    private java.lang.String pid;
+	/**状态*/
+	@Excel(name = "状态", width = 15, dicCode = "sample_type_status")
+	@Dict(dicCode = "sample_type_status")
+    @ApiModelProperty(value = "状态")
+    private java.lang.String status;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+	/**备注*/
+	@Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+    private java.lang.String remark;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/inventory/entity/ItdmSampleExpire.java

@@ -0,0 +1,76 @@
+package org.jeecg.modules.inventory.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:   2023-06-26
+ * @Version: V1.0
+ */
+@Data
+@TableName("itdm_sample_expire")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="itdm_sample_expire对象", description="样品过期表")
+public class ItdmSampleExpire implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+	/**过期的条码列表*/
+	@Excel(name = "过期的条码列表", width = 15, dictTable = "itdm_inventory_barcode", dicText = "bar_code", dicCode = "id")
+	@Dict(dictTable = "itdm_inventory_barcode", dicText = "bar_code", dicCode = "bar_code")
+    @ApiModelProperty(value = "过期的条码列表")
+    private java.lang.String barCodes;
+	/**处理方式*/
+	@Excel(name = "处理方式", width = 15)
+    @ApiModelProperty(value = "处理方式")
+    private java.lang.String handlingMethod;
+	/**审核状态*/
+	@Excel(name = "审核状态", width = 15, dicCode = "audit_status")
+	@Dict(dicCode = "audit_status")
+    @ApiModelProperty(value = "审核状态")
+    private java.lang.String auditStatus;
+	/**拒绝原因*/
+	@Excel(name = "拒绝原因", width = 15)
+    @ApiModelProperty(value = "拒绝原因")
+    private java.lang.String rejectReason;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/inventory/entity/ItdmSampleExpireReal.java

@@ -0,0 +1,74 @@
+package org.jeecg.modules.inventory.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:   2023-06-26
+ * @Version: V1.0
+ */
+@Data
+@TableName("itdm_sample_expire_real")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="itdm_sample_expire_real对象", description="样品过期审核通过表")
+public class ItdmSampleExpireReal implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+	/**样品过期申请表id*/
+	@Excel(name = "样品过期申请表id", width = 15)
+    @ApiModelProperty(value = "样品过期申请表id")
+    private java.lang.String expireId;
+	/**过期的样品条码id*/
+	@Excel(name = "过期的样品条码", width = 15)
+    @ApiModelProperty(value = "过期的样品条码")
+    private java.lang.String barCode;
+    /**处理方式*/
+    @Excel(name = "处理方式", width = 15)
+    @ApiModelProperty(value = "处理方式")
+    private java.lang.String handlingMethod;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;
+	/**备注*/
+	@Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+    private java.lang.String remark;
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/inventory/mapper/ItdmSampleClassificationMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.inventory.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.inventory.entity.ItdmSampleClassification;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 样品分类表
+ * @Author: jeecg-boot
+ * @Date:   2023-06-26
+ * @Version: V1.0
+ */
+public interface ItdmSampleClassificationMapper extends BaseMapper<ItdmSampleClassification> {
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/inventory/mapper/ItdmSampleExpireMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.inventory.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.inventory.entity.ItdmSampleExpire;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 样品过期表
+ * @Author: jeecg-boot
+ * @Date:   2023-06-26
+ * @Version: V1.0
+ */
+public interface ItdmSampleExpireMapper extends BaseMapper<ItdmSampleExpire> {
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/inventory/mapper/ItdmSampleExpireRealMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.inventory.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.inventory.entity.ItdmSampleExpireReal;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 样品过期审核通过表
+ * @Author: jeecg-boot
+ * @Date:   2023-06-26
+ * @Version: V1.0
+ */
+public interface ItdmSampleExpireRealMapper extends BaseMapper<ItdmSampleExpireReal> {
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/inventory/mapper/ItdmSampleInventoryMapper.java

@@ -1,10 +1,9 @@
 package org.jeecg.modules.inventory.mapper;
 
-import java.util.List;
-
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.inventory.entity.ItdmSampleInventory;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * @Description: 样品库存
@@ -14,4 +13,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface ItdmSampleInventoryMapper extends BaseMapper<ItdmSampleInventory> {
 
+    @Select("select * from itdm_sample_inventory where id = " +
+            "(select inventory_id from itdm_inventory_barcode where bar_code = #{barCode})")
+    public ItdmSampleInventory getByBarCode(@Param("barCode") String barCode);
 }

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/inventory/mapper/xml/ItdmSampleClassificationMapper.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.inventory.mapper.ItdmSampleClassificationMapper">
+
+</mapper>

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/inventory/mapper/xml/ItdmSampleExpireMapper.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.inventory.mapper.ItdmSampleExpireMapper">
+
+</mapper>

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/inventory/mapper/xml/ItdmSampleExpireRealMapper.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.inventory.mapper.ItdmSampleExpireRealMapper">
+
+</mapper>

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/inventory/service/IItdmSampleClassificationService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.inventory.service;
+
+import org.jeecg.modules.inventory.entity.ItdmSampleClassification;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 样品分类表
+ * @Author: jeecg-boot
+ * @Date:   2023-06-26
+ * @Version: V1.0
+ */
+public interface IItdmSampleClassificationService extends IService<ItdmSampleClassification> {
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/inventory/service/IItdmSampleExpireRealService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.inventory.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.inventory.entity.ItdmSampleExpireReal;
+
+/**
+ * @Description: 样品过期审核通过表
+ * @Author: jeecg-boot
+ * @Date:   2023-06-26
+ * @Version: V1.0
+ */
+public interface IItdmSampleExpireRealService extends IService<ItdmSampleExpireReal> {
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/inventory/service/IItdmSampleExpireService.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.inventory.service;
+
+import org.jeecg.modules.inventory.entity.ItdmSampleExpire;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 样品过期表
+ * @Author: jeecg-boot
+ * @Date:   2023-06-26
+ * @Version: V1.0
+ */
+public interface IItdmSampleExpireService extends IService<ItdmSampleExpire> {
+
+
+//    public int shenhe(ItdmSampleExpire itdmSampleExpire);
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/inventory/service/impl/ItdmSampleClassificationServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.inventory.service.impl;
+
+import org.jeecg.modules.inventory.entity.ItdmSampleClassification;
+import org.jeecg.modules.inventory.mapper.ItdmSampleClassificationMapper;
+import org.jeecg.modules.inventory.service.IItdmSampleClassificationService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 样品分类表
+ * @Author: jeecg-boot
+ * @Date:   2023-06-26
+ * @Version: V1.0
+ */
+@Service
+public class ItdmSampleClassificationServiceImpl extends ServiceImpl<ItdmSampleClassificationMapper, ItdmSampleClassification> implements IItdmSampleClassificationService {
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/inventory/service/impl/ItdmSampleExpireRealServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.inventory.service.impl;
+
+import org.jeecg.modules.inventory.entity.ItdmSampleExpireReal;
+import org.jeecg.modules.inventory.mapper.ItdmSampleExpireRealMapper;
+import org.jeecg.modules.inventory.service.IItdmSampleExpireRealService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 样品过期审核通过表
+ * @Author: jeecg-boot
+ * @Date:   2023-06-26
+ * @Version: V1.0
+ */
+@Service
+public class ItdmSampleExpireRealServiceImpl extends ServiceImpl<ItdmSampleExpireRealMapper, ItdmSampleExpireReal> implements IItdmSampleExpireRealService {
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/inventory/service/impl/ItdmSampleExpireServiceImpl.java

@@ -0,0 +1,31 @@
+package org.jeecg.modules.inventory.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.inventory.entity.ItdmSampleExpire;
+import org.jeecg.modules.inventory.mapper.ItdmSampleExpireMapper;
+import org.jeecg.modules.inventory.service.IItdmSampleExpireService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description: 样品过期表
+ * @Author: jeecg-boot
+ * @Date:   2023-06-26
+ * @Version: V1.0
+ */
+@Service
+public class ItdmSampleExpireServiceImpl extends ServiceImpl<ItdmSampleExpireMapper, ItdmSampleExpire> implements IItdmSampleExpireService {
+
+//    @Autowired
+//    @SuppressWarnings("all")
+//    ItdmSampleExpireMapper sampleExpireMapper;
+//    @Autowired
+//    @SuppressWarnings("all")
+//    ItdmSampleExpireRealMapper itdmSampleExpireRealMapper;
+
+
+//    public int shenhe(ItdmSampleExpire itdmSampleExpire){
+//
+//        return sampleExpireMapper.updateById(itdmSampleExpire);
+//    }
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/inventory/service/impl/ItdmSampleInventoryServiceImpl.java

@@ -3,6 +3,7 @@ package org.jeecg.modules.inventory.service.impl;
 import org.jeecg.modules.inventory.entity.ItdmSampleInventory;
 import org.jeecg.modules.inventory.mapper.ItdmSampleInventoryMapper;
 import org.jeecg.modules.inventory.service.IItdmSampleInventoryService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -16,4 +17,13 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class ItdmSampleInventoryServiceImpl extends ServiceImpl<ItdmSampleInventoryMapper, ItdmSampleInventory> implements IItdmSampleInventoryService {
 
+    @Autowired
+    @SuppressWarnings("all")
+    private ItdmSampleInventoryMapper itdmSampleInventoryMapper;
+
+
+    public ItdmSampleInventory getByBarCode(String barCode){
+        return itdmSampleInventoryMapper.getByBarCode(barCode);
+    }
+
 }

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/inventory/vo/ItdmSampleExpireRealListVO.java

@@ -0,0 +1,55 @@
+package org.jeecg.modules.inventory.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import java.io.Serializable;
+
+@Data
+@Accessors(chain = true)
+public class ItdmSampleExpireRealListVO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+//    /**主键*/
+//    @TableId(type = IdType.ASSIGN_ID)
+//    @ApiModelProperty(value = "主键")
+//    private java.lang.String id;
+    /**样品过期申请表id*/
+    @Excel(name = "样品过期申请表id", width = 15)
+    @ApiModelProperty(value = "样品过期申请表id")
+    private java.lang.String expireId;
+    /**过期的样品条码id*/
+    @Excel(name = "过期的样品条码", width = 15)
+    @ApiModelProperty(value = "过期的样品条码")
+    private java.lang.String barCode;
+    /**处理方式*/
+    @Excel(name = "处理方式", width = 15)
+    @ApiModelProperty(value = "处理方式")
+    private java.lang.String handlingMethod;
+//    /**备注*/
+//    @Excel(name = "备注", width = 15)
+//    @ApiModelProperty(value = "备注")
+//    private java.lang.String remark;
+
+
+    /**样品名称*/
+    @Excel(name = "样品名称", width = 15)
+    @ApiModelProperty(value = "样品名称")
+    private String sampleName;
+    /**样品规格*/
+    @Excel(name = "样品规格", width = 15)
+    @ApiModelProperty(value = "样品规格")
+    private String sampleSpecifications;
+    /**生产厂家*/
+    @Excel(name = "生产厂家", width = 15)
+    @ApiModelProperty(value = "生产厂家")
+    private String sampleManufacturer;
+    /**批次号*/
+    @Excel(name = "批次号", width = 15)
+    @ApiModelProperty(value = "批次号")
+    private String batchNumber;
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongDan/service/impl/ItdmGongdanMasterServiceImpl.java

@@ -3,10 +3,13 @@ package org.jeecg.modules.itdmGongDan.service.impl;
 import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanMaster;
 import org.jeecg.modules.itdmGongDan.mapper.ItdmGongdanMasterMapper;
 import org.jeecg.modules.itdmGongDan.service.IItdmGongdanMasterService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import java.util.List;
+
 /**
  * @Description: 工单master
  * @Author: jeecg-boot
@@ -15,5 +18,14 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  */
 @Service
 public class ItdmGongdanMasterServiceImpl extends ServiceImpl<ItdmGongdanMasterMapper, ItdmGongdanMaster> implements IItdmGongdanMasterService {
+    @Autowired
+    @SuppressWarnings("all")
+    private ItdmGongdanMasterMapper masterMapper;
 
+    /**
+     * 根据委托id查工单master
+     */
+    public List<ItdmGongdanMaster> listByWeituoId(String weituoId){
+        return masterMapper.listByWeituoId(weituoId);
+    }
 }