From df644b2785ac05eaed5b77738ae50ca29b34c2cb Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期六, 03 八月 2024 16:28:54 +0800
Subject: [PATCH] #
---
zy-asrs-admin/src/components/order/index.vue | 1
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaitPakinServiceImpl.java | 16 +++-
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/template/WaitPakinTemplate.java | 34 +++++++++++
zy-asrs-admin/src/views/in/waitPakin/index.vue | 70 +++++++++++++++++++++++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/WaitPakinController.java | 56 ++++++++++++++++++
5 files changed, 170 insertions(+), 7 deletions(-)
diff --git a/zy-asrs-admin/src/components/order/index.vue b/zy-asrs-admin/src/components/order/index.vue
index 21d27e4..36bebe3 100644
--- a/zy-asrs-admin/src/components/order/index.vue
+++ b/zy-asrs-admin/src/components/order/index.vue
@@ -252,6 +252,7 @@
let result = info.file.response;
if(result.code == 200) {
message.success(`${info.file.name} ${formatMessage('page.upload.success', '涓婁紶鎴愬姛')}`);
+ getPage()
}else {
message.error(result.msg);
}
diff --git a/zy-asrs-admin/src/views/in/waitPakin/index.vue b/zy-asrs-admin/src/views/in/waitPakin/index.vue
index f0d3219..24a1feb 100644
--- a/zy-asrs-admin/src/views/in/waitPakin/index.vue
+++ b/zy-asrs-admin/src/views/in/waitPakin/index.vue
@@ -3,11 +3,16 @@
import { useRouter } from "vue-router";
import { get, post, postBlob } from '@/utils/request.js'
import { message, Modal } from 'ant-design-vue';
-import { logout } from '@/config.js';
+import { globalState, logout } from '@/config.js';
import EditView from './edit.vue'
import { formatMessage } from '@/utils/localeUtils.js';
import useTableSearch from '@/utils/tableUtils.jsx';
import GenerateTaskView from '@/components/task/generateTask/index.vue';
+import {
+ DownOutlined,
+ UploadOutlined,
+ DownloadOutlined,
+} from "@ant-design/icons-vue";
const context = getCurrentInstance()?.appContext.config.globalProperties;
const router = useRouter();
@@ -226,6 +231,45 @@
generateTaskChild.value.open = true;
}
+const handleSyncOrderClick = (e) => {
+ if (e.key == 'import') {
+ importTemplate()
+ } else if (e.key == 'export') {
+ exportTemplate()
+ }
+}
+
+const importTemplate = () => {
+ //瀵煎叆妯℃澘
+}
+
+const exportTemplate = () => {
+ //妯℃澘瀵煎嚭
+ postBlob('/api/waitPakin/exportTemplate', {}).then(result => {
+ const blob = new Blob([result.data], { type: 'application/vnd.ms-excel' });
+ window.location.href = window.URL.createObjectURL(blob);
+ return true;
+ })
+}
+
+const fileList = ref([]);
+const handleUploadChange = info => {
+ if (info.file.status !== 'uploading') {
+ // console.log(info.file, info.fileList);
+ }
+ if (info.file.status === 'done') {
+ let result = info.file.response;
+ if(result.code == 200) {
+ message.success(`${info.file.name} ${formatMessage('page.upload.success', '涓婁紶鎴愬姛')}`);
+ getPage()
+ }else {
+ message.error(result.msg);
+ }
+ } else if (info.file.status === 'error') {
+ message.error(`${info.file.name} file upload failed.`);
+ }
+};
+
</script>
<script>
@@ -241,6 +285,30 @@
<a-input-search v-model:value="searchInput" :placeholder="formatMessage('page.input', '璇疯緭鍏�')"
style="width: 200px;" @search="onSearch" />
<div class="table-header-right">
+ <a-dropdown>
+ <template #overlay>
+ <a-menu @click="handleSyncOrderClick">
+ <a-menu-item key="import">
+ <a-upload v-model:file-list="fileList" name="file" action="/api/waitPakin/upload"
+ @change="handleUploadChange" :showUploadList="false" :headers="{
+ Authorization: globalState.token
+ }">
+ <UploadOutlined />
+ {{ formatMessage('page.waitPakin.import', '缁勬墭瀵煎叆') }}
+ </a-upload>
+ </a-menu-item>
+
+ <a-menu-item key="export">
+ <DownloadOutlined />
+ {{ formatMessage('page.waitPakin.export.template', '瀵煎嚭妯℃澘') }}
+ </a-menu-item>
+ </a-menu>
+ </template>
+ <a-button>
+ {{ formatMessage('page.waitPakin.sync', '缁勬墭鍚屾') }}
+ <DownOutlined />
+ </a-button>
+ </a-dropdown>
<a-button @click="generateTask()" type="primary">{{ formatMessage('page.generateTask', '鐢熸垚浠诲姟') }}</a-button>
<a-button @click="handleEdit(null)" type="primary">{{ formatMessage('page.add', '娣诲姞') }}</a-button>
<a-button @click="handleExport">{{ formatMessage('page.export', '瀵煎嚭') }}</a-button>
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/WaitPakinController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/WaitPakinController.java
index d7f845a..edd379f 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/WaitPakinController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/WaitPakinController.java
@@ -5,7 +5,9 @@
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.framework.exception.CoolException;
import com.zy.asrs.wms.asrs.entity.*;
+import com.zy.asrs.wms.asrs.entity.template.WaitPakinTemplate;
import com.zy.asrs.wms.asrs.service.*;
import com.zy.asrs.wms.common.annotation.OperationLog;
import com.zy.asrs.wms.common.domain.BaseParam;
@@ -15,8 +17,8 @@
import com.zy.asrs.wms.utils.ExcelUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.util.*;
@@ -27,6 +29,10 @@
@Autowired
private WaitPakinService waitPakinService;
+ @Autowired
+ private OrderService orderService;
+ @Autowired
+ private OrderDetlService orderDetlService;
@PreAuthorize("hasAuthority('asrs:waitPakin:list')")
@PostMapping("/waitPakin/page")
@@ -122,4 +128,52 @@
ExcelUtil.build(ExcelUtil.create(waitPakinService.list(), WaitPakin.class), response);
}
+ @PreAuthorize("hasAuthority('asrs:waitPakin:list')")
+ @PostMapping("/waitPakin/exportTemplate")
+ public void exportTemplate(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
+ ArrayList<WaitPakinTemplate> list = new ArrayList<>();
+ ExcelUtil.build(ExcelUtil.create(list, WaitPakinTemplate.class), response);
+ }
+
+ @PostMapping("/waitPakin/upload")
+ public R upload(@RequestParam("file") MultipartFile file) {
+ List<WaitPakinTemplate> list = ExcelUtil.parseExcelFile(file, WaitPakinTemplate.class);
+ for (WaitPakinTemplate waitPakinTemplate : list) {
+ Order order = orderService.getOne(new LambdaQueryWrapper<Order>().eq(Order::getOrderNo, waitPakinTemplate.getOrderNo()).eq(Order::getStatus, 1));
+ if (order == null) {
+ throw new CoolException("璁㈠崟涓嶅瓨鍦�");
+ }
+
+ LambdaQueryWrapper<OrderDetl> wrapper = new LambdaQueryWrapper<OrderDetl>().eq(OrderDetl::getOrderId, order.getId());
+ if (!Cools.isEmpty(waitPakinTemplate.getBatch())) {
+ wrapper.eq(OrderDetl::getBatch, waitPakinTemplate.getBatch());
+ }
+ List<OrderDetl> orderDetls = orderDetlService.list(wrapper);
+ if (orderDetls.isEmpty()) {
+ throw new CoolException("璁㈠崟鏄庣粏涓嶅瓨鍦�");
+ }
+
+ Long detlId = null;
+ for (OrderDetl orderDetl : orderDetls) {
+ Mat mat = orderDetl.getMat$();
+ if (mat.getMatnr().equals(waitPakinTemplate.getMatnr())) {
+ detlId = orderDetl.getId();
+ }
+ }
+
+ if (detlId == null) {
+ throw new CoolException("璁㈠崟鏄庣粏涓嶅瓨鍦�");
+ }
+
+ WaitPakin waitPakin = new WaitPakin();
+ waitPakin.setOrderId(order.getId());
+ waitPakin.setOrderNo(order.getOrderNo());
+ waitPakin.setAnfme(waitPakinTemplate.getAnfme());
+ waitPakin.setBarcode(waitPakinTemplate.getBarcode());
+ waitPakin.setDetlId(detlId);
+ waitPakinService.comb(waitPakin);
+ }
+ return R.ok();
+ }
+
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/template/WaitPakinTemplate.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/template/WaitPakinTemplate.java
new file mode 100644
index 0000000..754945d
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/template/WaitPakinTemplate.java
@@ -0,0 +1,34 @@
+package com.zy.asrs.wms.asrs.entity.template;
+
+import com.zy.asrs.common.utils.Synchro;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class WaitPakinTemplate {
+
+ //璁㈠崟缂栧彿
+ @ApiModelProperty(value= "璁㈠崟缂栧彿")
+ private String orderNo;
+
+ //鎵樼洏鐮�
+ @ApiModelProperty(value= "鎵樼洏鐮�")
+ private String barcode;
+
+ //鐗╂枡鍙�
+ @ApiModelProperty(value= "鐗╂枡鍙�")
+ private String matnr;
+
+ //鎵瑰彿
+ @ApiModelProperty(value= "鎵瑰彿")
+ private String batch;
+
+ //鏁伴噺
+ @ApiModelProperty(value= "鏁伴噺")
+ private Double anfme;
+
+ public void sync(Object source) {
+ Synchro.Copy(source, this);
+ }
+
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaitPakinServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaitPakinServiceImpl.java
index 57b933e..5a7755e 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaitPakinServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaitPakinServiceImpl.java
@@ -53,6 +53,17 @@
throw new CoolException("鎵樼洏姝ｅ湪鍏ュ簱涓�");
}
+ OrderDetl orderDetl = orderDetlService.getById(waitPakin.getDetlId());
+ if (orderDetl == null) {
+ throw new CoolException("璁㈠崟鏄庣粏涓嶅瓨鍦�");
+ }
+
+ //鍙敤鏁伴噺
+ Double count = orderDetl.getAnfme() - orderDetl.getQty() - orderDetl.getWorkQty() - orderDetl.getWaitQty();
+ if (waitPakin.getAnfme() > count) {
+ throw new CoolException("缁勬墭鏁伴噺瓒呰繃鍓╀綑鍙敤鏁伴噺");
+ }
+
//鏌ヨ鏄惁瀛樺湪鐩稿悓鏄庣粏鍜屾墭鐩樼爜鐨勭粍鎵橀�氱煡妗�
WaitPakin waitPakin1 = this.getOne(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, waitPakin.getBarcode()).eq(WaitPakin::getDetlId, waitPakin.getDetlId()));
if (waitPakin1 == null) {
@@ -67,11 +78,6 @@
if (!this.updateById(waitPakin1)) {
throw new CoolException("娣诲姞澶辫触");
}
- }
-
- OrderDetl orderDetl = orderDetlService.getById(waitPakin.getDetlId());
- if (orderDetl == null) {
- throw new CoolException("璁㈠崟鏄庣粏涓嶅瓨鍦�");
}
//鑾峰彇璁㈠崟
--
Gitblit v1.9.1