查询

huimv-admin/src/main/java/com/huimv/guowei/admin/controller/BaseDuckInfoController.java

@@ -149,6 +149,23 @@ public class BaseDuckInfoController {
         return new Result(ResultCode.SUCCESS, resultMap);
     }
 
+    @PostMapping("/getDuckByJiaoNum")
+    public Result getDuckByJiaoNum(@RequestBody Map<String, String> paramsMap) {
+        String jiaoNum = paramsMap.get("jiaoNum");
+        String farmId = paramsMap.get("farmId");
+        BaseDuckInfo baseDuckInfo = duckInfoService.getOne(new QueryWrapper<BaseDuckInfo>().eq("farm_id", farmId).eq("jiao_num", jiaoNum).eq("is_cage", 0));
+        if (ObjectUtil.isEmpty(baseDuckInfo)) {
+            return new Result(10001, "鸭只不存在或鸭只已出笼", false);
+        }
+        Map resultMap = new HashMap();
+        resultMap.put("chiNum", baseDuckInfo.getChiNum());
+        resultMap.put("jiaoNum", baseDuckInfo.getJiaoNum());
+        resultMap.put("batchNum", baseDuckInfo.getBatchNum());
+        resultMap.put("unitName", baseDuckInfo.getUnitName());
+        resultMap.put("duckNum", baseDuckInfo.getDuckNum());
+        return new Result(ResultCode.SUCCESS, resultMap);
+    }
+
     @GetMapping("/printDuck")
     public void printDuck(HttpServletResponse response, @RequestParam(name = "duckCode") String duckCode) throws Exception {
         Map<String, String> map = new HashMap<>();

huimv-admin/src/main/java/com/huimv/guowei/admin/controller/EnvMoveCallController.java

@@ -1,6 +1,7 @@
 package com.huimv.guowei.admin.controller;
 
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.guowei.admin.common.utils.Result;
 import com.huimv.guowei.admin.common.utils.ResultCode;
@@ -59,7 +60,10 @@ public class EnvMoveCallController {
             QueryWrapper<BaseDuckInfo> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("farm_id", envMoveCall.getFarmId()).eq("duck_num", envMoveCall.getDuckNum());
             BaseDuckInfo duckInfo = duckInfoService.getOne(queryWrapper);
-
+            BaseDuckInfo baseDuckInfo = duckInfoService.getOne(new QueryWrapper<BaseDuckInfo>().eq("farm_id", envMoveCall.getFarmId()).eq("duck_num", envMoveCall.getDuckNum()).eq("is_cage", 0));
+            if (ObjectUtil.isEmpty(baseDuckInfo)) {
+                return new Result(10001, "鸭只不存在或鸭只已出笼", false);
+            }
             Date callDate = envMoveCall.getCallDate();
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
             String month = sdf.format(callDate);