杰生 物料维护

hx-service/storage/src/main/java/com/fjhx/stock/controller/StockWaterController.java

@@ -174,5 +174,14 @@ public class StockWaterController {
         return R.success(list);
     }
 
+    /**
+     * 盘点详情
+     */
+    @PostMapping("inventoryDetails")
+    public R inventoryDetails(@RequestBody Condition condition) {
+        List<Map<String, Object>> list = stockWaterService.inventoryDetails(condition);
+        return R.success(list);
+    }
+
 }
 

hx-service/storage/src/main/java/com/fjhx/stock/mapper/StockWaterMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.base.Condition;
 import com.fjhx.entity.stock.StockWater;
 import org.apache.ibatis.annotations.Param;
 import org.springblade.core.tenant.annotation.TenantIgnore;
@@ -72,4 +73,6 @@ public interface StockWaterMapper extends BaseMapper<StockWater> {
 
     List<Map<String, Object>> getTransferBackList(@Param("ew") QueryWrapper<Object> wrapper);
 
+    List<Map<String, Object>> getInventoryDetails(@Param("condition") Condition condition);
+
 }

hx-service/storage/src/main/java/com/fjhx/stock/mapper/StockWaterMapper.xml

@@ -346,6 +346,43 @@
                  left join u_user uu2 on uu2.ID = aa2.ID
             ${ew.customSqlSegment}
     </select>
+    <select id="getInventoryDetails" resultType="java.util.Map">
+        SELECT scrd.ID            AS detialId,
+               CASE
+                   m.TechnologyType
+                   WHEN 0 THEN
+                       '直喷'
+                   WHEN 1 THEN
+                       '热转'
+                   WHEN 2 THEN
+                       '打纸'
+                   WHEN 3 THEN
+                       '墨水'
+                   WHEN 4 THEN
+                       '其他'
+                   END            AS categoryName,
+               m.Purpose             purpose,
+               scrd.MaterialCode  AS materialCode,
+               m.`Name`           AS materialName,
+               scrd.TagQuantity   AS stockCount,
+               scrd.CheckTagCount AS scanfCount,
+               scrd.HandTagCount  AS handCount,
+               CASE
+                   scrd.TagQuantity
+                   WHEN scrd.CheckTagCount THEN
+                       '正常'
+                   ELSE '异常'
+                   END            AS result,
+               scrd.CheckTime     AS checkTime,
+               uu.RealName        AS checkUser
+        FROM stock_checkrecorddetail scrd
+                 LEFT JOIN material m ON scrd.MaterialCode = m.`Code`
+                 LEFT JOIN u_user uu ON scrd.CreateUserID = uu.ID
+        WHERE scrd.RecordId = #{condition.recordId}
+          AND scrd.IsDelete = 0
+          AND (scrd.TagQuantity != scrd.AllStockScanCount OR scrd.Quantity != scrd.AllStockScanQty)
+        ORDER BY scrd.MaterialCode
+    </select>
 
 
 </mapper>

hx-service/storage/src/main/java/com/fjhx/stock/service/StockWaterService.java

@@ -52,4 +52,6 @@ public interface StockWaterService extends BaseService<StockWater> {
 
     List<JSONObject> transferOut(Condition condition);
 
+    List<Map<String, Object>> inventoryDetails(Condition condition);
+
 }

hx-service/storage/src/main/java/com/fjhx/stock/service/impl/StockWaterServiceImpl.java

@@ -597,6 +597,12 @@ public class StockWaterServiceImpl extends ServiceImpl<StockWaterMapper, StockWa
         return format(list);
     }
 
+    @Override
+    public List<Map<String, Object>> inventoryDetails(Condition condition) {
+
+        return baseMapper.getInventoryDetails(condition);
+    }
+
     private List<JSONObject> format(List<Map<String, Object>> list) {
         Map<String, JSONObject> collect = list.stream().collect(Collectors.toMap(
                 item -> item.get("materialCode").toString(),