From 931ccbb74b5b467a7964a9229e4e1661c43c9438 Mon Sep 17 00:00:00 2001
From: youjie <272855983@qq.com>
Date: Mon, 1 Jul 2024 08:32:56 +0800
Subject: [PATCH] 生成补充入库时，选择分拣口，如果只有一个分拣口 那么默认选择那个分拣口
---
ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerHeaderList.vue | 29 ++++++++++++++++++++++++++---
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/service/WcsServiceImpl.java | 10 +++++-----
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/port/controller/PortController.java | 33 +++++++++------------------------
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/port/entity/Port.java | 7 +++----
4 files changed, 43 insertions(+), 36 deletions(-)
diff --git a/ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerHeaderList.vue b/ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerHeaderList.vue
index 76a75bb..5164540 100644
--- a/ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerHeaderList.vue
+++ b/ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerHeaderList.vue
@@ -166,7 +166,7 @@ import ReceiptContainerDetailList from './ReceiptContainerDetailList'
import {initDictOptions, filterMultiDictText} from '@/components/dict/JDictSelectUtil'
import '@/assets/less/TableExpand.less'
import '@/assets/less/TableExpand.less'
-import {createReceiptTask, createReceiptBatchTask} from '@/api/api'
+import {createReceiptTask, createReceiptBatchTask, selectSupplePort} from '@/api/api'
import ReceiptContainerSelectModal from "./modules/ReceiptContainerSelectModal";
import ReceiptContainerFillSelectModal from "./modules/ReceiptContainerFillSelectModal";
import ReceiptContainerStatusSelectModal from "./modules/ReceiptContainerStatusSelectModal";
@@ -366,8 +366,31 @@ export default {
});
},
selectPort(record) {
- this.$refs.modalForm2.edit(record);
- this.$refs.modalForm2.title = "选择分拣入库口";
+ const that = this;
+ that.model = Object.assign({}, record);
+ selectSupplePort(record).then((res) => {
+ if (res.success) {
+ var portList = res.result;
+ if (portList.length == 1) {
+ this.loading = true;
+ that.model.toPort = portList[0].code;
+ createReceiptTask(this.model).then((res) => {
+ this.loading = false;
+ if (res.success) {
+ this.$message.success(res.message);
+ } else {
+ this.$message.error(res.message);
+ }
+ this.searchQuery();
+ });
+ } else {
+ this.$refs.modalForm2.edit(record);
+ this.$refs.modalForm2.title = "选择分拣入库口";
+ }
+ } else {
+ this.$message.warning(res.message);
+ }
+ });
},
selectFillPort(record) {
this.$refs.modalForm3.edit(record);
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/service/WcsServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/service/WcsServiceImpl.java
index f23b0bc..9c97b11 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/service/WcsServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/service/WcsServiceImpl.java
@@ -294,11 +294,11 @@ public class WcsServiceImpl implements WcsService {
throw new JeecgBootException("分配库位时，创建移库任务失败");
}
preTaskNo = result.getResult().getId();
- taskHeader.setPreTaskNo(preTaskNo);
- success = taskHeaderService.updatePreTaskNoById(preTaskNo, taskHeader.getId());
- if (!success) {
- throw new JeecgBootException("分配库位时，更新任务状态失败");
- }
+// taskHeader.setPreTaskNo(preTaskNo);
+// success = taskHeaderService.updatePreTaskNoById(preTaskNo, taskHeader.getId());
+// if (!success) {
+// throw new JeecgBootException("分配库位时，更新任务状态失败");
+// }
}
} else {
Location outSideLocation = locationService.getOutSideNear(location);
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/port/controller/PortController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/port/controller/PortController.java
index 91d7606..18911a5 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/port/controller/PortController.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/port/controller/PortController.java
@@ -1,44 +1,29 @@
package org.jeecg.modules.wms.config.port.controller;
import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
+
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.wms.config.port.entity.Port;
+import org.jeecg.modules.wms.config.port.service.IPortService;
import org.jeecg.utils.HuahengJwtUtil;
-import org.jeecg.common.util.oConvertUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.modules.wms.config.port.entity.Port;
-import org.jeecg.modules.wms.config.port.service.IPortService;
-import org.jeecg.utils.StringUtils;
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-import org.jeecg.common.system.base.controller.JeecgController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.jeecg.common.aspect.annotation.AutoLog;
+import lombok.extern.slf4j.Slf4j;
/**
* @Description: 出入口
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/port/entity/Port.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/port/entity/Port.java
index 6bc8c78..30c2e08 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/port/entity/Port.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/port/entity/Port.java
@@ -6,9 +6,7 @@ import java.util.Date;
import org.jeecg.common.aspect.annotation.Dict;
import org.jeecgframework.poi.excel.annotation.Excel;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -58,7 +56,8 @@ public class Port implements Serializable {
/** 巷道 */
@Excel(name = "巷道", width = 15)
@ApiModelProperty(value = "巷道")
- private String roadWay;
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
+ private Integer roadWay;
/** 备用字段1 */
@Excel(name = "备用字段1", width = 15)
@ApiModelProperty(value = "备用字段1")
--
libgit2 0.22.2