From 95acd3c49e98e57ec4965d74560283b8a3e538b9 Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Tue, 19 Jul 2022 18:16:57 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=8F=E5=AE=89=E4=B8=80=E8=88=AC=E8=80=97?=
 =?UTF-8?q?=E6=9D=90=E6=97=A0=E6=B3=95=E6=89=93=E5=8D=B0=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=8C=E6=89=B9=E6=AC=A1=E5=8F=B7=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basic/BussinessOriginTypeController.java       | 14 ++++++++++++--
 .../inout/StockQRCodeTextController.java           |  4 ++--
 .../basic/BussinessOriginTypeFilterRequest.java    |  2 ++
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessOriginTypeController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessOriginTypeController.java
index 6e63faa..385362b 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessOriginTypeController.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessOriginTypeController.java
@@ -3,12 +3,14 @@ package com.glxp.sale.admin.controller.basic;
 import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageInfo;
 import com.glxp.sale.admin.annotation.AuthRuleAnnotation;
+import com.glxp.sale.admin.entity.basic.BasicThirdSysEntity;
 import com.glxp.sale.admin.entity.basic.BussinessOriginTypeEntity;
 import com.glxp.sale.admin.httpclient.ErpBasicClient;
 import com.glxp.sale.admin.req.basic.BussinessOriginTypeFilterRequest;
 import com.glxp.sale.admin.req.inout.DeleteRequest;
 import com.glxp.sale.admin.res.PageSimpleResponse;
 import com.glxp.sale.admin.res.basic.BussinessOriginTypeResponse;
+import com.glxp.sale.admin.service.basic.BasicThirdSysService;
 import com.glxp.sale.admin.service.basic.BussinessOriginTypeService;
 import com.glxp.sale.common.enums.ResultEnum;
 import com.glxp.sale.common.res.BaseResponse;
@@ -29,6 +31,8 @@ public class BussinessOriginTypeController {
     private BussinessOriginTypeService bussinessOriginTypeService;
     @Resource
     ErpBasicClient erpBasicClient;
+    @Resource
+    private BasicThirdSysService basicThirdSysService;
 
     @AuthRuleAnnotation("")
     @GetMapping("/udiwms/originBusType/filter")
@@ -39,8 +43,14 @@ public class BussinessOriginTypeController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
 
-        if (StrUtil.isEmpty(bussinessTypeFilterRequest.getThirdSys())) {
-            return ResultVOUtils.error(500, "请先选择第三系统");
+        if (bussinessTypeFilterRequest.isOnlyMain()) {
+            BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys();
+            bussinessTypeFilterRequest.setThirdSys(basicThirdSysEntity.getThirdId());
+        } else if (StrUtil.isEmpty(bussinessTypeFilterRequest.getThirdSys())) {
+
+            BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys();
+            bussinessTypeFilterRequest.setThirdSys(basicThirdSysEntity.getThirdId());
+//            return ResultVOUtils.error(500, "请先选择第三方系统");
         }
 
 
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockQRCodeTextController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockQRCodeTextController.java
index 823efe7..ab6175b 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockQRCodeTextController.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockQRCodeTextController.java
@@ -464,8 +464,8 @@ public class StockQRCodeTextController {
 
     public StockOrderDetailEntity getDetailByRelBatch(List<StockOrderDetailEntity> stockOrderDetailEntities, String relId, String batchNo) {
         for (StockOrderDetailEntity stockOrderDetailEntity : stockOrderDetailEntities) {
-            if (StrUtil.trim(stockOrderDetailEntity.getBatchNo()).equals(StrUtil.trim(batchNo))
-                    && StrUtil.trim(stockOrderDetailEntity.getRelId()).equals(StrUtil.trim(relId))
+            if (StrUtil.trimToEmpty(stockOrderDetailEntity.getBatchNo()).equals(StrUtil.trimToEmpty(batchNo))
+                    && StrUtil.trimToEmpty(stockOrderDetailEntity.getRelId()).equals(StrUtil.trimToEmpty(relId))
             ) {
                 return stockOrderDetailEntity;
             }
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BussinessOriginTypeFilterRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BussinessOriginTypeFilterRequest.java
index a0a0199..9363d34 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BussinessOriginTypeFilterRequest.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BussinessOriginTypeFilterRequest.java
@@ -15,4 +15,6 @@ public class BussinessOriginTypeFilterRequest extends ListPageRequest {
     private String localAction;
     private String lastUpdateTime;
     private Integer corpType;
+    private String key;
+    private boolean onlyMain;
 }