From ec583e53bb8f1f79f48063c48d554fa895e321a6 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 02 一月 2024 10:14:29 +0800
Subject: [PATCH] 四项库出库作业 出库相同物料不同料箱号报错bug修复 新增平库无组托上架功能
---
src/main/java/com/zy/asrs/service/impl/DocTypeServiceImpl.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/DocTypeServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/DocTypeServiceImpl.java
index 4f2a66d..5d142eb 100644
--- a/src/main/java/com/zy/asrs/service/impl/DocTypeServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/DocTypeServiceImpl.java
@@ -1,6 +1,7 @@
package com.zy.asrs.service.impl;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.mapper.DocTypeMapper;
@@ -19,7 +20,20 @@
if (Cools.isEmpty(docName)) {
return null;
}
- DocType docType = this.selectOne(new EntityWrapper<DocType>().eq("doc_name", docName));
+ DocType docType = null;
+ try {
+ docType = this.selectById(docName);
+ } catch (Exception ignore) {}
+ if (docType == null) {
+ Wrapper<DocType> wrapper = new EntityWrapper<DocType>().eq("doc_name", docName);
+ if(pakin){
+ wrapper.eq("pakin",1);
+ }else {
+ wrapper.eq("pakout",1);
+ }
+ docType = this.selectOne(wrapper);
+ }
+
if (docType == null) {
long docId = 1L;
DocType last = this.selectOne(new EntityWrapper<DocType>().orderBy("doc_id", false));
--
Gitblit v1.9.1