APP首页、库存、巡检优化

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

@@ -1,44 +1,34 @@
 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.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.TWarehouse;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.warehouse.check.domain.TWarehouseCheck;
 import com.ruoyi.warehouse.check.domain.TWarehouseCheckItems;
 import com.ruoyi.warehouse.check.domain.TWarehouseCheckItemsDetails;
 import com.ruoyi.warehouse.check.service.ITWarehouseCheckItemsDetailsService;
 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;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * 巡检checkController
- * 
+ *
  * @author dongyongwei
  * @date 2021-07-21
  */
 @RestController
 @RequestMapping("/warehouse/check")
-public class TWarehouseCheckController extends BaseController
-{
+public class TWarehouseCheckController extends BaseController {
     @Autowired
     private ITWarehouseCheckService tWarehouseCheckService;
 
@@ -49,16 +39,12 @@ public class TWarehouseCheckController extends BaseController
     private ITWarehouseCheckItemsDetailsService tWarehouseCheckItemsDetailsService;
 
     /**
-     * 获取表内存在的仓库列表
-     */
-    /**
      * 查询巡检check列表
      */
-    //@PreAuthorize("@ss.hasPermi('warehouse:check:list')")
+    // @PreAuthorize("@ss.hasPermi('warehouse:check:list')")
     @GetMapping("/selectTWarehouseListInCheck")
-    public TableDataInfo list()
-    {
-//        startPage();
+    public TableDataInfo list() {
+        // startPage();
         List<TWarehouse> list = tWarehouseCheckService.selectTWarehouseListInCheck();
         return getDataTable(list);
     }
@@ -69,8 +55,7 @@ public class TWarehouseCheckController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('warehouse:check:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TWarehouseCheck tWarehouseCheck)
-    {
+    public TableDataInfo list(TWarehouseCheck tWarehouseCheck) {
         startPage();
         List<TWarehouseCheck> list = tWarehouseCheckService.selectTWarehouseCheckList(tWarehouseCheck);
         return getDataTable(list);
@@ -81,8 +66,7 @@ public class TWarehouseCheckController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('warehouse:check:list')")
     @GetMapping("/listByUser")
-    public TableDataInfo listByUser(TWarehouseCheck tWarehouseCheck)
-    {
+    public TableDataInfo listByUser(TWarehouseCheck tWarehouseCheck) {
         tWarehouseCheck.setfInspectorId(SecurityUtils.getLoginUser().getUser().getUserId());
         startPage();
         List<TWarehouseCheck> list = tWarehouseCheckService.selectTWarehouseCheckList(tWarehouseCheck);
@@ -95,8 +79,7 @@ public class TWarehouseCheckController extends BaseController
     @PreAuthorize("@ss.hasPermi('warehouse:check:export')")
     @Log(title = "巡检check", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult export(TWarehouseCheck tWarehouseCheck)
-    {
+    public AjaxResult export(TWarehouseCheck tWarehouseCheck) {
         List<TWarehouseCheck> list = tWarehouseCheckService.selectTWarehouseCheckList(tWarehouseCheck);
         ExcelUtil<TWarehouseCheck> util = new ExcelUtil<TWarehouseCheck>(TWarehouseCheck.class);
         return util.exportExcel(list, "check");
@@ -107,8 +90,7 @@ public class TWarehouseCheckController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('warehouse:check:query')")
     @GetMapping(value = "/{fId}")
-    public AjaxResult getInfo(@PathVariable("fId") Long fId)
-    {
+    public AjaxResult getInfo(@PathVariable("fId") Long fId) {
         return AjaxResult.success(tWarehouseCheckService.selectTWarehouseCheckById(fId));
     }
 
@@ -118,8 +100,7 @@ public class TWarehouseCheckController extends BaseController
     @PreAuthorize("@ss.hasPermi('warehouse:check:add')")
     @Log(title = "巡检check", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody TWarehouseCheck tWarehouseCheck)
-    {
+    public AjaxResult add(@RequestBody TWarehouseCheck tWarehouseCheck) {
         return toAjax(tWarehouseCheckService.insertTWarehouseCheck(tWarehouseCheck).intValue());
     }
 
@@ -129,28 +110,27 @@ public class TWarehouseCheckController extends BaseController
     @PreAuthorize("@ss.hasPermi('warehouse:check:add')")
     @Log(title = "巡检saveCheckAndItems", businessType = BusinessType.INSERT)
     @PostMapping("/saveCheckAndItems")
-    public AjaxResult saveCheckAndItems(@RequestBody TWarehouseCheck tWarehouseCheck)
-    {
+    public AjaxResult saveCheckAndItems(@RequestBody TWarehouseCheck tWarehouseCheck) {
         //大计划fId
         Long fId = 0L;
-        if (tWarehouseCheck.getfId() != null){
+        if (tWarehouseCheck.getfId() != null) {
             //更新大计划
             fId = tWarehouseCheck.getfId();
             tWarehouseCheckService.updateTWarehouseCheck(tWarehouseCheck);
-        }else{
+        } else {
             //新增大计划
-            fId =tWarehouseCheckService.insertTWarehouseCheck(tWarehouseCheck);
+            fId = tWarehouseCheckService.insertTWarehouseCheck(tWarehouseCheck);
         }
 
-        if(fId>0){
+        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){
+            if (tWarehouseCheckItemsList.size() > 0) {
+                //有数据情况下
+                for (TWarehouseCheckItems tWarehouseCheckItems : tWarehouseCheckItemsList) {
+                    if (tWarehouseCheckItems.getfId() != null) {
                         //更新数据
                         itWarehouseCheckItemsService.updateTWarehouseCheckItems(tWarehouseCheckItems);
-                    }else{
+                    } else {
                         //新增数据
                         tWarehouseCheckItems.setfCheckFid(fId);
                         itWarehouseCheckItemsService.insertTWarehouseCheckItems(tWarehouseCheckItems);
@@ -158,7 +138,7 @@ public class TWarehouseCheckController extends BaseController
                 }
             }
             return AjaxResult.success(fId);
-        }else{
+        } else {
             return AjaxResult.error("巡检任务更新失败,明细未处理");
         }
     }
@@ -170,8 +150,7 @@ public class TWarehouseCheckController extends BaseController
     @PreAuthorize("@ss.hasPermi('warehouse:check:edit')")
     @Log(title = "巡检check", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody TWarehouseCheck tWarehouseCheck)
-    {
+    public AjaxResult edit(@RequestBody TWarehouseCheck tWarehouseCheck) {
         return toAjax(tWarehouseCheckService.updateTWarehouseCheck(tWarehouseCheck));
     }
 
@@ -180,18 +159,24 @@ public class TWarehouseCheckController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('warehouse:check:remove')")
     @Log(title = "巡检check", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{fIds}")
-    public AjaxResult remove(@PathVariable Long[] fIds)
-    {
-        for (int f = 0; f < fIds.length; f++) {
-            Long checkId = fIds[f];
+    @DeleteMapping("/{fIds}")
+    public AjaxResult remove(@PathVariable Long[] fIds) {
+        for (Long checkId : fIds) {
             TWarehouseCheckItemsDetails tWarehouseCheckItemsDetailsQuery = new TWarehouseCheckItemsDetails();
             tWarehouseCheckItemsDetailsQuery.setfCheckFid(checkId);
-            List<TWarehouseCheckItemsDetails> tWarehouseCheckItemsDetailsList =tWarehouseCheckItemsDetailsService.selectTWarehouseCheckItemsDetailsList(tWarehouseCheckItemsDetailsQuery);
-            if(tWarehouseCheckItemsDetailsList.size()>0){
-                return AjaxResult.error("任务编号:"+checkId.intValue()+" 已存在巡检记录,无法删除");
+            List<TWarehouseCheckItemsDetails> tWarehouseCheckItemsDetailsList = tWarehouseCheckItemsDetailsService.selectTWarehouseCheckItemsDetailsList(tWarehouseCheckItemsDetailsQuery);
+            if (tWarehouseCheckItemsDetailsList.size() > 0) {
+                return AjaxResult.error("任务编号:" + checkId.intValue() + " 已存在巡检记录,无法删除");
             }
         }
         return toAjax(tWarehouseCheckService.deleteTWarehouseCheckByIds(fIds));
     }
+
+    /**
+     * APP新增巡检check
+     */
+    @PostMapping("/saveCheckItemsDetails")
+    public AjaxResult saveCheckItemsDetails(@RequestBody TWarehouseCheck tWarehouseCheck) {
+        return toAjax(tWarehouseCheckService.saveCheckItemsDetails(tWarehouseCheck));
+    }
 }

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

@@ -1,32 +1,28 @@
 package com.ruoyi.web.controller.warehouse.check;
 
-import java.util.List;
-
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.warehouse.check.domain.TWarehouseCheckItemsDetails;
-import com.ruoyi.warehouse.check.service.ITWarehouseCheckItemsDetailsService;
-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.core.domain.entity.SysUser;
+import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.warehouse.check.domain.TWarehouseCheckItems;
+import com.ruoyi.warehouse.check.domain.TWarehouseCheckItemsDetails;
+import com.ruoyi.warehouse.check.service.ITWarehouseCheckItemsDetailsService;
 import com.ruoyi.warehouse.check.service.ITWarehouseCheckItemsService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * 巡检check-itemController
- * 
+ *
  * @author dongyongwei
  * @date 2021-07-21
  */
@@ -59,7 +55,7 @@ public class TWarehouseCheckItemsController extends BaseController
     @GetMapping("/listByUser")
     public TableDataInfo listByUser(TWarehouseCheckItems tWarehouseCheckItems)
     {
-        if (!SecurityUtils.getUsername().equals("admin")){
+        if (!"admin".equals(SecurityUtils.getUsername())){
             tWarehouseCheckItems.setfInspectorId(SecurityUtils.getLoginUser().getUser().getUserId());
         }
         startPage();
@@ -121,13 +117,12 @@ public class TWarehouseCheckItemsController extends BaseController
 	@DeleteMapping("/{fIds}")
     public AjaxResult remove(@PathVariable Long[] fIds)
     {
-        for (int f = 0; f < fIds.length; f++) {
-            Long itemId = fIds[f];
+        for (Long itemId : fIds) {
             TWarehouseCheckItemsDetails tWarehouseCheckItemsDetailsQuery = new TWarehouseCheckItemsDetails();
             tWarehouseCheckItemsDetailsQuery.setfItemFid(itemId);
-            List<TWarehouseCheckItemsDetails> tWarehouseCheckItemsDetailsList =tWarehouseCheckItemsDetailsService.selectTWarehouseCheckItemsDetailsList(tWarehouseCheckItemsDetailsQuery);
-            if(tWarehouseCheckItemsDetailsList.size()>0){
-                return AjaxResult.error("任务编号:"+itemId.intValue()+" 已存在巡检记录,无法删除");
+            List<TWarehouseCheckItemsDetails> tWarehouseCheckItemsDetailsList = tWarehouseCheckItemsDetailsService.selectTWarehouseCheckItemsDetailsList(tWarehouseCheckItemsDetailsQuery);
+            if (tWarehouseCheckItemsDetailsList.size() > 0) {
+                return AjaxResult.error("任务编号:" + itemId.intValue() + " 已存在巡检记录,无法删除");
             }
         }
         return toAjax(tWarehouseCheckItemsService.deleteTWarehouseCheckItemsByIds(fIds));
@@ -138,6 +133,13 @@ public class TWarehouseCheckItemsController extends BaseController
     @GetMapping("/appListByUser")
     public TableDataInfo appListByUser(TWarehouseCheckItems tWarehouseCheckItems)
     {
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        if ("外部用户".equals(user.getDept().getDeptName())) {
+            tWarehouseCheckItems.setfInspectorId(user.getUserId());
+            if (StringUtils.isEmpty(tWarehouseCheckItems.getInspectionEndDate())) {
+                tWarehouseCheckItems.setInspectionEndDate(DateUtils.lastMonth() + "23:59:59");
+            }
+        }
         startPage();
         List<TWarehouseCheckItems> list = tWarehouseCheckItemsService.appListByUser(tWarehouseCheckItems);
         return getDataTable(list);

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/reportManagement/TWarehousebillsitemsSummaryController.java

@@ -77,7 +77,7 @@ public class TWarehousebillsitemsSummaryController extends BaseController {
     /**
      * 出入库列表
      */
-    @GetMapping("/inAndOutStockMonthList")
+    @GetMapping("/inAndOutStockList")
     public TableDataInfo inAndOutStockList() {
         startPage();
         return getDataTable(itWarehouseBillsService.inAndOutStockList());
@@ -86,10 +86,10 @@ public class TWarehousebillsitemsSummaryController extends BaseController {
     /**
      * 库龄超过60天的库存列表
      */
-    @GetMapping("/stockAfterSixtyDaysList")
-    public TableDataInfo stockAfterSixtyDaysList() {
+    @GetMapping("/stockAfterMonthList")
+    public TableDataInfo stockAfterMonthList() {
         startPage();
-        return getDataTable(itWhgenlegService.stockAfterSixtyDaysList());
+        return getDataTable(itWhgenlegService.stockAfterMonthList());
     }
 
 }

ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java

@@ -444,6 +444,12 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
         return dateTime(cale.getTime());
     }
 
+    public static String lastMonth() {
+        Calendar cale = Calendar.getInstance();
+        cale.add(Calendar.MONTH, -1);
+        return dateTime(cale.getTime());
+    }
+
     public static String endOfLastMonth() {
         Calendar cale = Calendar.getInstance();
         cale.add(Calendar.MONTH, 0);
@@ -458,11 +464,20 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
         return dateTime(calendar.getTime());
     }
 
-    public static void main(String[] args) {
-        System.out.println(beginOfWeek());
-        System.out.println(endOfWeek());
-        System.out.println(beginOfLastWeek());
-        System.out.println(endOfLastWeek());
+    public static Date todayBegin() {
+        Calendar calendar = new GregorianCalendar();
+        calendar.set(Calendar.HOUR_OF_DAY, 0);
+        calendar.set(Calendar.MINUTE, 0);
+        calendar.set(Calendar.SECOND, 0);
+        return calendar.getTime();
+    }
+
+    public static Date todayEnd() {
+        Calendar calendar = new GregorianCalendar();
+        calendar.set(Calendar.HOUR_OF_DAY, 23);
+        calendar.set(Calendar.MINUTE, 59);
+        calendar.set(Calendar.SECOND, 59);
+        return calendar.getTime();
     }
 
 }

ruoyi-warehouse/src/main/java/com/ruoyi/reportManagement/mapper/TWhgenlegMapper.java

@@ -179,5 +179,5 @@ public interface TWhgenlegMapper {
      *
      * @return
      */
-    public List<Map<String, Object>> stockAfterSixtyDaysList(@Param("external") String external);
+    public List<Map<String, Object>> stockAfterMonthList(@Param("external") String external);
 }

ruoyi-warehouse/src/main/java/com/ruoyi/reportManagement/service/ITWhgenlegService.java

@@ -163,5 +163,5 @@ public interface ITWhgenlegService {
      *
      * @return
      */
-    public List<Map<String, Object>> stockAfterSixtyDaysList();
+    public List<Map<String, Object>> stockAfterMonthList();
 }

ruoyi-warehouse/src/main/java/com/ruoyi/reportManagement/service/impl/TWhgenlegServiceImpl.java

@@ -9,14 +9,11 @@ import com.ruoyi.basicData.mapper.TWarehouseMapper;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.entity.TWarehouse;
-import com.ruoyi.common.core.page.PageDomain;
-import com.ruoyi.common.core.page.TableSupport;
 import com.ruoyi.common.exception.WarehouseException;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.DictUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.sql.SqlUtil;
 import com.ruoyi.reportManagement.domain.SingleAnalysisExcel;
 import com.ruoyi.reportManagement.domain.SingleAnalysisFeesExcel;
 import com.ruoyi.reportManagement.domain.TWhgenleg;
@@ -625,13 +622,13 @@ public class TWhgenlegServiceImpl implements ITWhgenlegService {
      * @return
      */
     @Override
-    public List<Map<String, Object>> stockAfterSixtyDaysList() {
+    public List<Map<String, Object>> stockAfterMonthList() {
         String external = null;
         SysUser user = SecurityUtils.getLoginUser().getUser();
         if ("外部用户".equals(user.getDept().getDeptName())) {
             external = user.getUserName();
         }
-        return tWhgenlegMapper.stockAfterSixtyDaysList(external);
+        return tWhgenlegMapper.stockAfterMonthList(external);
     }
 
 }

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

@@ -1,21 +1,18 @@
 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;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
+import java.util.Date;
+import java.util.List;
 
 /**
  * 巡检check对象 t_warehouse_check
- * 
+ *
  * @author dongyongwei
  * @date 2021-07-21
  */
@@ -78,6 +75,17 @@ public class TWarehouseCheck extends BaseEntity
     /** 更新人姓名 */
     private String fUpdateByName;
 
+    /** 图片地址 */
+    private String fPhotoUrl;
+
+    public String getfPhotoUrl() {
+        return fPhotoUrl;
+    }
+
+    public void setfPhotoUrl(String fPhotoUrl) {
+        this.fPhotoUrl = fPhotoUrl;
+    }
+
     private List<TWarehouseCheckItems> tWarehouseCheckItemsList;
 
     public List<TWarehouseCheckItems> gettWarehouseCheckItemsList() {
@@ -129,111 +137,111 @@ public class TWarehouseCheck extends BaseEntity
     @Excel(name = "删除状态", readConverterExp = "0=正常,1=停用")
     private Integer fDelFlag;
 
-    public void setfId(Long fId) 
+    public void setfId(Long fId)
     {
         this.fId = fId;
     }
 
-    public Long getfId() 
+    public Long getfId()
     {
         return fId;
     }
-    public void setfWarehouseFid(Long fWarehouseFid) 
+    public void setfWarehouseFid(Long fWarehouseFid)
     {
         this.fWarehouseFid = fWarehouseFid;
     }
 
-    public Long getfWarehouseFid() 
+    public Long getfWarehouseFid()
     {
         return fWarehouseFid;
     }
-    public void setfInspectorId(Long fInspectorId) 
+    public void setfInspectorId(Long fInspectorId)
     {
         this.fInspectorId = fInspectorId;
     }
 
-    public Long getfInspectorId() 
+    public Long getfInspectorId()
     {
         return fInspectorId;
     }
-    public void setfSystemNo(String fSystemNo) 
+    public void setfSystemNo(String fSystemNo)
     {
         this.fSystemNo = fSystemNo;
     }
 
-    public String getfSystemNo() 
+    public String getfSystemNo()
     {
         return fSystemNo;
     }
-    public void setfInspectorBeginDatetime(Date fInspectorBeginDatetime) 
+    public void setfInspectorBeginDatetime(Date fInspectorBeginDatetime)
     {
         this.fInspectorBeginDatetime = fInspectorBeginDatetime;
     }
 
-    public Date getfInspectorBeginDatetime() 
+    public Date getfInspectorBeginDatetime()
     {
         return fInspectorBeginDatetime;
     }
-    public void setfInspectorEndDatetime(Date fInspectorEndDatetime) 
+    public void setfInspectorEndDatetime(Date fInspectorEndDatetime)
     {
         this.fInspectorEndDatetime = fInspectorEndDatetime;
     }
 
-    public Date getfInspectorEndDatetime() 
+    public Date getfInspectorEndDatetime()
     {
         return fInspectorEndDatetime;
     }
-    public void setfRemark(String fRemark) 
+    public void setfRemark(String fRemark)
     {
         this.fRemark = fRemark;
     }
 
-    public String getfRemark() 
+    public String getfRemark()
     {
         return fRemark;
     }
-    public void setfCreateBy(Long fCreateBy) 
+    public void setfCreateBy(Long fCreateBy)
     {
         this.fCreateBy = fCreateBy;
     }
 
-    public Long getfCreateBy() 
+    public Long getfCreateBy()
     {
         return fCreateBy;
     }
-    public void setfCreateTime(Date fCreateTime) 
+    public void setfCreateTime(Date fCreateTime)
     {
         this.fCreateTime = fCreateTime;
     }
 
-    public Date getfCreateTime() 
+    public Date getfCreateTime()
     {
         return fCreateTime;
     }
-    public void setfUpdateBy(Long fUpdateBy) 
+    public void setfUpdateBy(Long fUpdateBy)
     {
         this.fUpdateBy = fUpdateBy;
     }
 
-    public Long getfUpdateBy() 
+    public Long getfUpdateBy()
     {
         return fUpdateBy;
     }
-    public void setfUpdateTime(Date fUpdateTime) 
+    public void setfUpdateTime(Date fUpdateTime)
     {
         this.fUpdateTime = fUpdateTime;
     }
 
-    public Date getfUpdateTime() 
+    public Date getfUpdateTime()
     {
         return fUpdateTime;
     }
-    public void setfDelFlag(Integer fDelFlag) 
+    public void setfDelFlag(Integer fDelFlag)
     {
         this.fDelFlag = fDelFlag;
     }
 
-    public Integer getfDelFlag() 
+    public Integer getfDelFlag()
     {
         return fDelFlag;
     }

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

@@ -1,13 +1,12 @@
 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;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
 
 /**
  * 巡检check-item对象 t_warehouse_check_items
@@ -110,26 +109,26 @@ public class TWarehouseCheckItems extends BaseEntity
     @Excel(name = "最新巡检日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date fInspectionDatetimeLast;
 
-    /** 最新巡检日期查询 */
-    private String inspectionDate;
+    /** 最新巡检日期区间查询 */
+    private String inspectionBeginDate;
 
-    /** 最新巡检日期查询区间 */
-    private List<String> inspectionDateInterval;
+    /** 最新巡检日期区间查询 */
+    private String inspectionEndDate;
 
-    public String getInspectionDate() {
-        return inspectionDate;
+    public String getInspectionBeginDate() {
+        return inspectionBeginDate;
     }
 
-    public void setInspectionDate(String inspectionDate) {
-        this.inspectionDate = inspectionDate;
+    public void setInspectionBeginDate(String inspectionBeginDate) {
+        this.inspectionBeginDate = inspectionBeginDate;
     }
 
-    public List<String> getInspectionDateInterval() {
-        return inspectionDateInterval;
+    public String getInspectionEndDate() {
+        return inspectionEndDate;
     }
 
-    public void setInspectionDateInterval(List<String> inspectionDateInterval) {
-        this.inspectionDateInterval = inspectionDateInterval;
+    public void setInspectionEndDate(String inspectionEndDate) {
+        this.inspectionEndDate = inspectionEndDate;
     }
 
     /** 巡检备注 */

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

@@ -7,15 +7,15 @@ import com.ruoyi.warehouse.check.domain.TWarehouseCheck;
 
 /**
  * 巡检checkService接口
- * 
+ *
  * @author dongyongwei
  * @date 2021-07-21
  */
-public interface ITWarehouseCheckService 
+public interface ITWarehouseCheckService
 {
     /**
      * 查询巡检check
-     * 
+     *
      * @param fId 巡检checkID
      * @return 巡检check
      */
@@ -23,7 +23,7 @@ public interface ITWarehouseCheckService
 
     /**
      * 查询巡检check列表
-     * 
+     *
      * @param tWarehouseCheck 巡检check
      * @return 巡检check集合
      */
@@ -31,7 +31,7 @@ public interface ITWarehouseCheckService
 
     /**
      * 新增巡检check
-     * 
+     *
      * @param tWarehouseCheck 巡检check
      * @return 结果
      */
@@ -39,7 +39,7 @@ public interface ITWarehouseCheckService
 
     /**
      * 修改巡检check
-     * 
+     *
      * @param tWarehouseCheck 巡检check
      * @return 结果
      */
@@ -47,7 +47,7 @@ public interface ITWarehouseCheckService
 
     /**
      * 批量删除巡检check
-     * 
+     *
      * @param fIds 需要删除的巡检checkID
      * @return 结果
      */
@@ -55,7 +55,7 @@ public interface ITWarehouseCheckService
 
     /**
      * 删除巡检check信息
-     * 
+     *
      * @param fId 巡检checkID
      * @return 结果
      */
@@ -63,4 +63,12 @@ public interface ITWarehouseCheckService
 
     /** 获取主表内仓库清单 */
     public List<TWarehouse> selectTWarehouseListInCheck();
+
+    /**
+     * APP新增巡检check
+     *
+     * @param tWarehouseCheck 巡检check
+     * @return 结果
+     */
+    public int saveCheckItemsDetails(TWarehouseCheck tWarehouseCheck);
 }

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

@@ -1,16 +1,14 @@
 package com.ruoyi.warehouse.check.service.impl;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
 import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.StringUtils;
-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.mapper.TWarehouseCheckItemsMapper;
 import com.ruoyi.warehouse.check.service.ITWarehouseCheckItemsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
 
 /**
  * 巡检check-itemService业务层处理
@@ -45,13 +43,6 @@ public class TWarehouseCheckItemsServiceImpl implements ITWarehouseCheckItemsSer
     @Override
     public List<TWarehouseCheckItems> selectTWarehouseCheckItemsList(TWarehouseCheckItems tWarehouseCheckItems)
     {
-        String inspectionDate = tWarehouseCheckItems.getInspectionDate();
-        if (StringUtils.isNotEmpty(inspectionDate)) {
-            List<String> inspectionDateInterval = new ArrayList<>();
-            inspectionDateInterval.add(inspectionDate.split(",")[0]);
-            inspectionDateInterval.add(inspectionDate.split(",")[1]);
-            tWarehouseCheckItems.setInspectionDateInterval(inspectionDateInterval);
-        }
         return tWarehouseCheckItemsMapper.selectTWarehouseCheckItemsList(tWarehouseCheckItems);
     }
 
@@ -109,13 +100,6 @@ public class TWarehouseCheckItemsServiceImpl implements ITWarehouseCheckItemsSer
 
     @Override
     public List<TWarehouseCheckItems> appListByUser(TWarehouseCheckItems tWarehouseCheckItems) {
-        String inspectionDate = tWarehouseCheckItems.getInspectionDate();
-        if (StringUtils.isNotEmpty(inspectionDate)) {
-            List<String> inspectionDateInterval = new ArrayList<>();
-            inspectionDateInterval.add(inspectionDate.split(",")[0]);
-            inspectionDateInterval.add(inspectionDate.split(",")[1]);
-            tWarehouseCheckItems.setInspectionDateInterval(inspectionDateInterval);
-        }
         return tWarehouseCheckItemsMapper.selectTWarehouseCheckItemsList(tWarehouseCheckItems);
     }
 }

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

@@ -1,17 +1,21 @@
 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.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.warehouse.check.domain.TWarehouseCheck;
 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.domain.TWarehouseCheckItemsDetails;
+import com.ruoyi.warehouse.check.mapper.TWarehouseCheckItemsDetailsMapper;
+import com.ruoyi.warehouse.check.mapper.TWarehouseCheckItemsMapper;
 import com.ruoyi.warehouse.check.mapper.TWarehouseCheckMapper;
-import com.ruoyi.warehouse.check.domain.TWarehouseCheck;
 import com.ruoyi.warehouse.check.service.ITWarehouseCheckService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+import java.util.List;
 
 /**
  * 巡检checkService业务层处理
@@ -25,7 +29,10 @@ public class TWarehouseCheckServiceImpl implements ITWarehouseCheckService {
     private TWarehouseCheckMapper tWarehouseCheckMapper;
 
     @Autowired
-    private ITWarehouseCheckItemsService tWarehouseCheckItemsService;
+    private TWarehouseCheckItemsMapper tWarehouseCheckItemsMapper;
+
+    @Autowired
+    private TWarehouseCheckItemsDetailsMapper tWarehouseCheckItemsDetailsMapper;
 
     /**
      * 查询巡检check
@@ -40,7 +47,7 @@ public class TWarehouseCheckServiceImpl implements ITWarehouseCheckService {
         //增加返回明细数据
         TWarehouseCheckItems tWarehouseCheckItemsQuery = new TWarehouseCheckItems();
         tWarehouseCheckItemsQuery.setfCheckFid(fId);
-        List<TWarehouseCheckItems> tWarehouseCheckItemsList = tWarehouseCheckItemsService.selectTWarehouseCheckItemsList(tWarehouseCheckItemsQuery);
+        List<TWarehouseCheckItems> tWarehouseCheckItemsList = tWarehouseCheckItemsMapper.selectTWarehouseCheckItemsList(tWarehouseCheckItemsQuery);
         if (tWarehouseCheckItemsList.size() > 0) {
             tWarehouseCheck.settWarehouseCheckItemsList(tWarehouseCheckItemsList);
         }
@@ -114,4 +121,47 @@ public class TWarehouseCheckServiceImpl implements ITWarehouseCheckService {
     public List<TWarehouse> selectTWarehouseListInCheck() {
         return tWarehouseCheckMapper.selectTWarehouseListInCheck();
     }
+
+    /**
+     * APP新增巡检check
+     *
+     * @param tWarehouseCheck 巡检check
+     * @return 结果
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int saveCheckItemsDetails(TWarehouseCheck tWarehouseCheck) {
+        tWarehouseCheck.setfInspectorId(SecurityUtils.getLoginUser().getUser().getUserId());
+        tWarehouseCheck.setfInspectorName(SecurityUtils.getLoginUser().getUser().getNickName());
+        tWarehouseCheck.setfInspectorBeginDatetime(DateUtils.todayBegin());
+        tWarehouseCheck.setfInspectorEndDatetime(DateUtils.todayEnd());
+        tWarehouseCheck.setfCreateBy(SecurityUtils.getLoginUser().getUser().getUserId());
+        tWarehouseCheck.setfCreateTime(new Date());
+        tWarehouseCheckMapper.insertTWarehouseCheck(tWarehouseCheck);
+
+        Long fId = tWarehouseCheck.getfId();
+        TWarehouseCheckItems tWarehouseCheckItems = new TWarehouseCheckItems();
+        tWarehouseCheckItems.setfCheckFid(fId);
+        tWarehouseCheckItems.setfWarehouseFid(tWarehouseCheck.getfWarehouseFid());
+        tWarehouseCheckItems.setfInspectorId(SecurityUtils.getLoginUser().getUser().getUserId());
+        tWarehouseCheckItems.setfInspectionDatetime(new Date());
+        tWarehouseCheckItems.setfRemark(tWarehouseCheck.getfRemark());
+        tWarehouseCheckItems.setfInspectorIdLast(SecurityUtils.getLoginUser().getUser().getUserId());
+        tWarehouseCheckItems.setfInspectionDatetimeLast(new Date());
+        tWarehouseCheckItems.setfCreateBy(SecurityUtils.getLoginUser().getUser().getUserId());
+        tWarehouseCheckItems.setfCreateTime(new Date());
+        tWarehouseCheckItems.setfUpdateBy(SecurityUtils.getLoginUser().getUser().getUserId());
+        tWarehouseCheckItems.setfUpdateTime(new Date());
+        tWarehouseCheckItemsMapper.insertTWarehouseCheckItems(tWarehouseCheckItems);
+
+        Long fItemId = tWarehouseCheckItems.getfId();
+        TWarehouseCheckItemsDetails tWarehouseCheckItemsDetails = new TWarehouseCheckItemsDetails();
+        tWarehouseCheckItemsDetails.setfCheckFid(fId);
+        tWarehouseCheckItemsDetails.setfItemFid(fItemId);
+        tWarehouseCheckItemsDetails.setfPhotoUrl(tWarehouseCheck.getfPhotoUrl());
+        tWarehouseCheckItemsDetails.setfRemark(tWarehouseCheck.getfRemark());
+        tWarehouseCheckItemsDetails.setfCreateBy(SecurityUtils.getLoginUser().getUser().getUserId());
+        tWarehouseCheckItemsDetails.setfCreateTime(new Date());
+        return tWarehouseCheckItemsDetailsMapper.insertTWarehouseCheckItemsDetails(tWarehouseCheckItemsDetails);
+    }
 }

ruoyi-warehouse/src/main/resources/mapper/reportManagement/TWhgenlegMapper.xml

@@ -746,19 +746,19 @@
             IFNULL(SUM(leg.f_volumnD),0) AS fVolumnD,
             IFNULL(SUM(leg.f_qtyD),0) AS fQtyD,
             leg.f_mblno AS fMblno,
-            IFNULL(SUM(leg.f_grossweightD),0) AS fGrossweightD,
-            IFNULL(SUM(leg.f_netweightD),0) AS fNetweightD,
+            ROUND(IFNULL(SUM(leg.f_grossweightD),0) / 1000, 2)  AS fGrossweightD,
+            ROUND(IFNULL(SUM(leg.f_netweightD),0) / 1000, 2) AS fNetweightD,
             IFNULL(SUM(leg.f_volumnC),0) AS fVolumnC,
             IFNULL(SUM(leg.f_volumnblc),0) AS fVolumnblc,
             SUM(leg.f_qtyC) AS fQtyC,
             leg.f_business_type AS fBusinessType,
-            IFNULL(SUM(leg.f_grossweightC),0) AS fGrossweightC,
-            IFNULL(SUM(leg.f_netweightC),0) AS fNetweightC,
+            ROUND(IFNULL(SUM(leg.f_grossweightC),0) / 1000, 2) AS fGrossweightC,
+            ROUND(IFNULL(SUM(leg.f_netweightC),0) / 1000, 2) AS fNetweightC,
             IFNULL(SUM(leg.f_qtyblc),0) AS fQtyblc,
             leg.f_billingway AS fBillingway,
             leg.f_chargedate AS fChargedate,
-            IFNULL(SUM(leg.f_grossweightblc),0) AS fGrossweightblc,
-            IFNULL(SUM(leg.f_netweightblc),0) AS fNetweightblc,
+            ROUND(IFNULL(SUM(leg.f_grossweightblc),0) / 1000, 2) AS fGrossweightblc,
+            ROUND(IFNULL(SUM(leg.f_netweightblc),0) / 1000, 2) AS fNetweightblc,
             dict.dict_label AS fBusinessTypes,
             leg.f_marks AS fMarks,
             DATE_FORMAT( leg.create_time, '%Y-%m-%d' ) AS createTime,
@@ -1062,7 +1062,7 @@
     </select>
 
     <select id="stockStatistics" resultType="map">
-        select round(ifnull(sum(f_grossweightblc) / 1000, 0)) as total
+        select round(ifnull(sum(f_grossweightblc), 0) / 1000) as total
         from t_whgenleg
         <where>
             <if test="beginDate != null and beginDate != ''">and f_bsdate &gt;= #{beginDate}</if>
@@ -1077,26 +1077,27 @@
         select datediff(date_format(now(),'%Y-%m-%d'),date_format(min(f_bsdate),'%Y-%m-%d')) as days
         from t_whgenleg
         where
-            f_grossweightblc > 5
+            f_qtyD != 0
+            and f_qtyblc != 0
             <if test="external != null and external != ''">
                 and f_corpid = (select f_pid from t_customer_contact where f_tel = #{external})
             </if>
     </select>
 
-    <select id="stockAfterSixtyDaysList" resultType="map">
+    <select id="stockAfterMonthList" resultType="map">
         select
             tw.f_mblno as fMblno,
             tg.f_name as goodsName,
             tw.f_bsdate as fBsdate,
             tc.f_name as customerName,
-            round(tw.f_grossweightblc / 1000, 2) as fGrossweight
+            round(ifnull(tw.f_grossweightblc, 0) / 1000, 2) as fGrossweight
         from t_whgenleg tw
         left join t_goods tg on tg.f_id = tw.f_goodsid
         left join t_corps tc on tw.f_corpid = tc.f_id
         where
             tw.f_qtyD != 0
             and tw.f_qtyblc != 0
-            and datediff(date_format(now(),'%Y-%m-%d'),date_format(tw.f_bsdate,'%Y-%m-%d')) > 180
+            and datediff(date_format(now(),'%Y-%m-%d'),date_format(tw.f_bsdate,'%Y-%m-%d')) &gt; 30
             <if test="external != null and external != ''">
                 and tw.f_corpid = (select f_pid from t_customer_contact where f_tel = #{external})
             </if>

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

@@ -69,12 +69,8 @@
             <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>
-            <if test='inspectionDateInterval != null and inspectionDateInterval[0] != null and inspectionDateInterval[0]!= ""'>
-                and f_inspection_datetime_last &gt;= #{inspectionDateInterval[0]}
-            </if>
-            <if test='inspectionDateInterval != null and inspectionDateInterval[1] != null and inspectionDateInterval[1]!= ""'>
-                and f_inspection_datetime_last &lt;= #{inspectionDateInterval[1]}
-            </if>
+            <if test="inspectionBeginDate != null and inspectionBeginDate != ''">and f_inspection_datetime &gt;= #{inspectionBeginDate}</if>
+            <if test="inspectionEndDate != null and inspectionEndDate != ''">and f_inspection_datetime &lt;= #{inspectionEndDate}</if>
         </where>
             order by f_id desc
     </select>

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

@@ -2850,21 +2850,31 @@
 
     <select id="inAndOutStockList" resultType="map">
         select
-        tb.f_mblno as fMblno,
-        tg.f_name as goodsName,
-        tb.f_bsdate as fBsdate,
-        round(tb.f_grossweight / 1000, 2) as fGrossweight,
-        case tb.f_billtype when 'SJRK' then '入库' when 'SJCK' then '出库' end as fBilltype,
-        tb.create_by as createBy
+            tb.f_mblno as fMblno,
+            tg.f_name as goodsName,
+            tb.f_marks as fMarks,
+            tb.f_bsdate as fBsdate,
+            tb.f_planqty as fPlanqty,
+            case tb.f_billtype when 'SJRK' then '入库' when 'SJCK' then '出库' end as fBilltype,
+            case
+                when tb.f_billtype = 'SJRK' and tb.f_items_status = '1' then '计划'
+                when tb.f_billtype = 'SJRK' and tb.f_items_status = '2' then '待入库'
+                when tb.f_billtype = 'SJRK' and tb.f_items_status = '3' then '入库中'
+                when tb.f_billtype = 'SJRK' and tb.f_items_status = '4' then '已入库'
+                when tb.f_billtype = 'SJCK' and tb.f_items_status = '1' then '计划'
+                when tb.f_billtype = 'SJCK' and tb.f_items_status = '2' then '待出库'
+                when tb.f_billtype = 'SJCK' and tb.f_items_status = '3' then '出库中'
+                when tb.f_billtype = 'SJCK' and tb.f_items_status = '4' then '已出库'
+            end as fBillstatus
         from t_warehousebills tb
-        left join t_goods tg ON tg.f_id = tb.f_goodsid
+        left join t_goods tg on tg.f_id = tb.f_goodsid
         where
-        if(tb.f_planqty is not null, tb.f_planqty != tb.f_qty, tb.f_id != '')
-        and tb.f_billstatus != 6
-        and tb.f_billtype in ('SJRK', 'SJCK')
-        <if test="external != null and external != ''">
-            and tb.f_corpid = (select f_pid from t_customer_contact where f_tel = #{external})
-        </if>
+            if(tb.f_planqty is not null, tb.f_planqty != tb.f_qty, tb.f_id != '')
+            and tb.f_billstatus != 6
+            and tb.f_billtype in ('SJRK', 'SJCK')
+            <if test="external != null and external != ''">
+                and tb.f_corpid = (select f_pid from t_customer_contact where f_tel = #{external})
+            </if>
         order by tb.f_bsdate desc
     </select>
 </mapper>