From 7b2a401752b45d3f8122441701a58d290634df56 Mon Sep 17 00:00:00 2001
From: maochaoying <925670706@qq.com>
Date: Thu, 13 Apr 2023 16:50:14 +0800
Subject: [PATCH] 123

---
 src/service/chicken.service.js | 32 +++++++++++++++++++++++++++++++-
 src/service/coop.service.js    |  8 ++++----
 src/utils/common.js            | 13 +++++++------
 3 files changed, 42 insertions(+), 11 deletions(-)

diff --git a/src/service/chicken.service.js b/src/service/chicken.service.js
index f9960ba..f47af0c 100644
--- a/src/service/chicken.service.js
+++ b/src/service/chicken.service.js
@@ -28,7 +28,37 @@ class ChickenService {
     factory_id,
     log_user_id
   ) {
-    const batch_number = generateSerialNumber();
+    // batchnumber需要更改为 时间(到天的日期)20230403- + 鸡场ID- + 第几次进
+    // 加鸡场ID区分哪一个鸡场
+    // 需要查询今天进鸡的最大的批次号递增1
+    const currentDayDataRes = await Chicken.findAll({
+      where: {
+        [Sequelize.Op.and]: [
+          {
+            house_id,
+          },
+          Sequelize.where(
+            Sequelize.fn("DATE", Sequelize.col("createdAt")), // 表对应的字段
+            Sequelize.literal("CURRENT_DATE")
+          ),
+        ],
+      },
+    });
+    const currentDayData = currentDayDataRes?.map((item) => item.dataValues);
+    let batch_number = "";
+    if (currentDayData?.length > 0) {
+      batch_number =
+        generateSerialNumber() +
+        "-" +
+        house_id +
+        "-" +
+        (parseInt(
+          currentDayData[currentDayData.length - 1]?.batch_number?.split("-")[2]
+        ) +
+          1);
+    } else {
+      batch_number = generateSerialNumber() + "-" + house_id + "-" + "1";
+    }
     // 生成real_life_init_time
     const real_life_init_time = getTimeLastDate(put_time, chicken_day_life);
     const res = await Chicken.create({
diff --git a/src/service/coop.service.js b/src/service/coop.service.js
index f2e6246..4a446a4 100644
--- a/src/service/coop.service.js
+++ b/src/service/coop.service.js
@@ -95,13 +95,13 @@ class CoopService {
   }
 
   async deleteCoop(id) {
-    const chickenInfo = await Chicken.findAll({
+    // 已有进鸡记录优化，新增coop表is_empty
+    const chickenInfo = await Coop.findAll({
       where: {
-        coop_id: id,
-        is_marketed: 0,
+        id,
+        is_empty: 0,
       },
     });
-    console.log(chickenInfo);
     if (chickenInfo && chickenInfo.length > 0) {
       // 已有进鸡记录的鸡舍不可删除
       return null;
diff --git a/src/utils/common.js b/src/utils/common.js
index 3cc8f5f..4c7f233 100644
--- a/src/utils/common.js
+++ b/src/utils/common.js
@@ -9,14 +9,15 @@ function isJsonString(str) {
 
 function generateSerialNumber() {
   const now = new Date();
+  let month = 1;
   const year = now.getFullYear(); //得到年份
-  const month = now.getMonth() + 1; //得到月份
+  if (month < 10) {
+    month = "0" + (now.getMonth() + 1);
+  } else {
+    month = now.getMonth() + 1;
+  }
   const date = now.getDate(); //得到日期
-  const hour = now.getHours(); //得到小时数
-  const minute = now.getMinutes(); //得到分钟数
-  const second = now.getSeconds(); //得到秒数
-  const time = now.getTime();
-  return `${year}${month}${date}${hour}${minute}${second}${time}`;
+  return `${year}${month}${date}`;
 }
 
 // 判断当时时间是否为整点