diff --git a/src/controller/die.controller.js b/src/controller/die.controller.js index 70f58b7..c837a4d 100644 --- a/src/controller/die.controller.js +++ b/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); } diff --git a/src/controller/market.controller.js b/src/controller/market.controller.js index dcb2c76..4e89f6e 100644 --- a/src/controller/market.controller.js +++ b/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 { diff --git a/src/model/die.model.js b/src/model/die.model.js index 4795e0f..309d42f 100644 --- a/src/model/die.model.js +++ b/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", + }, }); // 强制同步数据库(创建数据表) diff --git a/src/model/market.model.js b/src/model/market.model.js index f1d774b..1d9c7e2 100644 --- a/src/model/market.model.js +++ b/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, diff --git a/src/service/chicken.service.js b/src/service/chicken.service.js index 5c9839e..fae8025 100644 --- a/src/service/chicken.service.js +++ b/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; diff --git a/src/service/control.service.js b/src/service/control.service.js index 7cf63e5..35f7fb3 100644 --- a/src/service/control.service.js +++ b/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}%`, }, diff --git a/src/service/die.service.js b/src/service/die.service.js index 2b73dc2..fee9615 100644 --- a/src/service/die.service.js +++ b/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; } diff --git a/src/service/market.service.js b/src/service/market.service.js index 9e825c6..6f33055 100644 --- a/src/service/market.service.js +++ b/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批量查询