123

src/controller/die.controller.js

@@ -12,12 +12,14 @@ class DieController {
   async add(ctx, next) {
     const { house_id, coop_id, reason_id, die_number, put_time } =
       ctx.request.body;
+    const { id: log_user_id } = ctx.state.user;
     const res = await addDieLog(
       house_id,
       coop_id,
       reason_id,
       die_number,
-      put_time
+      put_time,
+      log_user_id
     );
     ctx.body = Response(0, "新增死淘记录成功", res);
   }

src/controller/market.controller.js

@@ -17,12 +17,14 @@ class MarketController {
       house_id,
       out_time,
     } = ctx.request.body;
+    const { id: log_user_id } = ctx.state.user;
     const res = await addNewMarket(
       batch_id,
       market_number,
       market_counter_balance,
       house_id,
-      out_time
+      out_time,
+      log_user_id
     );
     // 一旦出栏，需要将该批次号下的所有coop中的is_empty变为1，变为空舍
     try {

src/model/die.model.js

@@ -30,6 +30,11 @@ const Die = seq.define("chicken_die", {
     defaultValue: DataTypes.NOW,
     comment: "录入时间",
   },
+  log_user_id: {
+    type: DataTypes.INTEGER,
+    allowNull: false,
+    comment: "记录人id",
+  },
 });
 
 // 强制同步数据库(创建数据表)

src/model/market.model.js

@@ -28,6 +28,11 @@ const Market = seq.define("chicken_market", {
     allowNull: false,
     comment: "鸡场id",
   },
+  log_user_id: {
+    type: DataTypes.INTEGER,
+    allowNull: false,
+    comment: "记录人id",
+  },
   out_time: {
     type: DataTypes.DATE,
     allowNull: false,

src/service/chicken.service.js

@@ -109,7 +109,10 @@ class ChickenService {
       const varietyName = await getVarietyById(someId.variety_id);
       const allCoops = await getBatchCoopByIds(someId.coop_id.split(","));
       someId.houseName = houseInfo.house_name;
-      someId.log_name = log_name;
+      // 不能通过登录人去拿log_name 应该去库里查询
+      // someId.log_user_id
+      const userinfo = await getAccountInfo({ id: someId.log_user_id });
+      someId.log_name = userinfo?.name;
       someId.factoryName = factoryName;
       someId.varietyName = varietyName;
       someId.allCoops = allCoops;

src/service/control.service.js

@@ -59,6 +59,7 @@ class ControlService {
       // 查询批次号和日龄
       const allChickenInfo = await Chicken.findAll({
         where: {
+          is_marketed: 0,
           coop_id: {
             [Op.like]: `%${coop_id}%`,
           },

src/service/die.service.js

@@ -9,13 +9,21 @@ const { getAccountInfo } = require("./account.service");
 const { getReasonById } = require("./reason.service");
 const moment = require("moment");
 class DieService {
-  async addDieLog(house_id, coop_id, reason_id, die_number, put_time) {
+  async addDieLog(
+    house_id,
+    coop_id,
+    reason_id,
+    die_number,
+    put_time,
+    log_user_id
+  ) {
     const res = await Die.create({
       house_id,
       coop_id,
       reason_id,
       die_number,
       put_time,
+      log_user_id,
     });
     return res ? res.dataValues : null;
   }
@@ -223,7 +231,7 @@ class DieService {
         chickenInfo.real_life_init_time
       );
       res.dataValues.factoryInfo = factoryInfo;
-      const userInfo = await getAccountInfo(chickenInfo.log_user_id);
+      const userInfo = await getAccountInfo(res.log_user_id);
       res.dataValues.log_user = userInfo.name;
       return res.dataValues;
     }

src/service/market.service.js

@@ -14,7 +14,8 @@ class MarketService {
     market_number,
     market_counter_balance,
     house_id,
-    out_time
+    out_time,
+    log_user_id
   ) {
     const res = await Market.create({
       batch_id,
@@ -22,6 +23,7 @@ class MarketService {
       market_counter_balance,
       house_id,
       out_time,
+      log_user_id,
     });
     // 新增后 将chicken表中该batch_number对应的row中is_marketed改为1
     const updateRes = await Chicken.update(
@@ -73,9 +75,8 @@ class MarketService {
     });
     // 根据当前的batch_id查询基本信息
     const chickenInfo = await getAllChickenByBatchId(batch_id);
-    const log_user_id = chickenInfo.log_user_id;
     const variety_id = chickenInfo.variety_id;
-    const userInfo = await getAccountInfo({ id: log_user_id });
+    const userInfo = await getAccountInfo({ id: res.log_user_id });
     const varietyInfo = await getVarietyById(variety_id);
     const coop_ids = chickenInfo.coop_id.split(",");
     // // 根据coop_id批量查询