From b2b94e46f83a9577a99c02e85a576b445461d583 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 18 九月 2025 10:28:47 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/kingdee/utils/CustomStringUtils.java | 2 +-
src/main/java/com/zy/asrs/service/impl/ICMOServiceImpl.java | 8 ++++----
src/main/webapp/views/erpReceiving/erpReceiving.html | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/ICMOServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/ICMOServiceImpl.java
index cd5f599..dd8729c 100644
--- a/src/main/java/com/zy/asrs/service/impl/ICMOServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/ICMOServiceImpl.java
@@ -2,6 +2,7 @@
import cn.hutool.core.date.DatePattern;
import com.baomidou.dynamic.datasource.annotation.DS;
+import com.core.common.Cools;
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
@@ -17,7 +18,6 @@
import com.zy.kingdee.entity.PoOrder;
import com.zy.kingdee.entity.SubContract;
import com.zy.kingdee.entity.Vendor;
-import com.zy.kingdee.utils.CustomStringUtils;
import com.zy.kingdee.utils.ERPDateUtil;
import com.zy.kingdee.utils.SnowFlakeUtils;
import org.aspectj.weaver.ResolvedType;
@@ -222,7 +222,7 @@
String soCode = listSo.stream().filter(p2 -> {
return p2.equals(q.getSoCode());
}).findAny().orElse(null);
- if (CustomStringUtils.isBlank(soCode)) {
+ if (Cools.isEmpty(soCode)) {
poInStockEntry.setFEntrySelfP0362(poInStockEntry.getFEntrySelfP0362() + "," + q.getSoCode());
}
PoOrder poOrder2 = new PoOrder();
@@ -362,7 +362,7 @@
String soCode2 = listSo2.stream().filter(p4 -> {
return p4.equals(q2.getSoCode());
}).findAny().orElse(null);
- if (CustomStringUtils.isBlank(soCode2)) {
+ if (Cools.isEmpty(soCode2)) {
poInStockEntry3.setFEntrySelfP0362(poInStockEntry3.getFEntrySelfP0362() + "," + q2.getSoCode());
}
SubContract poOrder4 = new SubContract();
@@ -435,7 +435,7 @@
String strCode = venCode + ERPDateUtil.getDateStr(new Date(), DatePattern.PURE_DATE_PATTERN);
try {
String nowCode = this.poInStockMapper.getMaxCode(strCode);
- if (!CustomStringUtils.isBlank(nowCode)) {
+ if (!Cools.isEmpty(nowCode)) {
String strLeft = nowCode.substring(0, strCode.length());
String strRight = nowCode.substring(strCode.length(), nowCode.length());
Integer num = Integer.valueOf(Integer.valueOf(strRight).intValue() + 1);
diff --git a/src/main/java/com/zy/kingdee/utils/CustomStringUtils.java b/src/main/java/com/zy/kingdee/utils/CustomStringUtils.java
index ed53940..0ec8a71 100644
--- a/src/main/java/com/zy/kingdee/utils/CustomStringUtils.java
+++ b/src/main/java/com/zy/kingdee/utils/CustomStringUtils.java
@@ -1,6 +1,6 @@
package com.zy.kingdee.utils;
-import com.core.common.SpringUtils;
+
public class CustomStringUtils {
diff --git a/src/main/webapp/views/erpReceiving/erpReceiving.html b/src/main/webapp/views/erpReceiving/erpReceiving.html
index b09db90..0d6ce58 100644
--- a/src/main/webapp/views/erpReceiving/erpReceiving.html
+++ b/src/main/webapp/views/erpReceiving/erpReceiving.html
@@ -56,7 +56,7 @@
<el-button type="primary">鎾ら攢閫�鏂�</el-button>
</el-form-item>
</el-form>
- <el-table :data="tableData" border style="width: 100%" row-key="finterid" @selection-change="handleSelectionChange">
+ <el-table :data="tableData" border style="width: 100%" row-key="finterid" @selection-change="handleSelectionChange" max-height="650">
<el-table-column type="selection" >
</el-table-column>
<el-table-column type="index" width="50" >
--
Gitblit v1.9.1