生成补充入库时，选择分拣口，如果只有一个分拣口那么默认选择那个分拣口

肖超群
1 parent c1b57ab7
Showing 4 changed files with 43 additions and 36 deletions
ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerHeaderList.vue
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/service/WcsServiceImpl.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/port/controller/PortController.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/port/entity/Port.java
@@ -166,7 +166,7 @@ import ReceiptContainerDetailList from &#39;./ReceiptContainerDetailList&#39;
 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);
@@ -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);
 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: 出入口
@@ -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")