From 34e429f219812e65204571f20bc7f90370e01858 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期二, 09 九月 2025 14:13:19 +0800
Subject: [PATCH] `1`
---
construction-data/src/components/datav/index.vue | 6 +++---
zy-asrs-admin/src/views/IndexView.vue | 17 ++++++++++++++++-
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/entity/domain/WaveTaskDetl.java | 3 +++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java | 12 ++++++------
4 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/construction-data/src/components/datav/index.vue b/construction-data/src/components/datav/index.vue
index ee328a8..cfc0eab 100644
--- a/construction-data/src/components/datav/index.vue
+++ b/construction-data/src/components/datav/index.vue
@@ -83,7 +83,7 @@
<!-- </el-col>-->
<!-- </el-row>-->
<div class="pick-wall-box">
- <el-col :span="6" v-for="(item, index) in seedBracket" :key="index" @click.native="lightClick(item)">
+ <el-col :span="6" v-for="(item, index) in seedBracket" :key="index" >
<div class="seed-bracket" :style="getLightStatus(item)" />
</el-col>
</div>
@@ -117,7 +117,7 @@
<el-col>
<div class="header-title">鎷ｈ揣鏁伴噺锛�</div>
<dv-border-box-10 class="box">
- <el-input type="text" v-model="getWorkQty" disabled></el-input>
+ <el-input type="text" v-model="selected.revQty" disabled></el-input>
</dv-border-box-10>
</el-col>
</el-row>
@@ -341,7 +341,7 @@
//闅愯棌寮规
this.show = false
// eslint-disable-next-line no-undef
- $ajax.post('wave/sow/review', { waveSeedId: this.selected.id, reviewNum: this.getWorkQty }).then(response => {
+ $ajax.post('wave/sow/review', { waveSeedId: this.selected.id, reviewNum: this.selected.revQty }).then(response => {
if (response.code === 200) {
this.getWaves()
} else {
diff --git a/zy-asrs-admin/src/views/IndexView.vue b/zy-asrs-admin/src/views/IndexView.vue
index be72d95..f615790 100644
--- a/zy-asrs-admin/src/views/IndexView.vue
+++ b/zy-asrs-admin/src/views/IndexView.vue
@@ -204,18 +204,33 @@
const licenseDays = ref(365);
getLicenseDays();
function getLicenseDays() {
+ const currentDate = new Date();
+ const newDate = new Date(currentDate);
post('/api/license/getLicenseDays', {}).then((resp) => {
let result = resp.data;
let data = result.data;
if (result.code == 200) {
licenseDays.value = data;
if(data <= 15) {
- 銆�alert("璁稿彲璇佹湁鏁堟湡锛�" + data + "澶�")
+ newDate.setDate(currentDate.getDate() + data);
+ 銆�alert("璁稿彲璇佹湁鏁堟湡锛�" + data + "澶╋紝"銆�+銆�"鍒版湡鏃ユ湡锛�"銆�+銆�formatDate(newDate))
}
}
})
}
+// 瀹屾暣鐨勬棩鏈熸牸寮忓寲鍑芥暟
+function formatDate(date, format = 'yyyy-MM-dd') {
+ const year = date.getFullYear();
+ const month = String(date.getMonth() + 1).padStart(2, '0');
+ const day = String(date.getDate()).padStart(2, '0');
+
+ return format
+ .replace('yyyy', year)
+ .replace('MM', month)
+ .replace('dd', day);
+}
+
const switchHost = (item) => {
globalState.currentHost = item;
postForm('/api/root/change/host/auth', {
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/entity/domain/WaveTaskDetl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/entity/domain/WaveTaskDetl.java
index 517fd88..4a2f9f3 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/entity/domain/WaveTaskDetl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/entity/domain/WaveTaskDetl.java
@@ -25,6 +25,9 @@
* 鏁伴噺
*/
private Integer anfme;
+
+ @TableField(exist = false)
+ private Integer revQty;
/**
* 娉㈡鍙�
*/
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java
index 5b25040..248d0b6 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java
@@ -444,12 +444,12 @@
throw new CoolException("璁㈠崟鎾浣嶇粦瀹氬け璐ワ紒锛�");
}
-// if (!waveSeedMapper.update(new LambdaUpdateWrapper<WaveSeed>()
-// .eq(WaveSeed::getOrderNo, order.getOrderNo())
-// .set(WaveSeed::getSiteId, siteNo.getId())
-// .set(WaveSeed::getSiteNo, siteNo.getSiteNo()))) {
-// throw new CoolException("鎾绔欑偣鏇存柊澶辫触锛侊紒");
-// }
+ if (!waveSeedMapper.update(new LambdaUpdateWrapper<WaveSeed>()
+ .eq(WaveSeed::getOrderNo, order.getOrderNo())
+ .set(WaveSeed::getSiteId, siteNo.getId())
+ .set(WaveSeed::getSiteNo, siteNo.getSiteNo()))) {
+ throw new CoolException("鎾绔欑偣鏇存柊澶辫触锛侊紒");
+ }
//缁戝畾鎴愬姛锛屾挱绉嶅浜伅
sowLightMange(siteNo.getSiteNo(), order, "LIGHT");
} else {
--
Gitblit v1.9.1