From a4441247e9a81797ddf7ae93f03fb326efc339a7 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 20 九月 2024 14:59:34 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/WaveSeed.java | 6 ++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/param/WaveSeedReviewParam.java | 12 ++++
zy-asrs-admin/src/views/base/cacheSite/index.vue | 2
zy-asrs-admin/src/components/order/order/orderIn.vue | 1
zy-asrs-admin/src/components/order/order/orderOut.vue | 1
zy-asrs-admin/src/components/order/order/order.vue | 1
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/WaveSeedController.java | 9 +++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskWaveTimer.java | 9 +-
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/WaveSeedService.java | 3 +
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaveSeedServiceImpl.java | 39 +++++++++++++
zy-asrs-admin/src/views/out/waveSeed/index.vue | 40 +++++++++++--
11 files changed, 110 insertions(+), 13 deletions(-)
diff --git a/zy-asrs-admin/src/components/order/order/order.vue b/zy-asrs-admin/src/components/order/order/order.vue
index 8b4c353..cf763ec 100644
--- a/zy-asrs-admin/src/components/order/order/order.vue
+++ b/zy-asrs-admin/src/components/order/order/order.vue
@@ -126,6 +126,7 @@
dataIndex: 'oper',
key: 'oper',
width: 240,
+ fixed: 'right',
},
];
diff --git a/zy-asrs-admin/src/components/order/order/orderIn.vue b/zy-asrs-admin/src/components/order/order/orderIn.vue
index 8b4c353..cf763ec 100644
--- a/zy-asrs-admin/src/components/order/order/orderIn.vue
+++ b/zy-asrs-admin/src/components/order/order/orderIn.vue
@@ -126,6 +126,7 @@
dataIndex: 'oper',
key: 'oper',
width: 240,
+ fixed: 'right',
},
];
diff --git a/zy-asrs-admin/src/components/order/order/orderOut.vue b/zy-asrs-admin/src/components/order/order/orderOut.vue
index 2e4339e..7628d7a 100644
--- a/zy-asrs-admin/src/components/order/order/orderOut.vue
+++ b/zy-asrs-admin/src/components/order/order/orderOut.vue
@@ -135,6 +135,7 @@
dataIndex: 'oper',
key: 'oper',
width: 240,
+ fixed: 'right',
},
];
diff --git a/zy-asrs-admin/src/views/base/cacheSite/index.vue b/zy-asrs-admin/src/views/base/cacheSite/index.vue
index 34eb1a7..1a5fd32 100644
--- a/zy-asrs-admin/src/views/base/cacheSite/index.vue
+++ b/zy-asrs-admin/src/views/base/cacheSite/index.vue
@@ -213,7 +213,7 @@
<script>
export default {
- name: '缂撳瓨绔欑偣'
+ name: '鎾绔欑偣'
}
</script>
diff --git a/zy-asrs-admin/src/views/out/waveSeed/index.vue b/zy-asrs-admin/src/views/out/waveSeed/index.vue
index 3429c34..9932d59 100644
--- a/zy-asrs-admin/src/views/out/waveSeed/index.vue
+++ b/zy-asrs-admin/src/views/out/waveSeed/index.vue
@@ -52,12 +52,26 @@
...getColumnSearchProps('siteNo'),
},
{
- title: formatMessage('db.man_wave_seed.order_detl_id', '璁㈠崟鏄庣粏'),
- dataIndex: 'orderDetlId$',
+ title: formatMessage('db.man_wave_seed.orderNo', '璁㈠崟缂栧彿'),
+ dataIndex: ['orderDetl$', 'orderNo'],
width: 140,
ellipsis: true,
- ...getColumnSearchProps('orderDetlId$'),
+ ...getColumnSearchProps('orderNo'),
},
+ {
+ title: formatMessage('db.man_wave_seed.matnr', '鍟嗗搧缂栧彿'),
+ dataIndex: ['orderDetl$', 'mat$', 'matnr'],
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('matnr'),
+ },
+ // {
+ // title: formatMessage('db.man_wave_seed.order_detl_id', '璁㈠崟鏄庣粏'),
+ // dataIndex: 'orderDetlId$',
+ // width: 140,
+ // ellipsis: true,
+ // ...getColumnSearchProps('orderDetlId$'),
+ // },
{
title: formatMessage('db.man_wave_seed.anfme', '鏁伴噺'),
dataIndex: 'anfme',
@@ -222,7 +236,19 @@
}
const handleReviewOk = () => {
-
+ post('/api/waveSeed/review', {
+ waveSeedId: reviewState.record.id,
+ reviewNum: reviewState.reviewNum,
+ }).then((resp) => {
+ let result = resp.data;
+ if (result.code === 200) {
+ message.success(result.msg);
+ reviewState.open = false;
+ handleTableReload()
+ } else {
+ message.error(result.msg);
+ }
+ })
}
</script>
@@ -263,11 +289,11 @@
</a-table>
<a-modal v-model:open="reviewState.open" :title="formatMessage('page.review', '澶嶆牳')" @ok="handleReviewOk">
- <div>
+ <div style="margin-bottom: 20px;">
鎾鏁伴噺锛歿{ reviewState.record.anfme }}
</div>
- <div>
- 瀹為檯鏁伴噺锛�<a-input v-model:value="reviewState.reviewNum" />
+ <div style="display: flex;justify-content: flex-start;align-items: center;">
+ 瀹為檯鏁伴噺锛�<a-input-number v-model:value="reviewState.reviewNum" :min="1" :max="reviewState.record.anfme" />
</div>
</a-modal>
</div>
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/WaveSeedController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/WaveSeedController.java
index 6b97141..c4afa5b 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/WaveSeedController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/WaveSeedController.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
+import com.zy.asrs.wms.asrs.entity.param.WaveSeedReviewParam;
import com.zy.asrs.wms.common.annotation.OperationLog;
import com.zy.asrs.wms.common.domain.BaseParam;
import com.zy.asrs.wms.common.domain.KeyValVo;
@@ -99,4 +100,12 @@
ExcelUtil.build(ExcelUtil.create(waveSeedService.list(), WaveSeed.class), response);
}
+ @PreAuthorize("hasAuthority('asrs:waveSeed:update')")
+ @OperationLog("鎾澶嶆牳")
+ @PostMapping("/waveSeed/review")
+ public R review(@RequestBody WaveSeedReviewParam param) {
+ waveSeedService.waveSeedReview(param);
+ return R.ok("鎾澶嶆牳鎴愬姛");
+ }
+
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/WaveSeed.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/WaveSeed.java
index 04f815f..b256a92 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/WaveSeed.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/WaveSeed.java
@@ -55,6 +55,12 @@
private String siteNo;
/**
+ * 璁㈠崟
+ */
+ @ApiModelProperty(value= "璁㈠崟")
+ private Long orderId;
+
+ /**
* 璁㈠崟鏄庣粏
*/
@ApiModelProperty(value= "璁㈠崟鏄庣粏")
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/param/WaveSeedReviewParam.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/param/WaveSeedReviewParam.java
new file mode 100644
index 0000000..cdc33bc
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/param/WaveSeedReviewParam.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.wms.asrs.entity.param;
+
+import lombok.Data;
+
+@Data
+public class WaveSeedReviewParam {
+
+ private Long waveSeedId;
+
+ private Double reviewNum;
+
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/WaveSeedService.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/WaveSeedService.java
index ce5e9e0..2aba5f9 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/WaveSeedService.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/WaveSeedService.java
@@ -2,7 +2,10 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.asrs.wms.asrs.entity.WaveSeed;
+import com.zy.asrs.wms.asrs.entity.param.WaveSeedReviewParam;
public interface WaveSeedService extends IService<WaveSeed> {
+ void waveSeedReview(WaveSeedReviewParam param);
+
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaveSeedServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaveSeedServiceImpl.java
index d155b5c..8bb5b2b 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaveSeedServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaveSeedServiceImpl.java
@@ -1,12 +1,51 @@
package com.zy.asrs.wms.asrs.service.impl;
+import com.zy.asrs.framework.exception.CoolException;
+import com.zy.asrs.wms.asrs.entity.param.WaveSeedReviewParam;
import com.zy.asrs.wms.asrs.mapper.WaveSeedMapper;
import com.zy.asrs.wms.asrs.entity.WaveSeed;
import com.zy.asrs.wms.asrs.service.WaveSeedService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
+import java.util.Date;
+import java.util.Optional;
+
@Service("waveSeedService")
public class WaveSeedServiceImpl extends ServiceImpl<WaveSeedMapper, WaveSeed> implements WaveSeedService {
+ @Override
+ public void waveSeedReview(WaveSeedReviewParam param) {
+ if (param == null) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖");
+ }
+
+ if (param.getWaveSeedId() == null) {
+ throw new CoolException("鎾鏁版嵁涓嶈兘涓虹┖");
+ }
+
+ if (param.getReviewNum() == null) {
+ throw new CoolException("鎾鏁伴噺涓嶈兘涓虹┖");
+ }
+
+ if (param.getReviewNum() <= 0) {
+ throw new CoolException("鎾鏁伴噺闇�瑕佸ぇ浜�0");
+ }
+
+ WaveSeed waveSeed = this.getById(param.getWaveSeedId());
+ if (waveSeed == null) {
+ throw new CoolException("鎾鏁版嵁涓嶅瓨鍦�");
+ }
+
+ Double stock = Optional.of(waveSeed.getAnfme() - waveSeed.getWorkQty()).orElse(0.0D);
+ if (stock - param.getReviewNum() < 0) {
+ throw new CoolException("鎾鏁伴噺宸叉弧");
+ }
+
+ waveSeed.setWorkQty(waveSeed.getWorkQty() + param.getReviewNum());
+ waveSeed.setUpdateTime(new Date());
+ if (!this.updateById(waveSeed)) {
+ throw new CoolException("鎾澶嶆牳鏇存柊澶辫触");
+ }
+ }
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskWaveTimer.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskWaveTimer.java
index ea48026..f6c92a5 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskWaveTimer.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskWaveTimer.java
@@ -101,16 +101,15 @@
orderUtils.updateWorkQty(orderDetl.getId(), workQty, true);
-
- List<CacheSite> cacheSites = cacheSiteService.list(new LambdaQueryWrapper<CacheSite>().eq(CacheSite::getSiteStatus, CacheSiteStatusType.O.id).eq(CacheSite::getHostId, hostId));
- if (cacheSites.isEmpty()) {
- throw new CoolException("缂撳瓨绔欑┖闂翠笉瓒筹紝璇风◢鍚庡啀璇�");
+ CacheSite cacheSite = cacheSiteService.getOne(new LambdaQueryWrapper<CacheSite>().eq(CacheSite::getOrderId, orderDetl.getOrderId()).eq(CacheSite::getHostId, hostId));
+ if (cacheSite == null) {
+ throw new CoolException("缂撳瓨绔欑┖闂翠笉瀛樺湪");
}
- CacheSite cacheSite = cacheSites.get(0);
WaveSeed waveSeed = new WaveSeed();
waveSeed.setSiteId(cacheSite.getId());
waveSeed.setSiteNo(cacheSite.getSiteNo());
+ waveSeed.setOrderId(orderDetl.getOrderId());
waveSeed.setOrderDetlId(orderDetl.getId());
waveSeed.setTaskDetlId(taskDetl.getId());
waveSeed.setAnfme(taskDetl.getAnfme());
--
Gitblit v1.9.1