123

ruoyi-ui/src/api/livestockFinance/yakAsset.js

@@ -9,7 +9,7 @@ export function listYakAsset(query) {
   })
 }
 
-/** 档案详情（主表 + 四子表） */
+/** 档案详情（主表 + 子表） */
 export function getYakAsset(id) {
   return request({
     url: "/dataModel/yakAsset/" + id,
@@ -43,7 +43,7 @@ export function getYakGrowthChart(id, query) {
   })
 }
 
-/** 第三方同步 */
+/** 第三方五段全量同步（不含 IoT） */
 export function syncYakAsset() {
   return request({
     url: "/dataModel/yakAsset/sync",

ruoyi-ui/src/lang/bo/livestockFinance.js

@@ -26,7 +26,13 @@ export default {
     queryYakNoPh: "འབྲོང་ཨང་འཚོལ་རོགས།",
     queryAssetStatus: "རྒྱུ་ནོར་གནས་བབ།",
     btnSync: "མཉམ་སྒྲིག",
-    syncSummary: "གསར་{insert} རྩོམ་{update} ཕམ་{fail}",
+    syncSummary: "ནང་འཇུག：གསར་{insert} རྩོམ་{update} ཕམ་{fail}",
+    syncMasterSummary: "མཉམ་སྒྲིག་ཚར（རྩྭ་ཁང་ {pInsert}/{pUpdate}/{pFail}，ལྡེ་མིག {eInsert}/{eUpdate}/{eFail}，འཆར་གཞི {plInsert}/{plUpdate}/{plFail}，ཚོགས {bInsert}/{bUpdate}/{bFail}，ནང་འཇུག {yInsert}/{yUpdate}/{yFail}）",
+    syncStepPasture: "རྩྭ་ཁང་",
+    syncStepEnclosure: "ལྡེ་མིག",
+    syncStepPlan: "འཆར་གཞི",
+    syncStepBatch: "ཚོགས",
+    syncStepYakAsset: "ནང་འཇུག",
     syncTimeHint: "གཞི་གྲངས་དུས་ཚོད：{time}",
     colYakNo: "འབྲོང་ཨང་།",
     colPastureName: "རྩྭ་ཁང་།",
@@ -44,6 +50,11 @@ export default {
     sectionGrowth: "འཛོམས་རྒྱས།",
     sectionReproduction: "འཕྲོད་ནུས།",
     sectionFeeding: "ཟས་གསོས།",
+    sectionPen: "འབྲོང་ལྡེ་མིག",
+    sectionBatch: "འབྲོང་ཚོགས",
+    colEnclosureName: "ལྡེ་མིག་མིང་།",
+    colPenLocation: "ལྡེ་མིག་གནས།",
+    colEntryCycle: "ནང་འཇུག་དུས་ཚོད།",
     growthModeList: "ཐོ་བྱང་།",
     growthModeChart: "འཁྱར་རིས།",
     growthMetric: "ཚད་གཞི།",
@@ -74,6 +85,18 @@ export default {
     fieldEnvTemp: "ཁོར་ཡུག་དྲོད།",
     fieldLocation: "གནས་ཡུལ།",
     fieldPhysioCollectTime: "བསྡུ་ཚེས།",
+    fieldEarTagNumber: "རྣ་རྟགས་ཨང་།",
+    fieldEnclosureName: "ལྡེ་མིག་མིང་།",
+    fieldEntryCycle: "ནང་འཇུག་དུས་ཚོད།",
+    fieldCattleVariety: "འབྲོང་རིགས།",
+    fieldCattlePicture: "འབྲོང་པར།",
+    fieldRegistrant: "ཐོ་འགོད་མཁན།",
+    fieldRemark: "ཟུར་མཆན།",
+    fieldStatusChangeDate: "བསྒྱུར་ཚེས།",
+    fieldStatusChangeReason: "བསྒྱུར་རྒྱུ་མཚན།",
+    fieldPenLocation: "ལྡེ་མིག་གནས།",
+    fieldExpectedOutDate: "ཕྱིར་འདོན་དུས་ཚོད།",
+    fieldSupplementPlan: "ཟས་གསོས་འཆར་གཞི།",
     fieldLastSyncTime: "མཉམ་སྒྲིག་དུས་ཚོད།",
     colDayAge: "ཉིན་གྲངས།",
     colWeight: "ལུས་ཚད།",
@@ -96,15 +119,8 @@ export default {
     dataKindForecast: "སྔོན་དཔྱད།",
     pedigreeNotFound: "ཨང་{no} མ་རྙེད།",
     status1: "སྤྱིར་བཟང་།",
-    status2: "འཕྲུལ་བཞིན།",
-    status3: "འཕྲོད་དུས།",
-    status4: "ཐག་གཏོར།",
-    status5: "སྲུང་འཁོར།",
-    status6: "ཕྱིར་འདོན་སྒུག",
-    status7: "སྐྱུར་མེད།",
-    status8: "ཤི་བ།",
-    status9: "ཕུད།",
-    status10: "བཙོངས་ཟིན།",
-    status11: "ཆད་པ།"
+    status2: "ཤི་ཕུད།",
+    status3: "ཆད་པ།",
+    status4: "ཕྱིར་འདོན།"
   }
 }

ruoyi-ui/src/lang/zh/livestockFinance.js

@@ -26,7 +26,13 @@ export default {
     queryYakNoPh: "请输入牦牛编号关键字",
     queryAssetStatus: "资产状态",
     btnSync: "同步",
-    syncSummary: "新增 {insert} 条，更新 {update} 条，失败 {fail} 条",
+    syncSummary: "入栏建档：新增 {insert} 条，更新 {update} 条，失败 {fail} 条",
+    syncMasterSummary: "同步完成（养殖场 {pInsert}/{pUpdate}/{pFail}，圈舍 {eInsert}/{eUpdate}/{eFail}，计划 {plInsert}/{plUpdate}/{plFail}，批次 {bInsert}/{bUpdate}/{bFail}，入栏 {yInsert}/{yUpdate}/{yFail}）",
+    syncStepPasture: "养殖场",
+    syncStepEnclosure: "圈舍",
+    syncStepPlan: "生产计划",
+    syncStepBatch: "批次",
+    syncStepYakAsset: "入栏建档",
     syncTimeHint: "数据截至：{time}",
     colYakNo: "牦牛编号",
     colPastureName: "所属牧场",
@@ -44,6 +50,11 @@ export default {
     sectionGrowth: "生长性状",
     sectionReproduction: "繁殖性能",
     sectionFeeding: "饲喂数据",
+    sectionPen: "牦牛圈舍",
+    sectionBatch: "牦牛批次",
+    colEnclosureName: "圈舍名称",
+    colPenLocation: "圈舍位置",
+    colEntryCycle: "入栏周期",
     growthModeList: "列表",
     growthModeChart: "曲线图",
     growthMetric: "指标",
@@ -74,6 +85,18 @@ export default {
     fieldEnvTemp: "环境温度",
     fieldLocation: "位置",
     fieldPhysioCollectTime: "采集时间",
+    fieldEarTagNumber: "耳标编号",
+    fieldEnclosureName: "圈舍名称",
+    fieldEntryCycle: "入栏周期",
+    fieldCattleVariety: "牛只品种",
+    fieldCattlePicture: "牛只图片",
+    fieldRegistrant: "登记人",
+    fieldRemark: "备注",
+    fieldStatusChangeDate: "变更日期",
+    fieldStatusChangeReason: "状态变更原因",
+    fieldPenLocation: "圈舍位置",
+    fieldExpectedOutDate: "预计出栏日期",
+    fieldSupplementPlan: "补饲方案",
     fieldLastSyncTime: "最近同步时间",
     colDayAge: "日龄",
     colWeight: "体重",
@@ -96,15 +119,8 @@ export default {
     dataKindForecast: "预测",
     pedigreeNotFound: "未找到编号为 {no} 的档案",
     status1: "正常",
-    status2: "在养",
-    status3: "生产期",
-    status4: "抵押中",
-    status5: "投保中",
-    status6: "待出栏",
-    status7: "闲置",
-    status8: "死亡",
-    status9: "淘汰",
-    status10: "已出售",
-    status11: "丢失"
+    status2: "死淘",
+    status3: "丢失",
+    status4: "出栏"
   }
 }

ruoyi-ui/src/views/livestockFinance/yakAsset/detailDrawer.vue

@@ -16,6 +16,9 @@
           <el-col :span="3"><span class="yak-detail__label">{{ lfT("fieldGender") }}：</span>{{ asset.gender || dash }}</el-col>
           <el-col :span="3"><span class="yak-detail__label">{{ lfT("fieldAgeMonths") }}：</span>{{ formatAgeMonths(asset.ageMonths) }}</el-col>
         </el-row>
+        <el-row v-if="asset.earTagNumber" :gutter="16" class="yak-detail__summary-extra">
+          <el-col :span="6"><span class="yak-detail__label">{{ lfT("fieldEarTagNumber") }}：</span>{{ asset.earTagNumber }}</el-col>
+        </el-row>
         <div v-if="asset.lastSyncTime" class="yak-detail__sync-hint">{{ lfT("syncTimeHint", { time: parseTime(asset.lastSyncTime) }) }}</div>
       </el-card>
 
@@ -23,9 +26,13 @@
         <div slot="header">{{ lfT("sectionBasic") }}</div>
         <el-descriptions v-if="asset" :column="3" border size="small">
           <el-descriptions-item :label="lfT('fieldYakNo')">{{ asset.yakNo || dash }}</el-descriptions-item>
+          <el-descriptions-item :label="lfT('fieldEarTagNumber')">{{ asset.earTagNumber || dash }}</el-descriptions-item>
           <el-descriptions-item :label="lfT('fieldPastureName')">{{ asset.pastureName || dash }}</el-descriptions-item>
           <el-descriptions-item :label="lfT('fieldBatchNo')">{{ asset.batchNo || dash }}</el-descriptions-item>
+          <el-descriptions-item :label="lfT('fieldEnclosureName')">{{ asset.enclosureName || dash }}</el-descriptions-item>
+          <el-descriptions-item :label="lfT('fieldEntryCycle')">{{ asset.entryCycle || dash }}</el-descriptions-item>
           <el-descriptions-item :label="lfT('fieldGender')">{{ asset.gender || dash }}</el-descriptions-item>
+          <el-descriptions-item :label="lfT('fieldCattleVariety')">{{ asset.cattleVariety || dash }}</el-descriptions-item>
           <el-descriptions-item :label="lfT('fieldBirthDate')">{{ asset.birthDate || dash }}</el-descriptions-item>
           <el-descriptions-item :label="lfT('fieldAgeMonths')">{{ formatAgeMonths(asset.ageMonths) }}</el-descriptions-item>
           <el-descriptions-item :label="lfT('fieldEntryDate')">{{ asset.entryDate || dash }}</el-descriptions-item>
@@ -33,7 +40,22 @@
           <el-descriptions-item :label="lfT('fieldSource')">{{ asset.source || dash }}</el-descriptions-item>
           <el-descriptions-item :label="lfT('fieldBreedingMethod')">{{ asset.breedingMethod || dash }}</el-descriptions-item>
           <el-descriptions-item :label="lfT('fieldAssetStatus')">{{ assetStatusLabel(asset.assetStatus) }}</el-descriptions-item>
+          <el-descriptions-item :label="lfT('fieldStatusChangeDate')">{{ asset.statusChangeDate || dash }}</el-descriptions-item>
+          <el-descriptions-item :label="lfT('fieldStatusChangeReason')">{{ asset.statusChangeReason || dash }}</el-descriptions-item>
+          <el-descriptions-item :label="lfT('fieldPenLocation')">{{ asset.penLocation || dash }}</el-descriptions-item>
+          <el-descriptions-item :label="lfT('fieldExpectedOutDate')">{{ asset.expectedOutDate || dash }}</el-descriptions-item>
+          <el-descriptions-item :label="lfT('fieldSupplementPlan')">{{ asset.supplementPlan || dash }}</el-descriptions-item>
+          <el-descriptions-item :label="lfT('fieldRegistrant')">{{ asset.registrant || dash }}</el-descriptions-item>
           <el-descriptions-item :label="lfT('fieldLastSyncTime')">{{ asset.lastSyncTime ? parseTime(asset.lastSyncTime) : dash }}</el-descriptions-item>
+          <el-descriptions-item :label="lfT('fieldRemark')" :span="3">{{ asset.remark || dash }}</el-descriptions-item>
+          <el-descriptions-item v-if="asset.cattlePicture" :label="lfT('fieldCattlePicture')" :span="3">
+            <el-image
+              :src="asset.cattlePicture"
+              fit="contain"
+              class="yak-detail__picture"
+              :preview-src-list="[asset.cattlePicture]"
+            />
+          </el-descriptions-item>
         </el-descriptions>
       </el-card>
 
@@ -84,7 +106,7 @@
             </el-select>
           </span>
         </div>
-        <el-table v-show="growthMode === 'list'" :data="growthRecords" border size="small" max-height="280">
+        <el-table v-show="growthMode === 'list'" :data="displayGrowthRecords" border size="small" max-height="280">
           <el-table-column :label="lfT('colDayAge')" prop="dayAge" align="center" width="80" />
           <el-table-column :label="lfT('colWeight')" align="center" width="90">
             <template slot-scope="scope">{{ formatWithUnit(scope.row.weightKg, lfCommon('unitKg')) }}</template>
@@ -142,6 +164,24 @@
           <el-table-column :label="lfT('colFeedType')" prop="feedType" align="center" min-width="120" :show-overflow-tooltip="true" />
         </el-table>
       </el-card>
+
+      <el-card shadow="never" class="yak-detail__block">
+        <div slot="header">{{ lfT("sectionPen") }}</div>
+        <el-table :data="penTableRows" border size="small">
+          <el-table-column :label="lfT('colEnclosureName')" prop="enclosureName" align="center" min-width="140" :show-overflow-tooltip="true" />
+          <el-table-column :label="lfT('colPenLocation')" prop="penLocation" align="center" min-width="140" :show-overflow-tooltip="true" />
+          <el-table-column :label="lfT('fieldYakNo')" prop="yakNo" align="center" min-width="120" />
+        </el-table>
+      </el-card>
+
+      <el-card shadow="never" class="yak-detail__block">
+        <div slot="header">{{ lfT("sectionBatch") }}</div>
+        <el-table :data="batchTableRows" border size="small">
+          <el-table-column :label="lfT('fieldBatchNo')" prop="batchNo" align="center" min-width="140" :show-overflow-tooltip="true" />
+          <el-table-column :label="lfT('colEntryCycle')" prop="entryCycle" align="center" min-width="120" :show-overflow-tooltip="true" />
+          <el-table-column :label="lfT('fieldYakNo')" prop="yakNo" align="center" min-width="120" />
+        </el-table>
+      </el-card>
     </div>
   </el-drawer>
 </template>
@@ -192,6 +232,29 @@ export default {
         { value: "chest", label: this.lfT("metricChest") },
         { value: "length", label: this.lfT("metricLength") }
       ]
+    },
+    penTableRows() {
+      if (!this.asset) {
+        return []
+      }
+      return [{
+        enclosureName: this.asset.enclosureName,
+        penLocation: this.asset.penLocation,
+        yakNo: this.asset.yakNo
+      }]
+    },
+    batchTableRows() {
+      if (!this.asset) {
+        return []
+      }
+      return [{
+        batchNo: this.asset.batchNo,
+        entryCycle: this.asset.entryCycle,
+        yakNo: this.asset.yakNo
+      }]
+    },
+    displayGrowthRecords() {
+      return (this.growthRecords || []).filter((row) => this.hasDayAge(row))
     }
   },
   watch: {
@@ -212,7 +275,7 @@ export default {
   },
   methods: {
     assetStatusLabel(status) {
-      if (status == null || status < 1 || status > 11) {
+      if (status == null || status < 1 || status > 4) {
         return this.dash
       }
       return this.lfT("status" + status)
@@ -313,14 +376,16 @@ export default {
         this.$nextTick(() => this.loadGrowthChart())
       }
     },
+    hasDayAge(item) {
+      return item && item.dayAge != null && item.dayAge !== ""
+    },
     chartPointsToSeries(points) {
-      const sorted = (points || []).slice().sort((a, b) => {
-        const da = a.dayAge != null ? a.dayAge : 0
-        const db = b.dayAge != null ? b.dayAge : 0
-        return da - db
-      })
+      const sorted = (points || [])
+        .filter((p) => this.hasDayAge(p))
+        .slice()
+        .sort((a, b) => a.dayAge - b.dayAge)
       return {
-        x: sorted.map((p) => (p.dayAge != null ? String(p.dayAge) : "")),
+        x: sorted.map((p) => String(p.dayAge)),
         y: sorted.map((p) => (p.value != null ? Number(p.value) : null))
       }
     },
@@ -445,6 +510,13 @@ export default {
 .yak-detail__label {
   color: #909399;
 }
+.yak-detail__summary-extra {
+  margin-top: 8px;
+}
+.yak-detail__picture {
+  width: 120px;
+  height: 120px;
+}
 .yak-detail__sync-hint {
   margin-top: 8px;
   font-size: 12px;

ruoyi-ui/src/views/livestockFinance/yakAsset/index.vue

@@ -105,9 +105,9 @@ export default {
   },
   computed: {
     assetStatusOptions() {
-      return Array.from({ length: 11 }, (_, i) => ({
-        value: i + 1,
-        label: this.lfT("status" + (i + 1))
+      return [1, 2, 3, 4].map((value) => ({
+        value,
+        label: this.lfT("status" + value)
       }))
     }
   },
@@ -116,23 +116,51 @@ export default {
   },
   methods: {
     assetStatusLabel(status) {
-      if (status == null || status < 1 || status > 11) {
+      if (status == null || status < 1 || status > 4) {
         return this.lfCommon("dash")
       }
       return this.lfT("status" + status)
     },
     assetStatusTagType(status) {
-      if (status === 8 || status === 9 || status === 11) {
+      if (status === 2 || status === 3) {
         return "danger"
       }
-      if (status === 4 || status === 6) {
+      if (status === 4) {
         return "warning"
       }
-      if (status === 1 || status === 2) {
+      if (status === 1) {
         return "success"
       }
       return "info"
     },
+    syncStepCounts(step) {
+      const s = step || {}
+      return {
+        insert: s.insertCount != null ? s.insertCount : 0,
+        update: s.updateCount != null ? s.updateCount : 0,
+        fail: s.failCount != null ? s.failCount : 0
+      }
+    },
+    collectSyncFailMessages(data) {
+      const steps = ["pasture", "enclosure", "plan", "batch", "yakAsset"]
+      const labels = {
+        pasture: this.lfT("syncStepPasture"),
+        enclosure: this.lfT("syncStepEnclosure"),
+        plan: this.lfT("syncStepPlan"),
+        batch: this.lfT("syncStepBatch"),
+        yakAsset: this.lfT("syncStepYakAsset")
+      }
+      const messages = []
+      steps.forEach((key) => {
+        const step = data[key]
+        if (step && step.failMessages && step.failMessages.length) {
+          step.failMessages.forEach((msg) => {
+            messages.push(`${labels[key]}: ${msg}`)
+          })
+        }
+      })
+      return messages
+    },
     formatAgeMonths(val) {
       if (val == null || val === "") {
         return this.lfCommon("dash")
@@ -174,12 +202,34 @@ export default {
       this.runSyncWithLoading(() => syncYakAsset())
         .then((res) => {
           const data = res.data || {}
-          const msg = this.lfT("syncSummary", {
-            insert: data.insertCount != null ? data.insertCount : 0,
-            update: data.updateCount != null ? data.updateCount : 0,
-            fail: data.failCount != null ? data.failCount : 0
-          })
-          this.$modal.msgSuccess(msg)
+          const pasture = this.syncStepCounts(data.pasture)
+          const enclosure = this.syncStepCounts(data.enclosure)
+          const plan = this.syncStepCounts(data.plan)
+          const batch = this.syncStepCounts(data.batch)
+          const yakAsset = this.syncStepCounts(data.yakAsset)
+          this.$modal.msgSuccess(
+            this.lfT("syncMasterSummary", {
+              pInsert: pasture.insert,
+              pUpdate: pasture.update,
+              pFail: pasture.fail,
+              eInsert: enclosure.insert,
+              eUpdate: enclosure.update,
+              eFail: enclosure.fail,
+              plInsert: plan.insert,
+              plUpdate: plan.update,
+              plFail: plan.fail,
+              bInsert: batch.insert,
+              bUpdate: batch.update,
+              bFail: batch.fail,
+              yInsert: yakAsset.insert,
+              yUpdate: yakAsset.update,
+              yFail: yakAsset.fail
+            })
+          )
+          const failMessages = this.collectSyncFailMessages(data)
+          if (failMessages.length) {
+            this.$modal.msgWarning(failMessages.join("；"))
+          }
           if (data.syncTime) {
             this.lastSyncHint = this.lfT("syncTimeHint", { time: this.parseTime(data.syncTime) })
           }