From 32a6f7e84224f5479984d9682df32b79c7ddde09 Mon Sep 17 00:00:00 2001
From: zpl <pzl_7001@163.com>
Date: Sat, 17 Jul 2021 17:30:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=B8=8B=E6=96=99=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E3=80=81=E8=AE=BE=E5=A4=87=E7=82=B9=E6=A3=80=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E7=BB=B4=E6=8A=A4bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../equip/dto/ResourceInspectTaskDto.java     |  6 +++
 .../impl/ResourceInspectTaskServiceImpl.java  |  7 ++-
 .../mapper/ResourceInspectTaskMapper.xml      | 44 ++++++++++---------
 .../meapi/controller/InventoryController.java | 24 +++++++++-
 .../meapi/controller/ResrceController.java    | 10 +++++
 .../mesnac/meapi/mapper/ResrceMapper.java     |  4 ++
 .../mesnac/meapi/service/ResrceService.java   |  9 ++++
 .../meapi/service/impl/ResrceServiceImpl.java |  6 +++
 .../main/resources/mapper/ResrceMapper.xml    | 13 ++++++
 9 files changed, 100 insertions(+), 23 deletions(-)

diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/dto/ResourceInspectTaskDto.java b/equip/src/main/java/com/foreverwin/mesnac/equip/dto/ResourceInspectTaskDto.java
index 43ff7061..0c584460 100644
--- a/equip/src/main/java/com/foreverwin/mesnac/equip/dto/ResourceInspectTaskDto.java
+++ b/equip/src/main/java/com/foreverwin/mesnac/equip/dto/ResourceInspectTaskDto.java
@@ -87,7 +87,13 @@ public class ResourceInspectTaskDto implements Serializable {
     /**消耗备品**/
     private List<ResourceInspectTaskSpare> taskSpareList;
 
+    public Integer getItemSeq() {
+        return itemSeq;
+    }
 
+    public void setItemSeq(Integer itemSeq) {
+        this.itemSeq = itemSeq;
+    }
 
     public String getCompareStartDate() {
         return compareStartDate;
diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectTaskServiceImpl.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectTaskServiceImpl.java
index d2ffb3a7..f180277b 100644
--- a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectTaskServiceImpl.java
+++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectTaskServiceImpl.java
@@ -78,10 +78,12 @@ public class ResourceInspectTaskServiceImpl extends ServiceImpl<ResourceInspectT
         resourceInspectTaskDto.setSite(site);
         List<ResourceInspectTaskDto> list = resourceInspectTaskMapper.findResourceInspectTaskList(resourceInspectTaskDto);
         for (ResourceInspectTaskDto task:list) {
-            task.setResourceTypeNo(task.getResourceTypeBo().split(",")[1]);
             task.setCycle(getCycle(task));
             task.setCurrentUser(currentUser);
         }
+        for (ResourceInspectTaskDto task:list) {
+            System.out.println(task.getTaskNo());
+        }
         return list;
     }
 
@@ -229,6 +231,9 @@ public class ResourceInspectTaskServiceImpl extends ServiceImpl<ResourceInspectT
         String frequencyUnit = task.getFrequencyUnit();
         String frequency = task.getFrequency();
         StringBuffer cycle = new StringBuffer("每");
+        if (frequencyUnit == null){
+            return "---";
+        }
         switch (frequencyUnit){
             case "D":
                 cycle = cycle.append(frequency).append("天");
diff --git a/equip/src/main/resources/mapper/ResourceInspectTaskMapper.xml b/equip/src/main/resources/mapper/ResourceInspectTaskMapper.xml
index cf202d8e..6a71cedb 100644
--- a/equip/src/main/resources/mapper/ResourceInspectTaskMapper.xml
+++ b/equip/src/main/resources/mapper/ResourceInspectTaskMapper.xml
@@ -595,48 +595,50 @@
 
         <!--自定义sql：模糊查询检验任务所有字段、车间、设备名称等字段-->
     <select id="findResourceInspectTaskList" resultType="com.foreverwin.mesnac.equip.dto.ResourceInspectTaskDto">
-        SELECT DISTINCT ZK.* ,RIP.PLAN_NO AS PLAN_NO ,RIP.FREQUENCY ,RIP.FREQUENCY_UNIT ,
+        SELECT DISTINCT RIK.* ,RIP.PLAN_NO AS PLAN_NO ,RIP.FREQUENCY ,RIP.FREQUENCY_UNIT ,
         R.RESRCE AS RESOURCE_NO ,R.DESCRIPTION AS RESOURCE_DESCRIPTION ,
-        RTR.RESOURCE_TYPE_BO,WCT.DESCRIPTION AS WORK_CENTER
-        FROM ( SELECT * FROM Z_RESOURCE_INSPECT_TASK SD
-        WHERE SD.SITE = #{site}
+        RTR.RESOURCE_TYPE_BO ,RT.RESOURCE_TYPE AS RESOURCE_TYPE_NO ,RT.DESCRIPTION AS RESOURCE_TYPE_DESCRIPTION ,
+        WCT.DESCRIPTION AS WORK_CENTER
+        FROM Z_RESOURCE_INSPECT_TASK RIK
+        LEFT JOIN Z_INSPECT_PLAN_USER_GROUP ZG ON ZG.RESOURCE_INSPECT_PLAN_BO = RIK.RESOURCE_INSPECT_PLAN_BO
+        LEFT JOIN USER_GROUP_MEMBER UGM ON UGM.USER_GROUP_BO = ZG.USER_GROUP_BO
+        LEFT JOIN Z_RESOURCE_INSPECT_PLAN RIP ON RIK.RESOURCE_INSPECT_PLAN_BO = RIP.HANDLE
+        LEFT JOIN RESRCE R ON R.HANDLE = RIK.RESOURCE_BO
+        LEFT JOIN WORK_CENTER_MEMBER WCM ON WCM.WORK_CENTER_OR_RESOURCE_GBO = RIK.RESOURCE_BO
+        LEFT JOIN WORK_CENTER_T WCT ON WCT.WORK_CENTER_BO = WCM.WORK_CENTER_BO
+        LEFT JOIN RESOURCE_TYPE_RESOURCE RTR ON RTR.RESOURCE_BO = RIK.RESOURCE_BO
+        LEFT JOIN RESOURCE_TYPE RT ON RT.HANDLE = RTR.RESOURCE_TYPE_BO
+        WHERE
+        (ZG.USER_GROUP_BO IS NULL OR (ZG.USER_GROUP_BO IS NOT NULL AND UGM.USER_OR_GROUP_GBO = #{currentUser}))
+        AND RIK.SITE = #{site}
         <if test="taskNo != null and taskNo != ''">
-            AND SD.TASK_NO = #{taskNo}
+            AND RIK.TASK_NO = #{taskNo}
         </if>
         <if test="category != null and category != ''">
-            AND SD.CATEGORY = #{category}
+            AND RIK.CATEGORY = #{category}
         </if>
         <if test="status != null and status != ''">
-            AND SD.STATUS = #{status}
+            AND RIK.STATUS = #{status}
         </if>
         <if test="resourceInspectPlanBo != null and resourceInspectPlanBo != ''">
-            AND SD.RESOURCE_INSPECT_PLAN_BO LIKE #{resourceInspectPlanBo}
+            AND RIK.RESOURCE_INSPECT_PLAN_BO LIKE #{resourceInspectPlanBo}
         </if>
         <if test="resourceBo != null and resourceBo != ''">
-            AND SD.RESOURCE_BO = #{resourceBo}
+            AND RIK.RESOURCE_BO = #{resourceBo}
         </if>
         <if test="compareStartDate != null and compareStartDate != ''">
-            AND SD.TASK_CREATE_DATE &gt; TO_DATE( #{compareStartDate},'yyyy-MM-dd hh24:mi-ss' )
+            AND RIK.TASK_CREATE_DATE &gt; TO_DATE( #{compareStartDate},'yyyy-MM-dd hh24:mi-ss' )
         </if>
         <if test="compareEndDate != null and compareEndDate != ''">
-            AND SD.TASK_CREATE_DATE &lt; TO_DATE( #{compareEndDate},'yyyy-MM-dd hh24:mi-ss' )
+            AND RIK.TASK_CREATE_DATE &lt; TO_DATE( #{compareEndDate},'yyyy-MM-dd hh24:mi-ss' )
         </if>
-        ) ZK
-        LEFT JOIN Z_INSPECT_PLAN_USER_GROUP ZG ON ZG.RESOURCE_INSPECT_PLAN_BO = ZK.RESOURCE_INSPECT_PLAN_BO
-        LEFT JOIN USER_GROUP_MEMBER UGM ON UGM.USER_GROUP_BO = ZG.USER_GROUP_BO
-        LEFT JOIN Z_RESOURCE_INSPECT_PLAN RIP ON ZK.RESOURCE_INSPECT_PLAN_BO = RIP.HANDLE
-        LEFT JOIN RESRCE R ON R.HANDLE = ZK.RESOURCE_BO
-        LEFT JOIN WORK_CENTER_MEMBER WCM ON WCM.WORK_CENTER_OR_RESOURCE_GBO = ZK.RESOURCE_BO
-        LEFT JOIN WORK_CENTER_T WCT ON WCT.WORK_CENTER_BO = WCM.WORK_CENTER_BO
-        LEFT JOIN RESOURCE_TYPE_RESOURCE RTR ON RTR.RESOURCE_BO = ZK.RESOURCE_BO
-        WHERE
-        (ZG.USER_GROUP_BO IS NULL OR (ZG.USER_GROUP_BO IS NOT NULL AND UGM.USER_OR_GROUP_GBO = #{currentUser}))
         <if test="resourceTypeBo != null and resourceTypeBo != ''">
             AND RTR.RESOURCE_TYPE_BO = #{resourceTypeBo}
         </if>
         <if test="workCenter != null and workCenter != ''">
             AND WCM.WORK_CENTER_BO = #{workCenter}
         </if>
+        ORDER BY RIK.TASK_NO ASC
     </select>
 
         <!--自定义sql：条件查询，根据检验计划handle及设备handle，获取最新的创建任务时间-->
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/InventoryController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/InventoryController.java
index fb0e375f..7faab2b5 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/InventoryController.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/InventoryController.java
@@ -2,7 +2,6 @@ package com.foreverwin.mesnac.meapi.controller;
 
 import com.foreverwin.modular.core.util.R;
 import com.foreverwin.modular.core.util.FrontPage;
-import com.foreverwin.modular.core.util.CommonMethods;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -11,6 +10,8 @@ import org.springframework.web.bind.annotation.*;
 
 import com.foreverwin.mesnac.meapi.service.InventoryService;
 import com.foreverwin.mesnac.meapi.model.Inventory;
+
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -136,4 +137,25 @@ public class InventoryController {
     public R removeByIds(List<String> ids){
         return R.ok(inventoryService.removeByIds(ids));
     }
+
+    /**
+     * 根据条码号，返回库存数量
+     * 使用场景：扫描物料条码，返回库存数量
+     * @param inventory
+     * @return
+     */
+    @ResponseBody
+    @GetMapping("/getInventoryOne")
+    public R getInventoryOne(Inventory inventory){
+        List<Inventory> inventoryList = inventoryService.selectList(inventory);
+        if (inventoryList.size() < 1){
+            inventory.setQtyOnHand(new BigDecimal(0));
+            return R.ok(inventory);
+        }
+        if (inventoryList.size() == 1){
+            return R.ok(inventoryList.get(0));
+        }
+        return R.failed("一个条码匹配多个数据！");
+    }
+
 }
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ResrceController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ResrceController.java
index 62506810..b7683a07 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ResrceController.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ResrceController.java
@@ -164,4 +164,14 @@ public class ResrceController {
     public R findAllResrce(){
         return R.ok(resrceService.findAllResrce());
     }
+
+    /**
+     * 根据设备，找车间信息
+     * @return
+     */
+    @GetMapping("findResourceAndWorkCenterByResource")
+    public R findResourceAndWorkCenterByResource(Resrce resrce){
+        return R.ok(resrceService.findResourceAndWorkCenterByResource(resrce));
+    }
+
 }
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/ResrceMapper.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/ResrceMapper.java
index 9abafbd0..5c370428 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/ResrceMapper.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/ResrceMapper.java
@@ -1,5 +1,6 @@
 package com.foreverwin.mesnac.meapi.mapper;
 
+import com.foreverwin.mesnac.meapi.dto.ResrceWorkCenter;
 import com.foreverwin.mesnac.meapi.model.Resrce;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
@@ -36,4 +37,7 @@ public interface ResrceMapper extends BaseMapper<Resrce> {
     List<Resrce> findResourceListByResourceType(@Param("site")String site,@Param("resourceTypeBo")String resourceTypeBo);
 
     List<Map<String, Object>> selectResourceOperation(@Param("resourceBo") String resourceBo);
+
+    ResrceWorkCenter findResourceAndWorkCenterByResource(Resrce resrce);
+
 }
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/ResrceService.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/ResrceService.java
index 83c34a20..a4d3866c 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/ResrceService.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/ResrceService.java
@@ -1,6 +1,7 @@
 package com.foreverwin.mesnac.meapi.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.foreverwin.mesnac.meapi.dto.ResrceWorkCenter;
 import com.foreverwin.mesnac.meapi.model.Resrce;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.foreverwin.modular.core.util.FrontPage;
@@ -69,4 +70,12 @@ public interface ResrceService extends IService<Resrce> {
      * @return
      */
     List<Map<String, Object>> getResourceOperation(String resourceBo);
+
+    /**
+     * 根据设备查询设备及车间信息
+     * @param resrce
+     * @return
+     */
+    ResrceWorkCenter findResourceAndWorkCenterByResource(Resrce resrce);
+
 }
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/ResrceServiceImpl.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/ResrceServiceImpl.java
index 0477c4a5..703522ef 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/ResrceServiceImpl.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/ResrceServiceImpl.java
@@ -1,5 +1,6 @@
 package com.foreverwin.mesnac.meapi.service.impl;
 
+import com.foreverwin.mesnac.meapi.dto.ResrceWorkCenter;
 import com.foreverwin.modular.core.util.CommonMethods;
 import com.foreverwin.modular.core.util.FrontPage;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -89,5 +90,10 @@ public class ResrceServiceImpl extends ServiceImpl<ResrceMapper, Resrce> impleme
         return resrceMapper.selectResourceOperation(resourceBo);
     }
 
+    @Override
+    public ResrceWorkCenter findResourceAndWorkCenterByResource(Resrce resrce) {
+        return resrceMapper.findResourceAndWorkCenterByResource(resrce);
+    }
+
 
 }
\ No newline at end of file
diff --git a/meapi/src/main/resources/mapper/ResrceMapper.xml b/meapi/src/main/resources/mapper/ResrceMapper.xml
index a2cff535..2b0231cd 100644
--- a/meapi/src/main/resources/mapper/ResrceMapper.xml
+++ b/meapi/src/main/resources/mapper/ResrceMapper.xml
@@ -586,4 +586,17 @@
         LEFT JOIN RESOURCE_TYPE RT ON RT.HANDLE = RR.RESOURCE_TYPE_BO
         WHERE RS.HANDLE = #{resourceBo}
     </select>
+
+    <select id="findResourceAndWorkCenterByResource" resultType="com.foreverwin.mesnac.meapi.dto.ResrceWorkCenter">
+        SELECT R.RESRCE AS RESOURCE_NO ,R.DESCRIPTION AS RESOURCE_DESCRIPTION,
+            WCM2.WORK_CENTER_BO , WCT.DESCRIPTION AS WORK_CENTER_DESCRIPTION ,WC.WORK_CENTER AS WORK_CENTER_NO
+        FROM RESRCE r
+        LEFT JOIN WORK_CENTER_MEMBER WCM ON WCM.WORK_CENTER_OR_RESOURCE_GBO = R.HANDLE
+        LEFT JOIN WORK_CENTER_MEMBER wcm2 ON WCM2.WORK_CENTER_OR_RESOURCE_GBO = WCM.WORK_CENTER_BO
+        LEFT JOIN WORK_CENTER_T wct ON WCM2.WORK_CENTER_BO = WCT.WORK_CENTER_BO
+        LEFT JOIN WORK_CENTER wc ON WC.HANDLE = WCM2.WORK_CENTER_BO
+        WHERE R.RESRCE = #{resrce} AND R.SITE = #{site}
+    </select>
+
+
 </mapper>