仓储统计查询

src/main/java/com/gyee/viewticket/controller/viewticket/EquoperationrecordController.java

@@ -10,6 +10,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
 import java.util.List;
 import java.util.Map;
 
@@ -62,23 +64,46 @@ public class EquoperationrecordController {
 
     /**
      * top4
+     *
      * @param stId
      * @return
      */
     @GetMapping(value = "top4")
     public AjaxResult getEquoperationrecordTop4(
-            @RequestParam(value = "stId",required = false)String stId
-        ){
+            @RequestParam(value = "stId", required = false) String stId,
+            @RequestParam(value = "wtId", required = false) String wtId,
+            @RequestParam(value = "beginDate", required = false) String beginDate,
+            @RequestParam(value = "endDate", required = false) String endDate
+    ) {
         try {
-            if(null ==stId || "0".equals(stId.trim())){
+            if (null == stId || "0".equals(stId.trim())) {
                 stId = "";
             }
-            List<Map> list = equoperationrecordService.getEquoperationrecordTope(stId);
+            if ( null ==beginDate || "".equals(beginDate.trim()) || null == endDate || "".equals(endDate.trim())){
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                Calendar calendar = Calendar.getInstance();
+                // 时
+                calendar.set(Calendar.HOUR_OF_DAY, 0);
+                // 分
+                calendar.set(Calendar.MINUTE, 0);
+                // 秒
+                calendar.set(Calendar.SECOND, 0);
+                // 毫秒
+                calendar.set(Calendar.MILLISECOND, 0);
+                beginDate =  sdf.format(calendar.getTime());
+                calendar.add(Calendar.DATE,1);
+                endDate = sdf.format(calendar.getTime());
+            }
+            List<Map> list = equoperationrecordService.getEquoperationrecordTope(stId, wtId, beginDate, endDate);
             return AjaxResult.successData(list);
         } catch (Exception e) {
-            log.error("操作失败",e);
+            log.error("操作失败", e);
             return AjaxResult.error();
         }
     }
+
+
+
+
 }
 

src/main/java/com/gyee/viewticket/controller/viewticket/InventoryController.java

@@ -0,0 +1,56 @@
+package com.gyee.viewticket.controller.viewticket;
+
+
+import com.gyee.viewticket.comm.domain.AjaxResult;
+import com.gyee.viewticket.service.ticket.InventoryService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author admin
+ * @since 2021-08-01
+ */
+@RestController
+@RequestMapping("/inventory")
+public class InventoryController {
+
+    private static final Logger log = LoggerFactory.getLogger(InventoryController.class);
+
+    @Autowired
+    private InventoryService inventoryService;
+    /**
+     * top4
+     * @param stId
+     * @return
+     */
+    @GetMapping(value = "groupcount")
+    public AjaxResult getInventoryClassGroupCount( @RequestParam(value = "stId",required = false)String stId){
+        try {
+            if(null ==stId || "0".equals(stId.trim())){
+                stId = "";
+            }
+            List<Map> list = inventoryService.getInventoryClassGroupCount(stId);
+            return AjaxResult.successData(list);
+        } catch (Exception e) {
+            log.error("操作失败",e);
+            return AjaxResult.error();
+        }
+    }
+
+
+
+}
+

src/main/java/com/gyee/viewticket/controller/viewticket/InvstockController.java

@@ -0,0 +1,21 @@
+package com.gyee.viewticket.controller.viewticket;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author admin
+ * @since 2021-08-01
+ */
+@RestController
+@RequestMapping("/invstock")
+public class InvstockController {
+
+}
+

src/main/java/com/gyee/viewticket/mapper/ticket/EquoperationrecordMapper.java

@@ -31,6 +31,6 @@ public interface EquoperationrecordMapper extends BaseMapper<Equoperationrecord>
 
 
 
-   List<Map> selectEquoperationrecordTop4(String stId);
+   List<Map> selectEquoperationrecordTop4(String stId,String wtId,String beginDate,String endDate);
 
 }

src/main/java/com/gyee/viewticket/mapper/ticket/InventoryMapper.java

@@ -0,0 +1,25 @@
+package com.gyee.viewticket.mapper.ticket;
+
+import com.gyee.viewticket.model.ticket.Inventory;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author admin
+ * @since 2021-08-01
+ */
+@Repository
+@Mapper
+public interface InventoryMapper extends BaseMapper<Inventory> {
+
+    List<Map> getInventoryClassGroupCount(String wfshortname);
+
+}

src/main/java/com/gyee/viewticket/mapper/ticket/InvstockMapper.java

@@ -0,0 +1,20 @@
+package com.gyee.viewticket.mapper.ticket;
+
+import com.gyee.viewticket.model.ticket.Invstock;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author admin
+ * @since 2021-08-01
+ */
+@Repository
+@Mapper
+public interface InvstockMapper extends BaseMapper<Invstock> {
+
+}

src/main/java/com/gyee/viewticket/model/ticket/Inventory.java

@@ -0,0 +1,105 @@
+package com.gyee.viewticket.model.ticket;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author admin
+ * @since 2021-08-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("INVENTORY")
+public class Inventory extends Model<Inventory> {
+
+    private static final long serialVersionUID=1L;
+
+      @TableId("ID")
+    private Double id;
+
+    @TableField("ITEMNUM")
+    private String itemnum;
+
+    @TableField("WAREHOUSE")
+    private String warehouse;
+
+    @TableField("BINNUM")
+    private String binnum;
+
+    @TableField("VENDOR")
+    private String vendor;
+
+    @TableField("MANUFACTURER")
+    private String manufacturer;
+
+    @TableField("MODELNUM")
+    private String modelnum;
+
+    @TableField("MINLEVEL")
+    private Double minlevel;
+
+    @TableField("MAXLEVEL")
+    private Double maxlevel;
+
+    @TableField("STOCKTYPE")
+    private String stocktype;
+
+    @TableField("ORDERUNIT")
+    private String orderunit;
+
+    @TableField("ISSUEUNIT")
+    private String issueunit;
+
+    @TableField("CONVERSION")
+    private Double conversion;
+
+    @TableField("ORDERQTY")
+    private Double orderqty;
+
+    @TableField("STDCOST")
+    private Double stdcost;
+
+    @TableField("AVGCOST")
+    private Double avgcost;
+
+    @TableField("LASTCOST")
+    private Double lastcost;
+
+    @TableField("LASTISSUEDATE")
+    private LocalDateTime lastissuedate;
+
+    @TableField("ISSUEYTD")
+    private Double issueytd;
+
+    @TableField("ABCTYPE")
+    private String abctype;
+
+    @TableField("SSTOCK")
+    private Double sstock;
+
+    @TableField("ITEMDESC")
+    private String itemdesc;
+
+    @TableField("SITENUM")
+    private String sitenum;
+
+    @TableField("CORPNUM")
+    private String corpnum;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

src/main/java/com/gyee/viewticket/model/ticket/Invstock.java

@@ -0,0 +1,60 @@
+package com.gyee.viewticket.model.ticket;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author admin
+ * @since 2021-08-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("INVSTOCK")
+public class Invstock extends Model<Invstock> {
+
+    private static final long serialVersionUID=1L;
+
+      @TableId("ID")
+    private Double id;
+
+    @TableField("ITEMNUM")
+    private String itemnum;
+
+    @TableField("WAREHOUSE")
+    private String warehouse;
+
+    @TableField("BINNUM")
+    private String binnum;
+
+    @TableField("LOTNUM")
+    private String lotnum;
+
+    @TableField("CURBAL")
+    private Double curbal;
+
+    @TableField("PHYSCNT")
+    private Double physcnt;
+
+    @TableField("PHYSCNTDATE")
+    private LocalDateTime physcntdate;
+
+    @TableField("RECONCILED")
+    private String reconciled;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

src/main/java/com/gyee/viewticket/service/impl/ticket/EquoperationrecordServiceImpl.java

@@ -38,40 +38,40 @@ public class EquoperationrecordServiceImpl extends ServiceImpl<Equoperationrecor
     }
 
     @Override
-    public List<Map> getEquoperationrecordTope(String stId) throws Exception {
+    public List<Map> getEquoperationrecordTope(String stId,String wtId,String beginDate,String endDate) throws Exception {
 
 
 
         String url = serverConfig.getUrl() + "/img/";
         List<Map> maps = new ArrayList<>();
-        List<Map> list = equoperationrecordMapper.selectEquoperationrecordTop4(stId);
+        List<Map> list = equoperationrecordMapper.selectEquoperationrecordTop4(stId,wtId,beginDate,endDate);
         for (Map e : list) {
-            Map map = new HashMap();
-            map.put("id", e.get("id"));
-            map.put("starttime", e.get("starttime"));
-            map.put("endtime", e.get("endtime"));
-            map.put("type", e.get("type"));
-            map.put("tolocdes", e.get("tolocdes"));
-            map.put("problem", e.get("problem"));
-            map.put("solveway", e.get("solveway"));
+//            Map map = new HashMap();
+//            map.put("id", e.get("id"));
+//            map.put("starttime", e.get("starttime"));
+//            map.put("endtime", e.get("endtime"));
+//            map.put("type", e.get("type"));
+//            map.put("tolocdes", e.get("tolocdes"));
+//            map.put("problem", e.get("problem"));
+//            map.put("solveway", e.get("solveway"));
 
             String labornum = e.get("labornum").toString().toLowerCase();
             InputStream inputStream = this.getClass().getResourceAsStream("/static/img/"+labornum+".jpg");
             if (null != inputStream){
-                map.put("imgurl", url + labornum + ".jpg");
+                e.put("imgurl", url + labornum + ".jpg");
             }else {
-                map.put("imgurl", url +"null.jpg");
+                e.put("imgurl", url +"null.jpg");
             }
-            map.put("labornum", e.get("labornum"));
-            map.put("laborname", e.get("laborname"));
-            map.put("jobcode", e.get("jobcode"));
-            map.put("employeetype", e.get("employeetype"));
-            map.put("ticketnum", e.get("ticketnum"));
-            map.put("wfshortname", e.get("wfshortname"));
-            map.put("wfname", e.get("wfname"));
-            maps.add(map);
+//            map.put("labornum", e.get("labornum"));
+//            map.put("laborname", e.get("laborname"));
+//            map.put("jobcode", e.get("jobcode"));
+//            map.put("employeetype", e.get("employeetype"));
+//            map.put("ticketnum", e.get("ticketnum"));
+//            map.put("wfshortname", e.get("wfshortname"));
+//            map.put("wfname", e.get("wfname"));
+//            maps.add(map);
         }
-        return maps;
+        return list;
     }
 
 

src/main/java/com/gyee/viewticket/service/impl/ticket/InventoryServiceImpl.java

@@ -0,0 +1,33 @@
+package com.gyee.viewticket.service.impl.ticket;
+
+import com.gyee.viewticket.model.ticket.Inventory;
+import com.gyee.viewticket.mapper.ticket.InventoryMapper;
+import com.gyee.viewticket.service.ticket.InventoryService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author admin
+ * @since 2021-08-01
+ */
+@Service
+public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory> implements InventoryService {
+
+
+    @Autowired
+    private InventoryMapper inventoryMapper;
+
+    @Override
+    public List<Map> getInventoryClassGroupCount(String wfshortname) {
+        List<Map> map = inventoryMapper.getInventoryClassGroupCount(wfshortname);
+        return map;
+    }
+}

src/main/java/com/gyee/viewticket/service/impl/ticket/InvstockServiceImpl.java

@@ -0,0 +1,20 @@
+package com.gyee.viewticket.service.impl.ticket;
+
+import com.gyee.viewticket.model.ticket.Invstock;
+import com.gyee.viewticket.mapper.ticket.InvstockMapper;
+import com.gyee.viewticket.service.ticket.InvstockService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author admin
+ * @since 2021-08-01
+ */
+@Service
+public class InvstockServiceImpl extends ServiceImpl<InvstockMapper, Invstock> implements InvstockService {
+
+}

src/main/java/com/gyee/viewticket/service/ticket/EquoperationrecordService.java

@@ -23,6 +23,6 @@ public interface EquoperationrecordService extends IService<Equoperationrecord>
     IPage<Map> getEquoperationrecordPageList(Page page, String startTime, String endTime, String wtid,String type);
 
 
-    List<Map> getEquoperationrecordTope(String stId) throws Exception;
+    List<Map> getEquoperationrecordTope(String stId,String wtId,String beginDate,String endDate) throws Exception;
 
 }

src/main/java/com/gyee/viewticket/service/ticket/InventoryService.java

@@ -0,0 +1,24 @@
+package com.gyee.viewticket.service.ticket;
+
+import com.gyee.viewticket.model.ticket.Inventory;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author admin
+ * @since 2021-08-01
+ */
+@Service
+public interface InventoryService extends IService<Inventory> {
+
+
+   List<Map> getInventoryClassGroupCount(String wfshortname);
+
+}

src/main/java/com/gyee/viewticket/service/ticket/InvstockService.java

@@ -0,0 +1,16 @@
+package com.gyee.viewticket.service.ticket;
+
+import com.gyee.viewticket.model.ticket.Invstock;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author admin
+ * @since 2021-08-01
+ */
+public interface InvstockService extends IService<Invstock> {
+
+}

src/main/resources/mapper/ticket/EquoperationrecordMapper.xml

@@ -78,20 +78,40 @@
                 w.ticketnum,
                 w.wonum,
                 f.wfshortname,
-                f.wfname
+                f.wfname,
+                b.eqnum,
+                a.wtid,
+                b.prodtdepttime,
+                b.departuretime,
+                a.reason,
+                b.status,
+                a.rid,
+                a.operationdate,
+                a.ismain
             from
                 equoperationrecord e
             left join labor u on e.leader = u.laborname
             left join workticket w on w.wonum = e.wonum
             left join windfarm f on  w.workdept = f.wfname
+            left join wobugeq b on  w.bugnum=b.bugnum
+        left join recommenmain a on a.wobugid=b.bugnum
 
 
-            <where>
+        <where>
+                and a.operationdate is not null
+                and (b.status!='流程关闭' or b.status is null)
                 <if test=" '' != stId and null != stId ">
                     and  f.wfshortname = #{stId}
                 </if>
+                <if test="wtId!=null &amp;&amp; wtId.trim()!=''">
+                    and a.WTID=#{wtId}
+                </if>
 
-            </where>
+            <if test="beginDate !=null and endDate !=null">
+                and a.OPERATIONDATE >= #{beginDate} and a.OPERATIONDATE &lt;= #{endDate}
+            </if>
+
+        </where>
             order by
             e.starttime desc
     </select>

src/main/resources/mapper/ticket/InventoryMapper.xml

@@ -0,0 +1,67 @@
+<?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.gyee.viewticket.mapper.ticket.InventoryMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.gyee.viewticket.model.ticket.Inventory">
+        <id column="ID" property="id" />
+        <result column="ITEMNUM" property="itemnum" />
+        <result column="WAREHOUSE" property="warehouse" />
+        <result column="BINNUM" property="binnum" />
+        <result column="VENDOR" property="vendor" />
+        <result column="MANUFACTURER" property="manufacturer" />
+        <result column="MODELNUM" property="modelnum" />
+        <result column="MINLEVEL" property="minlevel" />
+        <result column="MAXLEVEL" property="maxlevel" />
+        <result column="STOCKTYPE" property="stocktype" />
+        <result column="ORDERUNIT" property="orderunit" />
+        <result column="ISSUEUNIT" property="issueunit" />
+        <result column="CONVERSION" property="conversion" />
+        <result column="ORDERQTY" property="orderqty" />
+        <result column="STDCOST" property="stdcost" />
+        <result column="AVGCOST" property="avgcost" />
+        <result column="LASTCOST" property="lastcost" />
+        <result column="LASTISSUEDATE" property="lastissuedate" />
+        <result column="ISSUEYTD" property="issueytd" />
+        <result column="ABCTYPE" property="abctype" />
+        <result column="SSTOCK" property="sstock" />
+        <result column="ITEMDESC" property="itemdesc" />
+        <result column="SITENUM" property="sitenum" />
+        <result column="CORPNUM" property="corpnum" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, ITEMNUM, WAREHOUSE, BINNUM, VENDOR, MANUFACTURER, MODELNUM, MINLEVEL, MAXLEVEL, STOCKTYPE, ORDERUNIT, ISSUEUNIT, CONVERSION, ORDERQTY, STDCOST, AVGCOST, LASTCOST, LASTISSUEDATE, ISSUEYTD, ABCTYPE, SSTOCK, ITEMDESC, SITENUM, CORPNUM
+    </sql>
+
+
+    <select id="getInventoryClassGroupCount" resultType="java.util.Map">
+
+            with t as (
+            select
+            y.itemnum,
+            c.classid,
+            c.description,
+            k.curbal,
+            y.sitenum,
+            w.wfshortname
+            from
+            inventory y
+            left join invstock k on y.itemnum = k.itemnum
+            left join item m on m.itemnum = y.itemnum
+            left join classification c on c.classid = m.classid
+            left join windfarm w on w.wfname = y.sitenum
+            <where>
+                <if test=" '' != wfshortname and null != wfshortname ">
+                    and  w.wfshortname  = #{wfshortname}
+                </if>
+            </where>
+            )
+            select classid, sum (t.curbal) curbal, t.description from t
+            group by t.classid, t.description
+
+
+    </select>
+
+</mapper>

src/main/resources/mapper/ticket/InvstockMapper.xml

@@ -0,0 +1,23 @@
+<?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.gyee.viewticket.mapper.ticket.InvstockMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.gyee.viewticket.model.ticket.Invstock">
+        <id column="ID" property="id" />
+        <result column="ITEMNUM" property="itemnum" />
+        <result column="WAREHOUSE" property="warehouse" />
+        <result column="BINNUM" property="binnum" />
+        <result column="LOTNUM" property="lotnum" />
+        <result column="CURBAL" property="curbal" />
+        <result column="PHYSCNT" property="physcnt" />
+        <result column="PHYSCNTDATE" property="physcntdate" />
+        <result column="RECONCILED" property="reconciled" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, ITEMNUM, WAREHOUSE, BINNUM, LOTNUM, CURBAL, PHYSCNT, PHYSCNTDATE, RECONCILED
+    </sql>
+
+</mapper>