诏安一般耗材无法打印问题，批次号问题

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())) {
+        if (bussinessTypeFilterRequest.isOnlyMain()) {
-            return ResultVOUtils.error(500, "请先选择第三系统");
+            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, "请先选择第三方系统");
         }
 
 

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))
+            if (StrUtil.trimToEmpty(stockOrderDetailEntity.getBatchNo()).equals(StrUtil.trimToEmpty(batchNo))
-                    && StrUtil.trim(stockOrderDetailEntity.getRelId()).equals(StrUtil.trim(relId))
+                    && StrUtil.trimToEmpty(stockOrderDetailEntity.getRelId()).equals(StrUtil.trimToEmpty(relId))
             ) {
                 return stockOrderDetailEntity;
             }

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;
 }