巡检

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/check/TWarehouseCheckController.java

@@ -0,0 +1,183 @@
+package com.ruoyi.web.controller.warehouse.check;
+
+import java.util.Date;
+import java.util.List;
+
+import com.ruoyi.basicData.service.ITWarehouseService;
+import com.ruoyi.common.core.domain.entity.TWarehouse;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.warehouse.check.domain.TWarehouseCheckItems;
+import com.ruoyi.warehouse.check.service.ITWarehouseCheckItemsService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.warehouse.check.domain.TWarehouseCheck;
+import com.ruoyi.warehouse.check.service.ITWarehouseCheckService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 巡检checkController
+ * 
+ * @author dongyongwei
+ * @date 2021-07-21
+ */
+@RestController
+@RequestMapping("/warehouse/check")
+public class TWarehouseCheckController extends BaseController
+{
+    @Autowired
+    private ITWarehouseCheckService tWarehouseCheckService;
+
+    @Autowired
+    private ITWarehouseCheckItemsService itWarehouseCheckItemsService;
+
+    /**
+     * 获取表内存在的仓库列表
+     */
+    /**
+     * 查询巡检check列表
+     */
+    @PreAuthorize("@ss.hasPermi('warehouse:check:list')")
+    @GetMapping("/selectTWarehouseListInCheck")
+    public TableDataInfo list()
+    {
+//        startPage();
+        List<TWarehouse> list = tWarehouseCheckService.selectTWarehouseListInCheck();
+        return getDataTable(list);
+    }
+
+
+    /**
+     * 查询巡检check列表
+     */
+    @PreAuthorize("@ss.hasPermi('warehouse:check:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TWarehouseCheck tWarehouseCheck)
+    {
+        startPage();
+        List<TWarehouseCheck> list = tWarehouseCheckService.selectTWarehouseCheckList(tWarehouseCheck);
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询巡检check列表
+     */
+    @PreAuthorize("@ss.hasPermi('warehouse:check:list')")
+    @GetMapping("/listByUser")
+    public TableDataInfo listByUser(TWarehouseCheck tWarehouseCheck)
+    {
+        tWarehouseCheck.setfInspectorId(SecurityUtils.getLoginUser().getUser().getUserId());
+        startPage();
+        List<TWarehouseCheck> list = tWarehouseCheckService.selectTWarehouseCheckList(tWarehouseCheck);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出巡检check列表
+     */
+    @PreAuthorize("@ss.hasPermi('warehouse:check:export')")
+    @Log(title = "巡检check", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TWarehouseCheck tWarehouseCheck)
+    {
+        List<TWarehouseCheck> list = tWarehouseCheckService.selectTWarehouseCheckList(tWarehouseCheck);
+        ExcelUtil<TWarehouseCheck> util = new ExcelUtil<TWarehouseCheck>(TWarehouseCheck.class);
+        return util.exportExcel(list, "check");
+    }
+
+    /**
+     * 获取巡检check详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('warehouse:check:query')")
+    @GetMapping(value = "/{fId}")
+    public AjaxResult getInfo(@PathVariable("fId") Long fId)
+    {
+        return AjaxResult.success(tWarehouseCheckService.selectTWarehouseCheckById(fId));
+    }
+
+    /**
+     * 新增巡检check
+     */
+    @PreAuthorize("@ss.hasPermi('warehouse:check:add')")
+    @Log(title = "巡检check", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TWarehouseCheck tWarehouseCheck)
+    {
+        return toAjax(tWarehouseCheckService.insertTWarehouseCheck(tWarehouseCheck).intValue());
+    }
+
+    /**
+     * 新增巡检check
+     */
+    @PreAuthorize("@ss.hasPermi('warehouse:check:add')")
+    @Log(title = "巡检saveCheckAndItems", businessType = BusinessType.INSERT)
+    @PostMapping("/saveCheckAndItems")
+    public AjaxResult saveCheckAndItems(@RequestBody TWarehouseCheck tWarehouseCheck)
+    {
+        //大计划fId
+        Long fId = 0L;
+        if (tWarehouseCheck.getfId() != null){
+            //更新大计划
+            fId = tWarehouseCheck.getfId();
+            tWarehouseCheckService.updateTWarehouseCheck(tWarehouseCheck);
+        }else{
+            //新增大计划
+            fId =tWarehouseCheckService.insertTWarehouseCheck(tWarehouseCheck);
+        }
+
+        if(fId>0){
+            List<TWarehouseCheckItems> tWarehouseCheckItemsList = tWarehouseCheck.gettWarehouseCheckItemsList();
+            if(tWarehouseCheckItemsList.size()>0){//有数据情况下
+                for (int j = 0; j < tWarehouseCheckItemsList.size(); j++) {
+                    TWarehouseCheckItems tWarehouseCheckItems = tWarehouseCheckItemsList.get(j);
+                    if(tWarehouseCheckItems.getfId() != null){
+                        //更新数据
+                        itWarehouseCheckItemsService.updateTWarehouseCheckItems(tWarehouseCheckItems);
+                    }else{
+                        //新增数据
+                        tWarehouseCheckItems.setfCheckFid(fId);
+                        itWarehouseCheckItemsService.insertTWarehouseCheckItems(tWarehouseCheckItems);
+                    }
+                }
+            }
+            return AjaxResult.success(fId);
+        }else{
+            return AjaxResult.error("巡检任务更新失败,明细未处理");
+        }
+    }
+
+
+    /**
+     * 修改巡检check
+     */
+    @PreAuthorize("@ss.hasPermi('warehouse:check:edit')")
+    @Log(title = "巡检check", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TWarehouseCheck tWarehouseCheck)
+    {
+        return toAjax(tWarehouseCheckService.updateTWarehouseCheck(tWarehouseCheck));
+    }
+
+    /**
+     * 删除巡检check
+     */
+    @PreAuthorize("@ss.hasPermi('warehouse:check:remove')")
+    @Log(title = "巡检check", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{fIds}")
+    public AjaxResult remove(@PathVariable Long[] fIds)
+    {
+        return toAjax(tWarehouseCheckService.deleteTWarehouseCheckByIds(fIds));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/check/TWarehouseCheckItemsController.java

@@ -0,0 +1,119 @@
+package com.ruoyi.web.controller.warehouse.check;
+
+import java.util.List;
+
+import com.ruoyi.common.utils.SecurityUtils;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.warehouse.check.domain.TWarehouseCheckItems;
+import com.ruoyi.warehouse.check.service.ITWarehouseCheckItemsService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 巡检check-itemController
+ * 
+ * @author dongyongwei
+ * @date 2021-07-21
+ */
+@RestController
+@RequestMapping("/warehouse/checkitems")
+public class TWarehouseCheckItemsController extends BaseController
+{
+    @Autowired
+    private ITWarehouseCheckItemsService tWarehouseCheckItemsService;
+
+    /**
+     * 查询巡检check-item列表
+     */
+    @PreAuthorize("@ss.hasPermi('warehouse:checkitems:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TWarehouseCheckItems tWarehouseCheckItems)
+    {
+        startPage();
+        List<TWarehouseCheckItems> list = tWarehouseCheckItemsService.selectTWarehouseCheckItemsList(tWarehouseCheckItems);
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询巡检check-item列表
+     */
+    @PreAuthorize("@ss.hasPermi('warehouse:checkitems:list')")
+    @GetMapping("/listByUser")
+    public TableDataInfo listByUser(TWarehouseCheckItems tWarehouseCheckItems)
+    {
+        tWarehouseCheckItems.setfInspectorId(SecurityUtils.getLoginUser().getUser().getUserId());
+        startPage();
+        List<TWarehouseCheckItems> list = tWarehouseCheckItemsService.selectTWarehouseCheckItemsList(tWarehouseCheckItems);
+        return getDataTable(list);
+    }
+
+
+    /**
+     * 导出巡检check-item列表
+     */
+    @PreAuthorize("@ss.hasPermi('warehouse:checkitems:export')")
+    @Log(title = "巡检check-item", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TWarehouseCheckItems tWarehouseCheckItems)
+    {
+        List<TWarehouseCheckItems> list = tWarehouseCheckItemsService.selectTWarehouseCheckItemsList(tWarehouseCheckItems);
+        ExcelUtil<TWarehouseCheckItems> util = new ExcelUtil<TWarehouseCheckItems>(TWarehouseCheckItems.class);
+        return util.exportExcel(list, "checkitems");
+    }
+
+    /**
+     * 获取巡检check-item详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('warehouse:checkitems:query')")
+    @GetMapping(value = "/{fId}")
+    public AjaxResult getInfo(@PathVariable("fId") Long fId)
+    {
+        return AjaxResult.success(tWarehouseCheckItemsService.selectTWarehouseCheckItemsById(fId));
+    }
+
+    /**
+     * 新增巡检check-item
+     */
+    @PreAuthorize("@ss.hasPermi('warehouse:checkitems:add')")
+    @Log(title = "巡检check-item", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TWarehouseCheckItems tWarehouseCheckItems)
+    {
+        return toAjax(tWarehouseCheckItemsService.insertTWarehouseCheckItems(tWarehouseCheckItems));
+    }
+
+    /**
+     * 修改巡检check-item
+     */
+    @PreAuthorize("@ss.hasPermi('warehouse:checkitems:edit')")
+    @Log(title = "巡检check-item", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TWarehouseCheckItems tWarehouseCheckItems)
+    {
+        return toAjax(tWarehouseCheckItemsService.updateTWarehouseCheckItems(tWarehouseCheckItems));
+    }
+
+    /**
+     * 删除巡检check-item
+     */
+    @PreAuthorize("@ss.hasPermi('warehouse:checkitems:remove')")
+    @Log(title = "巡检check-item", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{fIds}")
+    public AjaxResult remove(@PathVariable Long[] fIds)
+    {
+        return toAjax(tWarehouseCheckItemsService.deleteTWarehouseCheckItemsByIds(fIds));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/check/TWarehouseCheckItemsDetailsController.java

@@ -0,0 +1,121 @@
+package com.ruoyi.web.controller.warehouse.check;
+
+import java.util.Date;
+import java.util.List;
+
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.warehouse.check.domain.TWarehouseCheckItems;
+import com.ruoyi.warehouse.check.service.ITWarehouseCheckItemsService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.warehouse.check.domain.TWarehouseCheckItemsDetails;
+import com.ruoyi.warehouse.check.service.ITWarehouseCheckItemsDetailsService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 巡检check-items-detailsController
+ * 
+ * @author dongyongwei
+ * @date 2021-07-21
+ */
+@RestController
+@RequestMapping("/warehouse/checkitemsdetails")
+public class TWarehouseCheckItemsDetailsController extends BaseController
+{
+    @Autowired
+    private ITWarehouseCheckItemsDetailsService tWarehouseCheckItemsDetailsService;
+
+    @Autowired
+    private ITWarehouseCheckItemsService tWarehouseCheckItemsService;
+
+    /**
+     * 查询巡检check-items-details列表
+     */
+    @PreAuthorize("@ss.hasPermi('warehouse:checkitemsdetails:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TWarehouseCheckItemsDetails tWarehouseCheckItemsDetails)
+    {
+        startPage();
+        List<TWarehouseCheckItemsDetails> list = tWarehouseCheckItemsDetailsService.selectTWarehouseCheckItemsDetailsList(tWarehouseCheckItemsDetails);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出巡检check-items-details列表
+     */
+    @PreAuthorize("@ss.hasPermi('warehouse:checkitemsdetails:export')")
+    @Log(title = "巡检check-items-details", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TWarehouseCheckItemsDetails tWarehouseCheckItemsDetails)
+    {
+        List<TWarehouseCheckItemsDetails> list = tWarehouseCheckItemsDetailsService.selectTWarehouseCheckItemsDetailsList(tWarehouseCheckItemsDetails);
+        ExcelUtil<TWarehouseCheckItemsDetails> util = new ExcelUtil<TWarehouseCheckItemsDetails>(TWarehouseCheckItemsDetails.class);
+        return util.exportExcel(list, "checkitemsdetails");
+    }
+
+    /**
+     * 获取巡检check-items-details详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('warehouse:checkitemsdetails:query')")
+    @GetMapping(value = "/{fId}")
+    public AjaxResult getInfo(@PathVariable("fId") Long fId)
+    {
+        return AjaxResult.success(tWarehouseCheckItemsDetailsService.selectTWarehouseCheckItemsDetailsById(fId));
+    }
+
+    /**
+     * 新增巡检check-items-details
+     */
+    @PreAuthorize("@ss.hasPermi('warehouse:checkitemsdetails:add')")
+    @Log(title = "巡检check-items-details", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TWarehouseCheckItemsDetails tWarehouseCheckItemsDetails)
+    {
+        int i = tWarehouseCheckItemsDetailsService.insertTWarehouseCheckItemsDetails(tWarehouseCheckItemsDetails);
+        if(i>0){
+            //新增成功的情况下
+            //增加从表回写最后巡检人和最后巡检时间逻辑
+            //TODO
+            TWarehouseCheckItems tWarehouseCheckItems = tWarehouseCheckItemsService.selectTWarehouseCheckItemsById(tWarehouseCheckItemsDetails.getfItemFid());
+            tWarehouseCheckItems.setfInspectorIdLast(SecurityUtils.getLoginUser().getUser().getUserId());
+            tWarehouseCheckItems.setfInspectionDatetimeLast(new Date());
+            tWarehouseCheckItemsService.updateTWarehouseCheckItems(tWarehouseCheckItems);
+        }
+        return toAjax(i);
+    }
+
+    /**
+     * 修改巡检check-items-details
+     */
+    @PreAuthorize("@ss.hasPermi('warehouse:checkitemsdetails:edit')")
+    @Log(title = "巡检check-items-details", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TWarehouseCheckItemsDetails tWarehouseCheckItemsDetails)
+    {
+        return toAjax(tWarehouseCheckItemsDetailsService.updateTWarehouseCheckItemsDetails(tWarehouseCheckItemsDetails));
+    }
+
+    /**
+     * 删除巡检check-items-details
+     */
+    @PreAuthorize("@ss.hasPermi('warehouse:checkitemsdetails:remove')")
+    @Log(title = "巡检check-items-details", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{fIds}")
+    public AjaxResult remove(@PathVariable Long[] fIds)
+    {
+        return toAjax(tWarehouseCheckItemsDetailsService.deleteTWarehouseCheckItemsDetailsByIds(fIds));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/TWarehouseWarehousecheckController.java

@@ -1,115 +0,0 @@
-package com.ruoyi.web.controller.warehouse.warehouseBusiness;
-
-import java.util.List;
-
-import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.utils.ServletUtils;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.utils.spring.SpringUtils;
-import com.ruoyi.framework.web.service.TokenService;
-import com.ruoyi.warehouseBusiness.domain.TWarehouseWarehousecheck;
-import com.ruoyi.warehouseBusiness.service.ITWarehouseWarehousecheckService;
-import com.ruoyi.warehouseBusiness.service.ITWarehouseWarehousecheckitemsService;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.core.page.TableDataInfo;
-
-/**
- * 巡检主Controller
- *
- * @author ruoyi
- * @date 2021-06-27
- */
-@RestController
-@RequestMapping("/warehouseBusiness/warehouseCheck")
-public class TWarehouseWarehousecheckController extends BaseController
-{
-    @Autowired
-    private ITWarehouseWarehousecheckService tWarehouseWarehousecheckService;
-
-
-    @Autowired
-    private ITWarehouseWarehousecheckitemsService  itWarehouseWarehousecheckitemsService;
-
-    /**
-     * 查询巡检主列表
-     */
-    @PreAuthorize("@ss.hasPermi('warehouseBusiness:warehouseCheck:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(TWarehouseWarehousecheck tWarehouseWarehousecheck)
-    {
-        startPage();
-        List<TWarehouseWarehousecheck> list = tWarehouseWarehousecheckService.selectTWarehouseWarehousecheckList(tWarehouseWarehousecheck);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出巡检主列表
-     */
-    @PreAuthorize("@ss.hasPermi('warehouseBusiness:warehouseCheck:export')")
-    @Log(title = "巡检主", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(TWarehouseWarehousecheck tWarehouseWarehousecheck)
-    {
-        List<TWarehouseWarehousecheck> list = tWarehouseWarehousecheckService.selectTWarehouseWarehousecheckList(tWarehouseWarehousecheck);
-        ExcelUtil<TWarehouseWarehousecheck> util = new ExcelUtil<TWarehouseWarehousecheck>(TWarehouseWarehousecheck.class);
-        return util.exportExcel(list, "warehouseCheck");
-    }
-
-    /**
-     * 获取巡检主详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('warehouseBusiness:warehouseCheck:query')")
-    @GetMapping(value = "/{fId}")
-    public AjaxResult getInfo(@PathVariable("fId") Long fId)
-    {
-        return tWarehouseWarehousecheckService.selectTWarehouseWarehousecheckById(fId);
-    }
-
-    /**
-     * 新增巡检主
-     */
-    @PreAuthorize("@ss.hasPermi('warehouseBusiness:warehouseCheck:add')")
-    @Log(title = "巡检主", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestParam("tWarehouseWarehousecheck") String tWarehouseWareHouseCheck,
-                          @RequestParam("TWarehouseWarehousecheckitems") String TWarehouseWareHouseCheckItems)
-    {
-        if (StringUtils.isNull(tWarehouseWareHouseCheck) || "{}".equals(tWarehouseWareHouseCheck)){
-            return AjaxResult.error("巡检主表信息不能为空");
-        }
-        if (StringUtils.isNull(TWarehouseWareHouseCheckItems) || "[]".equals(TWarehouseWareHouseCheckItems)){
-            return AjaxResult.error("巡检从表信息不能为空");
-        }
-        LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
-        return tWarehouseWarehousecheckService.tWarehouseWareHouseCheckInsert(tWarehouseWareHouseCheck,TWarehouseWareHouseCheckItems,loginUser);
-    }
-
-    /**
-     * 修改巡检主
-     */
-    @PreAuthorize("@ss.hasPermi('warehouseBusiness:warehouseCheck:edit')")
-    @Log(title = "巡检主", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody TWarehouseWarehousecheck tWarehouseWarehousecheck)
-    {
-        return toAjax(tWarehouseWarehousecheckService.updateTWarehouseWarehousecheck(tWarehouseWarehousecheck));
-    }
-
-    /**
-     * 删除巡检主子表信息
-     */
-    @PreAuthorize("@ss.hasPermi('warehouseBusiness:warehouseCheck:remove')")
-    @Log(title = "巡检主", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{fIds}")
-    public AjaxResult remove(@PathVariable Long[] fIds)
-    {
-        return tWarehouseWarehousecheckService.deleteTWarehouseWarehousecheckByIds(fIds);
-    }
-}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/TWarehouseWarehousecheckitemsController.java

@@ -1,104 +0,0 @@
-package com.ruoyi.web.controller.warehouse.warehouseBusiness;
-
-import java.util.List;
-
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.warehouseBusiness.domain.TWarehouseWarehousecheckitems;
-import com.ruoyi.warehouseBusiness.service.ITWarehouseWarehousecheckitemsService;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.core.page.TableDataInfo;
-
-/**
- * 巡检子Controller
- *
- * @author ruoyi
- * @date 2021-06-27
- */
-@RestController
-@RequestMapping("/warehouseBusiness/warehouseCheckItems")
-public class TWarehouseWarehousecheckitemsController extends BaseController
-{
-    @Autowired
-    private ITWarehouseWarehousecheckitemsService tWarehouseWarehousecheckitemsService;
-
-    /**
-     * 查询巡检子列表
-     */
-    @PreAuthorize("@ss.hasPermi('warehouseBusiness:warehouseCheckItems:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(TWarehouseWarehousecheckitems tWarehouseWarehousecheckitems)
-    {
-        startPage();
-        List<TWarehouseWarehousecheckitems> list = tWarehouseWarehousecheckitemsService.selectTWarehouseWarehousecheckitemsList(tWarehouseWarehousecheckitems);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出巡检子列表
-     */
-    @PreAuthorize("@ss.hasPermi('warehouseBusiness:warehouseCheckItems:export')")
-    @Log(title = "巡检子", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(TWarehouseWarehousecheckitems tWarehouseWarehousecheckitems)
-    {
-        List<TWarehouseWarehousecheckitems> list = tWarehouseWarehousecheckitemsService.selectTWarehouseWarehousecheckitemsList(tWarehouseWarehousecheckitems);
-        ExcelUtil<TWarehouseWarehousecheckitems> util = new ExcelUtil<TWarehouseWarehousecheckitems>(TWarehouseWarehousecheckitems.class);
-        return util.exportExcel(list, "warehouseCheckItems");
-    }
-
-    /**
-     * 获取巡检子详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('warehouseBusiness:warehouseCheckItems:query')")
-    @GetMapping(value = "/{fId}")
-    public AjaxResult getInfo(@PathVariable("fId") Long fId)
-    {
-        return AjaxResult.success(tWarehouseWarehousecheckitemsService.selectTWarehouseWarehousecheckitemsById(fId));
-    }
-
-    /**
-     * 新增巡检子
-     */
-    @PreAuthorize("@ss.hasPermi('warehouseBusiness:warehouseCheckItems:add')")
-    @Log(title = "巡检子", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody TWarehouseWarehousecheckitems tWarehouseWarehousecheckitems)
-    {
-        return toAjax(tWarehouseWarehousecheckitemsService.insertTWarehouseWarehousecheckitems(tWarehouseWarehousecheckitems));
-    }
-
-    /**
-     * 修改巡检子
-     */
-    @PreAuthorize("@ss.hasPermi('warehouseBusiness:warehouseCheckItems:edit')")
-    @Log(title = "巡检子", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody TWarehouseWarehousecheckitems tWarehouseWarehousecheckitems)
-    {
-        return toAjax(tWarehouseWarehousecheckitemsService.updateTWarehouseWarehousecheckitems(tWarehouseWarehousecheckitems));
-    }
-
-    /**
-     * 删除巡检子
-     */
-    @PreAuthorize("@ss.hasPermi('warehouseBusiness:warehouseCheckItems:remove')")
-    @Log(title = "巡检子", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{fIds}")
-    public AjaxResult remove(@PathVariable Long[] fIds)
-    {
-        return toAjax(tWarehouseWarehousecheckitemsService.deleteTWarehouseWarehousecheckitemsByIds(fIds));
-    }
-}

ruoyi-warehouse/src/main/java/com/ruoyi/warehouse/check/domain/TWarehouseCheck.java

@@ -0,0 +1,253 @@
+package com.ruoyi.warehouse.check.domain;
+
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 巡检check对象 t_warehouse_check
+ * 
+ * @author dongyongwei
+ * @date 2021-07-21
+ */
+public class TWarehouseCheck extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键id */
+    private Long fId;
+
+    /** 仓库id */
+    @Excel(name = "仓库id")
+    private Long fWarehouseFid;
+
+    /** 仓库名称 */
+    private String fWarehouseName;
+
+    /** 巡检人 */
+    @Excel(name = "巡检人")
+    private Long fInspectorId;
+
+    /** 巡检人姓名 */
+    private String fInspectorName;
+
+    /** 系统编号 */
+    @Excel(name = "系统编号")
+    private String fSystemNo;
+
+    /** 巡检计划日期起 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "巡检计划日期起", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date fInspectorBeginDatetime;
+
+    /** 巡检计划日期止 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "巡检计划日期止", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date fInspectorEndDatetime;
+
+    /** 巡检备注 */
+    @Excel(name = "巡检备注")
+    private String fRemark;
+
+    /** 制单人 */
+    @Excel(name = "制单人")
+    private Long fCreateBy;
+
+    /** 制单人姓名 */
+    private String fCreateByName;
+
+    /** 制单日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "制单日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date fCreateTime;
+
+    /** 更新人 */
+    @Excel(name = "更新人")
+    private Long fUpdateBy;
+
+    /** 更新人姓名 */
+    private String fUpdateByName;
+
+    private List<TWarehouseCheckItems> tWarehouseCheckItemsList;
+
+    public List<TWarehouseCheckItems> gettWarehouseCheckItemsList() {
+        return tWarehouseCheckItemsList;
+    }
+
+    public void settWarehouseCheckItemsList(List<TWarehouseCheckItems> tWarehouseCheckItemsList) {
+        this.tWarehouseCheckItemsList = tWarehouseCheckItemsList;
+    }
+
+    public String getfWarehouseName() {
+        return fWarehouseName;
+    }
+
+    public void setfWarehouseName(String fWarehouseName) {
+        this.fWarehouseName = fWarehouseName;
+    }
+
+    public String getfInspectorName() {
+        return fInspectorName;
+    }
+
+    public void setfInspectorName(String fInspectorName) {
+        this.fInspectorName = fInspectorName;
+    }
+
+    public String getfCreateByName() {
+        return fCreateByName;
+    }
+
+    public void setfCreateByName(String fCreateByName) {
+        this.fCreateByName = fCreateByName;
+    }
+
+    public String getfUpdateByName() {
+        return fUpdateByName;
+    }
+
+    public void setfUpdateByName(String fUpdateByName) {
+        this.fUpdateByName = fUpdateByName;
+    }
+
+    /** 最新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "最新时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fUpdateTime;
+
+    /** 删除状态（0正常 1停用） */
+    @Excel(name = "删除状态", readConverterExp = "0=正常,1=停用")
+    private Integer fDelFlag;
+
+    public void setfId(Long fId) 
+    {
+        this.fId = fId;
+    }
+
+    public Long getfId() 
+    {
+        return fId;
+    }
+    public void setfWarehouseFid(Long fWarehouseFid) 
+    {
+        this.fWarehouseFid = fWarehouseFid;
+    }
+
+    public Long getfWarehouseFid() 
+    {
+        return fWarehouseFid;
+    }
+    public void setfInspectorId(Long fInspectorId) 
+    {
+        this.fInspectorId = fInspectorId;
+    }
+
+    public Long getfInspectorId() 
+    {
+        return fInspectorId;
+    }
+    public void setfSystemNo(String fSystemNo) 
+    {
+        this.fSystemNo = fSystemNo;
+    }
+
+    public String getfSystemNo() 
+    {
+        return fSystemNo;
+    }
+    public void setfInspectorBeginDatetime(Date fInspectorBeginDatetime) 
+    {
+        this.fInspectorBeginDatetime = fInspectorBeginDatetime;
+    }
+
+    public Date getfInspectorBeginDatetime() 
+    {
+        return fInspectorBeginDatetime;
+    }
+    public void setfInspectorEndDatetime(Date fInspectorEndDatetime) 
+    {
+        this.fInspectorEndDatetime = fInspectorEndDatetime;
+    }
+
+    public Date getfInspectorEndDatetime() 
+    {
+        return fInspectorEndDatetime;
+    }
+    public void setfRemark(String fRemark) 
+    {
+        this.fRemark = fRemark;
+    }
+
+    public String getfRemark() 
+    {
+        return fRemark;
+    }
+    public void setfCreateBy(Long fCreateBy) 
+    {
+        this.fCreateBy = fCreateBy;
+    }
+
+    public Long getfCreateBy() 
+    {
+        return fCreateBy;
+    }
+    public void setfCreateTime(Date fCreateTime) 
+    {
+        this.fCreateTime = fCreateTime;
+    }
+
+    public Date getfCreateTime() 
+    {
+        return fCreateTime;
+    }
+    public void setfUpdateBy(Long fUpdateBy) 
+    {
+        this.fUpdateBy = fUpdateBy;
+    }
+
+    public Long getfUpdateBy() 
+    {
+        return fUpdateBy;
+    }
+    public void setfUpdateTime(Date fUpdateTime) 
+    {
+        this.fUpdateTime = fUpdateTime;
+    }
+
+    public Date getfUpdateTime() 
+    {
+        return fUpdateTime;
+    }
+    public void setfDelFlag(Integer fDelFlag) 
+    {
+        this.fDelFlag = fDelFlag;
+    }
+
+    public Integer getfDelFlag() 
+    {
+        return fDelFlag;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("fId", getfId())
+            .append("fWarehouseFid", getfWarehouseFid())
+            .append("fInspectorId", getfInspectorId())
+            .append("fSystemNo", getfSystemNo())
+            .append("fInspectorBeginDatetime", getfInspectorBeginDatetime())
+            .append("fInspectorEndDatetime", getfInspectorEndDatetime())
+            .append("fRemark", getfRemark())
+            .append("fCreateBy", getfCreateBy())
+            .append("fCreateTime", getfCreateTime())
+            .append("fUpdateBy", getfUpdateBy())
+            .append("fUpdateTime", getfUpdateTime())
+            .append("fDelFlag", getfDelFlag())
+            .toString();
+    }
+}

ruoyi-warehouse/src/main/java/com/ruoyi/warehouse/check/domain/TWarehouseCheckItems.java

@@ -0,0 +1,263 @@
+package com.ruoyi.warehouse.check.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 巡检check-item对象 t_warehouse_check_items
+ * 
+ * @author dongyongwei
+ * @date 2021-07-21
+ */
+public class TWarehouseCheckItems extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键id */
+    private Long fId;
+
+    /** 巡检主表id */
+    @Excel(name = "巡检主表id")
+    private Long fCheckFid;
+
+    /** 仓库id */
+    @Excel(name = "仓库id")
+    private Long fWarehouseFid;
+
+    /** 仓库名称 */
+    private String fWarehouseName;
+
+    /** 巡检人ID */
+    private Long fInspectorId;
+
+    public Long getfInspectorId() {
+        return fInspectorId;
+    }
+
+    public void setfInspectorId(Long fInspectorId) {
+        this.fInspectorId = fInspectorId;
+    }
+
+    /** 巡检人姓名 */
+    private String fInspectorName;
+
+    public String getfWarehouseName() {
+        return fWarehouseName;
+    }
+
+    public void setfWarehouseName(String fWarehouseName) {
+        this.fWarehouseName = fWarehouseName;
+    }
+
+    public String getfInspectorName() {
+        return fInspectorName;
+    }
+
+    public void setfInspectorName(String fInspectorName) {
+        this.fInspectorName = fInspectorName;
+    }
+
+    public String getfCreateByName() {
+        return fCreateByName;
+    }
+
+    public void setfCreateByName(String fCreateByName) {
+        this.fCreateByName = fCreateByName;
+    }
+
+    public String getfUpdateByName() {
+        return fUpdateByName;
+    }
+
+    public void setfUpdateByName(String fUpdateByName) {
+        this.fUpdateByName = fUpdateByName;
+    }
+
+    /** 制单人姓名 */
+    private String fCreateByName;
+
+    /** 更新人姓名 */
+    private String fUpdateByName;
+
+    /** 巡检日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "巡检日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date fInspectionDatetime;
+
+    /** 最新巡检人id */
+    @Excel(name = "最新巡检人id")
+    private Long fInspectorIdLast;
+
+    /** 最新巡检人姓名 */
+    private String fInspectorNameLast;
+
+    public String getfInspectorNameLast() {
+        return fInspectorNameLast;
+    }
+
+    public void setfInspectorNameLast(String fInspectorNameLast) {
+        this.fInspectorNameLast = fInspectorNameLast;
+    }
+
+    /** 最新巡检日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "最新巡检日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date fInspectionDatetimeLast;
+
+    /** 巡检备注 */
+    @Excel(name = "巡检备注")
+    private String fRemark;
+
+    /** 制单人 */
+    @Excel(name = "制单人")
+    private Long fCreateBy;
+
+    /** 制单日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "制单日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date fCreateTime;
+
+    /** 更新人 */
+    @Excel(name = "更新人")
+    private Long fUpdateBy;
+
+    /** 最新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "最新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date fUpdateTime;
+
+    /** 删除状态（0正常 1停用） */
+    @Excel(name = "删除状态", readConverterExp = "0=正常,1=停用")
+    private Integer fDelFlag;
+
+    public void setfId(Long fId) 
+    {
+        this.fId = fId;
+    }
+
+    public Long getfId() 
+    {
+        return fId;
+    }
+    public void setfCheckFid(Long fCheckFid) 
+    {
+        this.fCheckFid = fCheckFid;
+    }
+
+    public Long getfCheckFid() 
+    {
+        return fCheckFid;
+    }
+    public void setfWarehouseFid(Long fWarehouseFid) 
+    {
+        this.fWarehouseFid = fWarehouseFid;
+    }
+
+    public Long getfWarehouseFid() 
+    {
+        return fWarehouseFid;
+    }
+    public void setfInspectionDatetime(Date fInspectionDatetime) 
+    {
+        this.fInspectionDatetime = fInspectionDatetime;
+    }
+
+    public Date getfInspectionDatetime() 
+    {
+        return fInspectionDatetime;
+    }
+    public void setfInspectorIdLast(Long fInspectorIdLast) 
+    {
+        this.fInspectorIdLast = fInspectorIdLast;
+    }
+
+    public Long getfInspectorIdLast() 
+    {
+        return fInspectorIdLast;
+    }
+    public void setfInspectionDatetimeLast(Date fInspectionDatetimeLast) 
+    {
+        this.fInspectionDatetimeLast = fInspectionDatetimeLast;
+    }
+
+    public Date getfInspectionDatetimeLast() 
+    {
+        return fInspectionDatetimeLast;
+    }
+    public void setfRemark(String fRemark) 
+    {
+        this.fRemark = fRemark;
+    }
+
+    public String getfRemark() 
+    {
+        return fRemark;
+    }
+    public void setfCreateBy(Long fCreateBy) 
+    {
+        this.fCreateBy = fCreateBy;
+    }
+
+    public Long getfCreateBy() 
+    {
+        return fCreateBy;
+    }
+    public void setfCreateTime(Date fCreateTime) 
+    {
+        this.fCreateTime = fCreateTime;
+    }
+
+    public Date getfCreateTime() 
+    {
+        return fCreateTime;
+    }
+    public void setfUpdateBy(Long fUpdateBy) 
+    {
+        this.fUpdateBy = fUpdateBy;
+    }
+
+    public Long getfUpdateBy() 
+    {
+        return fUpdateBy;
+    }
+    public void setfUpdateTime(Date fUpdateTime) 
+    {
+        this.fUpdateTime = fUpdateTime;
+    }
+
+    public Date getfUpdateTime() 
+    {
+        return fUpdateTime;
+    }
+    public void setfDelFlag(Integer fDelFlag) 
+    {
+        this.fDelFlag = fDelFlag;
+    }
+
+    public Integer getfDelFlag() 
+    {
+        return fDelFlag;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("fId", getfId())
+            .append("fCheckFid", getfCheckFid())
+            .append("fWarehouseFid", getfWarehouseFid())
+            .append("fInspectionDatetime", getfInspectionDatetime())
+            .append("fInspectorIdLast", getfInspectorIdLast())
+            .append("fInspectionDatetimeLast", getfInspectionDatetimeLast())
+            .append("fRemark", getfRemark())
+            .append("fCreateBy", getfCreateBy())
+            .append("fCreateTime", getfCreateTime())
+            .append("fUpdateBy", getfUpdateBy())
+            .append("fUpdateTime", getfUpdateTime())
+            .append("fDelFlag", getfDelFlag())
+            .toString();
+    }
+}

ruoyi-warehouse/src/main/java/com/ruoyi/warehouse/check/domain/TWarehouseCheckItemsDetails.java

@@ -0,0 +1,167 @@
+package com.ruoyi.warehouse.check.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 巡检check-items-details对象 t_warehouse_check_items_details
+ * 
+ * @author dongyongwei
+ * @date 2021-07-21
+ */
+public class TWarehouseCheckItemsDetails extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键id */
+    private Long fId;
+
+    /** 巡检主表id */
+    @Excel(name = "巡检主表id")
+    private Long fCheckFid;
+
+    /** 巡检从表id */
+    @Excel(name = "巡检从表id")
+    private Long fItemFid;
+
+    /** 巡检照片url */
+    @Excel(name = "巡检照片url")
+    private String fPhotoUrl;
+
+    /** 巡检备注 */
+    @Excel(name = "巡检备注")
+    private String fRemark;
+
+    /** 制单人 */
+    @Excel(name = "制单人")
+    private Long fCreateBy;
+
+    /** 制单日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "制单日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fCreateTime;
+
+    /** 更新人 */
+    @Excel(name = "更新人")
+    private Long fUpdateBy;
+
+    /** 最新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "最新时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fUpdateTime;
+
+    /** 删除状态（0正常 1停用） */
+    @Excel(name = "删除状态", readConverterExp = "0=正常,1=停用")
+    private Integer fDelFlag;
+
+    public void setfId(Long fId) 
+    {
+        this.fId = fId;
+    }
+
+    public Long getfId() 
+    {
+        return fId;
+    }
+    public void setfCheckFid(Long fCheckFid) 
+    {
+        this.fCheckFid = fCheckFid;
+    }
+
+    public Long getfCheckFid() 
+    {
+        return fCheckFid;
+    }
+    public void setfItemFid(Long fItemFid) 
+    {
+        this.fItemFid = fItemFid;
+    }
+
+    public Long getfItemFid() 
+    {
+        return fItemFid;
+    }
+    public void setfPhotoUrl(String fPhotoUrl) 
+    {
+        this.fPhotoUrl = fPhotoUrl;
+    }
+
+    public String getfPhotoUrl() 
+    {
+        return fPhotoUrl;
+    }
+    public void setfRemark(String fRemark) 
+    {
+        this.fRemark = fRemark;
+    }
+
+    public String getfRemark() 
+    {
+        return fRemark;
+    }
+    public void setfCreateBy(Long fCreateBy) 
+    {
+        this.fCreateBy = fCreateBy;
+    }
+
+    public Long getfCreateBy() 
+    {
+        return fCreateBy;
+    }
+    public void setfCreateTime(Date fCreateTime) 
+    {
+        this.fCreateTime = fCreateTime;
+    }
+
+    public Date getfCreateTime() 
+    {
+        return fCreateTime;
+    }
+    public void setfUpdateBy(Long fUpdateBy) 
+    {
+        this.fUpdateBy = fUpdateBy;
+    }
+
+    public Long getfUpdateBy() 
+    {
+        return fUpdateBy;
+    }
+    public void setfUpdateTime(Date fUpdateTime) 
+    {
+        this.fUpdateTime = fUpdateTime;
+    }
+
+    public Date getfUpdateTime() 
+    {
+        return fUpdateTime;
+    }
+    public void setfDelFlag(Integer fDelFlag) 
+    {
+        this.fDelFlag = fDelFlag;
+    }
+
+    public Integer getfDelFlag() 
+    {
+        return fDelFlag;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("fId", getfId())
+            .append("fCheckFid", getfCheckFid())
+            .append("fItemFid", getfItemFid())
+            .append("fPhotoUrl", getfPhotoUrl())
+            .append("fRemark", getfRemark())
+            .append("fCreateBy", getfCreateBy())
+            .append("fCreateTime", getfCreateTime())
+            .append("fUpdateBy", getfUpdateBy())
+            .append("fUpdateTime", getfUpdateTime())
+            .append("fDelFlag", getfDelFlag())
+            .toString();
+    }
+}

ruoyi-warehouse/src/main/java/com/ruoyi/warehouse/check/mapper/TWarehouseCheckItemsDetailsMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.warehouse.check.mapper;
+
+import java.util.List;
+import com.ruoyi.warehouse.check.domain.TWarehouseCheckItemsDetails;
+
+/**
+ * 巡检check-items-detailsMapper接口
+ * 
+ * @author dongyongwei
+ * @date 2021-07-21
+ */
+public interface TWarehouseCheckItemsDetailsMapper 
+{
+    /**
+     * 查询巡检check-items-details
+     * 
+     * @param fId 巡检check-items-detailsID
+     * @return 巡检check-items-details
+     */
+    public TWarehouseCheckItemsDetails selectTWarehouseCheckItemsDetailsById(Long fId);
+
+    /**
+     * 查询巡检check-items-details列表
+     * 
+     * @param tWarehouseCheckItemsDetails 巡检check-items-details
+     * @return 巡检check-items-details集合
+     */
+    public List<TWarehouseCheckItemsDetails> selectTWarehouseCheckItemsDetailsList(TWarehouseCheckItemsDetails tWarehouseCheckItemsDetails);
+
+    /**
+     * 新增巡检check-items-details
+     * 
+     * @param tWarehouseCheckItemsDetails 巡检check-items-details
+     * @return 结果
+     */
+    public int insertTWarehouseCheckItemsDetails(TWarehouseCheckItemsDetails tWarehouseCheckItemsDetails);
+
+    /**
+     * 修改巡检check-items-details
+     * 
+     * @param tWarehouseCheckItemsDetails 巡检check-items-details
+     * @return 结果
+     */
+    public int updateTWarehouseCheckItemsDetails(TWarehouseCheckItemsDetails tWarehouseCheckItemsDetails);
+
+    /**
+     * 删除巡检check-items-details
+     * 
+     * @param fId 巡检check-items-detailsID
+     * @return 结果
+     */
+    public int deleteTWarehouseCheckItemsDetailsById(Long fId);
+
+    /**
+     * 批量删除巡检check-items-details
+     * 
+     * @param fIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTWarehouseCheckItemsDetailsByIds(Long[] fIds);
+}

ruoyi-warehouse/src/main/java/com/ruoyi/warehouse/check/mapper/TWarehouseCheckItemsMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.warehouse.check.mapper;
+
+import java.util.List;
+import com.ruoyi.warehouse.check.domain.TWarehouseCheckItems;
+
+/**
+ * 巡检check-itemMapper接口
+ * 
+ * @author dongyongwei
+ * @date 2021-07-21
+ */
+public interface TWarehouseCheckItemsMapper 
+{
+    /**
+     * 查询巡检check-item
+     * 
+     * @param fId 巡检check-itemID
+     * @return 巡检check-item
+     */
+    public TWarehouseCheckItems selectTWarehouseCheckItemsById(Long fId);
+
+    /**
+     * 查询巡检check-item列表
+     * 
+     * @param tWarehouseCheckItems 巡检check-item
+     * @return 巡检check-item集合
+     */
+    public List<TWarehouseCheckItems> selectTWarehouseCheckItemsList(TWarehouseCheckItems tWarehouseCheckItems);
+
+    /**
+     * 新增巡检check-item
+     * 
+     * @param tWarehouseCheckItems 巡检check-item
+     * @return 结果
+     */
+    public int insertTWarehouseCheckItems(TWarehouseCheckItems tWarehouseCheckItems);
+
+    /**
+     * 修改巡检check-item
+     * 
+     * @param tWarehouseCheckItems 巡检check-item
+     * @return 结果
+     */
+    public int updateTWarehouseCheckItems(TWarehouseCheckItems tWarehouseCheckItems);
+
+    /**
+     * 删除巡检check-item
+     * 
+     * @param fId 巡检check-itemID
+     * @return 结果
+     */
+    public int deleteTWarehouseCheckItemsById(Long fId);
+
+    /**
+     * 批量删除巡检check-item
+     * 
+     * @param fIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTWarehouseCheckItemsByIds(Long[] fIds);
+}

ruoyi-warehouse/src/main/java/com/ruoyi/warehouse/check/mapper/TWarehouseCheckMapper.java

@@ -0,0 +1,68 @@
+package com.ruoyi.warehouse.check.mapper;
+
+import java.util.List;
+
+import com.ruoyi.common.core.domain.entity.TWarehouse;
+import com.ruoyi.warehouse.check.domain.TWarehouseCheck;
+
+/**
+ * 巡检checkMapper接口
+ * 
+ * @author dongyongwei
+ * @date 2021-07-21
+ */
+public interface TWarehouseCheckMapper 
+{
+    /**
+     * 查询巡检check
+     * 
+     * @param fId 巡检checkID
+     * @return 巡检check
+     */
+    public TWarehouseCheck selectTWarehouseCheckById(Long fId);
+
+    /**
+     * 查询巡检check列表
+     * 
+     * @param tWarehouseCheck 巡检check
+     * @return 巡检check集合
+     */
+    public List<TWarehouseCheck> selectTWarehouseCheckList(TWarehouseCheck tWarehouseCheck);
+
+    /**
+     * 新增巡检check
+     * 
+     * @param tWarehouseCheck 巡检check
+     * @return 结果
+     */
+    public int insertTWarehouseCheck(TWarehouseCheck tWarehouseCheck);
+
+    /**
+     * 修改巡检check
+     * 
+     * @param tWarehouseCheck 巡检check
+     * @return 结果
+     */
+    public int updateTWarehouseCheck(TWarehouseCheck tWarehouseCheck);
+
+    /**
+     * 删除巡检check
+     * 
+     * @param fId 巡检checkID
+     * @return 结果
+     */
+    public int deleteTWarehouseCheckById(Long fId);
+
+    /**
+     * 批量删除巡检check
+     * 
+     * @param fIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTWarehouseCheckByIds(Long[] fIds);
+
+    /**
+     * 获取主表内仓库清单
+     */
+    List<TWarehouse> selectTWarehouseListInCheck();
+}

ruoyi-warehouse/src/main/java/com/ruoyi/warehouse/check/service/ITWarehouseCheckItemsDetailsService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.warehouse.check.service;
+
+import java.util.List;
+import com.ruoyi.warehouse.check.domain.TWarehouseCheckItemsDetails;
+
+/**
+ * 巡检check-items-detailsService接口
+ * 
+ * @author dongyongwei
+ * @date 2021-07-21
+ */
+public interface ITWarehouseCheckItemsDetailsService 
+{
+    /**
+     * 查询巡检check-items-details
+     * 
+     * @param fId 巡检check-items-detailsID
+     * @return 巡检check-items-details
+     */
+    public TWarehouseCheckItemsDetails selectTWarehouseCheckItemsDetailsById(Long fId);
+
+    /**
+     * 查询巡检check-items-details列表
+     * 
+     * @param tWarehouseCheckItemsDetails 巡检check-items-details
+     * @return 巡检check-items-details集合
+     */
+    public List<TWarehouseCheckItemsDetails> selectTWarehouseCheckItemsDetailsList(TWarehouseCheckItemsDetails tWarehouseCheckItemsDetails);
+
+    /**
+     * 新增巡检check-items-details
+     * 
+     * @param tWarehouseCheckItemsDetails 巡检check-items-details
+     * @return 结果
+     */
+    public int insertTWarehouseCheckItemsDetails(TWarehouseCheckItemsDetails tWarehouseCheckItemsDetails);
+
+    /**
+     * 修改巡检check-items-details
+     * 
+     * @param tWarehouseCheckItemsDetails 巡检check-items-details
+     * @return 结果
+     */
+    public int updateTWarehouseCheckItemsDetails(TWarehouseCheckItemsDetails tWarehouseCheckItemsDetails);
+
+    /**
+     * 批量删除巡检check-items-details
+     * 
+     * @param fIds 需要删除的巡检check-items-detailsID
+     * @return 结果
+     */
+    public int deleteTWarehouseCheckItemsDetailsByIds(Long[] fIds);
+
+    /**
+     * 删除巡检check-items-details信息
+     * 
+     * @param fId 巡检check-items-detailsID
+     * @return 结果
+     */
+    public int deleteTWarehouseCheckItemsDetailsById(Long fId);
+}

ruoyi-warehouse/src/main/java/com/ruoyi/warehouse/check/service/ITWarehouseCheckItemsService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.warehouse.check.service;
+
+import java.util.List;
+import com.ruoyi.warehouse.check.domain.TWarehouseCheckItems;
+
+/**
+ * 巡检check-itemService接口
+ * 
+ * @author dongyongwei
+ * @date 2021-07-21
+ */
+public interface ITWarehouseCheckItemsService 
+{
+    /**
+     * 查询巡检check-item
+     * 
+     * @param fId 巡检check-itemID
+     * @return 巡检check-item
+     */
+    public TWarehouseCheckItems selectTWarehouseCheckItemsById(Long fId);
+
+    /**
+     * 查询巡检check-item列表
+     * 
+     * @param tWarehouseCheckItems 巡检check-item
+     * @return 巡检check-item集合
+     */
+    public List<TWarehouseCheckItems> selectTWarehouseCheckItemsList(TWarehouseCheckItems tWarehouseCheckItems);
+
+    /**
+     * 新增巡检check-item
+     * 
+     * @param tWarehouseCheckItems 巡检check-item
+     * @return 结果
+     */
+    public int insertTWarehouseCheckItems(TWarehouseCheckItems tWarehouseCheckItems);
+
+    /**
+     * 修改巡检check-item
+     * 
+     * @param tWarehouseCheckItems 巡检check-item
+     * @return 结果
+     */
+    public int updateTWarehouseCheckItems(TWarehouseCheckItems tWarehouseCheckItems);
+
+    /**
+     * 批量删除巡检check-item
+     * 
+     * @param fIds 需要删除的巡检check-itemID
+     * @return 结果
+     */
+    public int deleteTWarehouseCheckItemsByIds(Long[] fIds);
+
+    /**
+     * 删除巡检check-item信息
+     * 
+     * @param fId 巡检check-itemID
+     * @return 结果
+     */
+    public int deleteTWarehouseCheckItemsById(Long fId);
+}

ruoyi-warehouse/src/main/java/com/ruoyi/warehouse/check/service/ITWarehouseCheckService.java

@@ -0,0 +1,66 @@
+package com.ruoyi.warehouse.check.service;
+
+import java.util.List;
+
+import com.ruoyi.common.core.domain.entity.TWarehouse;
+import com.ruoyi.warehouse.check.domain.TWarehouseCheck;
+
+/**
+ * 巡检checkService接口
+ * 
+ * @author dongyongwei
+ * @date 2021-07-21
+ */
+public interface ITWarehouseCheckService 
+{
+    /**
+     * 查询巡检check
+     * 
+     * @param fId 巡检checkID
+     * @return 巡检check
+     */
+    public TWarehouseCheck selectTWarehouseCheckById(Long fId);
+
+    /**
+     * 查询巡检check列表
+     * 
+     * @param tWarehouseCheck 巡检check
+     * @return 巡检check集合
+     */
+    public List<TWarehouseCheck> selectTWarehouseCheckList(TWarehouseCheck tWarehouseCheck);
+
+    /**
+     * 新增巡检check
+     * 
+     * @param tWarehouseCheck 巡检check
+     * @return 结果
+     */
+    public Long insertTWarehouseCheck(TWarehouseCheck tWarehouseCheck);
+
+    /**
+     * 修改巡检check
+     * 
+     * @param tWarehouseCheck 巡检check
+     * @return 结果
+     */
+    public int updateTWarehouseCheck(TWarehouseCheck tWarehouseCheck);
+
+    /**
+     * 批量删除巡检check
+     * 
+     * @param fIds 需要删除的巡检checkID
+     * @return 结果
+     */
+    public int deleteTWarehouseCheckByIds(Long[] fIds);
+
+    /**
+     * 删除巡检check信息
+     * 
+     * @param fId 巡检checkID
+     * @return 结果
+     */
+    public int deleteTWarehouseCheckById(Long fId);
+
+    /** 获取主表内仓库清单 */
+    public List<TWarehouse> selectTWarehouseListInCheck();
+}

ruoyi-warehouse/src/main/java/com/ruoyi/warehouse/check/service/impl/TWarehouseCheckItemsDetailsServiceImpl.java

@@ -0,0 +1,102 @@
+package com.ruoyi.warehouse.check.service.impl;
+
+import java.util.Date;
+import java.util.List;
+
+import com.ruoyi.common.utils.SecurityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.warehouse.check.mapper.TWarehouseCheckItemsDetailsMapper;
+import com.ruoyi.warehouse.check.domain.TWarehouseCheckItemsDetails;
+import com.ruoyi.warehouse.check.service.ITWarehouseCheckItemsDetailsService;
+
+/**
+ * 巡检check-items-detailsService业务层处理
+ * 
+ * @author dongyongwei
+ * @date 2021-07-21
+ */
+@Service
+public class TWarehouseCheckItemsDetailsServiceImpl implements ITWarehouseCheckItemsDetailsService 
+{
+    @Autowired
+    private TWarehouseCheckItemsDetailsMapper tWarehouseCheckItemsDetailsMapper;
+
+    /**
+     * 查询巡检check-items-details
+     * 
+     * @param fId 巡检check-items-detailsID
+     * @return 巡检check-items-details
+     */
+    @Override
+    public TWarehouseCheckItemsDetails selectTWarehouseCheckItemsDetailsById(Long fId)
+    {
+        return tWarehouseCheckItemsDetailsMapper.selectTWarehouseCheckItemsDetailsById(fId);
+    }
+
+    /**
+     * 查询巡检check-items-details列表
+     * 
+     * @param tWarehouseCheckItemsDetails 巡检check-items-details
+     * @return 巡检check-items-details
+     */
+    @Override
+    public List<TWarehouseCheckItemsDetails> selectTWarehouseCheckItemsDetailsList(TWarehouseCheckItemsDetails tWarehouseCheckItemsDetails)
+    {
+        return tWarehouseCheckItemsDetailsMapper.selectTWarehouseCheckItemsDetailsList(tWarehouseCheckItemsDetails);
+    }
+
+    /**
+     * 新增巡检check-items-details
+     * 
+     * @param tWarehouseCheckItemsDetails 巡检check-items-details
+     * @return 结果
+     */
+    @Override
+    public int insertTWarehouseCheckItemsDetails(TWarehouseCheckItemsDetails tWarehouseCheckItemsDetails)
+    {
+        tWarehouseCheckItemsDetails.setfCreateBy(SecurityUtils.getLoginUser().getUser().getUserId());
+        tWarehouseCheckItemsDetails.setfCreateTime(new Date());
+        int i =tWarehouseCheckItemsDetailsMapper.insertTWarehouseCheckItemsDetails(tWarehouseCheckItemsDetails);
+        System.out.println(tWarehouseCheckItemsDetails.getfId());
+        return i;
+    }
+
+    /**
+     * 修改巡检check-items-details
+     * 
+     * @param tWarehouseCheckItemsDetails 巡检check-items-details
+     * @return 结果
+     */
+    @Override
+    public int updateTWarehouseCheckItemsDetails(TWarehouseCheckItemsDetails tWarehouseCheckItemsDetails)
+    {
+        tWarehouseCheckItemsDetails.setfUpdateBy(SecurityUtils.getLoginUser().getUser().getUserId());
+        tWarehouseCheckItemsDetails.setfUpdateTime(new Date());
+        return tWarehouseCheckItemsDetailsMapper.updateTWarehouseCheckItemsDetails(tWarehouseCheckItemsDetails);
+    }
+
+    /**
+     * 批量删除巡检check-items-details
+     * 
+     * @param fIds 需要删除的巡检check-items-detailsID
+     * @return 结果
+     */
+    @Override
+    public int deleteTWarehouseCheckItemsDetailsByIds(Long[] fIds)
+    {
+        return tWarehouseCheckItemsDetailsMapper.deleteTWarehouseCheckItemsDetailsByIds(fIds);
+    }
+
+    /**
+     * 删除巡检check-items-details信息
+     * 
+     * @param fId 巡检check-items-detailsID
+     * @return 结果
+     */
+    @Override
+    public int deleteTWarehouseCheckItemsDetailsById(Long fId)
+    {
+        return tWarehouseCheckItemsDetailsMapper.deleteTWarehouseCheckItemsDetailsById(fId);
+    }
+}

ruoyi-warehouse/src/main/java/com/ruoyi/warehouse/check/service/impl/TWarehouseCheckItemsServiceImpl.java

@@ -0,0 +1,100 @@
+package com.ruoyi.warehouse.check.service.impl;
+
+import java.util.Date;
+import java.util.List;
+
+import com.ruoyi.common.utils.SecurityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.warehouse.check.mapper.TWarehouseCheckItemsMapper;
+import com.ruoyi.warehouse.check.domain.TWarehouseCheckItems;
+import com.ruoyi.warehouse.check.service.ITWarehouseCheckItemsService;
+
+/**
+ * 巡检check-itemService业务层处理
+ * 
+ * @author dongyongwei
+ * @date 2021-07-21
+ */
+@Service
+public class TWarehouseCheckItemsServiceImpl implements ITWarehouseCheckItemsService 
+{
+    @Autowired
+    private TWarehouseCheckItemsMapper tWarehouseCheckItemsMapper;
+
+    /**
+     * 查询巡检check-item
+     * 
+     * @param fId 巡检check-itemID
+     * @return 巡检check-item
+     */
+    @Override
+    public TWarehouseCheckItems selectTWarehouseCheckItemsById(Long fId)
+    {
+        return tWarehouseCheckItemsMapper.selectTWarehouseCheckItemsById(fId);
+    }
+
+    /**
+     * 查询巡检check-item列表
+     * 
+     * @param tWarehouseCheckItems 巡检check-item
+     * @return 巡检check-item
+     */
+    @Override
+    public List<TWarehouseCheckItems> selectTWarehouseCheckItemsList(TWarehouseCheckItems tWarehouseCheckItems)
+    {
+        return tWarehouseCheckItemsMapper.selectTWarehouseCheckItemsList(tWarehouseCheckItems);
+    }
+
+    /**
+     * 新增巡检check-item
+     * 
+     * @param tWarehouseCheckItems 巡检check-item
+     * @return 结果
+     */
+    @Override
+    public int insertTWarehouseCheckItems(TWarehouseCheckItems tWarehouseCheckItems)
+    {
+        tWarehouseCheckItems.setfCreateBy(SecurityUtils.getLoginUser().getUser().getUserId());
+        tWarehouseCheckItems.setfCreateTime(new Date());
+        return tWarehouseCheckItemsMapper.insertTWarehouseCheckItems(tWarehouseCheckItems);
+    }
+
+    /**
+     * 修改巡检check-item
+     * 
+     * @param tWarehouseCheckItems 巡检check-item
+     * @return 结果
+     */
+    @Override
+    public int updateTWarehouseCheckItems(TWarehouseCheckItems tWarehouseCheckItems)
+    {
+        tWarehouseCheckItems.setfUpdateBy(SecurityUtils.getLoginUser().getUser().getUserId());
+        tWarehouseCheckItems.setfUpdateTime(new Date());
+        return tWarehouseCheckItemsMapper.updateTWarehouseCheckItems(tWarehouseCheckItems);
+    }
+
+    /**
+     * 批量删除巡检check-item
+     * 
+     * @param fIds 需要删除的巡检check-itemID
+     * @return 结果
+     */
+    @Override
+    public int deleteTWarehouseCheckItemsByIds(Long[] fIds)
+    {
+        return tWarehouseCheckItemsMapper.deleteTWarehouseCheckItemsByIds(fIds);
+    }
+
+    /**
+     * 删除巡检check-item信息
+     * 
+     * @param fId 巡检check-itemID
+     * @return 结果
+     */
+    @Override
+    public int deleteTWarehouseCheckItemsById(Long fId)
+    {
+        return tWarehouseCheckItemsMapper.deleteTWarehouseCheckItemsById(fId);
+    }
+}

ruoyi-warehouse/src/main/java/com/ruoyi/warehouse/check/service/impl/TWarehouseCheckServiceImpl.java

@@ -0,0 +1,117 @@
+package com.ruoyi.warehouse.check.service.impl;
+
+import java.util.Date;
+import java.util.List;
+
+import com.ruoyi.common.core.domain.entity.TWarehouse;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.warehouse.check.domain.TWarehouseCheckItems;
+import com.ruoyi.warehouse.check.service.ITWarehouseCheckItemsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.warehouse.check.mapper.TWarehouseCheckMapper;
+import com.ruoyi.warehouse.check.domain.TWarehouseCheck;
+import com.ruoyi.warehouse.check.service.ITWarehouseCheckService;
+
+/**
+ * 巡检checkService业务层处理
+ *
+ * @author dongyongwei
+ * @date 2021-07-21
+ */
+@Service
+public class TWarehouseCheckServiceImpl implements ITWarehouseCheckService {
+    @Autowired
+    private TWarehouseCheckMapper tWarehouseCheckMapper;
+
+    @Autowired
+    private ITWarehouseCheckItemsService tWarehouseCheckItemsService;
+
+    /**
+     * 查询巡检check
+     *
+     * @param fId 巡检checkID
+     * @return 巡检check
+     */
+    @Override
+    public TWarehouseCheck selectTWarehouseCheckById(Long fId) {
+
+        TWarehouseCheck tWarehouseCheck = tWarehouseCheckMapper.selectTWarehouseCheckById(fId);
+        //增加返回明细数据
+        TWarehouseCheckItems tWarehouseCheckItemsQuery = new TWarehouseCheckItems();
+        tWarehouseCheckItemsQuery.setfCheckFid(fId);
+        List<TWarehouseCheckItems> tWarehouseCheckItemsList = tWarehouseCheckItemsService.selectTWarehouseCheckItemsList(tWarehouseCheckItemsQuery);
+        if (tWarehouseCheckItemsList.size() > 0) {
+            tWarehouseCheck.settWarehouseCheckItemsList(tWarehouseCheckItemsList);
+        }
+        return tWarehouseCheck;
+    }
+
+    /**
+     * 查询巡检check列表
+     *
+     * @param tWarehouseCheck 巡检check
+     * @return 巡检check
+     */
+    @Override
+    public List<TWarehouseCheck> selectTWarehouseCheckList(TWarehouseCheck tWarehouseCheck) {
+        return tWarehouseCheckMapper.selectTWarehouseCheckList(tWarehouseCheck);
+    }
+
+    /**
+     * 新增巡检check
+     *
+     * @param tWarehouseCheck 巡检check
+     * @return 结果
+     */
+    @Override
+    public Long insertTWarehouseCheck(TWarehouseCheck tWarehouseCheck) {
+        tWarehouseCheck.setfCreateBy(SecurityUtils.getLoginUser().getUser().getUserId());
+        tWarehouseCheck.setfCreateTime(new Date());
+        tWarehouseCheckMapper.insertTWarehouseCheck(tWarehouseCheck);
+        return tWarehouseCheck.getfId();
+    }
+
+    /**
+     * 修改巡检check
+     *
+     * @param tWarehouseCheck 巡检check
+     * @return 结果
+     */
+    @Override
+    public int updateTWarehouseCheck(TWarehouseCheck tWarehouseCheck) {
+        tWarehouseCheck.setfUpdateBy(SecurityUtils.getLoginUser().getUser().getUserId());
+        tWarehouseCheck.setfUpdateTime(new Date());
+        return tWarehouseCheckMapper.updateTWarehouseCheck(tWarehouseCheck);
+    }
+
+    /**
+     * 批量删除巡检check
+     *
+     * @param fIds 需要删除的巡检checkID
+     * @return 结果
+     */
+    @Override
+    public int deleteTWarehouseCheckByIds(Long[] fIds) {
+        return tWarehouseCheckMapper.deleteTWarehouseCheckByIds(fIds);
+    }
+
+    /**
+     * 删除巡检check信息
+     *
+     * @param fId 巡检checkID
+     * @return 结果
+     */
+    @Override
+    public int deleteTWarehouseCheckById(Long fId) {
+        return tWarehouseCheckMapper.deleteTWarehouseCheckById(fId);
+    }
+
+    /**
+     * 获取主表内仓库清单
+     */
+    @Override
+    public List<TWarehouse> selectTWarehouseListInCheck() {
+        return tWarehouseCheckMapper.selectTWarehouseListInCheck();
+    }
+}

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/domain/TWarehouseWarehousecheck.java

@@ -1,143 +0,0 @@
-package com.ruoyi.warehouseBusiness.domain;
-
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 巡检主对象 t_warehouse_warehousecheck
- *
- * @author ruoyi
- * @date 2021-06-27
- */
-public class TWarehouseWarehousecheck extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 主键id */
-    private Long fId;
-
-    /** 仓库id */
-    @Excel(name = "仓库id")
-    private String fWarehouseid;
-
-    /** 仓库名称 */
-    @Excel(name = "仓库名称")
-    private String fWarehousename;
-
-    /** 计划日期 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "计划日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date plannedDate;
-
-    /** 巡检日期 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "巡检日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date inspectionDate;
-
-    /** 巡检人 */
-    @Excel(name = "巡检人")
-    private String inspector;
-
-    /** 巡检备注 */
-    @Excel(name = "巡检备注")
-    private String inspectionRemark;
-
-    /** 删除状态 */
-    private String delFlag;
-
-    public void setfId(Long fId)
-    {
-        this.fId = fId;
-    }
-
-    public Long getfId()
-    {
-        return fId;
-    }
-    public void setfWarehouseid(String fWarehouseid)
-    {
-        this.fWarehouseid = fWarehouseid;
-    }
-
-    public String getfWarehouseid()
-    {
-        return fWarehouseid;
-    }
-    public void setfWarehousename(String fWarehousename)
-    {
-        this.fWarehousename = fWarehousename;
-    }
-
-    public String getfWarehousename()
-    {
-        return fWarehousename;
-    }
-    public void setPlannedDate(Date plannedDate)
-    {
-        this.plannedDate = plannedDate;
-    }
-
-    public Date getPlannedDate()
-    {
-        return plannedDate;
-    }
-    public void setInspectionDate(Date inspectionDate)
-    {
-        this.inspectionDate = inspectionDate;
-    }
-
-    public Date getInspectionDate()
-    {
-        return inspectionDate;
-    }
-    public void setInspector(String inspector)
-    {
-        this.inspector = inspector;
-    }
-
-    public String getInspector()
-    {
-        return inspector;
-    }
-    public void setInspectionRemark(String inspectionRemark)
-    {
-        this.inspectionRemark = inspectionRemark;
-    }
-
-    public String getInspectionRemark()
-    {
-        return inspectionRemark;
-    }
-    public void setDelFlag(String delFlag)
-    {
-        this.delFlag = delFlag;
-    }
-
-    public String getDelFlag()
-    {
-        return delFlag;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("fId", getfId())
-            .append("fWarehouseid", getfWarehouseid())
-            .append("fWarehousename", getfWarehousename())
-            .append("plannedDate", getPlannedDate())
-            .append("inspectionDate", getInspectionDate())
-            .append("inspector", getInspector())
-            .append("inspectionRemark", getInspectionRemark())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("delFlag", getDelFlag())
-            .append("remark", getRemark())
-            .toString();
-    }
-}

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/domain/TWarehouseWarehousecheckitems.java

@@ -1,154 +0,0 @@
-package com.ruoyi.warehouseBusiness.domain;
-
-import java.util.Arrays;
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 巡检子对象 t_warehouse_warehousecheckitems
- *
- * @author ruoyi
- * @date 2021-06-27
- */
-public class TWarehouseWarehousecheckitems<DataTypeWithBLOBs> extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 主键id */
-    private Long fId;
-
-    /** 对应主表id */
-    @Excel(name = "对应主表id")
-    private Long fPid;
-
-    /** 仓库id */
-    @Excel(name = "仓库id")
-    private String fWarehouseid;
-
-    /** 仓库名称 */
-    @Excel(name = "仓库名称")
-    private String fWarehousename;
-
-    /** 巡检照片 */
-    @Excel(name = "巡检照片")
-    private String inspectionPhotos;
-
-    /** 计划日期 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "计划日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date plannedDate;
-
-    /** 巡检日期 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "巡检日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date inspectionDate;
-
-    /** 巡检人 */
-    @Excel(name = "巡检人")
-    private String inspector;
-
-    /** 巡检备注 */
-    @Excel(name = "巡检备注")
-    private String inspectionRemark;
-
-    /** 删除状态 */
-    private String delFlag;
-
-    public Long getfId() {
-        return fId;
-    }
-
-    public void setfId(Long fId) {
-        this.fId = fId;
-    }
-
-    public Long getfPid() {
-        return fPid;
-    }
-
-    public void setfPid(Long fPid) {
-        this.fPid = fPid;
-    }
-
-    public String getfWarehouseid() {
-        return fWarehouseid;
-    }
-
-    public void setfWarehouseid(String fWarehouseid) {
-        this.fWarehouseid = fWarehouseid;
-    }
-
-    public String getfWarehousename() {
-        return fWarehousename;
-    }
-
-    public void setfWarehousename(String fWarehousename) {
-        this.fWarehousename = fWarehousename;
-    }
-
-    public String getInspectionPhotos() {
-        return inspectionPhotos;
-    }
-
-    public void setInspectionPhotos(String inspectionPhotos) {
-        this.inspectionPhotos = inspectionPhotos;
-    }
-
-    public Date getPlannedDate() {
-        return plannedDate;
-    }
-
-    public void setPlannedDate(Date plannedDate) {
-        this.plannedDate = plannedDate;
-    }
-
-    public Date getInspectionDate() {
-        return inspectionDate;
-    }
-
-    public void setInspectionDate(Date inspectionDate) {
-        this.inspectionDate = inspectionDate;
-    }
-
-    public String getInspector() {
-        return inspector;
-    }
-
-    public void setInspector(String inspector) {
-        this.inspector = inspector;
-    }
-
-    public String getInspectionRemark() {
-        return inspectionRemark;
-    }
-
-    public void setInspectionRemark(String inspectionRemark) {
-        this.inspectionRemark = inspectionRemark;
-    }
-
-    public String getDelFlag() {
-        return delFlag;
-    }
-
-    public void setDelFlag(String delFlag) {
-        this.delFlag = delFlag;
-    }
-
-    @Override
-    public String toString() {
-        return "TWarehouseWarehousecheckitems{" +
-                "fId=" + fId +
-                ", fPid=" + fPid +
-                ", fWarehouseid='" + fWarehouseid + '\'' +
-                ", fWarehousename='" + fWarehousename + '\'' +
-                ", inspectionPhotos='" + inspectionPhotos + '\'' +
-                ", plannedDate=" + plannedDate +
-                ", inspectionDate=" + inspectionDate +
-                ", inspector='" + inspector + '\'' +
-                ", inspectionRemark='" + inspectionRemark + '\'' +
-                ", delFlag='" + delFlag + '\'' +
-                '}';
-    }
-}

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/mapper/TWarehouseWarehousecheckMapper.java

@@ -1,70 +0,0 @@
-package com.ruoyi.warehouseBusiness.mapper;
-
-import com.ruoyi.warehouseBusiness.domain.TWarehouseWarehousecheck;
-
-import java.util.List;
-
-
-/**
- * 巡检主Mapper接口
- *
- * @author ruoyi
- * @date 2021-06-27
- */
-public interface TWarehouseWarehousecheckMapper
-{
-    /**
-     * 查询巡检主
-     *
-     * @param fId 巡检主ID
-     * @return 巡检主
-     */
-    public TWarehouseWarehousecheck selectTWarehouseWarehousecheckById(Long fId);
-
-    /**
-     * 查询巡检主列表
-     *
-     * @param tWarehouseWarehousecheck 巡检主
-     * @return 巡检主集合
-     */
-    public List<TWarehouseWarehousecheck> selectTWarehouseWarehousecheckList(TWarehouseWarehousecheck tWarehouseWarehousecheck);
-
-    /**
-     * 新增巡检主
-     *
-     * @param tWarehouseWarehousecheck 巡检主
-     * @return 结果
-     */
-    public int insertTWarehouseWarehousecheck(TWarehouseWarehousecheck tWarehouseWarehousecheck);
-
-    /**
-     * 修改巡检主
-     *
-     * @param tWarehouseWarehousecheck 巡检主
-     * @return 结果
-     */
-    public int updateTWarehouseWarehousecheck(TWarehouseWarehousecheck tWarehouseWarehousecheck);
-
-    /**
-     * 删除巡检主
-     *
-     * @param fId 巡检主ID
-     * @return 结果
-     */
-    public int deleteTWarehouseWarehousecheckById(Long fId);
-
-    /**
-     * 批量删除巡检主
-     *
-     * @param fIds 需要删除的数据ID
-     * @return 结果
-     */
-    public int deleteTWarehouseWarehousecheckByIds(Long[] fIds);
-
-    /**
-     * 批量更新数据状态
-     * @param fIds
-     * @return
-     */
-    public int updateTWarehouseWarehousecheckById(Long[] fIds);
-}

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/mapper/TWarehouseWarehousecheckitemsMapper.java

@@ -1,69 +0,0 @@
-package com.ruoyi.warehouseBusiness.mapper;
-
-import com.ruoyi.warehouseBusiness.domain.TWarehouseWarehousecheckitems;
-
-import java.util.List;
-
-/**
- * 巡检子Mapper接口
- *
- * @author ruoyi
- * @date 2021-06-27
- */
-public interface TWarehouseWarehousecheckitemsMapper
-{
-    /**
-     * 查询巡检子
-     *
-     * @param fId 巡检子ID
-     * @return 巡检子
-     */
-    public TWarehouseWarehousecheckitems selectTWarehouseWarehousecheckitemsById(Long fId);
-
-    /**
-     * 查询巡检子列表
-     *
-     * @param tWarehouseWarehousecheckitems 巡检子
-     * @return 巡检子集合
-     */
-    public List<TWarehouseWarehousecheckitems> selectTWarehouseWarehousecheckitemsList(TWarehouseWarehousecheckitems tWarehouseWarehousecheckitems);
-
-    /**
-     * 新增巡检子
-     *
-     * @param tWarehouseWarehousecheckitems 巡检子
-     * @return 结果
-     */
-    public int insertTWarehouseWarehousecheckitems(TWarehouseWarehousecheckitems tWarehouseWarehousecheckitems);
-
-    /**
-     * 修改巡检子
-     *
-     * @param tWarehouseWarehousecheckitems 巡检子
-     * @return 结果
-     */
-    public int updateTWarehouseWarehousecheckitems(TWarehouseWarehousecheckitems tWarehouseWarehousecheckitems);
-
-    /**
-     * 删除巡检子
-     *
-     * @param fId 巡检子ID
-     * @return 结果
-     */
-    public int deleteTWarehouseWarehousecheckitemsById(Long fId);
-
-    /**
-     * 批量删除巡检子
-     *
-     * @param fIds 需要删除的数据ID
-     * @return 结果
-     */
-    public int deleteTWarehouseWarehousecheckitemsByIds(Long[] fIds);
-
-    /**
-     * 批量更新数据状态
-     * @param fIds
-     * @return
-     */
-    public int updateTWarehouseWarehousecheckitemsById(Long[] fIds);
-}

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/ITWarehouseWarehousecheckService.java

@@ -1,74 +0,0 @@
-package com.ruoyi.warehouseBusiness.service;
-
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.warehouseBusiness.domain.TWarehouseWarehousecheck;
-
-import java.util.List;
-
-/**
- * 巡检主Service接口
- *
- * @author ruoyi
- * @date 2021-06-27
- */
-public interface ITWarehouseWarehousecheckService
-{
-    /**
-     * 查询巡检主
-     *
-     * @param fId 巡检主ID
-     * @return 巡检主
-     */
-    public AjaxResult selectTWarehouseWarehousecheckById(Long fId);
-
-
-
-    /**
-     * 查询巡检主列表
-     *
-     * @param tWarehouseWarehousecheck 巡检主
-     * @return 巡检主集合
-     */
-    public List<TWarehouseWarehousecheck> selectTWarehouseWarehousecheckList(TWarehouseWarehousecheck tWarehouseWarehousecheck);
-
-    /**
-     * 新增巡检主
-     *
-     * @param tWarehouseWarehousecheck 巡检主
-     * @return 结果
-     */
-    public int insertTWarehouseWarehousecheck(TWarehouseWarehousecheck tWarehouseWarehousecheck);
-
-    /**
-     * 修改巡检主
-     *
-     * @param tWarehouseWarehousecheck 巡检主
-     * @return 结果
-     */
-    public int updateTWarehouseWarehousecheck(TWarehouseWarehousecheck tWarehouseWarehousecheck);
-
-    /**
-     * 批量删除巡检主
-     *
-     * @param fIds 需要删除的巡检主ID
-     * @return 结果
-     */
-    public AjaxResult deleteTWarehouseWarehousecheckByIds(Long[] fIds);
-
-    /**
-     * 删除巡检主信息
-     *
-     * @param fId 巡检主ID
-     * @return 结果
-     */
-    public int deleteTWarehouseWarehousecheckById(Long fId);
-    /**
-     * 新增巡检信息
-     *
-     * @param tWarehouseWareHouseCheck 巡检主
-     * @param TWarehouseWareHouseCheckItems 巡检从
-     * @return 结果
-     */
-    public AjaxResult tWarehouseWareHouseCheckInsert(String tWarehouseWareHouseCheck, String TWarehouseWareHouseCheckItems, LoginUser loginUser);
-}

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/ITWarehouseWarehousecheckitemsService.java

@@ -1,64 +0,0 @@
-package com.ruoyi.warehouseBusiness.service;
-
-import com.ruoyi.warehouseBusiness.domain.TWarehouseWarehousecheckitems;
-
-import java.util.List;
-
-/**
- * 巡检子Service接口
- *
- * @author ruoyi
- * @date 2021-06-27
- */
-public interface ITWarehouseWarehousecheckitemsService
-{
-
-
-    /**
-     * 查询巡检子
-     *
-     * @param fId 巡检子ID
-     * @return 巡检子
-     */
-    public TWarehouseWarehousecheckitems selectTWarehouseWarehousecheckitemsById(Long fId);
-
-    /**
-     * 查询巡检子列表
-     *
-     * @param tWarehouseWarehousecheckitems 巡检子
-     * @return 巡检子集合
-     */
-    public List<TWarehouseWarehousecheckitems> selectTWarehouseWarehousecheckitemsList(TWarehouseWarehousecheckitems tWarehouseWarehousecheckitems);
-
-    /**
-     * 新增巡检子
-     *
-     * @param tWarehouseWarehousecheckitems 巡检子
-     * @return 结果
-     */
-    public int insertTWarehouseWarehousecheckitems(TWarehouseWarehousecheckitems tWarehouseWarehousecheckitems);
-
-    /**
-     * 修改巡检子
-     *
-     * @param tWarehouseWarehousecheckitems 巡检子
-     * @return 结果
-     */
-    public int updateTWarehouseWarehousecheckitems(TWarehouseWarehousecheckitems tWarehouseWarehousecheckitems);
-
-    /**
-     * 批量删除巡检子
-     *
-     * @param fIds 需要删除的巡检子ID
-     * @return 结果
-     */
-    public int deleteTWarehouseWarehousecheckitemsByIds(Long[] fIds);
-
-    /**
-     * 删除巡检子信息
-     *
-     * @param fId 巡检子ID
-     * @return 结果
-     */
-    public int deleteTWarehouseWarehousecheckitemsById(Long fId);
-}

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehouseWarehousecheckServiceImpl.java

@@ -1,156 +0,0 @@
-package com.ruoyi.warehouseBusiness.service.impl;
-
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.warehouseBusiness.domain.TWarehouseWarehousecheck;
-import com.ruoyi.warehouseBusiness.domain.TWarehouseWarehousecheckitems;
-import com.ruoyi.warehouseBusiness.mapper.TWarehouseWarehousecheckMapper;
-import com.ruoyi.warehouseBusiness.mapper.TWarehouseWarehousecheckitemsMapper;
-import com.ruoyi.warehouseBusiness.service.ITWarehouseWarehousecheckService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
-
-/**
- * 巡检主Service业务层处理
- *
- * @author ruoyi
- * @date 2021-06-27
- */
-@Service
-public class TWarehouseWarehousecheckServiceImpl implements ITWarehouseWarehousecheckService
-{
-    @Autowired
-    private TWarehouseWarehousecheckMapper tWarehouseWarehousecheckMapper;
-    @Autowired
-    private TWarehouseWarehousecheckitemsMapper tWarehouseWarehousecheckitemsMapper;
-
-    /**
-     * 查询巡检主
-     *
-     * @param fId 巡检主ID
-     * @return 巡检主
-     */
-    @Override
-    public AjaxResult selectTWarehouseWarehousecheckById(Long fId)
-    {
-        Map<String, Object> map = new HashMap<>();
-        TWarehouseWarehousecheck tWarehouseWareHouseCheck = tWarehouseWarehousecheckMapper.selectTWarehouseWarehousecheckById(fId);
-        TWarehouseWarehousecheckitems checkItemsHouse = new TWarehouseWarehousecheckitems();
-        checkItemsHouse.setfPid(fId);
-        List<TWarehouseWarehousecheckitems> tWarehouseWareHouseCheckItems = tWarehouseWarehousecheckitemsMapper.selectTWarehouseWarehousecheckitemsList(checkItemsHouse);
-        map.put("tWarehouseWareHouseCheck",tWarehouseWareHouseCheck);
-        map.put("tWarehouseWareHouseCheckItems",tWarehouseWareHouseCheckItems);
-        return AjaxResult.success(map);
-    }
-
-    /**
-     * 查询巡检主列表
-     *
-     * @param tWarehouseWarehousecheck 巡检主
-     * @return 巡检主
-     */
-    @Override
-    public List<TWarehouseWarehousecheck> selectTWarehouseWarehousecheckList(TWarehouseWarehousecheck tWarehouseWarehousecheck)
-    {
-        return tWarehouseWarehousecheckMapper.selectTWarehouseWarehousecheckList(tWarehouseWarehousecheck);
-    }
-
-    /**
-     * 新增巡检主
-     *
-     * @param tWarehouseWarehousecheck 巡检主
-     * @return 结果
-     */
-    @Override
-    public int insertTWarehouseWarehousecheck(TWarehouseWarehousecheck tWarehouseWarehousecheck)
-    {
-        tWarehouseWarehousecheck.setCreateTime(DateUtils.getNowDate());
-        return tWarehouseWarehousecheckMapper.insertTWarehouseWarehousecheck(tWarehouseWarehousecheck);
-    }
-
-    /**
-     * 修改巡检主
-     *
-     * @param tWarehouseWarehousecheck 巡检主
-     * @return 结果
-     */
-    @Override
-    public int updateTWarehouseWarehousecheck(TWarehouseWarehousecheck tWarehouseWarehousecheck)
-    {
-        tWarehouseWarehousecheck.setUpdateTime(DateUtils.getNowDate());
-        return tWarehouseWarehousecheckMapper.updateTWarehouseWarehousecheck(tWarehouseWarehousecheck);
-    }
-
-    /**
-     * 批量删除巡检主
-     *
-     * @param fIds 需要删除的巡检主ID
-     * @return 结果
-     */
-    @Override
-    @Transactional
-    public AjaxResult deleteTWarehouseWarehousecheckByIds(Long[] fIds)
-    {
-        int check = tWarehouseWarehousecheckMapper.updateTWarehouseWarehousecheckById(fIds);
-        int checkitems = tWarehouseWarehousecheckitemsMapper.updateTWarehouseWarehousecheckitemsById(fIds);
-        if (check>0){
-            return AjaxResult.success();
-        }else {
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            return AjaxResult.error("删除失败");
-        }
-    }
-
-    /**
-     * 删除巡检主信息
-     *
-     * @param fId 巡检主ID
-     * @return 结果
-     */
-    @Override
-    public int deleteTWarehouseWarehousecheckById(Long fId)
-    {
-        return tWarehouseWarehousecheckMapper.deleteTWarehouseWarehousecheckById(fId);
-    }
-
-    @Override
-    @Transactional
-    public AjaxResult tWarehouseWareHouseCheckInsert(String tWarehouseWareHouseCheck, String TWarehouseWareHouseCheckItems, LoginUser loginUser) {
-        TWarehouseWarehousecheck tWarehouseWarehousecheck = JSONArray.parseObject(tWarehouseWareHouseCheck, TWarehouseWarehousecheck.class);
-        if (tWarehouseWarehousecheck.getfId() == null){
-            tWarehouseWarehousecheck.setCreateTime(new Date());
-            tWarehouseWarehousecheck.setCreateBy(loginUser.getUsername());
-        }else {
-            tWarehouseWarehousecheck.setUpdateTime(new Date());
-            tWarehouseWarehousecheck.setUpdateBy(loginUser.getUsername());
-        }
-        //保存主表新
-        int i = tWarehouseWarehousecheckMapper.insertTWarehouseWarehousecheck(tWarehouseWarehousecheck);
-        JSONArray warehouseJSON = JSONArray.parseArray(TWarehouseWareHouseCheckItems);
-        List<TWarehouseWarehousecheckitems> checkItemsList = JSONObject.parseArray(warehouseJSON.toJSONString(), TWarehouseWarehousecheckitems.class);
-        if (CollectionUtils.isNotEmpty(checkItemsList)){
-            for (TWarehouseWarehousecheckitems tWarehouseWarehousecheckitems : checkItemsList) {
-                if (tWarehouseWarehousecheckitems.getfId() == null){
-                    tWarehouseWarehousecheckitems.setCreateTime(new Date());
-                    tWarehouseWarehousecheckitems.setCreateBy(loginUser.getUsername());
-                }else {
-                    tWarehouseWarehousecheckitems.setUpdateTime(new Date());
-                    tWarehouseWarehousecheckitems.setUpdateBy(loginUser.getUsername());
-                }
-                int i1 = tWarehouseWarehousecheckitemsMapper.insertTWarehouseWarehousecheckitems(tWarehouseWarehousecheckitems);
-            }
-        }
-        return AjaxResult.success();
-    }
-}

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehouseWarehousecheckitemsServiceImpl.java

@@ -1,96 +0,0 @@
-package com.ruoyi.warehouseBusiness.service.impl;
-
-import java.util.List;
-import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.warehouseBusiness.domain.TWarehouseWarehousecheckitems;
-import com.ruoyi.warehouseBusiness.mapper.TWarehouseWarehousecheckitemsMapper;
-import com.ruoyi.warehouseBusiness.service.ITWarehouseWarehousecheckitemsService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;;
-
-/**
- * 巡检子Service业务层处理
- *
- * @author ruoyi
- * @date 2021-06-27
- */
-@Service
-public class TWarehouseWarehousecheckitemsServiceImpl implements ITWarehouseWarehousecheckitemsService
-{
-    @Autowired
-    private TWarehouseWarehousecheckitemsMapper tWarehouseWarehousecheckitemsMapper;
-
-    /**
-     * 查询巡检子
-     *
-     * @param fId 巡检子ID
-     * @return 巡检子
-     */
-    @Override
-    public TWarehouseWarehousecheckitems selectTWarehouseWarehousecheckitemsById(Long fId)
-    {
-        return tWarehouseWarehousecheckitemsMapper.selectTWarehouseWarehousecheckitemsById(fId);
-    }
-
-    /**
-     * 查询巡检子列表
-     *
-     * @param tWarehouseWarehousecheckitems 巡检子
-     * @return 巡检子
-     */
-    @Override
-    public List<TWarehouseWarehousecheckitems> selectTWarehouseWarehousecheckitemsList(TWarehouseWarehousecheckitems tWarehouseWarehousecheckitems)
-    {
-        return tWarehouseWarehousecheckitemsMapper.selectTWarehouseWarehousecheckitemsList(tWarehouseWarehousecheckitems);
-    }
-
-    /**
-     * 新增巡检子
-     *
-     * @param tWarehouseWarehousecheckitems 巡检子
-     * @return 结果
-     */
-    @Override
-    public int insertTWarehouseWarehousecheckitems(TWarehouseWarehousecheckitems tWarehouseWarehousecheckitems)
-    {
-        tWarehouseWarehousecheckitems.setCreateTime(DateUtils.getNowDate());
-        return tWarehouseWarehousecheckitemsMapper.insertTWarehouseWarehousecheckitems(tWarehouseWarehousecheckitems);
-    }
-
-    /**
-     * 修改巡检子
-     *
-     * @param tWarehouseWarehousecheckitems 巡检子
-     * @return 结果
-     */
-    @Override
-    public int updateTWarehouseWarehousecheckitems(TWarehouseWarehousecheckitems tWarehouseWarehousecheckitems)
-    {
-        tWarehouseWarehousecheckitems.setUpdateTime(DateUtils.getNowDate());
-        return tWarehouseWarehousecheckitemsMapper.updateTWarehouseWarehousecheckitems(tWarehouseWarehousecheckitems);
-    }
-
-    /**
-     * 批量删除巡检子
-     *
-     * @param fIds 需要删除的巡检子ID
-     * @return 结果
-     */
-    @Override
-    public int deleteTWarehouseWarehousecheckitemsByIds(Long[] fIds)
-    {
-        return tWarehouseWarehousecheckitemsMapper.deleteTWarehouseWarehousecheckitemsByIds(fIds);
-    }
-
-    /**
-     * 删除巡检子信息
-     *
-     * @param fId 巡检子ID
-     * @return 结果
-     */
-    @Override
-    public int deleteTWarehouseWarehousecheckitemsById(Long fId)
-    {
-        return tWarehouseWarehousecheckitemsMapper.deleteTWarehouseWarehousecheckitemsById(fId);
-    }
-}

ruoyi-warehouse/src/main/resources/mapper/warehouse/TWarehouseCheckItemsDetailsMapper.xml

@@ -0,0 +1,97 @@
+<?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="com.ruoyi.warehouse.check.mapper.TWarehouseCheckItemsDetailsMapper">
+    
+    <resultMap type="TWarehouseCheckItemsDetails" id="TWarehouseCheckItemsDetailsResult">
+        <result property="fId"    column="f_id"    />
+        <result property="fCheckFid"    column="f_check_fid"    />
+        <result property="fItemFid"    column="f_item_fid"    />
+        <result property="fPhotoUrl"    column="f_photo_url"    />
+        <result property="fRemark"    column="f_remark"    />
+        <result property="fCreateBy"    column="f_create_by"    />
+        <result property="fCreateTime"    column="f_create_time"    />
+        <result property="fUpdateBy"    column="f_update_by"    />
+        <result property="fUpdateTime"    column="f_update_time"    />
+        <result property="fDelFlag"    column="f_del_flag"    />
+    </resultMap>
+
+    <sql id="selectTWarehouseCheckItemsDetailsVo">
+        select f_id, f_check_fid, f_item_fid, f_photo_url, f_remark, f_create_by, f_create_time, f_update_by, f_update_time, f_del_flag from t_warehouse_check_items_details
+    </sql>
+
+    <select id="selectTWarehouseCheckItemsDetailsList" parameterType="TWarehouseCheckItemsDetails" resultMap="TWarehouseCheckItemsDetailsResult">
+        <include refid="selectTWarehouseCheckItemsDetailsVo"/>
+        <where>  
+            <if test="fCheckFid != null "> and f_check_fid = #{fCheckFid}</if>
+            <if test="fItemFid != null "> and f_item_fid = #{fItemFid}</if>
+            <if test="fPhotoUrl != null  and fPhotoUrl != ''"> and f_photo_url = #{fPhotoUrl}</if>
+            <if test="fRemark != null  and fRemark != ''"> and f_remark = #{fRemark}</if>
+            <if test="fCreateBy != null "> and f_create_by = #{fCreateBy}</if>
+            <if test="fCreateTime != null "> and f_create_time = #{fCreateTime}</if>
+            <if test="fUpdateBy != null "> and f_update_by = #{fUpdateBy}</if>
+            <if test="fUpdateTime != null "> and f_update_time = #{fUpdateTime}</if>
+            <if test="fDelFlag != null "> and f_del_flag = #{fDelFlag}</if>
+        </where>
+    </select>
+    
+    <select id="selectTWarehouseCheckItemsDetailsById" parameterType="Long" resultMap="TWarehouseCheckItemsDetailsResult">
+        <include refid="selectTWarehouseCheckItemsDetailsVo"/>
+        where f_id = #{fId}
+    </select>
+        
+    <insert id="insertTWarehouseCheckItemsDetails" parameterType="TWarehouseCheckItemsDetails" useGeneratedKeys="true" keyProperty="fId">
+        insert into t_warehouse_check_items_details
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="fCheckFid != null">f_check_fid,</if>
+            <if test="fItemFid != null">f_item_fid,</if>
+            <if test="fPhotoUrl != null and fPhotoUrl != ''">f_photo_url,</if>
+            <if test="fRemark != null">f_remark,</if>
+            <if test="fCreateBy != null">f_create_by,</if>
+            <if test="fCreateTime != null">f_create_time,</if>
+            <if test="fUpdateBy != null">f_update_by,</if>
+            <if test="fUpdateTime != null">f_update_time,</if>
+            <if test="fDelFlag != null">f_del_flag,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="fCheckFid != null">#{fCheckFid},</if>
+            <if test="fItemFid != null">#{fItemFid},</if>
+            <if test="fPhotoUrl != null and fPhotoUrl != ''">#{fPhotoUrl},</if>
+            <if test="fRemark != null">#{fRemark},</if>
+            <if test="fCreateBy != null">#{fCreateBy},</if>
+            <if test="fCreateTime != null">#{fCreateTime},</if>
+            <if test="fUpdateBy != null">#{fUpdateBy},</if>
+            <if test="fUpdateTime != null">#{fUpdateTime},</if>
+            <if test="fDelFlag != null">#{fDelFlag},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTWarehouseCheckItemsDetails" parameterType="TWarehouseCheckItemsDetails">
+        update t_warehouse_check_items_details
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="fCheckFid != null">f_check_fid = #{fCheckFid},</if>
+            <if test="fItemFid != null">f_item_fid = #{fItemFid},</if>
+            <if test="fPhotoUrl != null and fPhotoUrl != ''">f_photo_url = #{fPhotoUrl},</if>
+            <if test="fRemark != null">f_remark = #{fRemark},</if>
+            <if test="fCreateBy != null">f_create_by = #{fCreateBy},</if>
+            <if test="fCreateTime != null">f_create_time = #{fCreateTime},</if>
+            <if test="fUpdateBy != null">f_update_by = #{fUpdateBy},</if>
+            <if test="fUpdateTime != null">f_update_time = #{fUpdateTime},</if>
+            <if test="fDelFlag != null">f_del_flag = #{fDelFlag},</if>
+        </trim>
+        where f_id = #{fId}
+    </update>
+
+    <delete id="deleteTWarehouseCheckItemsDetailsById" parameterType="Long">
+        delete from t_warehouse_check_items_details where f_id = #{fId}
+    </delete>
+
+    <delete id="deleteTWarehouseCheckItemsDetailsByIds" parameterType="String">
+        delete from t_warehouse_check_items_details where f_id in 
+        <foreach item="fId" collection="array" open="(" separator="," close=")">
+            #{fId}
+        </foreach>
+    </delete>
+    
+</mapper>

ruoyi-warehouse/src/main/resources/mapper/warehouse/TWarehouseCheckItemsMapper.xml

@@ -0,0 +1,145 @@
+<?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="com.ruoyi.warehouse.check.mapper.TWarehouseCheckItemsMapper">
+
+    <resultMap type="TWarehouseCheckItems" id="TWarehouseCheckItemsResult">
+        <result property="fId" column="f_id"/>
+        <result property="fCheckFid" column="f_check_fid"/>
+        <result property="fWarehouseFid" column="f_warehouse_fid"/>
+        <result property="fInspectionDatetime" column="f_inspection_datetime"/>
+        <result property="fInspectorId" column="f_inspector_id"/>
+        <result property="fInspectorIdLast" column="f_inspector_id_last"/>
+        <result property="fInspectorNameLast" column="f_inspector_name_last"/>
+        <result property="fInspectionDatetimeLast" column="f_inspection_datetime_last"/>
+        <result property="fRemark" column="f_remark"/>
+        <result property="fCreateBy" column="f_create_by"/>
+        <result property="fCreateTime" column="f_create_time"/>
+        <result property="fUpdateBy" column="f_update_by"/>
+        <result property="fUpdateTime" column="f_update_time"/>
+        <result property="fDelFlag" column="f_del_flag"/>
+        <result property="fInspectorName" column="f_inspector_name"/>
+        <result property="fCreateByName" column="f_create_by_name"/>
+        <result property="fUpdateByName" column="f_update_by_name"/>
+        <result property="fWarehouseName" column="f_warehouse_name"/>
+    </resultMap>
+
+    <sql id="selectTWarehouseCheckItemsVo">
+        select a.f_id,
+               a.f_check_fid,
+               a.f_warehouse_fid,
+               w.f_name                 as f_warehouse_name,
+               inspection.nick_name     as f_Inspector_name,
+               a.f_inspection_datetime,
+               a.f_inspector_id,
+               a.f_inspector_id_last,
+               inspectionlast.nick_name as f_inspector_name_last,
+               a.f_inspection_datetime_last,
+               a.f_remark,
+               a.f_create_by,
+               a.f_create_time,
+               a.f_update_by,
+               a.f_update_time,
+               a.f_del_flag,
+               createby.nick_name       as f_create_by_name,
+               updateby.nick_name       as f_update_by_name
+        from t_warehouse_check_items a
+                 left join t_warehouse_check ch on ch.f_id = a.f_check_fid
+                 left join sys_user inspection on inspection.user_id = a.f_inspector_id
+                 left join sys_user inspectionlast on inspectionlast.user_id = a.f_inspector_id_last
+                 left join sys_user createby on createby.user_id = a.f_create_by
+                 left join sys_user updateby on updateby.user_id = a.f_update_by
+                 left join t_warehouse w on w.f_id = a.f_warehouse_fid
+    </sql>
+
+    <select id="selectTWarehouseCheckItemsList" parameterType="TWarehouseCheckItems"
+            resultMap="TWarehouseCheckItemsResult">
+        <include refid="selectTWarehouseCheckItemsVo"/>
+        <where>
+            <if test="fCheckFid != null ">and f_check_fid = #{fCheckFid}</if>
+            <if test="fWarehouseFid != null ">and a.f_warehouse_fid = #{fWarehouseFid}</if>
+            <if test="fInspectionDatetime != null ">and f_inspection_datetime = #{fInspectionDatetime}</if>
+            <if test="fInspectorId != null ">and a.f_inspector_id = #{fInspectorId}</if>
+            <if test="fInspectorIdLast != null ">and a.f_inspector_id_last = #{fInspectorIdLast}</if>
+            <if test="fInspectionDatetimeLast != null ">and a.f_inspection_datetime_last = #{fInspectionDatetimeLast}</if>
+            <if test="fRemark != null  and fRemark != ''">and a.f_remark = #{fRemark}</if>
+            <if test="fCreateBy != null ">and a.f_create_by = #{fCreateBy}</if>
+            <if test="fCreateTime != null ">and a.f_create_time = #{fCreateTime}</if>
+            <if test="fUpdateBy != null ">and a.f_update_by = #{fUpdateBy}</if>
+            <if test="fUpdateTime != null ">and a.f_update_time = #{fUpdateTime}</if>
+            <if test="fDelFlag != null ">and a.f_del_flag = #{fDelFlag}</if>
+        </where>
+    </select>
+
+    <select id="selectTWarehouseCheckItemsById" parameterType="Long" resultMap="TWarehouseCheckItemsResult">
+        <include refid="selectTWarehouseCheckItemsVo"/>
+        where a.f_id = #{fId}
+    </select>
+
+    <insert id="insertTWarehouseCheckItems" parameterType="TWarehouseCheckItems" useGeneratedKeys="true"
+            keyProperty="fId">
+        insert into t_warehouse_check_items
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="fCheckFid != null">f_check_fid,</if>
+            <if test="fWarehouseFid != null">f_warehouse_fid,</if>
+            <if test="fInspectionDatetime != null">f_inspection_datetime,</if>
+            <if test="fInspectorId != null">f_inspector_id,</if>
+            <if test="fInspectorIdLast != null">f_inspector_id_last,</if>
+            <if test="fInspectionDatetimeLast != null">f_inspection_datetime_last,</if>
+            <if test="fRemark != null">f_remark,</if>
+            <if test="fCreateBy != null">f_create_by,</if>
+            <if test="fCreateTime != null">f_create_time,</if>
+            <if test="fUpdateBy != null">f_update_by,</if>
+            <if test="fUpdateTime != null">f_update_time,</if>
+            <if test="fDelFlag != null">f_del_flag,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="fCheckFid != null">#{fCheckFid},</if>
+            <if test="fWarehouseFid != null">#{fWarehouseFid},</if>
+            <if test="fInspectionDatetime != null">#{fInspectionDatetime},</if>
+            <if test="fInspectorId != null">#{fInspectorId},</if>
+            <if test="fInspectorIdLast != null">#{fInspectorIdLast},</if>
+            <if test="fInspectionDatetimeLast != null">#{fInspectionDatetimeLast},</if>
+            <if test="fRemark != null">#{fRemark},</if>
+            <if test="fCreateBy != null">#{fCreateBy},</if>
+            <if test="fCreateTime != null">#{fCreateTime},</if>
+            <if test="fUpdateBy != null">#{fUpdateBy},</if>
+            <if test="fUpdateTime != null">#{fUpdateTime},</if>
+            <if test="fDelFlag != null">#{fDelFlag},</if>
+        </trim>
+    </insert>
+
+    <update id="updateTWarehouseCheckItems" parameterType="TWarehouseCheckItems">
+        update t_warehouse_check_items
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="fCheckFid != null">f_check_fid = #{fCheckFid},</if>
+            <if test="fWarehouseFid != null">f_warehouse_fid = #{fWarehouseFid},</if>
+            <if test="fInspectionDatetime != null">f_inspection_datetime = #{fInspectionDatetime},</if>
+            <if test="fInspectorId != null">f_inspector_id = #{fInspectorId},</if>
+            <if test="fInspectorIdLast != null">f_inspector_id_last = #{fInspectorIdLast},</if>
+            <if test="fInspectionDatetimeLast != null">f_inspection_datetime_last = #{fInspectionDatetimeLast},</if>
+            <if test="fRemark != null">f_remark = #{fRemark},</if>
+            <if test="fCreateBy != null">f_create_by = #{fCreateBy},</if>
+            <if test="fCreateTime != null">f_create_time = #{fCreateTime},</if>
+            <if test="fUpdateBy != null">f_update_by = #{fUpdateBy},</if>
+            <if test="fUpdateTime != null">f_update_time = #{fUpdateTime},</if>
+            <if test="fDelFlag != null">f_del_flag = #{fDelFlag},</if>
+        </trim>
+        where f_id = #{fId}
+    </update>
+
+    <delete id="deleteTWarehouseCheckItemsById" parameterType="Long">
+        delete
+        from t_warehouse_check_items
+        where f_id = #{fId}
+    </delete>
+
+    <delete id="deleteTWarehouseCheckItemsByIds" parameterType="String">
+        delete from t_warehouse_check_items where f_id in
+        <foreach item="fId" collection="array" open="(" separator="," close=")">
+            #{fId}
+        </foreach>
+    </delete>
+
+</mapper>

ruoyi-warehouse/src/main/resources/mapper/warehouse/TWarehouseCheckMapper.xml

@@ -0,0 +1,187 @@
+<?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="com.ruoyi.warehouse.check.mapper.TWarehouseCheckMapper">
+
+    <resultMap type="TWarehouseCheck" id="TWarehouseCheckResult">
+        <result property="fId" column="f_id"/>
+        <result property="fWarehouseFid" column="f_warehouse_fid"/>
+        <result property="fWarehouseName" column="f_warehouse_name"/>
+        <result property="fInspectorId" column="f_inspector_id"/>
+        <result property="fInspectorName" column="f_inspector_name"/>
+        <result property="fSystemNo" column="f_system_no"/>
+        <result property="fInspectorBeginDatetime" column="f_inspector_begin_datetime"/>
+        <result property="fInspectorEndDatetime" column="f_inspector_end_datetime"/>
+        <result property="fRemark" column="f_remark"/>
+        <result property="fCreateBy" column="f_create_by"/>
+        <result property="fCreateByName" column="f_create_by_name"/>
+        <result property="fCreateTime" column="f_create_time"/>
+        <result property="fUpdateBy" column="f_update_by"/>
+        <result property="fUpdateByName" column="f_update_by_name"/>
+        <result property="fUpdateTime" column="f_update_time"/>
+        <result property="fDelFlag" column="f_del_flag"/>
+    </resultMap>
+
+    <sql id="selectTWarehouseCheckVo">
+        select a.f_id,
+               f_warehouse_fid,
+               f_inspector_id,
+               f_system_no,
+               a.f_inspector_begin_datetime,
+               a.f_inspector_end_datetime,
+               a.f_remark,
+               a.f_create_by,
+               a.f_create_time,
+               a.f_update_by,
+               a.f_update_time,
+               a.f_del_flag,
+               b.f_name            as f_warehouse_name,
+               inspector.nick_name as f_inspector_name,
+               createby.nick_name  as f_create_by_name,
+               updateby.nick_name  as f_update_by_name
+        from t_warehouse_check a
+                 left join t_warehouse b on a.f_warehouse_fid = b.f_id
+                 left join sys_user inspector on inspector.user_id = a.f_inspector_id
+                 left join sys_user createby on createby.user_id = a.f_create_by
+                 left join sys_user updateby on updateby.user_id = a.f_update_by
+    </sql>
+
+    <sql id="selectTWarehouseVo">
+        select f_id,
+               parent_id,
+               ancestors,
+               order_num,
+               f_no,
+               f_name,
+               f_addr,
+               f_totalgross,
+               f_contacts,
+               f_tel,
+               f_charg,
+               f_status,
+               del_flag,
+               create_by,
+               create_time,
+               update_by,
+               update_time,
+               remark,
+               f_location,
+               f_warehouse_information
+        from t_warehouse
+        where f_id in (select f_warehouse_fid from t_warehouse_check)
+    </sql>
+
+    <resultMap type="TWarehouse" id="TWarehouseResult">
+        <result property="fId" column="f_id"/>
+        <result property="parentId" column="parent_id"/>
+        <result property="ancestors" column="ancestors"/>
+        <result property="orderNum" column="order_num"/>
+        <result property="fNo" column="f_no"/>
+        <result property="fName" column="f_name"/>
+        <result property="fAddr" column="f_addr"/>
+        <result property="fTotalgross" column="f_totalgross"/>
+        <result property="fContacts" column="f_contacts"/>
+        <result property="fTel" column="f_tel"/>
+        <result property="fCharg" column="f_charg"/>
+        <result property="fStatus" column="f_status"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
+        <result property="fLocation" column="f_location"/>
+        <result property="fWarehouseInformation" column="f_warehouse_information"/>
+    </resultMap>
+
+
+    <select id="selectTWarehouseCheckList" parameterType="TWarehouseCheck" resultMap="TWarehouseCheckResult">
+        <include refid="selectTWarehouseCheckVo"/>
+        <where>
+            <if test="fWarehouseFid != null ">and f_warehouse_fid = #{fWarehouseFid}</if>
+            <if test="fInspectorId != null ">and f_inspector_id = #{fInspectorId}</if>
+            <if test="fSystemNo != null  and fSystemNo != ''">and f_system_no = #{fSystemNo}</if>
+            <if test="fInspectorBeginDatetime != null ">and f_inspector_begin_datetime = #{fInspectorBeginDatetime}</if>
+            <if test="fInspectorEndDatetime != null ">and f_inspector_end_datetime = #{fInspectorEndDatetime}</if>
+            <if test="fRemark != null  and fRemark != ''">and f_remark = #{fRemark}</if>
+            <if test="fCreateBy != null ">and f_create_by = #{fCreateBy}</if>
+            <if test="fCreateTime != null ">and f_create_time = #{fCreateTime}</if>
+            <if test="fUpdateBy != null ">and f_update_by = #{fUpdateBy}</if>
+            <if test="fUpdateTime != null ">and f_update_time = #{fUpdateTime}</if>
+            <if test="fDelFlag != null ">and f_del_flag = #{fDelFlag}</if>
+        </where>
+    </select>
+
+    <select id="selectTWarehouseListInCheck" parameterType="TWarehouse" resultMap="TWarehouseResult">
+        <include refid="selectTWarehouseVo"/>
+    </select>
+
+
+    <select id="selectTWarehouseCheckById" parameterType="Long" resultMap="TWarehouseCheckResult">
+        <include refid="selectTWarehouseCheckVo"/>
+        where a.f_id = #{fId}
+    </select>
+
+    <insert id="insertTWarehouseCheck" parameterType="TWarehouseCheck" useGeneratedKeys="true" keyProperty="fId">
+        insert into t_warehouse_check
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="fWarehouseFid != null">f_warehouse_fid,</if>
+            <if test="fInspectorId != null">f_inspector_id,</if>
+            <if test="fSystemNo != null and fSystemNo != ''">f_system_no,</if>
+            <if test="fInspectorBeginDatetime != null">f_inspector_begin_datetime,</if>
+            <if test="fInspectorEndDatetime != null">f_inspector_end_datetime,</if>
+            <if test="fRemark != null">f_remark,</if>
+            <if test="fCreateBy != null">f_create_by,</if>
+            <if test="fCreateTime != null">f_create_time,</if>
+            <if test="fUpdateBy != null">f_update_by,</if>
+            <if test="fUpdateTime != null">f_update_time,</if>
+            <if test="fDelFlag != null">f_del_flag,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="fWarehouseFid != null">#{fWarehouseFid},</if>
+            <if test="fInspectorId != null">#{fInspectorId},</if>
+            <if test="fSystemNo != null and fSystemNo != ''">#{fSystemNo},</if>
+            <if test="fInspectorBeginDatetime != null">#{fInspectorBeginDatetime},</if>
+            <if test="fInspectorEndDatetime != null">#{fInspectorEndDatetime},</if>
+            <if test="fRemark != null">#{fRemark},</if>
+            <if test="fCreateBy != null">#{fCreateBy},</if>
+            <if test="fCreateTime != null">#{fCreateTime},</if>
+            <if test="fUpdateBy != null">#{fUpdateBy},</if>
+            <if test="fUpdateTime != null">#{fUpdateTime},</if>
+            <if test="fDelFlag != null">#{fDelFlag},</if>
+        </trim>
+    </insert>
+
+    <update id="updateTWarehouseCheck" parameterType="TWarehouseCheck">
+        update t_warehouse_check
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="fWarehouseFid != null">f_warehouse_fid = #{fWarehouseFid},</if>
+            <if test="fInspectorId != null">f_inspector_id = #{fInspectorId},</if>
+            <if test="fSystemNo != null and fSystemNo != ''">f_system_no = #{fSystemNo},</if>
+            <if test="fInspectorBeginDatetime != null">f_inspector_begin_datetime = #{fInspectorBeginDatetime},</if>
+            <if test="fInspectorEndDatetime != null">f_inspector_end_datetime = #{fInspectorEndDatetime},</if>
+            <if test="fRemark != null">f_remark = #{fRemark},</if>
+            <if test="fCreateBy != null">f_create_by = #{fCreateBy},</if>
+            <if test="fCreateTime != null">f_create_time = #{fCreateTime},</if>
+            <if test="fUpdateBy != null">f_update_by = #{fUpdateBy},</if>
+            <if test="fUpdateTime != null">f_update_time = #{fUpdateTime},</if>
+            <if test="fDelFlag != null">f_del_flag = #{fDelFlag},</if>
+        </trim>
+        where f_id = #{fId}
+    </update>
+
+    <delete id="deleteTWarehouseCheckById" parameterType="Long">
+        delete
+        from t_warehouse_check
+        where f_id = #{fId}
+    </delete>
+
+    <delete id="deleteTWarehouseCheckByIds" parameterType="String">
+        delete from t_warehouse_check where f_id in
+        <foreach item="fId" collection="array" open="(" separator="," close=")">
+            #{fId}
+        </foreach>
+    </delete>
+
+</mapper>

ruoyi-warehouse/src/main/resources/mapper/warehouseBusiness/TWarehouseWarehousecheckMapper.xml

@@ -1,116 +0,0 @@
-<?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="com.ruoyi.warehouseBusiness.mapper.TWarehouseWarehousecheckMapper">
-
-    <resultMap type="TWarehouseWarehousecheck" id="TWarehouseWarehousecheckResult">
-        <result property="fId"    column="f_id"    />
-        <result property="fWarehouseid"    column="f_warehouseid"    />
-        <result property="fWarehousename"    column="f_warehousename"    />
-        <result property="plannedDate"    column="planned_date"    />
-        <result property="inspectionDate"    column="inspection_date"    />
-        <result property="inspector"    column="inspector"    />
-        <result property="inspectionRemark"    column="inspection_remark"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="delFlag"    column="del_flag"    />
-        <result property="remark"    column="remark"    />
-    </resultMap>
-
-    <sql id="selectTWarehouseWarehousecheckVo">
-        select f_id, f_warehouseid, f_warehousename, planned_date, inspection_date, inspector, inspection_remark, create_by, create_time, update_by, update_time, del_flag, remark from t_warehouse_warehousecheck
-    </sql>
-
-    <select id="selectTWarehouseWarehousecheckList" parameterType="TWarehouseWarehousecheck" resultMap="TWarehouseWarehousecheckResult">
-        <include refid="selectTWarehouseWarehousecheckVo"/>
-        <where>
-            del_flag = '1'
-            <if test="fWarehouseid != null  and fWarehouseid != ''"> and f_warehouseid = #{fWarehouseid}</if>
-            <if test="fWarehousename != null  and fWarehousename != ''"> and f_warehousename like concat('%', #{fWarehousename}, '%')</if>
-            <if test="plannedDate != null "> and planned_date = #{plannedDate}</if>
-            <if test="inspectionDate != null "> and inspection_date = #{inspectionDate}</if>
-            <if test="inspector != null  and inspector != ''"> and inspector = #{inspector}</if>
-            <if test="inspectionRemark != null  and inspectionRemark != ''"> and inspection_remark = #{inspectionRemark}</if>
-        </where>
-    </select>
-
-
-    <select id="selectTWarehouseWarehousecheckById" parameterType="Long" resultMap="TWarehouseWarehousecheckResult">
-        <include refid="selectTWarehouseWarehousecheckVo"/>
-        where f_id = #{fId}
-    </select>
-
-    <insert id="insertTWarehouseWarehousecheck" parameterType="TWarehouseWarehousecheck" useGeneratedKeys="true" keyProperty="fId">
-        insert into t_warehouse_warehousecheck
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="fWarehouseid != null">f_warehouseid,</if>
-            <if test="fWarehousename != null">f_warehousename,</if>
-            <if test="plannedDate != null">planned_date,</if>
-            <if test="inspectionDate != null">inspection_date,</if>
-            <if test="inspector != null">inspector,</if>
-            <if test="inspectionRemark != null">inspection_remark,</if>
-            <if test="createBy != null">create_by,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateBy != null">update_by,</if>
-            <if test="updateTime != null">update_time,</if>
-            <if test="delFlag != null">del_flag,</if>
-            <if test="remark != null">remark,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="fWarehouseid != null">#{fWarehouseid},</if>
-            <if test="fWarehousename != null">#{fWarehousename},</if>
-            <if test="plannedDate != null">#{plannedDate},</if>
-            <if test="inspectionDate != null">#{inspectionDate},</if>
-            <if test="inspector != null">#{inspector},</if>
-            <if test="inspectionRemark != null">#{inspectionRemark},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-            <if test="delFlag != null">#{delFlag},</if>
-            <if test="remark != null">#{remark},</if>
-         </trim>
-    </insert>
-
-    <update id="updateTWarehouseWarehousecheck" parameterType="TWarehouseWarehousecheck">
-        update t_warehouse_warehousecheck
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="fWarehouseid != null">f_warehouseid = #{fWarehouseid},</if>
-            <if test="fWarehousename != null">f_warehousename = #{fWarehousename},</if>
-            <if test="plannedDate != null">planned_date = #{plannedDate},</if>
-            <if test="inspectionDate != null">inspection_date = #{inspectionDate},</if>
-            <if test="inspector != null">inspector = #{inspector},</if>
-            <if test="inspectionRemark != null">inspection_remark = #{inspectionRemark},</if>
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="delFlag != null">del_flag = #{delFlag},</if>
-            <if test="remark != null">remark = #{remark},</if>
-        </trim>
-        where f_id = #{fId}
-    </update>
-
-    <delete id="deleteTWarehouseWarehousecheckById" parameterType="Long">
-        delete from t_warehouse_warehousecheck where f_id = #{fId}
-    </delete>
-
-    <delete id="deleteTWarehouseWarehousecheckByIds" parameterType="String">
-        delete from t_warehouse_warehousecheck where f_id in
-        <foreach item="fId" collection="array" open="(" separator="," close=")">
-            #{fId}
-        </foreach>
-    </delete>
-    <update id="updateTWarehouseWarehousecheckById" parameterType="TWarehouseWarehousecheck">
-        update t_warehouse_warehousecheck
-         set del_flag = '1'
-        where f_id in
-        <foreach item="fId" collection="array" open="(" separator="," close=")">
-            #{fId}
-        </foreach>
-    </update>
-
-</mapper>

ruoyi-warehouse/src/main/resources/mapper/warehouseBusiness/TWarehouseWarehousecheckitemsMapper.xml

@@ -1,126 +0,0 @@
-<?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="com.ruoyi.warehouseBusiness.mapper.TWarehouseWarehousecheckitemsMapper">
-    <resultMap type="TWarehouseWarehousecheckitems" id="TWarehouseWarehousecheckitemsResult">
-        <result property="fId"    column="f_id"    />
-        <result property="fPid"    column="f_pid"    />
-        <result property="fWarehouseid"    column="f_warehouseid"    />
-        <result property="fWarehousename"    column="f_warehousename"    />
-        <result property="inspectionPhotos"    column="inspection_photos"    />
-        <result property="plannedDate"    column="planned_date"    />
-        <result property="inspectionDate"    column="inspection_date"    />
-        <result property="inspector"    column="inspector"    />
-        <result property="inspectionRemark"    column="inspection_remark"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="delFlag"    column="del_flag"    />
-        <result property="remark"    column="remark"    />
-    </resultMap>
-
-    <sql id="selectTWarehouseWarehousecheckitemsVo">
-        select f_id, f_pid, f_warehouseid, f_warehousename, inspection_photos, planned_date, inspection_date, inspector, inspection_remark, create_by, create_time, update_by, update_time, del_flag, remark from t_warehouse_warehousecheckitems
-    </sql>
-
-    <select id="selectTWarehouseWarehousecheckitemsList" parameterType="TWarehouseWarehousecheckitems" resultMap="TWarehouseWarehousecheckitemsResult">
-        <include refid="selectTWarehouseWarehousecheckitemsVo"/>
-        <where>
-            del_flag = '0'
-            <if test="fPid != null "> and f_pid = #{fPid}</if>
-            <if test="fWarehouseid != null  and fWarehouseid != ''"> and f_warehouseid = #{fWarehouseid}</if>
-            <if test="fWarehousename != null  and fWarehousename != ''"> and f_warehousename like concat('%', #{fWarehousename}, '%')</if>
-            <if test="inspectionPhotos != null  and inspectionPhotos != ''"> and inspection_photos = #{inspectionPhotos}</if>
-            <if test="plannedDate != null "> and planned_date = #{plannedDate}</if>
-            <if test="inspectionDate != null "> and inspection_date = #{inspectionDate}</if>
-            <if test="inspector != null  and inspector != ''"> and inspector = #{inspector}</if>
-            <if test="inspectionRemark != null  and inspectionRemark != ''"> and inspection_remark = #{inspectionRemark}</if>
-        </where>
-    </select>
-
-    <select id="selectTWarehouseWarehousecheckitemsById" parameterType="Long" resultMap="TWarehouseWarehousecheckitemsResult">
-        <include refid="selectTWarehouseWarehousecheckitemsVo"/>
-        where f_id = #{fId}
-    </select>
-
-    <insert id="insertTWarehouseWarehousecheckitems" parameterType="TWarehouseWarehousecheckitems" useGeneratedKeys="true" keyProperty="fId">
-        insert into t_warehouse_warehousecheckitems
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="fPid != null">f_pid,</if>
-            <if test="fWarehouseid != null">f_warehouseid,</if>
-            <if test="fWarehousename != null">f_warehousename,</if>
-            <if test="inspectionPhotos != null">inspection_photos,</if>
-            <if test="plannedDate != null">planned_date,</if>
-            <if test="inspectionDate != null">inspection_date,</if>
-            <if test="inspector != null">inspector,</if>
-            <if test="inspectionRemark != null">inspection_remark,</if>
-            <if test="createBy != null">create_by,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateBy != null">update_by,</if>
-            <if test="updateTime != null">update_time,</if>
-            <if test="delFlag != null">del_flag,</if>
-            <if test="remark != null">remark,</if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="fPid != null">#{fPid},</if>
-            <if test="fWarehouseid != null">#{fWarehouseid},</if>
-            <if test="fWarehousename != null">#{fWarehousename},</if>
-            <if test="inspectionPhotos != null">#{inspectionPhotos},</if>
-            <if test="plannedDate != null">#{plannedDate},</if>
-            <if test="inspectionDate != null">#{inspectionDate},</if>
-            <if test="inspector != null">#{inspector},</if>
-            <if test="inspectionRemark != null">#{inspectionRemark},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-            <if test="delFlag != null">#{delFlag},</if>
-            <if test="remark != null">#{remark},</if>
-        </trim>
-    </insert>
-
-    <update id="updateTWarehouseWarehousecheckitems" parameterType="TWarehouseWarehousecheckitems">
-        update t_warehouse_warehousecheckitems
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="fPid != null">f_pid = #{fPid},</if>
-            <if test="fWarehouseid != null">f_warehouseid = #{fWarehouseid},</if>
-            <if test="fWarehousename != null">f_warehousename = #{fWarehousename},</if>
-            <if test="inspectionPhotos != null">inspection_photos = #{inspectionPhotos},</if>
-            <if test="plannedDate != null">planned_date = #{plannedDate},</if>
-            <if test="inspectionDate != null">inspection_date = #{inspectionDate},</if>
-            <if test="inspector != null">inspector = #{inspector},</if>
-            <if test="inspectionRemark != null">inspection_remark = #{inspectionRemark},</if>
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="delFlag != null">del_flag = #{delFlag},</if>
-            <if test="remark != null">remark = #{remark},</if>
-        </trim>
-        where f_id = #{fId}
-    </update>
-
-    <delete id="deleteTWarehouseWarehousecheckitemsById" parameterType="Long">
-        delete from t_warehouse_warehousecheckitems where f_id = #{fId}
-    </delete>
-
-    <delete id="deleteTWarehouseWarehousecheckitemsByIds" parameterType="String">
-        delete from t_warehouse_warehousecheckitems where f_id in
-        <foreach item="fId" collection="array" open="(" separator="," close=")">
-            #{fId}
-        </foreach>
-    </delete>
-    <update id="updateTWarehouseWarehousecheckitemsById" parameterType="TWarehouseWarehousecheckitems">
-        update t_warehouse_warehousecheckitems
-        set
-            del_flag = '1'
-        where f_pid in
-        <foreach item="fId" collection="array" open="(" separator="," close=")">
-            #{fId}
-        </foreach>
-    </update>
-
-</mapper>

ruoyi-warehouse/target/classes/mapper/warehouseBusiness/TWarehouseWarehousecheckMapper.xml

@@ -1,116 +0,0 @@
-<?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="com.ruoyi.warehouseBusiness.mapper.TWarehouseWarehousecheckMapper">
-
-    <resultMap type="TWarehouseWarehousecheck" id="TWarehouseWarehousecheckResult">
-        <result property="fId"    column="f_id"    />
-        <result property="fWarehouseid"    column="f_warehouseid"    />
-        <result property="fWarehousename"    column="f_warehousename"    />
-        <result property="plannedDate"    column="planned_date"    />
-        <result property="inspectionDate"    column="inspection_date"    />
-        <result property="inspector"    column="inspector"    />
-        <result property="inspectionRemark"    column="inspection_remark"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="delFlag"    column="del_flag"    />
-        <result property="remark"    column="remark"    />
-    </resultMap>
-
-    <sql id="selectTWarehouseWarehousecheckVo">
-        select f_id, f_warehouseid, f_warehousename, planned_date, inspection_date, inspector, inspection_remark, create_by, create_time, update_by, update_time, del_flag, remark from t_warehouse_warehousecheck
-    </sql>
-
-    <select id="selectTWarehouseWarehousecheckList" parameterType="TWarehouseWarehousecheck" resultMap="TWarehouseWarehousecheckResult">
-        <include refid="selectTWarehouseWarehousecheckVo"/>
-        <where>
-            del_flag = '1'
-            <if test="fWarehouseid != null  and fWarehouseid != ''"> and f_warehouseid = #{fWarehouseid}</if>
-            <if test="fWarehousename != null  and fWarehousename != ''"> and f_warehousename like concat('%', #{fWarehousename}, '%')</if>
-            <if test="plannedDate != null "> and planned_date = #{plannedDate}</if>
-            <if test="inspectionDate != null "> and inspection_date = #{inspectionDate}</if>
-            <if test="inspector != null  and inspector != ''"> and inspector = #{inspector}</if>
-            <if test="inspectionRemark != null  and inspectionRemark != ''"> and inspection_remark = #{inspectionRemark}</if>
-        </where>
-    </select>
-
-
-    <select id="selectTWarehouseWarehousecheckById" parameterType="Long" resultMap="TWarehouseWarehousecheckResult">
-        <include refid="selectTWarehouseWarehousecheckVo"/>
-        where f_id = #{fId}
-    </select>
-
-    <insert id="insertTWarehouseWarehousecheck" parameterType="TWarehouseWarehousecheck" useGeneratedKeys="true" keyProperty="fId">
-        insert into t_warehouse_warehousecheck
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="fWarehouseid != null">f_warehouseid,</if>
-            <if test="fWarehousename != null">f_warehousename,</if>
-            <if test="plannedDate != null">planned_date,</if>
-            <if test="inspectionDate != null">inspection_date,</if>
-            <if test="inspector != null">inspector,</if>
-            <if test="inspectionRemark != null">inspection_remark,</if>
-            <if test="createBy != null">create_by,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateBy != null">update_by,</if>
-            <if test="updateTime != null">update_time,</if>
-            <if test="delFlag != null">del_flag,</if>
-            <if test="remark != null">remark,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="fWarehouseid != null">#{fWarehouseid},</if>
-            <if test="fWarehousename != null">#{fWarehousename},</if>
-            <if test="plannedDate != null">#{plannedDate},</if>
-            <if test="inspectionDate != null">#{inspectionDate},</if>
-            <if test="inspector != null">#{inspector},</if>
-            <if test="inspectionRemark != null">#{inspectionRemark},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-            <if test="delFlag != null">#{delFlag},</if>
-            <if test="remark != null">#{remark},</if>
-         </trim>
-    </insert>
-
-    <update id="updateTWarehouseWarehousecheck" parameterType="TWarehouseWarehousecheck">
-        update t_warehouse_warehousecheck
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="fWarehouseid != null">f_warehouseid = #{fWarehouseid},</if>
-            <if test="fWarehousename != null">f_warehousename = #{fWarehousename},</if>
-            <if test="plannedDate != null">planned_date = #{plannedDate},</if>
-            <if test="inspectionDate != null">inspection_date = #{inspectionDate},</if>
-            <if test="inspector != null">inspector = #{inspector},</if>
-            <if test="inspectionRemark != null">inspection_remark = #{inspectionRemark},</if>
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="delFlag != null">del_flag = #{delFlag},</if>
-            <if test="remark != null">remark = #{remark},</if>
-        </trim>
-        where f_id = #{fId}
-    </update>
-
-    <delete id="deleteTWarehouseWarehousecheckById" parameterType="Long">
-        delete from t_warehouse_warehousecheck where f_id = #{fId}
-    </delete>
-
-    <delete id="deleteTWarehouseWarehousecheckByIds" parameterType="String">
-        delete from t_warehouse_warehousecheck where f_id in
-        <foreach item="fId" collection="array" open="(" separator="," close=")">
-            #{fId}
-        </foreach>
-    </delete>
-    <update id="updateTWarehouseWarehousecheckById" parameterType="TWarehouseWarehousecheck">
-        update t_warehouse_warehousecheck
-         set del_flag = '1'
-        where f_id in
-        <foreach item="fId" collection="array" open="(" separator="," close=")">
-            #{fId}
-        </foreach>
-    </update>
-
-</mapper>

ruoyi-warehouse/target/classes/mapper/warehouseBusiness/TWarehouseWarehousecheckitemsMapper.xml

@@ -1,126 +0,0 @@
-<?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="com.ruoyi.warehouseBusiness.mapper.TWarehouseWarehousecheckitemsMapper">
-    <resultMap type="TWarehouseWarehousecheckitems" id="TWarehouseWarehousecheckitemsResult">
-        <result property="fId"    column="f_id"    />
-        <result property="fPid"    column="f_pid"    />
-        <result property="fWarehouseid"    column="f_warehouseid"    />
-        <result property="fWarehousename"    column="f_warehousename"    />
-        <result property="inspectionPhotos"    column="inspection_photos"    />
-        <result property="plannedDate"    column="planned_date"    />
-        <result property="inspectionDate"    column="inspection_date"    />
-        <result property="inspector"    column="inspector"    />
-        <result property="inspectionRemark"    column="inspection_remark"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="delFlag"    column="del_flag"    />
-        <result property="remark"    column="remark"    />
-    </resultMap>
-
-    <sql id="selectTWarehouseWarehousecheckitemsVo">
-        select f_id, f_pid, f_warehouseid, f_warehousename, inspection_photos, planned_date, inspection_date, inspector, inspection_remark, create_by, create_time, update_by, update_time, del_flag, remark from t_warehouse_warehousecheckitems
-    </sql>
-
-    <select id="selectTWarehouseWarehousecheckitemsList" parameterType="TWarehouseWarehousecheckitems" resultMap="TWarehouseWarehousecheckitemsResult">
-        <include refid="selectTWarehouseWarehousecheckitemsVo"/>
-        <where>
-            del_flag = '0'
-            <if test="fPid != null "> and f_pid = #{fPid}</if>
-            <if test="fWarehouseid != null  and fWarehouseid != ''"> and f_warehouseid = #{fWarehouseid}</if>
-            <if test="fWarehousename != null  and fWarehousename != ''"> and f_warehousename like concat('%', #{fWarehousename}, '%')</if>
-            <if test="inspectionPhotos != null  and inspectionPhotos != ''"> and inspection_photos = #{inspectionPhotos}</if>
-            <if test="plannedDate != null "> and planned_date = #{plannedDate}</if>
-            <if test="inspectionDate != null "> and inspection_date = #{inspectionDate}</if>
-            <if test="inspector != null  and inspector != ''"> and inspector = #{inspector}</if>
-            <if test="inspectionRemark != null  and inspectionRemark != ''"> and inspection_remark = #{inspectionRemark}</if>
-        </where>
-    </select>
-
-    <select id="selectTWarehouseWarehousecheckitemsById" parameterType="Long" resultMap="TWarehouseWarehousecheckitemsResult">
-        <include refid="selectTWarehouseWarehousecheckitemsVo"/>
-        where f_id = #{fId}
-    </select>
-
-    <insert id="insertTWarehouseWarehousecheckitems" parameterType="TWarehouseWarehousecheckitems" useGeneratedKeys="true" keyProperty="fId">
-        insert into t_warehouse_warehousecheckitems
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="fPid != null">f_pid,</if>
-            <if test="fWarehouseid != null">f_warehouseid,</if>
-            <if test="fWarehousename != null">f_warehousename,</if>
-            <if test="inspectionPhotos != null">inspection_photos,</if>
-            <if test="plannedDate != null">planned_date,</if>
-            <if test="inspectionDate != null">inspection_date,</if>
-            <if test="inspector != null">inspector,</if>
-            <if test="inspectionRemark != null">inspection_remark,</if>
-            <if test="createBy != null">create_by,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateBy != null">update_by,</if>
-            <if test="updateTime != null">update_time,</if>
-            <if test="delFlag != null">del_flag,</if>
-            <if test="remark != null">remark,</if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="fPid != null">#{fPid},</if>
-            <if test="fWarehouseid != null">#{fWarehouseid},</if>
-            <if test="fWarehousename != null">#{fWarehousename},</if>
-            <if test="inspectionPhotos != null">#{inspectionPhotos},</if>
-            <if test="plannedDate != null">#{plannedDate},</if>
-            <if test="inspectionDate != null">#{inspectionDate},</if>
-            <if test="inspector != null">#{inspector},</if>
-            <if test="inspectionRemark != null">#{inspectionRemark},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-            <if test="delFlag != null">#{delFlag},</if>
-            <if test="remark != null">#{remark},</if>
-        </trim>
-    </insert>
-
-    <update id="updateTWarehouseWarehousecheckitems" parameterType="TWarehouseWarehousecheckitems">
-        update t_warehouse_warehousecheckitems
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="fPid != null">f_pid = #{fPid},</if>
-            <if test="fWarehouseid != null">f_warehouseid = #{fWarehouseid},</if>
-            <if test="fWarehousename != null">f_warehousename = #{fWarehousename},</if>
-            <if test="inspectionPhotos != null">inspection_photos = #{inspectionPhotos},</if>
-            <if test="plannedDate != null">planned_date = #{plannedDate},</if>
-            <if test="inspectionDate != null">inspection_date = #{inspectionDate},</if>
-            <if test="inspector != null">inspector = #{inspector},</if>
-            <if test="inspectionRemark != null">inspection_remark = #{inspectionRemark},</if>
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="delFlag != null">del_flag = #{delFlag},</if>
-            <if test="remark != null">remark = #{remark},</if>
-        </trim>
-        where f_id = #{fId}
-    </update>
-
-    <delete id="deleteTWarehouseWarehousecheckitemsById" parameterType="Long">
-        delete from t_warehouse_warehousecheckitems where f_id = #{fId}
-    </delete>
-
-    <delete id="deleteTWarehouseWarehousecheckitemsByIds" parameterType="String">
-        delete from t_warehouse_warehousecheckitems where f_id in
-        <foreach item="fId" collection="array" open="(" separator="," close=")">
-            #{fId}
-        </foreach>
-    </delete>
-    <update id="updateTWarehouseWarehousecheckitemsById" parameterType="TWarehouseWarehousecheckitems">
-        update t_warehouse_warehousecheckitems
-        set
-            del_flag = '1'
-        where f_pid in
-        <foreach item="fId" collection="array" open="(" separator="," close=")">
-            #{fId}
-        </foreach>
-    </update>
-
-</mapper>