杰生重构

hx-service/storage-restructure/src/main/java/com/fjhx/controller/water/WaterTagController.java

@@ -79,7 +79,7 @@ public class WaterTagController {
      * 删除标签流程
      */
     @PostMapping("/deleteFlowCreate")
-    public R delete(@RequestBody WaterTagVo waterTagVo) {
+    public R deleteFlowCreate(@RequestBody WaterTagVo waterTagVo) {
         deleteTagService.create(waterTagVo.getId());
         return R.success();
     }
@@ -88,10 +88,19 @@ public class WaterTagController {
      * 删除标签跳转
      */
     @PostMapping("/deleteFlowJump")
-    public R delete(@RequestBody JumpVo jumpVo) {
+    public R deleteFlowJump(@RequestBody JumpVo jumpVo) {
         deleteTagService.jump(jumpVo);
         return R.success();
     }
 
+    /**
+     * 通过二维码获取标签明细
+     */
+    @PostMapping("/getDetailsByQrCode")
+    public R getDetailsByQrCode(@RequestBody WaterTag waterTag) {
+        Map<String, Object> result = waterTagService.getDetailsByQrCode(waterTag.getQrCode());
+        return R.success(result);
+    }
+
 }
 

hx-service/storage-restructure/src/main/java/com/fjhx/mapper/water/WaterTagMapper.java

@@ -20,4 +20,6 @@ public interface WaterTagMapper extends BaseMapper<WaterTag> {
 
     Page<Map<String, Object>> getPage(@Param("page") Page<Object> page, @Param("ew") QueryWrapper<WaterTag> wrapper);
 
+    Map<String, Object> getDetailsByQrCode(@Param("qrCode") String qrCode);
+
 }

hx-service/storage-restructure/src/main/java/com/fjhx/mapper/water/WaterTagMapper.xml

@@ -15,4 +15,20 @@
             ${ew.customSqlSegment}
     </select>
 
+    <select id="getDetailsByQrCode" resultType="java.util.Map">
+        select wt.id,
+               wt.number,
+               wb.contract_code,
+               wb.contract_details_code,
+               m.code materialCode,
+               m.name materialName,
+               m.Spec materialSpec,
+               wt.quantity,
+               m.unit materialUnit
+        from water_tag wt
+                 left join water_batch wb on wt.water_batch_id = wb.id
+                 left join material m on wb.material_id = m.id
+        where wt.qr_code = #{qrCode}
+    </select>
+
 </mapper>

hx-service/storage-restructure/src/main/java/com/fjhx/service/water/WaterTagService.java

@@ -32,4 +32,6 @@ public interface WaterTagService extends StorageBaseService<WaterTag> {
 
     void bindingRfid(Long id, String rfidCode);
 
+    Map<String, Object> getDetailsByQrCode(String qrCode);
+
 }

hx-service/storage-restructure/src/main/java/com/fjhx/service/water/impl/WaterTagServiceImpl.java

@@ -162,6 +162,11 @@ public class WaterTagServiceImpl extends ServiceImpl<WaterTagMapper, WaterTag> i
         );
     }
 
+    @Override
+    public Map<String, Object> getDetailsByQrCode(String qrCode) {
+        return baseMapper.getDetailsByQrCode(qrCode);
+    }
+
     /**
      * 解析excel文件中的数据
      */