bug修改，缺量，全量补单等

api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicThirdSysController.java

@@ -132,7 +132,7 @@ public class BasicThirdSysController {
             BasicThirdSysEntity temp = basicThirdSysService.selectByThirdId(basicThirdSysEntity.getThirdId());
             if (!temp.getMainSys().equals(basicThirdSysEntity.getMainSys())) {
                 if (udiRelevanceService.isExit() || unitMaintainService.isExit()) {
-                    return ResultVOUtils.error(999, "设置主系统失败");
+                    return ResultVOUtils.error(999, "产品信息已经关联，无法取消主系统！");
                 }
                 if ((!temp.getEnabled()) && basicThirdSysEntity.getMainSys()) {
                     if (!basicThirdSysEntity.getEnabled()) {

api-admin/src/main/java/com/glxp/api/admin/thread/InvProductsTrService.java

@@ -438,9 +438,9 @@ public class InvProductsTrService {
 
         List<WarehouseEntity> warehouseEntities = codesService.findByReceiptId(orderEntity.getId());
         List<WarehouseEntity> prePutList = new ArrayList<>();
-
-        SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("ullage_supplement_all");
-        if (systemParamConfigEntity != null && systemParamConfigEntity.getParamValue().equals("1")) {
+        BussinessTypeEntity bussinessTypeEntity1 = bussinessTypeService.findBTByAction(orderEntity.getAction());
+//        SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("ullage_supplement_all");
+        if (bussinessTypeEntity1.isSupplementAll()) {
             for (WarehouseEntity warehouseEntity : warehouseEntities) {
                 prePutList.add(warehouseEntity);
             }

api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml

@@ -382,7 +382,7 @@
         select t1.* from stock_order t1 left join io_order t2 on t1.billNo = t2.erpFk
         <where>
             <if test="request.billNo != null and request.billNo != ''">
-                AND (t2.erpFk like concat('%', #{request.billNo}, '%') or t2.thirdBillNo like concat('%',#{request.billNo},'%') or t1.billNo like concat('%', #{request.billNo}, '%'))
+                AND (t2.erpFk like concat('%', #{request.billNo}, '%') or t2.thirdBillNo like concat('%',#{request.billNo},'%'))
             </if>
             <if test="request.submitStatus != null">
                 AND t2.exportStatus = #{request.submitStatus}