From fc545bfecf1a42228dec6b1258e5f8ac2ee43a68 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期日, 13 二月 2022 11:47:40 +0800
Subject: [PATCH] #

---
 src/main/java/zy/cloud/wms/manager/entity/Order.java                    |    2 +-
 src/main/java/zy/cloud/wms/manager/service/impl/DocTypeServiceImpl.java |    7 +++++++
 src/main/java/zy/cloud/wms/manager/service/DocTypeService.java          |    2 ++
 3 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/src/main/java/zy/cloud/wms/manager/entity/Order.java b/src/main/java/zy/cloud/wms/manager/entity/Order.java
index 394e253..0cedbfa 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/Order.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/Order.java
@@ -399,7 +399,7 @@
 
     public String getDocType$(){
         DocTypeService service = SpringUtils.getBean(DocTypeService.class);
-        DocType docType = service.selectById(this.docType);
+        DocType docType = service.selectByNumAndHost(this.docType, this.hostId);
         if (!Cools.isEmpty(docType)){
             return String.valueOf(docType.getDocName());
         }
diff --git a/src/main/java/zy/cloud/wms/manager/service/DocTypeService.java b/src/main/java/zy/cloud/wms/manager/service/DocTypeService.java
index 221dcb0..65f52dd 100644
--- a/src/main/java/zy/cloud/wms/manager/service/DocTypeService.java
+++ b/src/main/java/zy/cloud/wms/manager/service/DocTypeService.java
@@ -5,4 +5,6 @@
 
 public interface DocTypeService extends IService<DocType> {
 
+    DocType selectByNumAndHost(Long docType, Long hostId);
+
 }
diff --git a/src/main/java/zy/cloud/wms/manager/service/impl/DocTypeServiceImpl.java b/src/main/java/zy/cloud/wms/manager/service/impl/DocTypeServiceImpl.java
index 9acd65f..8ad5c04 100644
--- a/src/main/java/zy/cloud/wms/manager/service/impl/DocTypeServiceImpl.java
+++ b/src/main/java/zy/cloud/wms/manager/service/impl/DocTypeServiceImpl.java
@@ -1,12 +1,19 @@
 package zy.cloud.wms.manager.service.impl;
 
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import zy.cloud.wms.manager.mapper.DocTypeMapper;
 import zy.cloud.wms.manager.entity.DocType;
 import zy.cloud.wms.manager.service.DocTypeService;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import javax.print.Doc;
+
 @Service("docTypeService")
 public class DocTypeServiceImpl extends ServiceImpl<DocTypeMapper, DocType> implements DocTypeService {
 
+    @Override
+    public DocType selectByNumAndHost(Long docType, Long hostId) {
+        return this.selectOne(new EntityWrapper<DocType>().eq("doc_id", docType).eq("host_id", hostId));
+    }
 }

--
Gitblit v1.9.1