|
@@ -864,12 +864,12 @@ public class SalesOrderController {
|
|
|
System.err.println(pubDescSeg4Name);
|
|
System.err.println(pubDescSeg4Name);
|
|
|
// 按逗号分割成数组(处理null或空字符串)
|
|
// 按逗号分割成数组(处理null或空字符串)
|
|
|
String[] codeArray = pubDescSeg4Name != null && !pubDescSeg4Name.isEmpty()
|
|
String[] codeArray = pubDescSeg4Name != null && !pubDescSeg4Name.isEmpty()
|
|
|
- ? pubDescSeg4Name.split(",")
|
|
|
|
|
|
|
+ ? pubDescSeg4Name.split(";")
|
|
|
: new String[0];
|
|
: new String[0];
|
|
|
|
|
|
|
|
// 查询料品档案并映射为品牌列表
|
|
// 查询料品档案并映射为品牌列表
|
|
|
QueryWrapper<ViewItemSel> itemQuery = new QueryWrapper<>();
|
|
QueryWrapper<ViewItemSel> itemQuery = new QueryWrapper<>();
|
|
|
- itemQuery.in(codeArray.length > 0, "Item_Name", codeArray);
|
|
|
|
|
|
|
+ itemQuery.in(codeArray.length > 0, "PubDescSeg4_Name", codeArray);
|
|
|
List<ViewItemSel> viewItemSelList = zcrmViewItemSelService.list(itemQuery);
|
|
List<ViewItemSel> viewItemSelList = zcrmViewItemSelService.list(itemQuery);
|
|
|
System.err.println("料品档案查询结果数量:" + viewItemSelList.size());
|
|
System.err.println("料品档案查询结果数量:" + viewItemSelList.size());
|
|
|
if (viewItemSelList.isEmpty()) {
|
|
if (viewItemSelList.isEmpty()) {
|
|
@@ -890,7 +890,7 @@ public class SalesOrderController {
|
|
|
|
|
|
|
|
// 查询库存视图并映射为库存列表
|
|
// 查询库存视图并映射为库存列表
|
|
|
QueryWrapper<ViewWhqohSel> stockQuery = new QueryWrapper<>();
|
|
QueryWrapper<ViewWhqohSel> stockQuery = new QueryWrapper<>();
|
|
|
- stockQuery.in(codeArray.length > 0, "Item_Name", codeArray);
|
|
|
|
|
|
|
+ stockQuery.in(codeArray.length > 0, "PubDescSeg4_Name", codeArray);
|
|
|
List<ViewWhqohSel> viewWhqohSelList = zcrmViewWhqohSelService.list(stockQuery);
|
|
List<ViewWhqohSel> viewWhqohSelList = zcrmViewWhqohSelService.list(stockQuery);
|
|
|
System.err.println("库存视图查询结果数量:" + viewWhqohSelList.size());
|
|
System.err.println("库存视图查询结果数量:" + viewWhqohSelList.size());
|
|
|
if (viewWhqohSelList.isEmpty()) {
|
|
if (viewWhqohSelList.isEmpty()) {
|